From 131cc78825466618ece9cfa1d3446a0acf98b639 Mon Sep 17 00:00:00 2001
From: "qingwei.li" <cinwell.li@gmail.com>
Date: Tue, 1 Nov 2016 18:28:20 +0800
Subject: [PATCH 1/2] Update build theme config

---
 examples/app.vue       | 2 +-
 package.json           | 5 ++---
 packages/theme-default | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/examples/app.vue b/examples/app.vue
index 00b175815..2f0cc7994 100644
--- a/examples/app.vue
+++ b/examples/app.vue
@@ -1,5 +1,5 @@
 <style lang="css">
-  @import '../node_modules/highlight.js/styles/color-brewer.css';
+  @import 'highlight.js/styles/color-brewer.css';
   @import 'assets/styles/common.css';
   @import 'assets/styles/fonts/style.css';
 
diff --git a/package.json b/package.json
index b3eb54012..12a005058 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
   ],
   "scripts": {
     "build:file": "node build/bin/iconInit.js & node build/bin/build-entry.js",
-    "dev": "npm run bootstrap && npm install && npm run build:file && cooking watch -c build/cooking.demo.js -p",
+    "dev": "npm install && npm run build:file && cooking watch -c build/cooking.demo.js -p",
     "dist": "npm run clean && npm run build:file && npm run lint && cooking build -c build/cooking.conf.js,build/cooking.common.js,build/cooking.component.js -p && npm run build:utils && npm run build:theme",
     "dist:all": "node build/bin/build-all.js && npm run build:theme",
     "build:theme": "git submodule update --remote && node build/bin/gen-cssfile && gulp build --gulpfile packages/theme-default/gulpfile.js && cp-cli packages/theme-default/lib lib/theme-default",
@@ -21,8 +21,7 @@
     "clean": "rimraf lib && rimraf packages/*/lib && rimraf test/**/coverage",
     "lint": "eslint src/**/* test/**/* packages/**/*.{js,vue} build/**/* --quiet",
     "test:watch": "karma start test/unit/karma.conf.js",
-    "bootstrap": "cd packages/theme-default && npm i --production && cd ../..",
-    "test": "npm run bootstrap && npm run lint && CI_ENV=/dev/ karma start test/unit/karma.conf.js --single-run"
+    "test": "npm run lint && CI_ENV=/dev/ karma start test/unit/karma.conf.js --single-run"
   },
   "repository": {
     "type": "git",
diff --git a/packages/theme-default b/packages/theme-default
index 1d92c70ea..543dc9668 160000
--- a/packages/theme-default
+++ b/packages/theme-default
@@ -1 +1 @@
-Subproject commit 1d92c70ea7e47432fb81021d10d142b37fe3e104
+Subproject commit 543dc96689963e3f2c1d2032b547aee5a8046559

From cacd19d27d24e5aeca7271a34bdb641a7583fafe Mon Sep 17 00:00:00 2001
From: "qingwei.li" <cinwell.li@gmail.com>
Date: Tue, 1 Nov 2016 22:51:03 +0800
Subject: [PATCH 2/2] package.json: Update scripts

---
 build/release.sh       | 10 ++++++++++
 package.json           | 20 +++++++++++---------
 packages/theme-default |  2 +-
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/build/release.sh b/build/release.sh
index 4a8b6a72e..605fbbe06 100644
--- a/build/release.sh
+++ b/build/release.sh
@@ -11,7 +11,17 @@ then
   # build
   VERSION=$VERSION npm run dist
 
+  # publish theme
+  echo "Releasing theme-default $VERSION ..."
+  cd packages/theme-default
+  git checkout master
+  npm version $VERSION --message "[release] $VERSION"
+  git push origin master --tags
+  npm publish --tag next
+  cd ../..
+
   # commit
+  git submodule update
   git add -A
   git commit -m "[build] $VERSION"
   npm version $VERSION --message "[release] $VERSION"
diff --git a/package.json b/package.json
index 12a005058..350c9b480 100644
--- a/package.json
+++ b/package.json
@@ -9,19 +9,21 @@
     "packages"
   ],
   "scripts": {
+    "bootstrap": "npm i && npm run submodule:fetch",
     "build:file": "node build/bin/iconInit.js & node build/bin/build-entry.js",
-    "dev": "npm install && npm run build:file && cooking watch -c build/cooking.demo.js -p",
-    "dist": "npm run clean && npm run build:file && npm run lint && cooking build -c build/cooking.conf.js,build/cooking.common.js,build/cooking.component.js -p && npm run build:utils && npm run build:theme",
-    "dist:all": "node build/bin/build-all.js && npm run build:theme",
-    "build:theme": "git submodule update --remote && node build/bin/gen-cssfile && gulp build --gulpfile packages/theme-default/gulpfile.js && cp-cli packages/theme-default/lib lib/theme-default",
-    "deploy": "npm run build:file && cooking build -c build/cooking.demo.js -p && echo element.eleme.io>>examples/element-ui/CNAME && gh-pages -d examples/element-ui --remote eleme && del examples/element-ui",
-    "pub": "sh build/release.sh",
-    "pub:all": "npm run dist:all && lerna publish",
+    "build:theme": "npm run submodule:fetch && node build/bin/gen-cssfile && gulp build --gulpfile packages/theme-default/gulpfile.js && cp-cli packages/theme-default/lib lib/theme-default",
     "build:utils": "cross-env BABEL_ENV=utils babel src --out-dir lib --ignore src/index.js",
     "clean": "rimraf lib && rimraf packages/*/lib && rimraf test/**/coverage",
+    "deploy": "npm run build:file && cooking build -c build/cooking.demo.js -p && echo element.eleme.io>>examples/element-ui/CNAME && gh-pages -d examples/element-ui --remote eleme && del examples/element-ui",
+    "dev": "npm run bootstrap && npm run build:file && cooking watch -c build/cooking.demo.js -p",
+    "dist": "npm run clean && npm run build:file && npm run lint && cooking build -c build/cooking.conf.js,build/cooking.common.js,build/cooking.component.js -p && npm run build:utils && npm run build:theme",
+    "dist:all": "node build/bin/build-all.js && npm run build:theme",
     "lint": "eslint src/**/* test/**/* packages/**/*.{js,vue} build/**/* --quiet",
-    "test:watch": "karma start test/unit/karma.conf.js",
-    "test": "npm run lint && CI_ENV=/dev/ karma start test/unit/karma.conf.js --single-run"
+    "pub": "sh build/release.sh",
+    "pub:all": "npm run dist:all && lerna publish",
+    "submodule:fetch": "git submodule foreach 'git checkout master && git pull' && git submodule update",
+    "test": "npm run lint && CI_ENV=/dev/ karma start test/unit/karma.conf.js --single-run",
+    "test:watch": "karma start test/unit/karma.conf.js"
   },
   "repository": {
     "type": "git",
diff --git a/packages/theme-default b/packages/theme-default
index 543dc9668..d8d012b4a 160000
--- a/packages/theme-default
+++ b/packages/theme-default
@@ -1 +1 @@
-Subproject commit 543dc96689963e3f2c1d2032b547aee5a8046559
+Subproject commit d8d012b4ac597297517fae0f9d05ac5d0d68fc5c