babel-loader 8.0.2 → 8.0.6

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2016 Luís Couto <hello@luiscouto.pt>
+Copyright (c) 2014-2019 Luís Couto <hello@luiscouto.pt>
 
 MIT License
 

package/README.md

@@ -3,7 +3,7 @@
 
 [![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">
@@ -29,12 +29,6 @@ This package allows transpiling JavaScript files using [Babel](https://github.co
 npm install -D babel-loader @babel/core @babel/preset-env webpack
 ```
 
-> webpack 4.x | babel-loader 7.x | babel 6.x
-
-```bash
-npm install -D babel-loader@7 babel-core babel-preset-env webpack
-```
-
 <h2 align="center">Usage</h2>
 
 webpack documentation: [Loaders](https://webpack.js.org/loaders/)
@@ -45,7 +39,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',
@@ -60,7 +54,7 @@ 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`](https://webpack.js.org/configuration/module/#rule-options-rule-query) property:
 
@@ -68,13 +62,13 @@ You can pass options to the loader by using the [`options`](https://webpack.js.o
 module: {
   rules: [
     {
-      test: /\.js$/,
+      test: /\.m?js$/,
       exclude: /(node_modules|bower_components)/,
       use: {
         loader: 'babel-loader',
         options: {
           presets: ['@babel/preset-env'],
-          plugins: [require('@babel/plugin-proposal-object-rest-spread')]
+          plugins: ['@babel/plugin-proposal-object-rest-spread']
         }
       }
     }
@@ -84,19 +78,19 @@ 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 set to `true` in options (`{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.
 
-**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).
+* `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.
 
 ## 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.
 
@@ -108,18 +102,18 @@ Babel uses very small helpers for common functions such as `_extend`. By default
 
 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, requiring `babel-plugin-transform-runtime` instead 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 -D @babel/plugin-transform-runtime` to include this in your project and `babel-runtime` itself as a dependency with `npm install @babel/runtime`.
+**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.
   {
-    test: /\.js$/,
+    test: /\.m?js$/,
     exclude: /(node_modules|bower_components)/,
     use: {
       loader: 'babel-loader',
@@ -134,7 +128,7 @@ rules: [
 
 #### **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
 // ...
@@ -183,18 +177,18 @@ require('./app');
 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`.
 
-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:
 ```javascript
   {
-    test: /\.js$/,
+    test: /\.m?js$/,
     loader: 'babel-loader',
   }
 ```
@@ -208,9 +202,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 {
@@ -230,7 +229,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
@@ -258,6 +257,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
@@ -275,4 +288,5 @@ be passed to `babel.transform`.
 Given Babel's result object, allow loaders to make additional tweaks to it.
 
 
-## [License](https://couto.mit-license.org/)
+## License
+[MIT](https://couto.mit-license.org/)

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
@@ -25,7 +27,7 @@ const mkdirpOrig = require("mkdirp");
 
 const findCacheDir = require("find-cache-dir");
 
-const promisify = require("util.promisify");
+const promisify = require("pify");
 
 const transform = require("./transform"); // Lazily instantiated when needed
 

package/lib/index.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); }); }; }
 
 let babel;
 
@@ -20,12 +22,20 @@ 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");
+const {
+  version
+} = require("../package.json");
 
 const cache = require("./cache");
 
 const transform = require("./transform");
 
+const injectCaller = require("./injectCaller");
+
+const {
+  isAbsolute
+} = require("path");
+
 const loaderUtils = require("loader-utils");
 
 function subscribe(subscriber, metadata, context) {
@@ -54,10 +64,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 (!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
@@ -93,6 +131,7 @@ function _loader() {
       sourceFileName: filename
     }); // Remove loader related options
 
+    delete programmaticOptions.customize;
     delete programmaticOptions.cacheDirectory;
     delete programmaticOptions.cacheIdentifier;
     delete programmaticOptions.cacheCompression;
@@ -102,7 +141,7 @@ function _loader() {
       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;
@@ -110,6 +149,7 @@ function _loader() {
       if (overrides && overrides.config) {
         options = yield overrides.config.call(this, config, {
           source,
+          map: inputSourceMap,
           customOptions
         });
       }
@@ -129,7 +169,7 @@ function _loader() {
         cacheIdentifier = JSON.stringify({
           options,
           "@babel/core": transform.version,
-          "@babel/loader": pkg.version
+          "@babel/loader": version
         }),
         cacheCompression = true,
         metadataSubscribers = []
@@ -159,6 +199,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,10 +1,12 @@
 "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");
 
-const promisify = require("util.promisify");
+const promisify = require("pify");
 
 const LoaderError = require("./Error");
 
@@ -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.2",
+  "version": "8.0.6",
   "description": "babel module loader for webpack",
   "files": [
     "lib"
@@ -10,35 +10,36 @@
     "node": ">= 6.9"
   },
   "dependencies": {
-    "find-cache-dir": "^1.0.0",
+    "find-cache-dir": "^2.0.0",
     "loader-utils": "^1.0.2",
     "mkdirp": "^0.5.1",
-    "util.promisify": "^1.0.0"
+    "pify": "^4.0.1"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0",
     "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",
-    "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-plugin-flowtype": "^2.25.0",
-    "eslint-plugin-prettier": "^2.1.2",
-    "husky": "^0.14.0",
-    "lint-staged": "^7.1.0",
-    "nyc": "^11.0.1",
-    "prettier": "^1.2.2",
+    "@babel/cli": "^7.2.0",
+    "@babel/core": "^7.2.0",
+    "@babel/preset-env": "^7.2.0",
+    "ava": "^1.1.0",
+    "babel-eslint": "^10.0.1",
+    "babel-plugin-istanbul": "^5.1.0",
+    "babel-plugin-react-intl": "^3.0.1",
+    "cross-env": "^5.2.0",
+    "eslint": "^5.9.0",
+    "eslint-config-babel": "^9.0.0",
+    "eslint-config-prettier": "^4.1.0",
+    "eslint-plugin-flowtype": "^3.2.0",
+    "eslint-plugin-prettier": "^3.0.0",
+    "husky": "^1.2.0",
+    "lint-staged": "^8.1.0",
+    "nyc": "^14.1.1",
+    "prettier": "^1.15.3",
     "react": "^16.0.0",
     "react-intl": "^2.1.2",
-    "react-intl-webpack-plugin": "^0.0.3",
+    "react-intl-webpack-plugin": "^0.3.0",
     "rimraf": "^2.4.3",
     "webpack": "^4.0.0"
   },
@@ -89,7 +90,7 @@
       "!test/fixtures/**/*",
       "!test/helpers/**/*"
     ],
-    "source": [
+    "sources": [
       "src/**/*.js"
     ]
   },