babel-loader 8.0.0-beta.3 → 8.0.0

package/README.md

@@ -22,16 +22,16 @@ __Notes:__ Issues with the output should be reported on the babel [issue tracker
 
 <h2 align="center">Install</h2>
 
-> webpack 3.x | babel-loader 8.x | babel 7.x
+> webpack 4.x | babel-loader 8.x | babel 7.x
 
 ```bash
-npm install "babel-loader@^8.0.0-beta" @babel/core @babel/preset-env webpack
+npm install babel-loader @babel/core @babel/preset-env webpack
 ```
 
-> webpack 3.x babel-loader 7.x | babel 6.x
+> webpack 4.x | babel-loader 7.x | babel 6.x
 
 ```bash
-npm install babel-loader babel-core babel-preset-env webpack
+npm install babel-loader@7 babel-core babel-preset-env webpack
 ```
 
 <h2 align="center">Usage</h2>
@@ -116,7 +116,7 @@ You can instead require the babel runtime as a separate module to avoid the dupl
 The following configuration disables automatic per-file runtime injection in babel, instead
 requiring `babel-plugin-transform-runtime` and making all helper references use it.
 
-See the [docs](http://babeljs.io/docs/plugins/transform-runtime/) for more information.
+See the [docs](https://babeljs.io/docs/plugins/transform-runtime/) for more information.
 
 **NOTE:** You must run `npm install @babel/plugin-transform-runtime --save-dev` to include this in your project and `babel-runtime` itself as a dependency with `npm install @babel/runtime --save`.
 
@@ -281,4 +281,4 @@ be passed to `babel.transform`.
 Given Babel's result object, allow loaders to make additional tweaks to it.
 
 
-## [License](http://couto.mit-license.org/)
+## [License](https://couto.mit-license.org/)

package/lib/cache.js

@@ -89,14 +89,14 @@ function () {
 
 
 const filename = function (source, identifier, options) {
-  const hash = crypto.createHash("SHA1");
+  const hash = crypto.createHash("md4");
   const contents = JSON.stringify({
     source,
     options,
     identifier
   });
-  hash.end(contents);
-  return hash.read().toString("hex") + ".json.gz";
+  hash.update(contents);
+  return hash.digest("hex") + ".json.gz";
 };
 /**
  * Handle the cache
@@ -116,6 +116,14 @@ function () {
       cacheIdentifier,
       cacheDirectory
     } = params;
+    const file = path.join(directory, filename(source, cacheIdentifier, options));
+
+    try {
+      // No errors mean that the file was previously cached
+      // we just need to return it
+      return yield read(file);
+    } catch (err) {}
+
     const fallback = typeof cacheDirectory !== "string" && directory !== os.tmpdir(); // Make sure the directory exists.
 
     try {
@@ -126,15 +134,7 @@ function () {
       }
 
       throw err;
-    }
-
-    const file = path.join(directory, filename(source, cacheIdentifier, options));
-
-    try {
-      // No errors mean that the file was previously cached
-      // we just need to return it
-      return yield read(file);
-    } catch (err) {} // Otherwise just transform the file
+    } // Otherwise just transform the file
     // return it to the user asap and write it in cache
 
 

package/lib/transform.js

@@ -17,16 +17,23 @@ function () {
     let result;
 
     try {
-      result = yield transform(source, options);
+      result = yield transform(source, injectCaller(options));
     } catch (err) {
       throw err.message && err.codeFrame ? new LoaderError(err) : err;
     }
 
-    if (!result) return null;
+    if (!result) return null; // We don't return the full result here because some entries are not
+    // really serializable. For a full list of properties see here:
+    // https://github.com/babel/babel/blob/master/packages/babel-core/src/transformation/index.js
+    // For discussion on this topic see here:
+    // https://github.com/babel/babel-loader/pull/629
+
     const {
+      ast,
       code,
       map,
-      metadata
+      metadata,
+      sourceType
     } = result;
 
     if (map && (!map.sourcesContent || !map.sourcesContent.length)) {
@@ -34,9 +41,11 @@ function () {
     }
 
     return {
+      ast,
       code,
       map,
-      metadata
+      metadata,
+      sourceType
     };
   });
 
@@ -45,4 +54,40 @@ function () {
   };
 }();
 
-module.exports.version = babel.version;
+module.exports.version = babel.version;
+
+function injectCaller(opts) {
+  if (!supportsCallerOption()) return opts;
+  return Object.assign({}, opts, {
+    caller: Object.assign({
+      name: "babel-loader",
+      // Webpack >= 2 supports ESM and dynamic import.
+      supportsStaticESM: true,
+      supportsDynamicImport: true
+    }, opts.caller)
+  });
+} // TODO: We can remove this eventually, I'm just adding it so that people have
+// a little time to migrate to the newer RCs of @babel/core without getting
+// hard-to-diagnose errors about unknown 'caller' options.
+
+
+let supportsCallerOptionFlag = undefined;
+
+function supportsCallerOption() {
+  if (supportsCallerOptionFlag === undefined) {
+    try {
+      // Rather than try to match the Babel version, we just see if it throws
+      // when passed a 'caller' flag, and use that to decide if it is supported.
+      babel.loadPartialConfig({
+        caller: undefined,
+        babelrc: false,
+        configFile: false
+      });
+      supportsCallerOptionFlag = true;
+    } catch (err) {
+      supportsCallerOptionFlag = false;
+    }
+  }
+
+  return supportsCallerOptionFlag;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-loader",
-  "version": "8.0.0-beta.3",
+  "version": "8.0.0",
   "description": "babel module loader for webpack",
   "files": [
     "lib"
@@ -16,7 +16,7 @@
     "util.promisify": "^1.0.0"
   },
   "peerDependencies": {
-    "@babel/core": "^7.0.0 || ^7.0.0-rc || ^7.0.0-beta.41",
+    "@babel/core": "^7.0.0",
     "webpack": ">=2"
   },
   "devDependencies": {