Change peerDep to @babel/core

babel · Oct 31, 2017 · 738b957 · 738b957
1 parent b9f4d60
commit 738b957
Show file tree

Hide file tree

Showing 7 changed files with 604 additions and 290 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,6 +1,11 @@
 {
   "presets": [
-    ["env", { "loose": true, "targets": { "node": "4.2" } }]
+    ["@babel/preset-env", {
+      "loose": true,
+      "targets": {
+        "node": "4.2"
+      }
+    }]
   ],
   "env": {
     "test": {

diff --git a/package.json b/package.json
@@ -15,18 +15,17 @@
     "mkdirp": "^0.5.1"
   },
   "peerDependencies": {
-    "babel-core": "6 || 7 || ^7.0.0-alpha || ^7.0.0-beta || ^7.0.0-rc",
+    "@babel/core": "7 || ^7.0.0-beta || ^7.0.0-rc",
     "webpack": "2 || 3"
   },
   "devDependencies": {
-    "ava": "^0.23.0",
-    "babel-cli": "^6.18.0",
-    "babel-core": "^6.0.0",
+    "@babel/cli": "7.0.0-beta.5",
+    "@babel/core": "7.0.0-beta.5",
+    "@babel/preset-env": "7.0.0-beta.5",
+    "ava": "0.23.0",
     "babel-eslint": "^8.0.0",
     "babel-plugin-istanbul": "^4.0.0",
     "babel-plugin-react-intl": "^2.1.3",
-    "babel-preset-env": "^1.2.0",
-    "babel-register": "^6.18.0",
     "cross-env": "^5.0.0",
     "eslint": "^4.1.0",
     "eslint-config-babel": "^7.0.0",
@@ -80,9 +79,6 @@
       "text",
       "json"
     ],
-    "require": [
-      "babel-register"
-    ],
     "sourceMap": false,
     "instrument": false
   },
@@ -94,8 +90,7 @@
     ],
     "source": [
       "src/**/*.js"
-    ],
-    "babel": "inherit"
+    ]
   },
   "lint-staged": {
     "scripts/*.js": [

diff --git a/src/index.js b/src/index.js
@@ -1,4 +1,4 @@
-const babel = require("babel-core");
+const babel = require("@babel/core");
 const loaderUtils = require("loader-utils");
 const path = require("path");
 const cache = require("./fs-cache.js");
@@ -131,8 +131,8 @@ module.exports = function(source, inputSourceMap) {
     sourceRoot: process.cwd(),
     filename: filename,
     cacheIdentifier: JSON.stringify({
-      "babel-loader": pkg.version,
-      "babel-core": babel.version,
+      "@babel/loader": pkg.version,
+      "@babel/core": babel.version,
       babelrc: babelrcPath ? read(fileSystem, babelrcPath) : null,
       env:
         loaderOptions.forceEnv ||

diff --git a/test/cache.test.js b/test/cache.test.js
@@ -60,7 +60,7 @@ test.cb("should output files to cache directory", t => {
           exclude: /node_modules/,
           query: {
             cacheDirectory: t.context.cacheDirectory,
-            presets: ["env"],
+            presets: ["@babel/preset-env"],
           },
         },
       ],
@@ -93,7 +93,7 @@ test.cb.serial(
             exclude: /node_modules/,
             query: {
               cacheDirectory: true,
-              presets: ["env"],
+              presets: ["@babel/preset-env"],
             },
           },
         ],
@@ -125,7 +125,7 @@ test.cb.serial(
         loaders: [
           {
             test: /\.jsx?/,
-            loader: `${babelLoader}?cacheDirectory=true&presets[]=env`,
+            loader: `${babelLoader}?cacheDirectory=true&presets[]=@babel/preset-env`,
             exclude: /node_modules/,
           },
         ],
@@ -139,6 +139,7 @@ test.cb.serial(
         files = files.filter(file => /\b[0-9a-f]{5,40}\.json\.gz\b/.test(file));
 
         t.is(err, null);
+
         t.true(files.length > 0);
         t.end();
       });
@@ -159,7 +160,7 @@ test.cb.skip("should read from cache directory if cached file exists", t => {
           exclude: /node_modules/,
           query: {
             cacheDirectory: t.context.cacheDirectory,
-            presets: ["env"],
+            presets: ["@babel/preset-env"],
           },
         },
       ],
@@ -195,7 +196,7 @@ test.cb("should have one file per module", t => {
           exclude: /node_modules/,
           query: {
             cacheDirectory: t.context.cacheDirectory,
-            presets: ["env"],
+            presets: ["@babel/preset-env"],
           },
         },
       ],
@@ -228,7 +229,7 @@ test.cb("should generate a new file if the identifier changes", t => {
             query: {
               cacheDirectory: t.context.cacheDirectory,
               cacheIdentifier: "a",
-              presets: ["env"],
+              presets: ["@babel/preset-env"],
             },
           },
         ],
@@ -247,7 +248,7 @@ test.cb("should generate a new file if the identifier changes", t => {
             query: {
               cacheDirectory: t.context.cacheDirectory,
               cacheIdentifier: "b",
-              presets: ["env"],
+              presets: ["@babel/preset-env"],
             },
           },
         ],
@@ -288,7 +289,7 @@ test.cb("should allow to specify the .babelrc file", t => {
             query: {
               cacheDirectory: t.context.cacheDirectory,
               babelrc: path.join(__dirname, "fixtures/babelrc"),
-              presets: ["env"],
+              presets: ["@babel/preset-env"],
             },
           },
         ],
@@ -307,7 +308,7 @@ test.cb("should allow to specify the .babelrc file", t => {
             exclude: /node_modules/,
             query: {
               cacheDirectory: t.context.cacheDirectory,
-              presets: ["env"],
+              presets: ["@babel/preset-env"],
             },
           },
         ],

diff --git a/test/fixtures/babelrc b/test/fixtures/babelrc
@@ -1,3 +1,3 @@
 {
-  "presets": ["env"]
+  "presets": ["@babel/preset-env"]
 }
diff --git a/test/loader.test.js b/test/loader.test.js
@@ -15,7 +15,7 @@ const globalConfig = {
         test: /\.jsx?/,
         loader: babelLoader,
         query: {
-          presets: ["env"],
+          presets: ["@babel/preset-env"],
         },
         exclude: /node_modules/,
       },