From 75e597ab0dd841e853f9c7f43145a8e524ee0a11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E6=96=87=E6=9D=B0?= Date: Tue, 21 May 2019 15:13:39 +0800 Subject: [PATCH 1/4] Add optional less plugin --- meta.js | 5 +++++ template/.electron-vue/webpack.renderer.config.js | 2 ++ template/.electron-vue/webpack.web.config.js | 2 ++ template/package.json | 4 ++++ 4 files changed, 13 insertions(+) diff --git a/meta.js b/meta.js index 79e14573..42068242 100644 --- a/meta.js +++ b/meta.js @@ -76,6 +76,11 @@ module.exports = { message: 'Use Sass / Scss?', required: true }, + useless: { + type: 'confirm', + message: 'Use Less?', + required: true + }, plugins: { type: 'checkbox', message: 'Select which Vue plugins to install', diff --git a/template/.electron-vue/webpack.renderer.config.js b/template/.electron-vue/webpack.renderer.config.js index 35f5870d..c63e18f0 100644 --- a/template/.electron-vue/webpack.renderer.config.js +++ b/template/.electron-vue/webpack.renderer.config.js @@ -54,10 +54,12 @@ let rendererConfig = { use: ['vue-style-loader', 'css-loader', 'sass-loader?indentedSyntax'] }, {{/if}} + {{#if useless}} { test: /\.less$/, use: ['vue-style-loader', 'css-loader', 'less-loader'] }, + {{/if}} { test: /\.css$/, use: ['vue-style-loader', 'css-loader'] diff --git a/template/.electron-vue/webpack.web.config.js b/template/.electron-vue/webpack.web.config.js index 3b3b2ca8..0e12ad95 100644 --- a/template/.electron-vue/webpack.web.config.js +++ b/template/.electron-vue/webpack.web.config.js @@ -41,10 +41,12 @@ let webConfig = { use: ['vue-style-loader', 'css-loader', 'sass-loader?indentedSyntax'] }, {{/if}} + {{#if useless}} { test: /\.less$/, use: ['vue-style-loader', 'css-loader', 'less-loader'] }, + {{/if}} { test: /\.css$/, use: ['vue-style-loader', 'css-loader'] diff --git a/template/package.json b/template/package.json index 3c5472f3..cb6f262c 100644 --- a/template/package.json +++ b/template/package.json @@ -137,6 +137,10 @@ "karma-spec-reporter": "^0.0.32", "karma-webpack": "^3.0.0", {{/if}} + {{#if useless}} + "less": "^3.9.0", + "less-loader": "^5.0.0", + {{/if}} {{#if e2e}} "require-dir": "^1.0.0", "spectron": "^3.8.0", From 159646dd4b521825bb1f0ccf6aa320719bbfc6a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E6=96=87=E6=9D=B0?= Date: Tue, 21 May 2019 22:57:08 +0800 Subject: [PATCH 2/4] Add optional less plugin and fix test setting --- tests/builds.json | 9 +++++++++ tests/scaffold.js | 15 ++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/tests/builds.json b/tests/builds.json index 56cd2a55..459ad680 100644 --- a/tests/builds.json +++ b/tests/builds.json @@ -11,6 +11,7 @@ "\n", "\n", "\n", + "\n", "\n" ], "eslint-airbnb": [ @@ -21,6 +22,7 @@ "\n", "\n", "\n", + "\n", "\u001b[B\n", "\n", "\n", @@ -35,6 +37,7 @@ "\n", "\n", "\n", + "\n", "\u001b[B\u001b[B\n", "\n", "\n", @@ -47,6 +50,7 @@ "\n", "\n", "\n", + "\n", "\u001b[B\u001b[B \n", "\n", "\n", @@ -61,6 +65,7 @@ "\n", "\n", "\n", + "\n", "\u001b[B\u001b[B\u001b[B \n", "\n", "\n", @@ -75,6 +80,7 @@ "\n", "\n", "\n", + "\n", "\u001b[B\u001b[B \u001b[B \n", "\n", "\n", @@ -92,6 +98,7 @@ "\n", "\n", "\n", + "\n", "n\n", "\n", "\n", @@ -107,6 +114,7 @@ "\n", "\n", "\n", + "\n", "n\n", "\n", "\n" @@ -122,6 +130,7 @@ "\n", "\n", "\n", + "\n", "\u001b[B\n", "\n" ] diff --git a/tests/scaffold.js b/tests/scaffold.js index babe233d..dbe30801 100644 --- a/tests/scaffold.js +++ b/tests/scaffold.js @@ -26,13 +26,14 @@ function generate (key, build) { .when(/Application Version/g).respond(build[2]) .when(/Project description/g).respond(build[3]) .when(/Scss/g).respond(build[4]) - .when(/plugins/g).respond(build[5]) - .when(/ESLint/g).respond(build[6]) - .when(/config/g).respond(build[7]) - .when(/unit/g).respond(build[8]) - .when(/end-to-end/g).respond(build[9]) - .when(/build tool/g).respond(build[10]) - .when(/author/g).respond(build[11]) + .when(/Less/g).respond(build[5]) + .when(/plugins/g).respond(build[6]) + .when(/ESLint/g).respond(build[7]) + .when(/config/g).respond(build[8]) + .when(/unit/g).respond(build[9]) + .when(/end-to-end/g).respond(build[10]) + .when(/build tool/g).respond(build[11]) + .when(/author/g).respond(build[12]) .on('error', err => { console.log(err.message) }) From 8ad835ffe3e61d46294fefe64174b84eb91c160d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E6=96=87=E6=9D=B0?= Date: Tue, 21 May 2019 22:59:17 +0800 Subject: [PATCH 3/4] formatting --- tests/scaffold.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/scaffold.js b/tests/scaffold.js index dbe30801..1bd2178a 100644 --- a/tests/scaffold.js +++ b/tests/scaffold.js @@ -21,19 +21,19 @@ function generate (key, build) { console.log(`${YELLOW}Generating \`${key}\`${END}`) suppose('vue', ['init', `${projectDir}`, key], { debug: process.stdout }) - .when(/Application Name/g).respond(build[0]) - .when(/Application Id/g).respond(build[1]) - .when(/Application Version/g).respond(build[2]) - .when(/Project description/g).respond(build[3]) - .when(/Scss/g).respond(build[4]) - .when(/Less/g).respond(build[5]) - .when(/plugins/g).respond(build[6]) - .when(/ESLint/g).respond(build[7]) - .when(/config/g).respond(build[8]) - .when(/unit/g).respond(build[9]) - .when(/end-to-end/g).respond(build[10]) - .when(/build tool/g).respond(build[11]) - .when(/author/g).respond(build[12]) + .when(/Application Name/g).respond(build[0]) + .when(/Application Id/g).respond(build[1]) + .when(/Application Version/g).respond(build[2]) + .when(/Project description/g).respond(build[3]) + .when(/Scss/g).respond(build[4]) + .when(/Less/g).respond(build[5]) + .when(/plugins/g).respond(build[6]) + .when(/ESLint/g).respond(build[7]) + .when(/config/g).respond(build[8]) + .when(/unit/g).respond(build[9]) + .when(/end-to-end/g).respond(build[10]) + .when(/build tool/g).respond(build[11]) + .when(/author/g).respond(build[12]) .on('error', err => { console.log(err.message) }) From dd17c9003e095ba4a1ddf069e116edb97c0cbd27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E6=96=87=E6=9D=B0?= Date: Tue, 21 May 2019 23:00:28 +0800 Subject: [PATCH 4/4] formatting --- tests/scaffold.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/scaffold.js b/tests/scaffold.js index 1bd2178a..43db581c 100644 --- a/tests/scaffold.js +++ b/tests/scaffold.js @@ -21,19 +21,19 @@ function generate (key, build) { console.log(`${YELLOW}Generating \`${key}\`${END}`) suppose('vue', ['init', `${projectDir}`, key], { debug: process.stdout }) - .when(/Application Name/g).respond(build[0]) - .when(/Application Id/g).respond(build[1]) - .when(/Application Version/g).respond(build[2]) - .when(/Project description/g).respond(build[3]) - .when(/Scss/g).respond(build[4]) - .when(/Less/g).respond(build[5]) - .when(/plugins/g).respond(build[6]) - .when(/ESLint/g).respond(build[7]) - .when(/config/g).respond(build[8]) - .when(/unit/g).respond(build[9]) - .when(/end-to-end/g).respond(build[10]) - .when(/build tool/g).respond(build[11]) - .when(/author/g).respond(build[12]) + .when(/Application Name/g).respond(build[0]) + .when(/Application Id/g).respond(build[1]) + .when(/Application Version/g).respond(build[2]) + .when(/Project description/g).respond(build[3]) + .when(/Scss/g).respond(build[4]) + .when(/Less/g).respond(build[5]) + .when(/plugins/g).respond(build[6]) + .when(/ESLint/g).respond(build[7]) + .when(/config/g).respond(build[8]) + .when(/unit/g).respond(build[9]) + .when(/end-to-end/g).respond(build[10]) + .when(/build tool/g).respond(build[11]) + .when(/author/g).respond(build[11]) .on('error', err => { console.log(err.message) })