Merge pull request #779 from QingWei-Li/fix/build-theme

Update build theme config

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"

examples/app.vue

 <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';
 

package.json

@@ -9,20 +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 run bootstrap && npm install && npm run build:file && cooking watch -c build/cooking.demo.js -p",
+    "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",
-    "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",
+    "lint": "eslint src/**/* test/**/* packages/**/*.{js,vue} build/**/* --quiet",
     "pub": "sh build/release.sh",
     "pub:all": "npm run dist:all && lerna publish",
-    "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",
-    "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"
+    "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",

theme-default @ d8d012b4

-Subproject commit 1d92c70ea7e47432fb81021d10d142b37fe3e104
+Subproject commit d8d012b4ac597297517fae0f9d05ac5d0d68fc5c