babel-loader 8.0.3 → 8.1.0

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

@@ -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/)
@@ -74,7 +68,7 @@ module: {
         loader: 'babel-loader',
         options: {
           presets: ['@babel/preset-env'],
-          plugins: [require('@babel/plugin-proposal-object-rest-spread')]
+          plugins: ['@babel/plugin-proposal-object-rest-spread']
         }
       }
     }
@@ -84,15 +78,13 @@ 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.
 
-* `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, 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 if you _must_ continue using `babel-loader` directly, but still want to customize.
 
 ## Troubleshooting
 
@@ -110,11 +102,11 @@ 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: [
@@ -136,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
 // ...
@@ -192,7 +184,7 @@ If you receive this message, it means that you have the npm package `babel` inst
 
 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
   {
@@ -201,6 +193,37 @@ In the case one of your dependencies is installing `babel` and you cannot uninst
   }
 ```
 
+## Customize config based on webpack target
+
+Webpack supports bundling multiple [targets](https://webpack.js.org/concepts/targets/). For cases where you may want different Babel configurations for each target (like `web` _and_ `node`), this loader provides a `target` property via Babel's [caller](https://babeljs.io/docs/en/config-files#apicallercb) API.
+
+For example, to change the environment targets passed to `@babel/preset-env` based on the webpack target:
+
+```javascript
+// babel.config.js
+
+module.exports = api => {
+  return {
+    plugins: [
+      "@babel/plugin-proposal-nullish-coalescing-operator",
+      "@babel/plugin-proposal-optional-chaining"
+    ],
+    presets: [
+      [
+        "@babel/preset-env",
+        {
+          useBuiltIns: "entry",
+          // caller.target will be the same as the target option from webpack
+          targets: api.caller(caller => caller && caller.target === "node")
+            ? { node: "current" }
+            : { chrome: "58", ie: "11" }
+        }
+      ]
+    ]
+  }
+}
+```
+
 ## Customized Loader
 
 `babel-loader` exposes a loader-builder utility that allows users to add custom handling
@@ -296,4 +319,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

@@ -27,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

@@ -22,7 +22,9 @@ 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");
 
@@ -30,10 +32,16 @@ const transform = require("./transform");
 
 const injectCaller = require("./injectCaller");
 
-const path = require("path");
+const schema = require("./schema");
+
+const {
+  isAbsolute
+} = require("path");
 
 const loaderUtils = require("loader-utils");
 
+const validateOptions = require("schema-utils");
+
 function subscribe(subscriber, metadata, context) {
   if (context[subscriber]) {
     context[subscriber](metadata);
@@ -60,13 +68,16 @@ function _loader() {
   _loader = _asyncToGenerator(function* (source, inputSourceMap, overrides) {
     const filename = this.resourcePath;
     let loaderOptions = loaderUtils.getOptions(this) || {};
+    validateOptions(schema, loaderOptions, {
+      name: "Babel loader"
+    });
 
     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)) {
+      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.");
       }
 
@@ -78,7 +89,7 @@ function _loader() {
 
       if (override.__esModule) override = override.default;
 
-      if (typeof override === "function") {
+      if (typeof override !== "function") {
         throw new Error("Custom overrides must be functions.");
       }
 
@@ -137,7 +148,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(injectCaller(programmaticOptions));
+    const config = babel.loadPartialConfig(injectCaller(programmaticOptions, this.target));
 
     if (config) {
       let options = config.options;
@@ -165,7 +176,7 @@ function _loader() {
         cacheIdentifier = JSON.stringify({
           options,
           "@babel/core": transform.version,
-          "@babel/loader": pkg.version
+          "@babel/loader": version
         }),
         cacheCompression = true,
         metadataSubscribers = []

package/lib/injectCaller.js

@@ -2,14 +2,21 @@
 
 const babel = require("@babel/core");
 
-module.exports = function injectCaller(opts) {
+module.exports = function injectCaller(opts, target) {
   if (!supportsCallerOption()) return opts;
   return Object.assign({}, opts, {
     caller: Object.assign({
       name: "babel-loader",
+      // Provide plugins with insight into webpack target.
+      // https://github.com/babel/babel-loader/issues/787
+      target,
       // Webpack >= 2 supports ESM and dynamic import.
       supportsStaticESM: true,
-      supportsDynamicImport: true
+      supportsDynamicImport: true,
+      // Webpack 5 supports TLA behind a flag. We enable it by default
+      // for Babel, and then webpack will throw an error if the experimental
+      // flag isn't enabled.
+      supportsTopLevelAwait: true
     }, opts.caller)
   });
 }; // TODO: We can remove this eventually, I'm just adding it so that people have

package/lib/schema.json

@@ -0,0 +1,28 @@
+{
+  "type": "object",
+  "properties": {
+    "cacheDirectory": {
+      "oneOf": [
+        {
+          "type": "boolean"
+        },
+        {
+          "type": "string"
+        }
+      ],
+      "default": false
+    },
+    "cacheIdentifier": {
+      "type": "string"
+    },
+    "cacheCompression": {
+      "type": "boolean",
+      "default": true
+    },
+    "customize": {
+      "type": "string",
+      "default": null
+    }
+  },
+  "additionalProperties": true
+}

package/lib/transform.js

@@ -6,7 +6,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 
 const babel = require("@babel/core");
 
-const promisify = require("util.promisify");
+const promisify = require("pify");
 
 const LoaderError = require("./Error");
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-loader",
-  "version": "8.0.3",
+  "version": "8.1.0",
   "description": "babel module loader for webpack",
   "files": [
     "lib"
@@ -10,41 +10,43 @@
     "node": ">= 6.9"
   },
   "dependencies": {
-    "find-cache-dir": "^1.0.0",
-    "loader-utils": "^1.0.2",
-    "mkdirp": "^0.5.1",
-    "util.promisify": "^1.0.0"
+    "find-cache-dir": "^2.1.0",
+    "loader-utils": "^1.4.0",
+    "mkdirp": "^0.5.3",
+    "pify": "^4.0.1",
+    "schema-utils": "^2.6.5"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0",
     "webpack": ">=2"
   },
   "devDependencies": {
-    "@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": "^8.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": "^2.4.0",
+    "babel-eslint": "^10.0.1",
+    "babel-plugin-istanbul": "^5.1.0",
+    "babel-plugin-react-intl": "^4.1.19",
+    "cross-env": "^6.0.0",
+    "eslint": "^6.5.1",
+    "eslint-config-babel": "^9.0.0",
+    "eslint-config-prettier": "^6.3.0",
+    "eslint-plugin-flowtype": "^4.3.0",
+    "eslint-plugin-prettier": "^3.0.0",
+    "husky": "^3.0.7",
+    "lint-staged": "^9.4.1",
+    "nyc": "^14.1.1",
+    "prettier": "^1.15.3",
     "react": "^16.0.0",
-    "react-intl": "^2.1.2",
-    "react-intl-webpack-plugin": "^0.0.3",
-    "rimraf": "^2.4.3",
+    "react-intl": "^3.3.2",
+    "react-intl-webpack-plugin": "^0.3.0",
+    "rimraf": "^3.0.0",
     "webpack": "^4.0.0"
   },
   "scripts": {
     "clean": "rimraf lib/",
-    "build": "babel src/ --out-dir lib/",
+    "build": "babel src/ --out-dir lib/ --copy-files",
     "format": "prettier --write --trailing-comma all 'src/**/*.js' 'test/**/*.test.js' 'test/helpers/*.js' && prettier --write --trailing-comma es5 'scripts/*.js'",
     "lint": "eslint src test",
     "precommit": "lint-staged",
@@ -89,7 +91,10 @@
       "!test/fixtures/**/*",
       "!test/helpers/**/*"
     ],
-    "source": [
+    "helpers": [
+      "**/helpers/**/*"
+    ],
+    "sources": [
       "src/**/*.js"
     ]
   },