From 3163e3e3835238b3b8e682718bd25261d62a5711 Mon Sep 17 00:00:00 2001 From: qiang Date: Thu, 7 Mar 2019 21:02:48 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81iOS=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/common/public/index.html | 45 ++++++++++++++++--------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/template/common/public/index.html b/template/common/public/index.html index acee806..a3d5e00 100644 --- a/template/common/public/index.html +++ b/template/common/public/index.html @@ -1,27 +1,28 @@ - - - - - - <%= htmlWebpackPlugin.options.title %> - - - - + + + + + <%= htmlWebpackPlugin.options.title %> + + + + - - -
- - + + +
+ + - + \ No newline at end of file From 9cbe6d8fcee7660b32a2b940b654b3182d3759d6 Mon Sep 17 00:00:00 2001 From: fxy060608 Date: Fri, 8 Mar 2019 18:04:30 +0800 Subject: [PATCH 2/5] Update preset.json add @dcloudio/vue-cli-plugin-hbuilderx --- preset.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/preset.json b/preset.json index 86f2fe2..38c1bf4 100644 --- a/preset.json +++ b/preset.json @@ -1,9 +1,10 @@ { "useConfigFiles": false, "plugins": { - "@dcloudio/vue-cli-plugin-uni": { - "version": "0.9.34" - }, + "@dcloudio/vue-cli-plugin-uni": { + "version": "0.9.34" + }, + "@dcloudio/vue-cli-plugin-hbuilderx": {}, "@vue/cli-plugin-babel": { "version": "3.3.0", "presets": [ @@ -13,4 +14,4 @@ ] } } -} +} From 0c5b9f8225855bf37a8796e0e9e938bdd27b59fe Mon Sep 17 00:00:00 2001 From: fxy060608 Date: Fri, 15 Mar 2019 21:52:20 +0800 Subject: [PATCH 3/5] Update preset.json --- preset.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/preset.json b/preset.json index 38c1bf4..dad9385 100644 --- a/preset.json +++ b/preset.json @@ -1,9 +1,7 @@ { "useConfigFiles": false, "plugins": { - "@dcloudio/vue-cli-plugin-uni": { - "version": "0.9.34" - }, + "@dcloudio/vue-cli-plugin-uni": {}, "@dcloudio/vue-cli-plugin-hbuilderx": {}, "@vue/cli-plugin-babel": { "version": "3.3.0", From 498cee1cc4c1d02c2114a8d7d68592315c60dcae Mon Sep 17 00:00:00 2001 From: qiang Date: Thu, 21 Mar 2019 16:45:23 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- generator.js | 5 +++-- template/common-ts/tsconfig.json | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/generator.js b/generator.js index 47a0f2d..2ab49a6 100644 --- a/generator.js +++ b/generator.js @@ -41,7 +41,8 @@ module.exports = (api, options, rootOptions) => { }, devDependencies: { '@babel/plugin-syntax-typescript': '^7.2.0', - '@dcloudio/types': '*', + '@types/uni-app': '*', + '@types/html5plus': '*', '@vue/cli-plugin-typescript': '^3.3.0', 'typescript': api.hasPlugin('eslint') ? '~3.1.1' : '^3.0.0' } @@ -105,4 +106,4 @@ module.exports = (api, options, rootOptions) => { await generate(path.resolve(__dirname, './template/common'), files) }) -} +} diff --git a/template/common-ts/tsconfig.json b/template/common-ts/tsconfig.json index 21e6cf5..ece882f 100644 --- a/template/common-ts/tsconfig.json +++ b/template/common-ts/tsconfig.json @@ -12,8 +12,7 @@ "sourceMap": true, "baseUrl": ".", "types": [ - "webpack-env", - "@dcloudio/types/uni-app" + "webpack-env" ], "paths": { "@/*": [ From 33bebac0f9625a5a59badab1be833d74b77fd20b Mon Sep 17 00:00:00 2001 From: qiang Date: Thu, 21 Mar 2019 17:47:38 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=B8=BA=E6=99=AE=E9=80=9A=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=A2=9E=E5=8A=A0=20uni=E3=80=81plus=20=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- generator.js | 13 +++++++++++-- template/common-ts/tsconfig.json | 3 ++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/generator.js b/generator.js index 2ab49a6..09fd84b 100644 --- a/generator.js +++ b/generator.js @@ -32,6 +32,16 @@ async function generate (dir, files, base = '', rootOptions = {}) { } module.exports = (api, options, rootOptions) => { + if (options.template !== 'default-ts') { + api.extendPackage(pkg => { + return { + devDependencies: { + '@types/uni-app': '*', + '@types/html5plus': '*' + } + } + }) + } if (options.template === 'default-ts') { // 启用 typescript api.extendPackage(pkg => { return { @@ -41,8 +51,7 @@ module.exports = (api, options, rootOptions) => { }, devDependencies: { '@babel/plugin-syntax-typescript': '^7.2.0', - '@types/uni-app': '*', - '@types/html5plus': '*', + '@dcloudio/types': '*', '@vue/cli-plugin-typescript': '^3.3.0', 'typescript': api.hasPlugin('eslint') ? '~3.1.1' : '^3.0.0' } diff --git a/template/common-ts/tsconfig.json b/template/common-ts/tsconfig.json index ece882f..21e6cf5 100644 --- a/template/common-ts/tsconfig.json +++ b/template/common-ts/tsconfig.json @@ -12,7 +12,8 @@ "sourceMap": true, "baseUrl": ".", "types": [ - "webpack-env" + "webpack-env", + "@dcloudio/types/uni-app" ], "paths": { "@/*": [