diff --git a/Makefile b/Makefile index a55dbf3a0..f43ce81e4 100644 --- a/Makefile +++ b/Makefile @@ -6,10 +6,10 @@ build-theme: npm run build:theme install: - npm run bootstrap + npm install install-cn: - npm run bootstrap --registry=http://registry.npm.taobao.org + npm install --registry=http://registry.npm.taobao.org dev: npm run dev diff --git a/package.json b/package.json index cfd99cc62..17e2a5e48 100644 --- a/package.json +++ b/package.json @@ -10,12 +10,11 @@ ], "scripts": { "build:file": "node build/bin/iconInit.js & node build/bin/build-entry.js", - "dev": "npm run bootstrap && 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": "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", - "bootstrap": "npm i && lerna bootstrap", "pub": "sh build/release.sh", "pub:all": "npm run dist:all && lerna publish", "build:utils": "babel src/utils --out-dir lib/utils", @@ -37,7 +36,11 @@ }, "dependencies": { "async-validator": "^1.6.6", + "gulp": "^3.9.1", + "gulp-cssmin": "^0.1.7", + "gulp-postcss": "^6.1.1", "object-equal": "^1.0.0", + "postcss-salad": "^1.0.5", "throttle-debounce": "^1.0.1", "vue-popup": "^0.2.8", "wind-dom": "0.0.3" @@ -60,7 +63,6 @@ "file-loader": "^0.9.0", "file-save": "^0.2.0", "gh-pages": "^0.11.0", - "gulp": "^3.9.1", "highlight.js": "^9.3.0", "html-loader": "^0.4.3", "html-webpack-plugin": "^2.22.0", @@ -72,7 +74,6 @@ "object-assign": "^4.1.0", "postcss": "^5.1.2", "postcss-loader": "^0.11.1", - "postcss-salad": "^1.0.5", "rimraf": "^2.5.4", "style-loader": "^0.13.1", "theaterjs": "^3.0.0",