babel-loader 9.1.3 → 9.2.0

package/README.md

@@ -82,11 +82,17 @@ module: {
 }
 ```
 
+The `options` passed here will be [merged](https://babeljs.io/docs/configuration#how-babel-merges-config-items) with Babel config files, e.g. `babel.config.js` or `.babelrc`.
+
 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 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 and the `babel-loader`'s version
+  - the [merged](https://babeljs.io/docs/configuration#how-babel-merges-config-items) [Babel config](https://babeljs.io/docs/config-files), including options passed to `babel-loader` and the contents of `babel.config.js` or `.babelrc` file if they exist
+  - 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.
 

package/lib/cache.js

@@ -27,7 +27,7 @@ let hashType = "sha256";
 // use md5 hashing if sha256 is not available
 try {
   crypto.createHash(hashType);
-} catch (err) {
+} catch {
   hashType = "md5";
 }
 const gunzip = promisify(zlib.gunzip);
@@ -91,19 +91,25 @@ const handleCache = async function (directory, params) {
     options = {},
     cacheIdentifier,
     cacheDirectory,
-    cacheCompression
+    cacheCompression,
+    logger
   } = 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
+    logger.debug(`reading cache file '${file}'`);
     return await read(file, cacheCompression);
-  } catch (err) {}
+  } catch {
+    // conitnue if cache can't be read
+    logger.debug(`discarded cache as it can not be read`);
+  }
   const fallback = typeof cacheDirectory !== "string" && directory !== os.tmpdir();
 
   // Make sure the directory exists.
   try {
     // overwrite directory if exists
+    logger.debug(`creating cache folder '${directory}'`);
     await mkdir(directory, {
       recursive: true
     });
@@ -116,12 +122,14 @@ const handleCache = async function (directory, params) {
 
   // Otherwise just transform the file
   // return it to the user asap and write it in cache
+  logger.debug(`applying Babel transform`);
   const result = await transform(source, options);
 
   // Do not cache if there are external dependencies,
   // since they might change and we cannot control it.
   if (!result.externalDependencies.length) {
     try {
+      logger.debug(`writing result to cache file '${file}'`);
       await write(file, cacheCompression, result);
     } catch (err) {
       if (fallback) {

package/lib/index.js

@@ -41,6 +41,7 @@ function makeLoader(callback) {
 }
 async function loader(source, inputSourceMap, overrides) {
   const filename = this.resourcePath;
+  const logger = this.getLogger("babel-loader");
   let loaderOptions = this.getOptions();
   validateOptions(schema, loaderOptions, {
     name: "Babel loader"
@@ -55,15 +56,18 @@ async function loader(source, inputSourceMap, overrides) {
     if (overrides) {
       throw new Error("babel-loader's 'customize' option is not available when already " + "using a customized babel-loader wrapper.");
     }
+    logger.debug(`loading customize override: '${loaderOptions.customize}'`);
     let override = require(loaderOptions.customize);
     if (override.__esModule) override = override.default;
     if (typeof override !== "function") {
       throw new Error("Custom overrides must be functions.");
     }
+    logger.debug("applying customize override to @babel/core");
     overrides = override(babel);
   }
   let customOptions;
   if (overrides && overrides.customOptions) {
+    logger.debug("applying overrides customOptions() to loader options");
     const result = await overrides.customOptions.call(this, loaderOptions, {
       source,
       map: inputSourceMap
@@ -79,7 +83,7 @@ async function loader(source, inputSourceMap, overrides) {
   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");
   }
-
+  logger.debug("normalizing loader 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.
@@ -106,10 +110,12 @@ async function loader(source, inputSourceMap, overrides) {
   delete programmaticOptions.cacheIdentifier;
   delete programmaticOptions.cacheCompression;
   delete programmaticOptions.metadataSubscribers;
+  logger.debug("resolving Babel configs");
   const config = await babel.loadPartialConfigAsync(injectCaller(programmaticOptions, this.target));
   if (config) {
     let options = config.options;
     if (overrides && overrides.config) {
+      logger.debug("applying overrides config() to Babel config");
       options = await overrides.config.call(this, config, {
         source,
         map: inputSourceMap,
@@ -137,20 +143,27 @@ async function loader(source, inputSourceMap, overrides) {
     } = loaderOptions;
     let result;
     if (cacheDirectory) {
+      logger.debug("cache is enabled");
       result = await cache({
         source,
         options,
         transform,
         cacheDirectory,
         cacheIdentifier,
-        cacheCompression
+        cacheCompression,
+        logger
       });
     } else {
+      logger.debug("cache is disabled, applying Babel transform");
       result = await transform(source, options);
     }
-    config.files.forEach(configFile => this.addDependency(configFile));
+    config.files.forEach(configFile => {
+      this.addDependency(configFile);
+      logger.debug(`added '${configFile}' to webpack dependencies`);
+    });
     if (result) {
       if (overrides && overrides.result) {
+        logger.debug("applying overrides result() to Babel transform results");
         result = await overrides.result.call(this, result, {
           source,
           map: inputSourceMap,
@@ -165,9 +178,13 @@ async function loader(source, inputSourceMap, overrides) {
         metadata,
         externalDependencies
       } = result;
-      externalDependencies == null ? void 0 : externalDependencies.forEach(dep => this.addDependency(dep));
+      externalDependencies?.forEach(dep => {
+        this.addDependency(dep);
+        logger.debug(`added '${dep}' to webpack dependencies`);
+      });
       metadataSubscribers.forEach(subscriber => {
         subscribe(subscriber, metadata, this);
+        logger.debug(`invoked metadata subscriber '${String(subscriber)}'`);
       });
       return [code, map];
     }

package/lib/injectCaller.js

@@ -1,6 +1,4 @@
-const babel = require("@babel/core");
 module.exports = function injectCaller(opts, target) {
-  if (!supportsCallerOption()) return opts;
   return Object.assign({}, opts, {
     caller: Object.assign({
       name: "babel-loader",
@@ -16,26 +14,4 @@ module.exports = function injectCaller(opts, target) {
       supportsTopLevelAwait: 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": "9.1.3",
+  "version": "9.2.0",
   "description": "babel module loader for webpack",
   "files": [
     "lib"
@@ -19,41 +19,34 @@
   },
   "devDependencies": {
     "@ava/babel": "^1.0.1",
-    "@babel/cli": "^7.19.3",
-    "@babel/core": "^7.19.6",
-    "@babel/preset-env": "^7.19.4",
+    "@babel/cli": "^7.23.0",
+    "@babel/core": "^7.23.3",
+    "@babel/eslint-parser": "^7.23.3",
+    "@babel/preset-env": "^7.23.3",
     "ava": "^3.13.0",
-    "babel-eslint": "^10.1.0",
-    "babel-plugin-istanbul": "^6.1.1",
-    "babel-plugin-react-intl": "^8.2.25",
-    "cross-env": "^7.0.2",
-    "eslint": "^7.13.0",
-    "eslint-config-babel": "^9.0.0",
-    "eslint-config-prettier": "^6.3.0",
-    "eslint-plugin-flowtype": "^5.2.0",
-    "eslint-plugin-prettier": "^3.0.0",
-    "husky": "^4.3.0",
-    "lint-staged": "^10.5.1",
-    "nyc": "^15.1.0",
-    "pnp-webpack-plugin": "^1.6.4",
-    "prettier": "^2.1.2",
-    "react": "^17.0.1",
-    "react-intl": "^5.9.4",
-    "react-intl-webpack-plugin": "^0.3.0",
-    "rimraf": "^3.0.0",
-    "semver": "7.5.2",
-    "webpack": "^5.74.0"
+    "c8": "^8.0.0",
+    "eslint": "^9.6.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.1.3",
+    "globals": "^15.8.0",
+    "husky": "^8.0.3",
+    "lint-staged": "^13.2.3",
+    "prettier": "^3.0.0",
+    "webpack": "^5.89.0"
   },
   "scripts": {
-    "clean": "rimraf lib/",
+    "clean": "node ./scripts/rimraf.mjs 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",
     "prepublish": "yarn run clean && yarn run build",
     "preversion": "yarn run test",
-    "test": "yarn run lint && cross-env BABEL_ENV=test yarn run build && yarn run test-only",
-    "test-only": "nyc ava"
+    "test": "yarn run lint && yarn run build --source-maps && c8 yarn run test-only",
+    "test-only": "ava"
+  },
+  "resolutions": {
+    "minipass": "6.0.2"
   },
   "repository": {
     "type": "git",
@@ -119,7 +112,5 @@
       "git add yarn.lock"
     ]
   },
-  "resolutions": {
-    "nyc/node-preload": "0.2.0"
-  }
+  "packageManager": "yarn@3.6.4"
 }