From 63a69a51c94bd51c4cfbe2cd268164a79f362c13 Mon Sep 17 00:00:00 2001 From: wuxingtao Date: Thu, 14 May 2020 23:26:36 +0800 Subject: [PATCH] update release --- .editorconfig | 0 .eslintignore | 0 .gitattributes | 0 .gitignore | 0 .travis.yml | 0 .yo-rc.json | 0 LICENSE | 0 NOTE.md | 0 __tests__/app.js | 0 __tests__/app.js.rej | 0 __tests__/app_backup.js | 0 generators/app/config/index.js | 0 generators/app/index.js | 0 generators/app/index_default.js | 0 generators/app/prompts.js | 0 generators/app/templates/common/react_package.json | 0 generators/app/templates/common/vue_package.json | 0 generators/app/templates/dummyfile.txt | 0 generators/app/templates/react/.babelrc | 8 ++++++-- generators/app/templates/react/README.md | 9 +++++++++ generators/app/templates/react/_.gitignore | 0 generators/app/templates/react/_package.json | 2 ++ generators/app/templates/react/package.json | 0 generators/app/templates/react/src/App.css | 0 generators/app/templates/react/src/App.js | 0 generators/app/templates/react/src/_App.js | 0 generators/app/templates/react/src/index.html | 0 generators/app/templates/react/src/redux/store/index.js | 0 .../templates/react/webpack/build/webpack.base.conf.js | 6 +++--- generators/app/templates/react/webpack/config/resolve.js | 5 +++-- generators/app/templates/react/webpack/dist/index.html | 0 generators/app/templates/vue/.babelrc | 0 generators/app/templates/vue/_.gitignore | 0 generators/app/templates/vue/_package.json | 0 generators/app/templates/vue/package.json | 0 generators/app/templates/vue/src/App.css | 0 generators/app/templates/vue/src/App.vue | 0 generators/app/templates/vue/src/index.html | 0 generators/app/templates/vue/src/views/Home.vue | 0 generators/app/templates/vue/src/vuex/modules/global.js | 0 generators/app/templates/vue/webpack/config/resolve.js | 5 +++-- generators/app/templates/vue/webpack/dist/index.html | 0 generators/app/utils.js | 0 package-lock.json | 2 +- 44 files changed, 27 insertions(+), 10 deletions(-) mode change 100644 => 100755 .editorconfig mode change 100644 => 100755 .eslintignore mode change 100644 => 100755 .gitattributes mode change 100644 => 100755 .gitignore mode change 100644 => 100755 .travis.yml mode change 100644 => 100755 .yo-rc.json mode change 100644 => 100755 LICENSE mode change 100644 => 100755 NOTE.md mode change 100644 => 100755 __tests__/app.js mode change 100644 => 100755 __tests__/app.js.rej mode change 100644 => 100755 __tests__/app_backup.js mode change 100644 => 100755 generators/app/config/index.js mode change 100644 => 100755 generators/app/index.js mode change 100644 => 100755 generators/app/index_default.js mode change 100644 => 100755 generators/app/prompts.js mode change 100644 => 100755 generators/app/templates/common/react_package.json mode change 100644 => 100755 generators/app/templates/common/vue_package.json mode change 100644 => 100755 generators/app/templates/dummyfile.txt mode change 100644 => 100755 generators/app/templates/react/.babelrc mode change 100644 => 100755 generators/app/templates/react/README.md mode change 100644 => 100755 generators/app/templates/react/_.gitignore mode change 100644 => 100755 generators/app/templates/react/_package.json mode change 100644 => 100755 generators/app/templates/react/package.json mode change 100644 => 100755 generators/app/templates/react/src/App.css mode change 100644 => 100755 generators/app/templates/react/src/App.js mode change 100644 => 100755 generators/app/templates/react/src/_App.js mode change 100644 => 100755 generators/app/templates/react/src/index.html mode change 100644 => 100755 generators/app/templates/react/src/redux/store/index.js mode change 100644 => 100755 generators/app/templates/react/webpack/build/webpack.base.conf.js mode change 100644 => 100755 generators/app/templates/react/webpack/config/resolve.js mode change 100644 => 100755 generators/app/templates/react/webpack/dist/index.html mode change 100644 => 100755 generators/app/templates/vue/.babelrc mode change 100644 => 100755 generators/app/templates/vue/_.gitignore mode change 100644 => 100755 generators/app/templates/vue/_package.json mode change 100644 => 100755 generators/app/templates/vue/package.json mode change 100644 => 100755 generators/app/templates/vue/src/App.css mode change 100644 => 100755 generators/app/templates/vue/src/App.vue mode change 100644 => 100755 generators/app/templates/vue/src/index.html mode change 100644 => 100755 generators/app/templates/vue/src/views/Home.vue mode change 100644 => 100755 generators/app/templates/vue/src/vuex/modules/global.js mode change 100644 => 100755 generators/app/templates/vue/webpack/config/resolve.js mode change 100644 => 100755 generators/app/templates/vue/webpack/dist/index.html mode change 100644 => 100755 generators/app/utils.js mode change 100644 => 100755 package-lock.json diff --git a/.editorconfig b/.editorconfig old mode 100644 new mode 100755 diff --git a/.eslintignore b/.eslintignore old mode 100644 new mode 100755 diff --git a/.gitattributes b/.gitattributes old mode 100644 new mode 100755 diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/.travis.yml b/.travis.yml old mode 100644 new mode 100755 diff --git a/.yo-rc.json b/.yo-rc.json old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/NOTE.md b/NOTE.md old mode 100644 new mode 100755 diff --git a/__tests__/app.js b/__tests__/app.js old mode 100644 new mode 100755 diff --git a/__tests__/app.js.rej b/__tests__/app.js.rej old mode 100644 new mode 100755 diff --git a/__tests__/app_backup.js b/__tests__/app_backup.js old mode 100644 new mode 100755 diff --git a/generators/app/config/index.js b/generators/app/config/index.js old mode 100644 new mode 100755 diff --git a/generators/app/index.js b/generators/app/index.js old mode 100644 new mode 100755 diff --git a/generators/app/index_default.js b/generators/app/index_default.js old mode 100644 new mode 100755 diff --git a/generators/app/prompts.js b/generators/app/prompts.js old mode 100644 new mode 100755 diff --git a/generators/app/templates/common/react_package.json b/generators/app/templates/common/react_package.json old mode 100644 new mode 100755 diff --git a/generators/app/templates/common/vue_package.json b/generators/app/templates/common/vue_package.json old mode 100644 new mode 100755 diff --git a/generators/app/templates/dummyfile.txt b/generators/app/templates/dummyfile.txt old mode 100644 new mode 100755 diff --git a/generators/app/templates/react/.babelrc b/generators/app/templates/react/.babelrc old mode 100644 new mode 100755 index bace0fd..dd58160 --- a/generators/app/templates/react/.babelrc +++ b/generators/app/templates/react/.babelrc @@ -10,8 +10,12 @@ ], "@babel/preset-react" ], - "plugins": ["@babel/plugin-syntax-dynamic-import"], + "plugins": [ + "@babel/plugin-syntax-dynamic-import", + ["@babel/plugin-proposal-decorators",{ "legacy": true}], + "@babel/plugin-proposal-class-properties" + ], "env": { "test": {} } -} \ No newline at end of file +} diff --git a/generators/app/templates/react/README.md b/generators/app/templates/react/README.md old mode 100644 new mode 100755 index 79ac4c2..02f5922 --- a/generators/app/templates/react/README.md +++ b/generators/app/templates/react/README.md @@ -1,2 +1,11 @@ # About +## babel dependence config +```js +// add for es6 class +"@babel/plugin-proposal-class-properties" +// add for es7 decorators +"@babel/plugin-proposal-decorators" +// add for import modules +"@babel/plugin-syntax-dynamic-import" +``` diff --git a/generators/app/templates/react/_.gitignore b/generators/app/templates/react/_.gitignore old mode 100644 new mode 100755 diff --git a/generators/app/templates/react/_package.json b/generators/app/templates/react/_package.json old mode 100644 new mode 100755 index 896d2df..0fcb698 --- a/generators/app/templates/react/_package.json +++ b/generators/app/templates/react/_package.json @@ -24,6 +24,8 @@ }, "devDependencies": { "@babel/core": "^7.6.2", + "@babel/plugin-proposal-class-properties": "^7.8.3", + "@babel/plugin-proposal-decorators": "^7.8.3", "@babel/plugin-syntax-dynamic-import": "^7.2.0", "@babel/plugin-transform-runtime": "^7.6.2", "@babel/preset-env": "^7.6.2", diff --git a/generators/app/templates/react/package.json b/generators/app/templates/react/package.json old mode 100644 new mode 100755 diff --git a/generators/app/templates/react/src/App.css b/generators/app/templates/react/src/App.css old mode 100644 new mode 100755 diff --git a/generators/app/templates/react/src/App.js b/generators/app/templates/react/src/App.js old mode 100644 new mode 100755 diff --git a/generators/app/templates/react/src/_App.js b/generators/app/templates/react/src/_App.js old mode 100644 new mode 100755 diff --git a/generators/app/templates/react/src/index.html b/generators/app/templates/react/src/index.html old mode 100644 new mode 100755 diff --git a/generators/app/templates/react/src/redux/store/index.js b/generators/app/templates/react/src/redux/store/index.js old mode 100644 new mode 100755 diff --git a/generators/app/templates/react/webpack/build/webpack.base.conf.js b/generators/app/templates/react/webpack/build/webpack.base.conf.js old mode 100644 new mode 100755 index 8c1463c..9b4ca65 --- a/generators/app/templates/react/webpack/build/webpack.base.conf.js +++ b/generators/app/templates/react/webpack/build/webpack.base.conf.js @@ -35,13 +35,13 @@ module.exports = { module: { rules: [ { - test: /\.jsx?$/, + test: /\.(js|jsx)?$/, exclude: /node_modules/, loader: 'babel-loader' }, { - test: /\.scss$/, - loader: ['css-loader','sass-loader'] + test: /\.(scss|sass)?$/, + loader: ['style-loader', 'css-loader', 'sass-loader'] }, { test: /\.less$/, diff --git a/generators/app/templates/react/webpack/config/resolve.js b/generators/app/templates/react/webpack/config/resolve.js old mode 100644 new mode 100755 index 9d0bf37..aa0d89d --- a/generators/app/templates/react/webpack/config/resolve.js +++ b/generators/app/templates/react/webpack/config/resolve.js @@ -8,10 +8,11 @@ const path = require('path'); const resolveConfig = { alias: { - '@src': path.resolve(__dirname, '../../src'), + '@': path.resolve(__dirname, '../../src'), '@assets': path.resolve(__dirname, '../../ASSETS'), '@build': path.resolve(__dirname, '../../build') - } + }, + extensions:['.js','.jsx','.ts','.tsx','.json'] }; exports.getResolve = function () { diff --git a/generators/app/templates/react/webpack/dist/index.html b/generators/app/templates/react/webpack/dist/index.html old mode 100644 new mode 100755 diff --git a/generators/app/templates/vue/.babelrc b/generators/app/templates/vue/.babelrc old mode 100644 new mode 100755 diff --git a/generators/app/templates/vue/_.gitignore b/generators/app/templates/vue/_.gitignore old mode 100644 new mode 100755 diff --git a/generators/app/templates/vue/_package.json b/generators/app/templates/vue/_package.json old mode 100644 new mode 100755 diff --git a/generators/app/templates/vue/package.json b/generators/app/templates/vue/package.json old mode 100644 new mode 100755 diff --git a/generators/app/templates/vue/src/App.css b/generators/app/templates/vue/src/App.css old mode 100644 new mode 100755 diff --git a/generators/app/templates/vue/src/App.vue b/generators/app/templates/vue/src/App.vue old mode 100644 new mode 100755 diff --git a/generators/app/templates/vue/src/index.html b/generators/app/templates/vue/src/index.html old mode 100644 new mode 100755 diff --git a/generators/app/templates/vue/src/views/Home.vue b/generators/app/templates/vue/src/views/Home.vue old mode 100644 new mode 100755 diff --git a/generators/app/templates/vue/src/vuex/modules/global.js b/generators/app/templates/vue/src/vuex/modules/global.js old mode 100644 new mode 100755 diff --git a/generators/app/templates/vue/webpack/config/resolve.js b/generators/app/templates/vue/webpack/config/resolve.js old mode 100644 new mode 100755 index 9d0bf37..aa0d89d --- a/generators/app/templates/vue/webpack/config/resolve.js +++ b/generators/app/templates/vue/webpack/config/resolve.js @@ -8,10 +8,11 @@ const path = require('path'); const resolveConfig = { alias: { - '@src': path.resolve(__dirname, '../../src'), + '@': path.resolve(__dirname, '../../src'), '@assets': path.resolve(__dirname, '../../ASSETS'), '@build': path.resolve(__dirname, '../../build') - } + }, + extensions:['.js','.jsx','.ts','.tsx','.json'] }; exports.getResolve = function () { diff --git a/generators/app/templates/vue/webpack/dist/index.html b/generators/app/templates/vue/webpack/dist/index.html old mode 100644 new mode 100755 diff --git a/generators/app/utils.js b/generators/app/utils.js old mode 100644 new mode 100755 diff --git a/package-lock.json b/package-lock.json old mode 100644 new mode 100755 index d4e0db9..7c6e670 --- a/package-lock.json +++ b/package-lock.json @@ -4826,7 +4826,7 @@ }, "lcov-parse": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-1.0.0.tgz", + "resolved": "https://registry.npm.taobao.org/lcov-parse/download/lcov-parse-1.0.0.tgz", "integrity": "sha1-6w1GtUER68VhrLTECO+TY73I9+A=", "dev": true },