babel-loader 8.0.0 → 8.0.4

package/README.md

@@ -1,42 +1,43 @@
-> This readme is for babel-loader v8 + Babel v7  
+> This README is for babel-loader v8 + Babel v7
 > Check the [7.x branch](https://github.com/babel/babel-loader/tree/7.x) for docs with Babel v6
 
 [![NPM Status](https://img.shields.io/npm/v/babel-loader.svg?style=flat)](https://www.npmjs.com/package/babel-loader)
 [![Build Status](https://travis-ci.org/babel/babel-loader.svg?branch=master)](https://travis-ci.org/babel/babel-loader)
-[![Build Status](https://ci.appveyor.com/api/projects/status/vgtpr2i5bykgyuqo/branch/master?svg=true)](https://ci.appveyor.com/project/danez/babel-loader/branch/master)
+[![Build Status](https://ci.appveyor.com/api/projects/status/77y5mk6amwqt0q88/branch/master?svg=true)](https://ci.appveyor.com/project/babel/babel-loader/branch/master)
 [![codecov](https://codecov.io/gh/babel/babel-loader/branch/master/graph/badge.svg)](https://codecov.io/gh/babel/babel-loader)
 
 <div align="center">
-  <a href="https://github.com/babel/babel/">
-    <img width="200" height="200" src="https://rawgit.com/babel/logo/master/babel.svg">
+  <a href="https://github.com/babel/babel">
+    <img src="https://rawgit.com/babel/logo/master/babel.svg" alt="Babel logo" width="200" height="200">
   </a>
   <a href="https://github.com/webpack/webpack">
-    <img width="200" height="200" src="https://webpack.js.org/assets/icon-square-big.svg">
+    <img src="https://webpack.js.org/assets/icon-square-big.svg" alt="webpack logo" width="200" height="200">
   </a>
-  <h1>Babel Loader</h1>
 </div>
 
+<h1 align="center">Babel Loader</h1>
+
 This package allows transpiling JavaScript files using [Babel](https://github.com/babel/babel) and [webpack](https://github.com/webpack/webpack).
 
-__Notes:__ Issues with the output should be reported on the babel [issue tracker](https://github.com/babel/babel/issues).
+**Note**: Issues with the output should be reported on the Babel [Issues](https://github.com/babel/babel/issues) tracker.
 
 <h2 align="center">Install</h2>
 
 > webpack 4.x | babel-loader 8.x | babel 7.x
 
 ```bash
-npm install babel-loader @babel/core @babel/preset-env webpack
+npm install -D babel-loader @babel/core @babel/preset-env webpack
 ```
 
 > webpack 4.x | babel-loader 7.x | babel 6.x
 
 ```bash
-npm install babel-loader@7 babel-core babel-preset-env webpack
+npm install -D babel-loader@7 babel-core babel-preset-env webpack
 ```
 
 <h2 align="center">Usage</h2>
 
-[Documentation: Using loaders](https://webpack.js.org/loaders/)
+webpack documentation: [Loaders](https://webpack.js.org/loaders/)
 
 Within your webpack configuration object, you'll need to add the babel-loader to the list of modules, like so:
 
@@ -44,7 +45,7 @@ Within your webpack configuration object, you'll need to add the babel-loader to
 module: {
   rules: [
     {
-      test: /\.js$/,
+      test: /\.m?js$/,
       exclude: /(node_modules|bower_components)/,
       use: {
         loader: 'babel-loader',
@@ -59,16 +60,15 @@ module: {
 
 ### Options
 
-See the `babel` [options](https://babeljs.io/docs/usage/api/#options).
-
+See the `babel` [options](https://babeljs.io/docs/en/options).
 
-You can pass options to the loader by using the [options property](https://webpack.js.org/configuration/module/#rule-options-rule-query):
+You can pass options to the loader by using the [`options`](https://webpack.js.org/configuration/module/#rule-options-rule-query) property:
 
 ```javascript
 module: {
   rules: [
     {
-      test: /\.js$/,
+      test: /\.m?js$/,
       exclude: /(node_modules|bower_components)/,
       use: {
         loader: 'babel-loader',
@@ -84,48 +84,44 @@ module: {
 
 This loader also supports the following loader-specific option:
 
-* `cacheDirectory`: Default `false`. When set, the given directory will be used to cache the results of the loader. Future webpack builds will attempt to read from the cache to avoid needing to run the potentially expensive Babel recompilation process on each run. If the value is blank (`loader: 'babel-loader?cacheDirectory'`) or `true` (`loader: babel-loader?cacheDirectory=true`) the loader will use the default cache directory in `node_modules/.cache/babel-loader` or fallback to the default OS temporary file directory if no `node_modules` folder could be found in any root directory.
+* `cacheDirectory`: Default `false`. When set, the given directory will be used to cache the results of the loader. Future webpack builds will attempt to read from the cache to avoid needing to run the potentially expensive Babel recompilation process on each run. If the value is blank (`loader: 'babel-loader?cacheDirectory'`) or `true` (`loader: 'babel-loader?cacheDirectory=true'`), the loader will use the default cache directory in `node_modules/.cache/babel-loader` or fallback to the default OS temporary file directory if no `node_modules` folder could be found in any root directory.
+
+* `cacheIdentifier`: Default is a string composed by the `babel-core`'s version, the `babel-loader`'s version, the contents of `.babelrc` file if it exists, and the value of the environment variable `BABEL_ENV` with a fallback to the `NODE_ENV` environment variable. This can be set to a custom value to force cache busting if the identifier changes.
 
-* `cacheIdentifier`: Default is a string composed by the babel-core's version, the babel-loader's version, the contents of .babelrc file if it exists and the value of the environment variable `BABEL_ENV` with a fallback to the `NODE_ENV` environment variable. This can be set to a custom value to force cache busting if the identifier changes.
+* `cacheCompression`: Default `true`. When set, each Babel transform output will be compressed with Gzip. If you want to opt-out of cache compression, set it to `false` -- your project may benefit from this if it transpiles thousands of files.
 
-* `babelrc`: Default `true`. When `false`, no options from `.babelrc` files will be used; only the options passed to
-`babel-loader` will be used.
+* `customize`: Default `null`. The path of a module that exports a `custom` callback [like the one that you'd pass to `.custom()`](#customized-loader). Since you already have to make a new file to use this, it is recommended that you instead use `.custom` to create a wrapper loader. Only use this is you _must_ continue using `babel-loader` directly, but still want to customize.
 
-__Note:__ The `sourceMap` option is ignored, instead sourceMaps are automatically enabled when webpack is configured to use them (via the `devtool` config option).
+**Note**: The `sourceMap` option is ignored. Instead, source maps are automatically enabled when webpack is configured to use them (via the [`devtool`](https://webpack.js.org/configuration/devtool/#devtool) config option).
 
 ## Troubleshooting
 
 ### babel-loader is slow!
 
-Make sure you are transforming as few files as possible. Because you are probably
-matching `/\.js$/`, you might be transforming the `node_modules` folder or other unwanted
-source.
+Make sure you are transforming as few files as possible. Because you are probably matching `/\.m?js$/`, you might be transforming the `node_modules` folder or other unwanted source.
 
 To exclude `node_modules`, see the `exclude` option in the `loaders` config as documented above.
 
-You can also speed up babel-loader by as much as 2x by using the `cacheDirectory` option.
-This will cache transformations to the filesystem.
+You can also speed up babel-loader by as much as 2x by using the `cacheDirectory` option. This will cache transformations to the filesystem.
 
-### babel is injecting helpers into each file and bloating my code!
+### Babel is injecting helpers into each file and bloating my code!
 
-babel uses very small helpers for common functions such as `_extend`. By default
-this will be added to every file that requires it.
+Babel uses very small helpers for common functions such as `_extend`. By default, this will be added to every file that requires it.
 
-You can instead require the babel runtime as a separate module to avoid the duplication.
+You can instead require the Babel runtime as a separate module to avoid the duplication.
 
-The following configuration disables automatic per-file runtime injection in babel, instead
-requiring `babel-plugin-transform-runtime` and making all helper references use it.
+The following configuration disables automatic per-file runtime injection in Babel, requiring `babel-plugin-transform-runtime` instead and making all helper references use it.
 
 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`.
+**NOTE**: You must run `npm install -D @babel/plugin-transform-runtime` to include this in your project and `babel-runtime` itself as a dependency with `npm install @babel/runtime`.
 
 ```javascript
 rules: [
-  // the 'transform-runtime' plugin tells babel to require the runtime
-  // instead of inlining it.
+  // the 'transform-runtime' plugin tells Babel to
+  // require the runtime instead of inlining it.
   {
-    test: /\.js$/,
+    test: /\.m?js$/,
     exclude: /(node_modules|bower_components)/,
     use: {
       loader: 'babel-loader',
@@ -138,9 +134,9 @@ rules: [
 ]
 ```
 
-#### **NOTE:** transform-runtime & custom polyfills (e.g. Promise library)
+#### **NOTE**: transform-runtime & custom polyfills (e.g. Promise library)
 
-Since [babel-plugin-transform-runtime](https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-runtime) includes a polyfill that includes a custom [regenerator runtime](https://github.com/facebook/regenerator/blob/master/packages/regenerator-runtime/runtime.js) and [core.js](https://github.com/zloirock/core-js), the following usual shimming method using `webpack.ProvidePlugin` will not work:
+Since [babel-plugin-transform-runtime](https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-runtime) includes a polyfill that includes a custom [regenerator-runtime](https://github.com/facebook/regenerator/blob/master/packages/regenerator-runtime/runtime.js) and [core-js](https://github.com/zloirock/core-js), the following usual shimming method using `webpack.ProvidePlugin` will not work:
 
 ```javascript
 // ...
@@ -184,23 +180,23 @@ require('@babel/runtime/core-js/promise').default = require('bluebird');
 require('./app');
 ```
 
-### The node API for `babel` has been moved to `babel-core`.
+### The Node.js API for `babel` has been moved to `babel-core`.
 
-If you receive this message it means that you have the npm package `babel` installed and use the short notation of the loader in the webpack config (which is not valid anymore as of webpack 2.x):
-```js
+If you receive this message, it means that you have the npm package `babel` installed and are using the short notation of the loader in the webpack config (which is not valid anymore as of webpack 2.x):
+```javascript
   {
-    test: /\.js$/,
+    test: /\.m?js$/,
     loader: 'babel',
   }
 ```
 
-Webpack then tries to load the `babel` package instead of the `babel-loader`.
+webpack then tries to load the `babel` package instead of the `babel-loader`.
 
-To fix this you should uninstall the npm package `babel` as it is deprecated in babel v6. (instead install `babel-cli` or `babel-core`)
+To fix this, you should uninstall the npm package `babel`, as it is deprecated in Babel v6. (Instead, install `babel-cli` or `babel-core`.)
 In the case one of your dependencies is installing `babel` and you cannot uninstall it yourself, use the complete name of the loader in the webpack config:
-```js
+```javascript
   {
-    test: /\.js$/,
+    test: /\.m?js$/,
     loader: 'babel-loader',
   }
 ```
@@ -214,9 +210,14 @@ of Babel's configuration for each file that it processes.
 `babel` so that tooling can ensure that it using exactly the same `@babel/core`
 instance as the loader itself.
 
+In cases where you want to customize without actually having a file to call `.custom`, you
+may also pass the `customize` option with a string pointing at a file that exports
+your `custom` callback function.
+
 ### Example
 
 ```js
+// Export from "./my-custom-loader.js" or whatever you want.
 module.exports = require("babel-loader").custom(babel => {
   function myPlugin() {
     return {
@@ -236,7 +237,7 @@ module.exports = require("babel-loader").custom(babel => {
       };
     },
 
-    // Passed Babel's 'PartialConfig' object. 
+    // Passed Babel's 'PartialConfig' object.
     config(cfg) {
       if (cfg.hasFilesystemConfig()) {
         // Use the normal config
@@ -264,6 +265,20 @@ module.exports = require("babel-loader").custom(babel => {
 });
 ```
 
+```js
+// And in your Webpack config
+module.exports = {
+  // ..
+  module: {
+    rules: [{
+      // ...
+      loader: path.join(__dirname, 'my-custom-loader.js'),
+      // ...
+    }]
+  }
+};
+```
+
 ### `customOptions(options: Object): { custom: Object, loader: Object }`
 
 Given the loader's options, split custom options out of `babel-loader`'s

package/lib/cache.js

@@ -1,6 +1,8 @@
 "use strict";
 
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } } function _next(value) { step("next", value); } function _throw(err) { step("throw", err); } _next(); }); }; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
 /**
  * Filesystem Cache
@@ -46,13 +48,13 @@ const mkdirp = promisify(mkdirpOrig);
 const read =
 /*#__PURE__*/
 function () {
-  var _ref = _asyncToGenerator(function* (filename) {
-    const data = yield readFile(filename);
-    const content = yield gunzip(data);
-    return JSON.parse(content);
+  var _ref = _asyncToGenerator(function* (filename, compress) {
+    const data = yield readFile(filename + (compress ? ".gz" : ""));
+    const content = compress ? yield gunzip(data) : data;
+    return JSON.parse(content.toString());
   });
 
-  return function read(_x) {
+  return function read(_x, _x2) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -68,13 +70,13 @@ function () {
 const write =
 /*#__PURE__*/
 function () {
-  var _ref2 = _asyncToGenerator(function* (filename, result) {
+  var _ref2 = _asyncToGenerator(function* (filename, compress, result) {
     const content = JSON.stringify(result);
-    const data = yield gzip(content);
-    return yield writeFile(filename, data);
+    const data = compress ? yield gzip(content) : content;
+    return yield writeFile(filename + (compress ? ".gz" : ""), data);
   });
 
-  return function write(_x2, _x3) {
+  return function write(_x3, _x4, _x5) {
     return _ref2.apply(this, arguments);
   };
 }();
@@ -96,7 +98,7 @@ const filename = function (source, identifier, options) {
     identifier
   });
   hash.update(contents);
-  return hash.digest("hex") + ".json.gz";
+  return hash.digest("hex") + ".json";
 };
 /**
  * Handle the cache
@@ -114,14 +116,15 @@ function () {
       source,
       options = {},
       cacheIdentifier,
-      cacheDirectory
+      cacheDirectory,
+      cacheCompression
     } = 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);
+      return yield read(file, cacheCompression);
     } catch (err) {}
 
     const fallback = typeof cacheDirectory !== "string" && directory !== os.tmpdir(); // Make sure the directory exists.
@@ -141,7 +144,7 @@ function () {
     const result = yield transform(source, options);
 
     try {
-      yield write(file, result);
+      yield write(file, cacheCompression, result);
     } catch (err) {
       if (fallback) {
         // Fallback to tmpdir if node_modules folder not writable
@@ -154,7 +157,7 @@ function () {
     return result;
   });
 
-  return function handleCache(_x4, _x5) {
+  return function handleCache(_x6, _x7) {
     return _ref3.apply(this, arguments);
   };
 }();
@@ -176,6 +179,7 @@ function () {
  *   cache({
  *     directory: '.tmp/cache',
  *     identifier: 'babel-loader-cachefile',
+ *     cacheCompression: false,
  *     source: *source code from file*,
  *     options: {
  *       experimental: true,
@@ -212,7 +216,7 @@ function () {
     return yield handleCache(directory, params);
   });
 
-  return function (_x6) {
+  return function (_x8) {
     return _ref4.apply(this, arguments);
   };
 }();

package/lib/index.js

@@ -1,8 +1,26 @@
 "use strict";
 
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } } function _next(value) { step("next", value); } function _throw(err) { step("throw", err); } _next(); }); }; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
-const babel = require("@babel/core");
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+let babel;
+
+try {
+  babel = require("@babel/core");
+} catch (err) {
+  if (err.code === "MODULE_NOT_FOUND") {
+    err.message += "\n babel-loader@8 requires Babel 7.x (the package '@babel/core'). " + "If you'd like to use Babel 6.x ('babel-core'), you should install 'babel-loader@7'.";
+  }
+
+  throw err;
+} // Since we've got the reverse bridge package at @babel/core@6.x, give
+// people useful feedback if they try to use it alongside babel-loader.
+
+
+if (/^6\./.test(babel.version)) {
+  throw new Error("\n babel-loader@8 will not work with the '@babel/core@6' bridge package. " + "If you want to use Babel 6.x, install 'babel-loader@7'.");
+}
 
 const pkg = require("../package.json");
 
@@ -10,7 +28,9 @@ const cache = require("./cache");
 
 const transform = require("./transform");
 
-const relative = require("./utils/relative");
+const injectCaller = require("./injectCaller");
+
+const path = require("path");
 
 const loaderUtils = require("loader-utils");
 
@@ -40,10 +60,38 @@ function _loader() {
   _loader = _asyncToGenerator(function* (source, inputSourceMap, overrides) {
     const filename = this.resourcePath;
     let loaderOptions = loaderUtils.getOptions(this) || {};
+
+    if (loaderOptions.customize != null) {
+      if (typeof loaderOptions.customize !== "string") {
+        throw new Error("Customized loaders must be implemented as standalone modules.");
+      }
+
+      if (!path.isAbsolute(loaderOptions.customize)) {
+        throw new Error("Customized loaders must be passed as absolute paths, since " + "babel-loader has no way to know what they would be relative to.");
+      }
+
+      if (overrides) {
+        throw new Error("babel-loader's 'customize' option is not available when already " + "using a customized babel-loader wrapper.");
+      }
+
+      let override = require(loaderOptions.customize);
+
+      if (override.__esModule) override = override.default;
+
+      if (typeof override !== "function") {
+        throw new Error("Custom overrides must be functions.");
+      }
+
+      overrides = override(babel);
+    }
+
     let customOptions;
 
     if (overrides && overrides.customOptions) {
-      const result = yield overrides.customOptions.call(this, loaderOptions);
+      const result = yield overrides.customOptions.call(this, loaderOptions, {
+        source,
+        map: inputSourceMap
+      });
       customOptions = result.custom;
       loaderOptions = result.loader;
     } // Deprecation handling
@@ -55,31 +103,41 @@ function _loader() {
 
     if (typeof loaderOptions.babelrc === "string") {
       console.warn("The option `babelrc` should not be set to a string anymore in the babel-loader config. " + "Please update your configuration and set `babelrc` to true or false.\n" + "If you want to specify a specific babel config file to inherit config from " + "please use the `extends` option.\nFor more information about this options see " + "https://babeljs.io/docs/core-packages/#options");
-    } // Set babel-loader's default options.
+    } // Standardize on 'sourceMaps' as the key passed through to Webpack, so that
+    // users may safely use either one alongside our default use of
+    // 'this.sourceMap' below without getting error about conflicting aliases.
+
 
+    if (Object.prototype.hasOwnProperty.call(loaderOptions, "sourceMap") && !Object.prototype.hasOwnProperty.call(loaderOptions, "sourceMaps")) {
+      loaderOptions = Object.assign({}, loaderOptions, {
+        sourceMaps: loaderOptions.sourceMap
+      });
+      delete loaderOptions.sourceMap;
+    }
 
-    const {
-      sourceRoot = process.cwd(),
-      sourceMap = this.sourceMap,
-      sourceFileName = relative(sourceRoot, filename)
-    } = loaderOptions;
     const programmaticOptions = Object.assign({}, loaderOptions, {
       filename,
       inputSourceMap: inputSourceMap || undefined,
-      sourceRoot,
-      sourceMap,
-      sourceFileName
+      // Set the default sourcemap behavior based on Webpack's mapping flag,
+      // but allow users to override if they want.
+      sourceMaps: loaderOptions.sourceMaps === undefined ? this.sourceMap : loaderOptions.sourceMaps,
+      // Ensure that Webpack will get a full absolute path in the sourcemap
+      // so that it can properly map the module back to its internal cached
+      // modules.
+      sourceFileName: filename
     }); // Remove loader related options
 
+    delete programmaticOptions.customize;
     delete programmaticOptions.cacheDirectory;
     delete programmaticOptions.cacheIdentifier;
+    delete programmaticOptions.cacheCompression;
     delete programmaticOptions.metadataSubscribers;
 
     if (!babel.loadPartialConfig) {
       throw new Error(`babel-loader ^8.0.0-beta.3 requires @babel/core@7.0.0-beta.41, but ` + `you appear to be using "${babel.version}". Either update your ` + `@babel/core version, or pin you babel-loader version to 8.0.0-beta.2`);
     }
 
-    const config = babel.loadPartialConfig(programmaticOptions);
+    const config = babel.loadPartialConfig(injectCaller(programmaticOptions));
 
     if (config) {
       let options = config.options;
@@ -87,10 +145,21 @@ function _loader() {
       if (overrides && overrides.config) {
         options = yield overrides.config.call(this, config, {
           source,
+          map: inputSourceMap,
           customOptions
         });
       }
 
+      if (options.sourceMaps === "inline") {
+        // Babel has this weird behavior where if you set "inline", we
+        // inline the sourcemap, and set 'result.map = null'. This results
+        // in bad behavior from Babel since the maps get put into the code,
+        // which Webpack does not expect, and because the map we return to
+        // Webpack is null, which is also bad. To avoid that, we override the
+        // behavior here so "inline" just behaves like 'true'.
+        options.sourceMaps = true;
+      }
+
       const {
         cacheDirectory = null,
         cacheIdentifier = JSON.stringify({
@@ -98,6 +167,7 @@ function _loader() {
           "@babel/core": transform.version,
           "@babel/loader": pkg.version
         }),
+        cacheCompression = true,
         metadataSubscribers = []
       } = loaderOptions;
       let result;
@@ -108,7 +178,8 @@ function _loader() {
           options,
           transform,
           cacheDirectory,
-          cacheIdentifier
+          cacheIdentifier,
+          cacheCompression
         });
       } else {
         result = yield transform(source, options);
@@ -124,6 +195,7 @@ function _loader() {
         if (overrides && overrides.result) {
           result = yield overrides.result.call(this, result, {
             source,
+            map: inputSourceMap,
             customOptions,
             config,
             options

package/lib/injectCaller.js

@@ -0,0 +1,39 @@
+"use strict";
+
+const babel = require("@babel/core");
+
+module.exports = 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/lib/transform.js

@@ -1,6 +1,8 @@
 "use strict";
 
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } } function _next(value) { step("next", value); } function _throw(err) { step("throw", err); } _next(); }); }; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
 const babel = require("@babel/core");
 
@@ -17,7 +19,7 @@ function () {
     let result;
 
     try {
-      result = yield transform(source, injectCaller(options));
+      result = yield transform(source, options);
     } catch (err) {
       throw err.message && err.codeFrame ? new LoaderError(err) : err;
     }
@@ -54,40 +56,4 @@ function () {
   };
 }();
 
-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;
-}
+module.exports.version = babel.version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-loader",
-  "version": "8.0.0",
+  "version": "8.0.4",
   "description": "babel module loader for webpack",
   "files": [
     "lib"
@@ -20,16 +20,16 @@
     "webpack": ">=2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.0.0-beta.41",
-    "@babel/core": "^7.0.0-beta.41",
-    "@babel/preset-env": "^7.0.0-beta.41",
+    "@babel/cli": "^7.0.0",
+    "@babel/core": "^7.0.0",
+    "@babel/preset-env": "^7.0.0",
     "ava": "0.25.0",
     "babel-eslint": "^8.0.0",
     "babel-plugin-istanbul": "^4.0.0",
     "babel-plugin-react-intl": "^2.1.3",
     "cross-env": "^5.0.0",
     "eslint": "^4.1.0",
-    "eslint-config-babel": "^7.0.0",
+    "eslint-config-babel": "^8.0.0",
     "eslint-plugin-flowtype": "^2.25.0",
     "eslint-plugin-prettier": "^2.1.2",
     "husky": "^0.14.0",

package/lib/utils/relative.js

@@ -1,15 +0,0 @@
-"use strict";
-
-const path = require("path");
-
-module.exports = function relative(root, file) {
-  const rootPath = root.replace(/\\/g, "/").split("/")[1];
-  const filePath = file.replace(/\\/g, "/").split("/")[1]; // If the file is in a completely different root folder
-  // use the absolute path of the file
-
-  if (rootPath && rootPath !== filePath) {
-    return file;
-  }
-
-  return path.relative(root, file);
-};