From b42d41d9e36f95e1037cbb49740be785b8507a7d Mon Sep 17 00:00:00 2001 From: sokis Date: Wed, 27 Jul 2016 15:19:04 +0800 Subject: [PATCH 1/9] [build] 2.0.0-beta.1 --- build/release.sh | 27 +++++++++++++++++++++++++++ package.json | 5 ++++- src/cli/vuex-serve.js | 18 ++++++++++++++++++ src/sub-commands/serve.js | 22 ++++++++++++++++++++++ src/tasks/webpack-server.js | 15 +++++++++++++++ 5 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 build/release.sh create mode 100644 src/cli/vuex-serve.js create mode 100644 src/sub-commands/serve.js create mode 100644 src/tasks/webpack-server.js diff --git a/build/release.sh b/build/release.sh new file mode 100644 index 0000000..67f478a --- /dev/null +++ b/build/release.sh @@ -0,0 +1,27 @@ +set -e +echo "Enter release version: " +read VERSION + +read -p "Releasing $VERSION - are you sure? (y/n)" -n 1 -r +echo # (optional) move to a new line +if [[ $REPLY =~ ^[Yy]$ ]] +then + echo "Releasing $VERSION ..." + export SAUCE_BUILD_ID=$VERSION:`date +"%s"` + + npm run clean + npm run test + + # build + VERSION=$VERSION npm run build + + # commit + git add -A + git commit -m "[build] $VERSION" + npm version $VERSION --message "[release] $VERSION" + + # publish + git push origin refs/tags/v$VERSION + git push + npm publish --tag next +fi \ No newline at end of file diff --git a/package.json b/package.json index e4a1984..8795df6 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,8 @@ "lint": "./node_modules/.bin/eslint ./src ./test ./blueprints", "clean": "rimraf lib", "publish:patch": "npm test && npm run clean && npm run build && npm version patch && npm publish", - "publish:minor": "npm test && npm run clean && npm run build && npm version minor && npm publish" + "publish:minor": "npm test && npm run clean && npm run build && npm version minor && npm publish", + "release": "bash build/release.sh" }, "bin": { "vuex": "bin/vuex.js", @@ -54,6 +55,7 @@ "fs-extra": "^0.26.5", "humps": "^1.0.0", "jsonfile": "^2.2.3", + "koa": "^1.2.1", "lodash": "^4.5.1", "log-update": "^1.0.2", "minimist": "^1.2.0", @@ -61,6 +63,7 @@ "shelljs": "^0.6.0", "temp": "^0.8.3", "through": "^2.3.8", + "vuex-cli-webpack": "^0.1.5", "walk-sync": "^0.2.6" }, "devDependencies": { diff --git a/src/cli/vuex-serve.js b/src/cli/vuex-serve.js new file mode 100644 index 0000000..bfb4682 --- /dev/null +++ b/src/cli/vuex-serve.js @@ -0,0 +1,18 @@ +import commander from 'commander'; +import { version } from '../version'; +import Serve from '../sub-commands/serve'; +// import minimist from 'minimist'; + +const subCommand = new Serve(); + +commander.on('--help', () => { + subCommand.printUserHelp(); +}); + +commander + .version(version()) + .description(' 启动开发服务器') + .parse(process.argv); + + +subCommand.run(); diff --git a/src/sub-commands/serve.js b/src/sub-commands/serve.js new file mode 100644 index 0000000..ec604dc --- /dev/null +++ b/src/sub-commands/serve.js @@ -0,0 +1,22 @@ +import SubCommand from '../models/sub-command'; +import WebServer from '../tasks/webpack-server'; + +// 开发服务器 +class Serve extends SubCommand { + constructor() { + super(); + this.webserver = new WebServer(this.environment); + } + + printUserHelp() { + this.logger.write( + ' vuex server --help ' + ); + } + + run(cliArg) { + this.webserver.run(cliArg); + } +} + +export default Serve; diff --git a/src/tasks/webpack-server.js b/src/tasks/webpack-server.js new file mode 100644 index 0000000..06825cd --- /dev/null +++ b/src/tasks/webpack-server.js @@ -0,0 +1,15 @@ +import Task from '../models/task'; +import config from '../config'; +import { serve } from 'vuex-cli-webpack' + +export default class extends Task { + constructor(environment) { + super(environment); + } + + run(config) { + const logger = this.logger; + logger.writeInfo('正在启动开发服务器...') + serve() + } +} From 139909abac24b4c2da148472c6f315da717e7583 Mon Sep 17 00:00:00 2001 From: sokis Date: Wed, 27 Jul 2016 15:19:05 +0800 Subject: [PATCH 2/9] [release] 2.0.0-beta.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8795df6..d4981c7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vuex-cli", - "version": "0.4.0", + "version": "2.0.0-beta.1", "description": "快速搭建 vuex/vuejs 应用脚手架。", "main": "bin/vuex.js", "engine": { From afcd0d57487f35d94af33f5e8bb422c1e90ad95d Mon Sep 17 00:00:00 2001 From: sokis Date: Wed, 27 Jul 2016 15:32:01 +0800 Subject: [PATCH 3/9] [build] 2.0.0-beta.2 --- .eslintignore | 3 +++ README.md | 6 ++++++ package.json | 4 +++- src/cli/vuex-compile.js | 17 +++++++++++++++++ src/cli/{vuex-serve.js => vuex-server.js} | 4 ++-- src/sub-commands/compile.js | 22 ++++++++++++++++++++++ src/sub-commands/{serve.js => server.js} | 0 src/tasks/webpack-compile.js | 15 +++++++++++++++ src/tasks/webpack-server.js | 4 ++-- 9 files changed, 70 insertions(+), 5 deletions(-) create mode 100644 .eslintignore create mode 100644 src/cli/vuex-compile.js rename src/cli/{vuex-serve.js => vuex-server.js} (78%) create mode 100644 src/sub-commands/compile.js rename src/sub-commands/{serve.js => server.js} (100%) create mode 100644 src/tasks/webpack-compile.js diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 0000000..379820a --- /dev/null +++ b/.eslintignore @@ -0,0 +1,3 @@ +build +node_modules +lib \ No newline at end of file diff --git a/README.md b/README.md index 98cde06..cdf461a 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,12 @@ \___/ \__,_|\___/_/\_\ \____/\_____/\___/ ``` +## 更新日志 + ++ 2016.07.27 集成webpack 配置服务 + - 启动webpack开发服务 `vuex serve` + - 编译代码 `vuex compile` + ## 使用 ```javascript diff --git a/package.json b/package.json index d4981c7..382028f 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,9 @@ "vuex-init": "bin/vuex-init.js", "vuex-generate": "bin/vuex-generate.js", "vuex-g": "bin/vuex-g.js", - "vuex-new": "bin/vuex-new.js" + "vuex-new": "bin/vuex-new.js", + "vuex-server": "bin/vuex-server.js", + "vuex-compile": "bin/vuex-compile.js" }, "repository": { "type": "git", diff --git a/src/cli/vuex-compile.js b/src/cli/vuex-compile.js new file mode 100644 index 0000000..41b8812 --- /dev/null +++ b/src/cli/vuex-compile.js @@ -0,0 +1,17 @@ +import commander from 'commander'; +import { version } from '../version'; +import Compile from '../sub-commands/compile'; + +const subCommand = new Compile(); + +commander.on('--help', () => { + subCommand.printUserHelp(); +}); + +commander + .version(version()) + .description(' 编译代码') + .parse(process.argv); + + +subCommand.run(); diff --git a/src/cli/vuex-serve.js b/src/cli/vuex-server.js similarity index 78% rename from src/cli/vuex-serve.js rename to src/cli/vuex-server.js index bfb4682..bb46936 100644 --- a/src/cli/vuex-serve.js +++ b/src/cli/vuex-server.js @@ -1,9 +1,9 @@ import commander from 'commander'; import { version } from '../version'; -import Serve from '../sub-commands/serve'; +import Server from '../sub-commands/server'; // import minimist from 'minimist'; -const subCommand = new Serve(); +const subCommand = new Server(); commander.on('--help', () => { subCommand.printUserHelp(); diff --git a/src/sub-commands/compile.js b/src/sub-commands/compile.js new file mode 100644 index 0000000..4d37103 --- /dev/null +++ b/src/sub-commands/compile.js @@ -0,0 +1,22 @@ +import SubCommand from '../models/sub-command'; +import CompileTask from '../tasks/webpack-compile'; + +// 开发服务器 +class Compile extends SubCommand { + constructor() { + super(); + this.compile = new CompileTask(this.environment); + } + + printUserHelp() { + this.logger.write( + ' vuex compile --help ' + ); + } + + run(cliArg) { + this.compile.run(cliArg); + } +} + +export default Compile; diff --git a/src/sub-commands/serve.js b/src/sub-commands/server.js similarity index 100% rename from src/sub-commands/serve.js rename to src/sub-commands/server.js diff --git a/src/tasks/webpack-compile.js b/src/tasks/webpack-compile.js new file mode 100644 index 0000000..9a85a89 --- /dev/null +++ b/src/tasks/webpack-compile.js @@ -0,0 +1,15 @@ +import Task from '../models/task'; +import config from '../config'; +import { compile } from 'vuex-cli-webpack' + +export default class extends Task { + constructor(environment) { + super(environment); + } + + run(config) { + const logger = this.logger; + logger.writeInfo('正在编译代码...') + compile() + } +} diff --git a/src/tasks/webpack-server.js b/src/tasks/webpack-server.js index 06825cd..cd603b1 100644 --- a/src/tasks/webpack-server.js +++ b/src/tasks/webpack-server.js @@ -1,6 +1,6 @@ import Task from '../models/task'; import config from '../config'; -import { serve } from 'vuex-cli-webpack' +import { server } from 'vuex-cli-webpack' export default class extends Task { constructor(environment) { @@ -10,6 +10,6 @@ export default class extends Task { run(config) { const logger = this.logger; logger.writeInfo('正在启动开发服务器...') - serve() + server() } } From 40c13be9a7c95ce93ea49ed794a6096facf7ac96 Mon Sep 17 00:00:00 2001 From: sokis Date: Wed, 27 Jul 2016 15:32:01 +0800 Subject: [PATCH 4/9] [release] 2.0.0-beta.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 382028f..3c3106b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vuex-cli", - "version": "2.0.0-beta.1", + "version": "2.0.0-beta.2", "description": "快速搭建 vuex/vuejs 应用脚手架。", "main": "bin/vuex.js", "engine": { From 373ccba72479b97bdaa618ccda7107e4f9a0ee13 Mon Sep 17 00:00:00 2001 From: sokis Date: Wed, 27 Jul 2016 15:36:09 +0800 Subject: [PATCH 5/9] [build] 2.0.0-beta.3 --- src/cli/index.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/cli/index.js b/src/cli/index.js index b82cf8e..9bf425f 100644 --- a/src/cli/index.js +++ b/src/cli/index.js @@ -18,12 +18,21 @@ program .command('generate', '基于Blueprints模板创建结构') .command('g', 'generate 的别名'); +program + .command('server', '开启开发服务器'); + +program + .command('compile', '编译代码'); + program.on('--help', () => { console.log(' Examples:'); console.log(''); console.log(' $ vuex init --help'); console.log(' $ vuex new my-vuex-project'); console.log(' $ vuex g component MyComponent'); + console.log(' **** new:'); + console.log(' $ vuex server'); + console.log(' $ vuex compile'); console.log(''); }); From 483c90ef1b3de42e4b9803af6a7ae7715d08e0ec Mon Sep 17 00:00:00 2001 From: sokis Date: Wed, 27 Jul 2016 15:36:10 +0800 Subject: [PATCH 6/9] [release] 2.0.0-beta.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3c3106b..a3aee26 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vuex-cli", - "version": "2.0.0-beta.2", + "version": "2.0.0-beta.3", "description": "快速搭建 vuex/vuejs 应用脚手架。", "main": "bin/vuex.js", "engine": { From f794e38e80f8469f3defb21bfc1e8f85bca0e37c Mon Sep 17 00:00:00 2001 From: sokis Date: Wed, 27 Jul 2016 15:52:30 +0800 Subject: [PATCH 7/9] [build] 2.0.0-beta.4 --- bin/vuex-compile.js | 3 +++ bin/vuex-server.js | 3 +++ 2 files changed, 6 insertions(+) create mode 100755 bin/vuex-compile.js create mode 100755 bin/vuex-server.js diff --git a/bin/vuex-compile.js b/bin/vuex-compile.js new file mode 100755 index 0000000..c91738f --- /dev/null +++ b/bin/vuex-compile.js @@ -0,0 +1,3 @@ +#!/usr/bin/env node + +require('../lib/cli/vuex-compile'); \ No newline at end of file diff --git a/bin/vuex-server.js b/bin/vuex-server.js new file mode 100755 index 0000000..3e07dc5 --- /dev/null +++ b/bin/vuex-server.js @@ -0,0 +1,3 @@ +#!/usr/bin/env node + +require('../lib/cli/vuex-server'); From e552a9a759b5ce5b4f4907e5268213dc00c9c62d Mon Sep 17 00:00:00 2001 From: sokis Date: Wed, 27 Jul 2016 15:52:30 +0800 Subject: [PATCH 8/9] [release] 2.0.0-beta.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a3aee26..998bc46 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vuex-cli", - "version": "2.0.0-beta.3", + "version": "2.0.0-beta.4", "description": "快速搭建 vuex/vuejs 应用脚手架。", "main": "bin/vuex.js", "engine": { From 022830cfcd19aa63392ace2b1f54ab928b988620 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=92=92=E5=AD=90=E9=83=BD=E5=AD=A6?= Date: Wed, 27 Jul 2016 15:57:08 +0800 Subject: [PATCH 9/9] Revert "Cli next" --- .eslintignore | 3 --- README.md | 6 ------ bin/vuex-compile.js | 3 --- bin/vuex-server.js | 3 --- build/release.sh | 27 --------------------------- package.json | 11 +++-------- src/cli/index.js | 9 --------- src/cli/vuex-compile.js | 17 ----------------- src/cli/vuex-server.js | 18 ------------------ src/sub-commands/compile.js | 22 ---------------------- src/sub-commands/server.js | 22 ---------------------- src/tasks/webpack-compile.js | 15 --------------- src/tasks/webpack-server.js | 15 --------------- 13 files changed, 3 insertions(+), 168 deletions(-) delete mode 100644 .eslintignore delete mode 100755 bin/vuex-compile.js delete mode 100755 bin/vuex-server.js delete mode 100644 build/release.sh delete mode 100644 src/cli/vuex-compile.js delete mode 100644 src/cli/vuex-server.js delete mode 100644 src/sub-commands/compile.js delete mode 100644 src/sub-commands/server.js delete mode 100644 src/tasks/webpack-compile.js delete mode 100644 src/tasks/webpack-server.js diff --git a/.eslintignore b/.eslintignore deleted file mode 100644 index 379820a..0000000 --- a/.eslintignore +++ /dev/null @@ -1,3 +0,0 @@ -build -node_modules -lib \ No newline at end of file diff --git a/README.md b/README.md index cdf461a..98cde06 100644 --- a/README.md +++ b/README.md @@ -8,12 +8,6 @@ \___/ \__,_|\___/_/\_\ \____/\_____/\___/ ``` -## 更新日志 - -+ 2016.07.27 集成webpack 配置服务 - - 启动webpack开发服务 `vuex serve` - - 编译代码 `vuex compile` - ## 使用 ```javascript diff --git a/bin/vuex-compile.js b/bin/vuex-compile.js deleted file mode 100755 index c91738f..0000000 --- a/bin/vuex-compile.js +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env node - -require('../lib/cli/vuex-compile'); \ No newline at end of file diff --git a/bin/vuex-server.js b/bin/vuex-server.js deleted file mode 100755 index 3e07dc5..0000000 --- a/bin/vuex-server.js +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env node - -require('../lib/cli/vuex-server'); diff --git a/build/release.sh b/build/release.sh deleted file mode 100644 index 67f478a..0000000 --- a/build/release.sh +++ /dev/null @@ -1,27 +0,0 @@ -set -e -echo "Enter release version: " -read VERSION - -read -p "Releasing $VERSION - are you sure? (y/n)" -n 1 -r -echo # (optional) move to a new line -if [[ $REPLY =~ ^[Yy]$ ]] -then - echo "Releasing $VERSION ..." - export SAUCE_BUILD_ID=$VERSION:`date +"%s"` - - npm run clean - npm run test - - # build - VERSION=$VERSION npm run build - - # commit - git add -A - git commit -m "[build] $VERSION" - npm version $VERSION --message "[release] $VERSION" - - # publish - git push origin refs/tags/v$VERSION - git push - npm publish --tag next -fi \ No newline at end of file diff --git a/package.json b/package.json index 998bc46..e4a1984 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vuex-cli", - "version": "2.0.0-beta.4", + "version": "0.4.0", "description": "快速搭建 vuex/vuejs 应用脚手架。", "main": "bin/vuex.js", "engine": { @@ -14,17 +14,14 @@ "lint": "./node_modules/.bin/eslint ./src ./test ./blueprints", "clean": "rimraf lib", "publish:patch": "npm test && npm run clean && npm run build && npm version patch && npm publish", - "publish:minor": "npm test && npm run clean && npm run build && npm version minor && npm publish", - "release": "bash build/release.sh" + "publish:minor": "npm test && npm run clean && npm run build && npm version minor && npm publish" }, "bin": { "vuex": "bin/vuex.js", "vuex-init": "bin/vuex-init.js", "vuex-generate": "bin/vuex-generate.js", "vuex-g": "bin/vuex-g.js", - "vuex-new": "bin/vuex-new.js", - "vuex-server": "bin/vuex-server.js", - "vuex-compile": "bin/vuex-compile.js" + "vuex-new": "bin/vuex-new.js" }, "repository": { "type": "git", @@ -57,7 +54,6 @@ "fs-extra": "^0.26.5", "humps": "^1.0.0", "jsonfile": "^2.2.3", - "koa": "^1.2.1", "lodash": "^4.5.1", "log-update": "^1.0.2", "minimist": "^1.2.0", @@ -65,7 +61,6 @@ "shelljs": "^0.6.0", "temp": "^0.8.3", "through": "^2.3.8", - "vuex-cli-webpack": "^0.1.5", "walk-sync": "^0.2.6" }, "devDependencies": { diff --git a/src/cli/index.js b/src/cli/index.js index 9bf425f..b82cf8e 100644 --- a/src/cli/index.js +++ b/src/cli/index.js @@ -18,21 +18,12 @@ program .command('generate', '基于Blueprints模板创建结构') .command('g', 'generate 的别名'); -program - .command('server', '开启开发服务器'); - -program - .command('compile', '编译代码'); - program.on('--help', () => { console.log(' Examples:'); console.log(''); console.log(' $ vuex init --help'); console.log(' $ vuex new my-vuex-project'); console.log(' $ vuex g component MyComponent'); - console.log(' **** new:'); - console.log(' $ vuex server'); - console.log(' $ vuex compile'); console.log(''); }); diff --git a/src/cli/vuex-compile.js b/src/cli/vuex-compile.js deleted file mode 100644 index 41b8812..0000000 --- a/src/cli/vuex-compile.js +++ /dev/null @@ -1,17 +0,0 @@ -import commander from 'commander'; -import { version } from '../version'; -import Compile from '../sub-commands/compile'; - -const subCommand = new Compile(); - -commander.on('--help', () => { - subCommand.printUserHelp(); -}); - -commander - .version(version()) - .description(' 编译代码') - .parse(process.argv); - - -subCommand.run(); diff --git a/src/cli/vuex-server.js b/src/cli/vuex-server.js deleted file mode 100644 index bb46936..0000000 --- a/src/cli/vuex-server.js +++ /dev/null @@ -1,18 +0,0 @@ -import commander from 'commander'; -import { version } from '../version'; -import Server from '../sub-commands/server'; -// import minimist from 'minimist'; - -const subCommand = new Server(); - -commander.on('--help', () => { - subCommand.printUserHelp(); -}); - -commander - .version(version()) - .description(' 启动开发服务器') - .parse(process.argv); - - -subCommand.run(); diff --git a/src/sub-commands/compile.js b/src/sub-commands/compile.js deleted file mode 100644 index 4d37103..0000000 --- a/src/sub-commands/compile.js +++ /dev/null @@ -1,22 +0,0 @@ -import SubCommand from '../models/sub-command'; -import CompileTask from '../tasks/webpack-compile'; - -// 开发服务器 -class Compile extends SubCommand { - constructor() { - super(); - this.compile = new CompileTask(this.environment); - } - - printUserHelp() { - this.logger.write( - ' vuex compile --help ' - ); - } - - run(cliArg) { - this.compile.run(cliArg); - } -} - -export default Compile; diff --git a/src/sub-commands/server.js b/src/sub-commands/server.js deleted file mode 100644 index ec604dc..0000000 --- a/src/sub-commands/server.js +++ /dev/null @@ -1,22 +0,0 @@ -import SubCommand from '../models/sub-command'; -import WebServer from '../tasks/webpack-server'; - -// 开发服务器 -class Serve extends SubCommand { - constructor() { - super(); - this.webserver = new WebServer(this.environment); - } - - printUserHelp() { - this.logger.write( - ' vuex server --help ' - ); - } - - run(cliArg) { - this.webserver.run(cliArg); - } -} - -export default Serve; diff --git a/src/tasks/webpack-compile.js b/src/tasks/webpack-compile.js deleted file mode 100644 index 9a85a89..0000000 --- a/src/tasks/webpack-compile.js +++ /dev/null @@ -1,15 +0,0 @@ -import Task from '../models/task'; -import config from '../config'; -import { compile } from 'vuex-cli-webpack' - -export default class extends Task { - constructor(environment) { - super(environment); - } - - run(config) { - const logger = this.logger; - logger.writeInfo('正在编译代码...') - compile() - } -} diff --git a/src/tasks/webpack-server.js b/src/tasks/webpack-server.js deleted file mode 100644 index cd603b1..0000000 --- a/src/tasks/webpack-server.js +++ /dev/null @@ -1,15 +0,0 @@ -import Task from '../models/task'; -import config from '../config'; -import { server } from 'vuex-cli-webpack' - -export default class extends Task { - constructor(environment) { - super(environment); - } - - run(config) { - const logger = this.logger; - logger.writeInfo('正在启动开发服务器...') - server() - } -}