fix babel-loader deprecated issue

leftstick · Feb 22, 2017 · de3bb64 · de3bb64
1 parent c9b3ac8
commit de3bb64
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 61 deletions.
diff --git a/generators/app/index.js b/generators/app/index.js
@@ -104,6 +104,7 @@ class gen extends Generator {
         this.fs.copyTpl(this.templatePath('js'), this.destinationPath('js'), this.obj, {
             interpolate: /<%=([\s\S]+?)%>/g
         });
+        this.fs.copy(this.templatePath('babelrc'), this.destinationPath('.babelrc'));
         this.fs.copy(this.templatePath('eslintrc'), this.destinationPath('.eslintrc'));
         this.fs.copy(this.templatePath('esformatter'), this.destinationPath('.esformatter'));
         this.fs.copy(this.templatePath('gitignore'), this.destinationPath('.gitignore'));

diff --git a/generators/app/templates/babelrc b/generators/app/templates/babelrc
@@ -0,0 +1,6 @@
+{
+  "presets": [
+    ["es2015", {"modules": false}]
+  ],
+  "plugins": ["angularjs-annotate"]
+}
diff --git a/generators/app/templates/package.json_vm b/generators/app/templates/package.json_vm
@@ -18,23 +18,23 @@
   "author": "<%= answers.username %> <% if(answers.email){ %><<%= answers.email %>><% } %>",
   "license": "MIT",
   "dependencies":{
-    "angular": "^1.6.1",
-    "angular-route": "^1.6.1",
+    "angular": "^1.6.2",
+    "angular-route": "^1.6.2",
     "splash-screen": "^3.0.1"
   },
   "devDependencies": {
-    "autoprefixer": "^6.7.0",
-    "babel-core": "^6.22.1",
-    "babel-loader": "^6.2.10",
+    "autoprefixer": "^6.7.4",
+    "babel-core": "^6.23.1",
+    "babel-loader": "^6.3.2",
     "babel-plugin-angularjs-annotate": "^0.7.0",
     "babel-preset-es2015": "^6.22.0",
     "css-loader": "^0.26.1",
-    "file-loader": "^0.9.0",
-    "html-webpack-plugin": "^2.26.0",
-    "postcss-loader": "^1.2.2",
+    "file-loader": "^0.10.0",
+    "html-webpack-plugin": "^2.28.0",
+    "postcss-loader": "^1.3.1",
     "html-loader": "^0.4.4",
     "style-loader": "^0.13.1",
-    "webpack": "^2.2.0",
-    "webpack-dev-server": "^2.2.0"
+    "webpack": "^2.2.1",
+    "webpack-dev-server": "^2.4.1"
   }
 }
diff --git a/generators/app/templates/webpack.config.js b/generators/app/templates/webpack.config.js
@@ -21,44 +21,24 @@ module.exports = {
         rules: [
             {
                 test: /splash\.min\.css$/,
-                use: [
-                    'style-loader/useable'
-                ]
+                use: ['style-loader/useable']
             },
             {
                 test: /(?!min)\.css$/,
-                use: [
-                    'style-loader',
-                    'css-loader',
-                    'postcss-loader'
-                ]
+                use: ['style-loader', 'css-loader', 'postcss-loader']
             },
             {
                 test: /\.(js|co)$/,
-                use: [
-                    {
-                        loader: 'babel-loader',
-                        options: {
-                            presets: [['es2015', {
-                                modules: false
-                            }]],
-                            plugins: ['angularjs-annotate']
-                        }
-                    }
-                ],
+                use: ['babel-loader'],
                 exclude: /(node_modules)/
             },
             {
                 test: /\.(eot|svg|ttf|woff|woff2|png)\w*/,
-                use: [
-                    'file-loader'
-                ]
+                use: ['file-loader']
             },
             {
                 test: /\.html$/,
-                use: [
-                    'html-loader'
-                ]
+                use: ['html-loader']
             }
         ]
     },

diff --git a/generators/app/templates/webpack.config.prod.js b/generators/app/templates/webpack.config.prod.js
@@ -16,44 +16,24 @@ module.exports = {
         rules: [
             {
                 test: /splash\.min\.css$/,
-                use: [
-                    'style-loader/useable'
-                ]
+                use: ['style-loader/useable']
             },
             {
                 test: /(?!min)\.css$/,
-                use: [
-                    'style-loader',
-                    'css-loader',
-                    'postcss-loader'
-                ]
+                use: ['style-loader', 'css-loader', 'postcss-loader']
             },
             {
                 test: /\.(js|co)$/,
-                use: [
-                    {
-                        loader: 'babel-loader',
-                        options: {
-                            presets: [['es2015', {
-                                modules: false
-                            }]],
-                            plugins: ['angularjs-annotate']
-                        }
-                    }
-                ],
+                use: ['babel-loader'],
                 exclude: /(node_modules)/
             },
             {
                 test: /\.(eot|svg|ttf|woff|woff2|png)\w*/,
-                use: [
-                    'file-loader'
-                ]
+                use: ['file-loader']
             },
             {
                 test: /\.html$/,
-                use: [
-                    'html-loader'
-                ]
+                use: ['html-loader']
             }
         ]
     },

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "generator-es6-angular",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "description": "generator-es6-angular",
   "repository": {
     "type": "git",