update release

wuxingtao · May 14, 2020 · 63a69a5 · 63a69a5
1 parent 590f67f
commit 63a69a5
Show file tree

Hide file tree

Showing 44 changed files with 27 additions and 10 deletions.
diff --git a/.editorconfig b/.editorconfig
diff --git a/.eslintignore b/.eslintignore
diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitignore b/.gitignore
diff --git a/.travis.yml b/.travis.yml
diff --git a/.yo-rc.json b/.yo-rc.json
diff --git a/LICENSE b/LICENSE
diff --git a/NOTE.md b/NOTE.md
diff --git a/__tests__/app.js b/__tests__/app.js
diff --git a/__tests__/app.js.rej b/__tests__/app.js.rej
diff --git a/__tests__/app_backup.js b/__tests__/app_backup.js
diff --git a/generators/app/config/index.js b/generators/app/config/index.js
diff --git a/generators/app/index.js b/generators/app/index.js
diff --git a/generators/app/index_default.js b/generators/app/index_default.js
diff --git a/generators/app/prompts.js b/generators/app/prompts.js
diff --git a/generators/app/templates/common/react_package.json b/generators/app/templates/common/react_package.json
diff --git a/generators/app/templates/common/vue_package.json b/generators/app/templates/common/vue_package.json
diff --git a/generators/app/templates/dummyfile.txt b/generators/app/templates/dummyfile.txt
diff --git 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": {}
   }
-}
+}
diff --git 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
diff --git 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
diff --git a/generators/app/templates/react/src/App.css b/generators/app/templates/react/src/App.css
diff --git a/generators/app/templates/react/src/App.js b/generators/app/templates/react/src/App.js
diff --git a/generators/app/templates/react/src/_App.js b/generators/app/templates/react/src/_App.js
diff --git a/generators/app/templates/react/src/index.html b/generators/app/templates/react/src/index.html
diff --git a/generators/app/templates/react/src/redux/store/index.js b/generators/app/templates/react/src/redux/store/index.js
diff --git 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
@@ -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
diff --git a/generators/app/templates/vue/.babelrc b/generators/app/templates/vue/.babelrc
diff --git a/generators/app/templates/vue/_.gitignore b/generators/app/templates/vue/_.gitignore
diff --git a/generators/app/templates/vue/_package.json b/generators/app/templates/vue/_package.json
diff --git a/generators/app/templates/vue/package.json b/generators/app/templates/vue/package.json
diff --git a/generators/app/templates/vue/src/App.css b/generators/app/templates/vue/src/App.css
diff --git a/generators/app/templates/vue/src/App.vue b/generators/app/templates/vue/src/App.vue
diff --git a/generators/app/templates/vue/src/index.html b/generators/app/templates/vue/src/index.html
diff --git a/generators/app/templates/vue/src/views/Home.vue b/generators/app/templates/vue/src/views/Home.vue
diff --git a/generators/app/templates/vue/src/vuex/modules/global.js b/generators/app/templates/vue/src/vuex/modules/global.js
diff --git 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
diff --git a/generators/app/utils.js b/generators/app/utils.js
diff --git a/package-lock.json b/package-lock.json