Merge pull request #953 from scttcper/babel6

Upgrade to Babel 6.x
Swiip · Mar 29, 2016 · 76e8744 · 76e8744
2 parents 7773ccf + b3b504d
commit 76e8744
Show file tree

Hide file tree

Showing 4 changed files with 407 additions and 408 deletions.
diff --git a/generators/app/templates/_package.json b/generators/app/templates/_package.json
@@ -53,8 +53,9 @@
 <% } if (props.jsPreprocessor.srcExtension === 'es6') { -%>
     "eslint-loader": "~1.1.0",
 <% } if (props.jsPreprocessor.key === 'babel') { -%>
-    "babel-core": "~5.8.25",
-    "babel-loader": "~5.3.2",
+    "babel-core": "~6.7.4",
+    "babel-loader": "~6.2.4",
+    "babel-preset-es2015": "~6.6.0",
 <% } if (props.jsPreprocessor.key === 'traceur') { -%>
     "traceur-loader": "~0.6.3",
 <% } if (props.jsPreprocessor.key === 'typescript') { -%>

diff --git a/generators/app/templates/gulp/_scripts.js b/generators/app/templates/gulp/_scripts.js
@@ -53,7 +53,7 @@ function webpackWrapper(watch, test, callback) {
       preLoaders: [{ test: /\.ts$/, exclude: /node_modules/, loader: 'tslint-loader'}],
 <%   } -%>
 <%   if (props.jsPreprocessor.key === 'babel') { -%>
-      loaders: [{ test: /\.js$/, exclude: /node_modules/, loaders: ['ng-annotate', 'babel-loader']}]
+      loaders: [{ test: /\.js$/, exclude: /node_modules/, loaders: ['ng-annotate', 'babel-loader?presets[]=es2015']}]
 <%   } if (props.jsPreprocessor.key === 'traceur') { -%>
       loaders: [{ test: /\.js$/, exclude: /node_modules/, loaders: ['ng-annotate', 'traceur-loader']}]
 <%   } if (props.jsPreprocessor.key === 'typescript') { -%>