Merge branch 'master' of https://github.com/webpack/webpack-cli

webpack · Nov 4, 2018 · 4b9df8d · 4b9df8d
2 parents 8f68555 + 779c689
commit 4b9df8d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/MIGRATE.md b/MIGRATE.md
@@ -57,7 +57,7 @@ module.exports = {
 		exclude: /node_modules/,
 		loader: 'babel',
 		query: {
-		  presets: ['env']
+		  presets: ['@babel/preset-env']
 		}
 	  },
 	  {
@@ -140,7 +140,7 @@ module.exports = {
 		  loader: 'babel-loader'
 		}],
 		options: {
-		  presets: ['env']
+		  presets: ['@babel/preset-env']
 		}
 	  },
 	  {

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -82,3 +82,6 @@ jobs:
       - script: |
           npm test
         displayName: "Run tests"
+
+variables:
+  nproc: 4
diff --git a/packages/generators/init-generator.ts b/packages/generators/init-generator.ts
@@ -151,9 +151,9 @@ export default class InitGenerator extends Generator {
 						getBabelPlugin(),
 					);
 					this.dependencies.push(
-						"babel-core",
 						"babel-loader",
-						"babel-preset-env",
+						"@babel/core",
+						"@babel/preset-env",
 					);
 				}
 			})

diff --git a/packages/generators/utils/module.ts b/packages/generators/utils/module.ts
@@ -24,7 +24,7 @@ export default function(): IModule {
 			],
 			presets: [
 				[
-					"'env'",
+					"'@babel/preset-env'",
 					{
 						"'modules'": false,
 					},

diff --git a/packages/migrate/loaders/__snapshots__/loaders.test.js.snap b/packages/migrate/loaders/__snapshots__/loaders.test.js.snap
@@ -234,7 +234,7 @@ exports[`loaders transforms correctly using "loaders-7" data 1`] = `
                     loader: 'babel-loader',
 
                     options: {
-                        presets: ['env']
+                        presets: ['@babel/preset-env']
                     }
                 }]
             }

diff --git a/packages/migrate/loaders/__testfixtures__/loaders-7.input.js b/packages/migrate/loaders/__testfixtures__/loaders-7.input.js
@@ -6,7 +6,7 @@ export default {
                 exclude: /(node_modules)/,
                 loader: 'babel-loader',
                 query: {
-                    presets: ['env']
+                    presets: ['@babel/preset-env']
                 }
             }
         ]