@babel/core - npm Package Compare versions

Comparing version 7.16.7 to 7.16.10

lib/config/files/index.js

@@ -45,3 +45,3 @@ "use strict";
   get: function () {
-    return _plugins.loadPlugin;
+    return plugins.loadPlugin;
   }
@@ -52,17 +52,6 @@ });
   get: function () {
-    return _plugins.loadPreset;
+    return plugins.loadPreset;
   }
 });
-Object.defineProperty(exports, "resolvePlugin", {
-  enumerable: true,
-  get: function () {
-    return _plugins.resolvePlugin;
-  }
-});
-Object.defineProperty(exports, "resolvePreset", {
-  enumerable: true,
-  get: function () {
-    return _plugins.resolvePreset;
-  }
-});
+exports.resolvePreset = exports.resolvePlugin = void 0;
 Object.defineProperty(exports, "resolveShowConfigPath", {
@@ -79,4 +68,22 @@ enumerable: true,
 
-var _plugins = require("./plugins");
+var plugins = require("./plugins");
 
-({});
+function _gensync() {
+  const data = require("gensync");
+
+  _gensync = function () {
+    return data;
+  };
+
+  return data;
+}
+
+({});
+
+const resolvePlugin = _gensync()(plugins.resolvePlugin).sync;
+
+exports.resolvePlugin = resolvePlugin;
+
+const resolvePreset = _gensync()(plugins.resolvePreset).sync;
+
+exports.resolvePreset = resolvePreset;

lib/config/files/module-types.js

@@ -7,2 +7,3 @@ "use strict";
 exports.default = loadCjsOrMjsDefault;
+exports.supportsESM = void 0;
 
@@ -51,2 +52,5 @@ var _async = require("../../gensync-utils/async");
 
+const supportsESM = !!import_;
+exports.supportsESM = supportsESM;
+
 function* loadCjsOrMjsDefault(filepath, asyncError, fallbackToTranspiledModule = false) {
@@ -53,0 +57,0 @@ switch (guessJSModuleType(filepath)) {

lib/config/files/plugins.js

@@ -31,4 +31,28 @@ "use strict";
 
+function _gensync() {
+  const data = require("gensync");
+
+  _gensync = function () {
+    return data;
+  };
+
+  return data;
+}
+
+var _async = require("../../gensync-utils/async");
+
 var _moduleTypes = require("./module-types");
 
+function _url() {
+  const data = require("url");
+
+  _url = function () {
+    return data;
+  };
+
+  return data;
+}
+
+var _importMetaResolve = require("./import-meta-resolve");
+
 function _module() {
@@ -44,2 +68,6 @@ const data = require("module");
 
+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 debug = _debug()("babel:config:loading:files:plugins");
@@ -56,17 +84,12 @@
 
-function resolvePlugin(name, dirname) {
-  return resolveStandardizedName("plugin", name, dirname);
+function* resolvePlugin(name, dirname) {
+  return yield* resolveStandardizedName("plugin", name, dirname);
 }
 
-function resolvePreset(name, dirname) {
-  return resolveStandardizedName("preset", name, dirname);
+function* resolvePreset(name, dirname) {
+  return yield* resolveStandardizedName("preset", name, dirname);
 }
 
 function* loadPlugin(name, dirname) {
-  const filepath = resolvePlugin(name, dirname);
-
-  if (!filepath) {
-    throw new Error(`Plugin ${name} not found relative to ${dirname}`);
-  }
-
+  const filepath = yield* resolvePlugin(name, dirname);
   const value = yield* requireModule("plugin", filepath);
@@ -81,8 +104,3 @@ debug("Loaded plugin %o from %o.", name, dirname);
 function* loadPreset(name, dirname) {
-  const filepath = resolvePreset(name, dirname);
-
-  if (!filepath) {
-    throw new Error(`Preset ${name} not found relative to ${dirname}`);
-  }
-
+  const filepath = yield* resolvePreset(name, dirname);
   const value = yield* requireModule("preset", filepath);
@@ -102,49 +120,35 @@ debug("Loaded preset %o from %o.", name, dirname);
 
-function resolveStandardizedName(type, name, dirname = process.cwd()) {
+function* resolveAlternativesHelper(type, name) {
   const standardizedName = standardizeName(type, name);
+  const {
+    error,
+    value
+  } = yield standardizedName;
+  if (!error) return value;
+  if (error.code !== "MODULE_NOT_FOUND") throw error;
 
-  try {
-    return (((v, w) => (v = v.split("."), w = w.split("."), +v[0] > +w[0] || v[0] == w[0] && +v[1] >= +w[1]))(process.versions.node, "8.9") ? require.resolve : (r, {
-      paths: [b]
-    }, M = require("module")) => {
-      let f = M._findPath(r, M._nodeModulePaths(b).concat(b));
+  if (standardizedName !== name && !(yield name).error) {
+    error.message += `\n- If you want to resolve "${name}", use "module:${name}"`;
+  }
 
-      if (f) return f;
-      f = new Error(`Cannot resolve module '${r}'`);
-      f.code = "MODULE_NOT_FOUND";
-      throw f;
-    })(standardizedName, {
-      paths: [dirname]
-    });
-  } catch (e) {
-    if (e.code !== "MODULE_NOT_FOUND") throw e;
+  if (!(yield standardizeName(type, "@babel/" + name)).error) {
+    error.message += `\n- Did you mean "@babel/${name}"?`;
+  }
 
-    if (standardizedName !== name) {
-      let resolvedOriginal = false;
+  const oppositeType = type === "preset" ? "plugin" : "preset";
 
-      try {
-        (((v, w) => (v = v.split("."), w = w.split("."), +v[0] > +w[0] || v[0] == w[0] && +v[1] >= +w[1]))(process.versions.node, "8.9") ? require.resolve : (r, {
-          paths: [b]
-        }, M = require("module")) => {
-          let f = M._findPath(r, M._nodeModulePaths(b).concat(b));
+  if (!(yield standardizeName(oppositeType, name)).error) {
+    error.message += `\n- Did you accidentally pass a ${oppositeType} as a ${type}?`;
+  }
 
-          if (f) return f;
-          f = new Error(`Cannot resolve module '${r}'`);
-          f.code = "MODULE_NOT_FOUND";
-          throw f;
-        })(name, {
-          paths: [dirname]
-        });
-        resolvedOriginal = true;
-      } catch (_unused) {}
+  throw error;
+}
 
-      if (resolvedOriginal) {
-        e.message += `\n- If you want to resolve "${name}", use "module:${name}"`;
-      }
-    }
-
-    let resolvedBabel = false;
-
-    try {
-      (((v, w) => (v = v.split("."), w = w.split("."), +v[0] > +w[0] || v[0] == w[0] && +v[1] >= +w[1]))(process.versions.node, "8.9") ? require.resolve : (r, {
+function tryRequireResolve(id, {
+  paths: [dirname]
+}) {
+  try {
+    return {
+      error: null,
+      value: (((v, w) => (v = v.split("."), w = w.split("."), +v[0] > +w[0] || v[0] == w[0] && +v[1] >= +w[1]))(process.versions.node, "8.9") ? require.resolve : (r, {
         paths: [b]
@@ -158,48 +162,111 @@ }, M = require("module")) => {
         throw f;
-      })(standardizeName(type, "@babel/" + name), {
+      })(id, {
         paths: [dirname]
-      });
-      resolvedBabel = true;
-    } catch (_unused2) {}
+      })
+    };
+  } catch (error) {
+    return {
+      error,
+      value: null
+    };
+  }
+}
 
-    if (resolvedBabel) {
-      e.message += `\n- Did you mean "@babel/${name}"?`;
-    }
+function tryImportMetaResolve(_x, _x2) {
+  return _tryImportMetaResolve.apply(this, arguments);
+}
 
-    let resolvedOppositeType = false;
-    const oppositeType = type === "preset" ? "plugin" : "preset";
+function _tryImportMetaResolve() {
+  _tryImportMetaResolve = _asyncToGenerator(function* (id, options) {
+    const importMetaResolve = yield (0, _importMetaResolve.default)();
 
     try {
-      (((v, w) => (v = v.split("."), w = w.split("."), +v[0] > +w[0] || v[0] == w[0] && +v[1] >= +w[1]))(process.versions.node, "8.9") ? require.resolve : (r, {
-        paths: [b]
-      }, M = require("module")) => {
-        let f = M._findPath(r, M._nodeModulePaths(b).concat(b));
+      return {
+        error: null,
+        value: yield importMetaResolve(id, options)
+      };
+    } catch (error) {
+      return {
+        error,
+        value: null
+      };
+    }
+  });
+  return _tryImportMetaResolve.apply(this, arguments);
+}
 
-        if (f) return f;
-        f = new Error(`Cannot resolve module '${r}'`);
-        f.code = "MODULE_NOT_FOUND";
-        throw f;
-      })(standardizeName(oppositeType, name), {
-        paths: [dirname]
-      });
-      resolvedOppositeType = true;
-    } catch (_unused3) {}
+function resolveStandardizedNameForRequrie(type, name, dirname) {
+  const it = resolveAlternativesHelper(type, name);
+  let res = it.next();
 
-    if (resolvedOppositeType) {
-      e.message += `\n- Did you accidentally pass a ${oppositeType} as a ${type}?`;
+  while (!res.done) {
+    res = it.next(tryRequireResolve(res.value, {
+      paths: [dirname]
+    }));
+  }
+
+  return res.value;
+}
+
+function resolveStandardizedNameForImport(_x3, _x4, _x5) {
+  return _resolveStandardizedNameForImport.apply(this, arguments);
+}
+
+function _resolveStandardizedNameForImport() {
+  _resolveStandardizedNameForImport = _asyncToGenerator(function* (type, name, dirname) {
+    const parentUrl = (0, _url().pathToFileURL)(_path().join(dirname, "./babel-virtual-resolve-base.js")).href;
+    const it = resolveAlternativesHelper(type, name);
+    let res = it.next();
+
+    while (!res.done) {
+      res = it.next(yield tryImportMetaResolve(res.value, parentUrl));
     }
 
-    throw e;
+    return (0, _url().fileURLToPath)(res.value);
+  });
+  return _resolveStandardizedNameForImport.apply(this, arguments);
+}
+
+const resolveStandardizedName = _gensync()({
+  sync(type, name, dirname = process.cwd()) {
+    return resolveStandardizedNameForRequrie(type, name, dirname);
+  },
+
+  async(type, name, dirname = process.cwd()) {
+    return _asyncToGenerator(function* () {
+      if (!_moduleTypes.supportsESM) {
+        return resolveStandardizedNameForRequrie(type, name, dirname);
+      }
+
+      try {
+        return yield resolveStandardizedNameForImport(type, name, dirname);
+      } catch (e) {
+        try {
+          return resolveStandardizedNameForRequrie(type, name, dirname);
+        } catch (e2) {
+          if (e.type === "MODULE_NOT_FOUND") throw e;
+          if (e2.type === "MODULE_NOT_FOUND") throw e2;
+          throw e;
+        }
+      }
+    })();
   }
+
+});
+
+{
+  var LOADING_MODULES = new Set();
 }
 
-const LOADING_MODULES = new Set();
-
 function* requireModule(type, name) {
-  if (LOADING_MODULES.has(name)) {
-    throw new Error(`Reentrant ${type} detected trying to load "${name}". This module is not ignored ` + "and is trying to load itself while compiling itself, leading to a dependency cycle. " + 'We recommend adding it to your "ignore" list in your babelrc, or to a .babelignore.');
+  {
+    if (!(yield* (0, _async.isAsync)()) && LOADING_MODULES.has(name)) {
+      throw new Error(`Reentrant ${type} detected trying to load "${name}". This module is not ignored ` + "and is trying to load itself while compiling itself, leading to a dependency cycle. " + 'We recommend adding it to your "ignore" list in your babelrc, or to a .babelignore.');
+    }
   }
 
   try {
-    LOADING_MODULES.add(name);
+    {
+      LOADING_MODULES.add(name);
+    }
     return yield* (0, _moduleTypes.default)(name, `You appear to be using a native ECMAScript module ${type}, ` + "which is only supported when running Babel asynchronously.", true);
@@ -210,4 +277,6 @@ } catch (err) {
   } finally {
-    LOADING_MODULES.delete(name);
+    {
+      LOADING_MODULES.delete(name);
+    }
   }
 }

lib/index.js

@@ -250,3 +250,3 @@ "use strict";
 
-const version = "7.16.7";
+const version = "7.16.10";
 exports.version = version;
@@ -253,0 +253,0 @@ const DEFAULT_EXTENSIONS = Object.freeze([".js", ".jsx", ".es6", ".es", ".mjs", ".cjs"]);

package.json

 {
   "name": "@babel/core",
-  "version": "7.16.7",
+  "version": "7.16.10",
   "description": "Babel compiler core.",
@@ -52,10 +52,10 @@ "main": "./lib/index.js",
     "@babel/code-frame": "^7.16.7",
-    "@babel/generator": "^7.16.7",
+    "@babel/generator": "^7.16.8",
     "@babel/helper-compilation-targets": "^7.16.7",
     "@babel/helper-module-transforms": "^7.16.7",
     "@babel/helpers": "^7.16.7",
-    "@babel/parser": "^7.16.7",
+    "@babel/parser": "^7.16.10",
     "@babel/template": "^7.16.7",
-    "@babel/traverse": "^7.16.7",
-    "@babel/types": "^7.16.7",
+    "@babel/traverse": "^7.16.10",
+    "@babel/types": "^7.16.8",
     "convert-source-map": "^1.7.0",
@@ -70,3 +70,3 @@ "debug": "^4.1.0",
     "@babel/helper-transform-fixture-test-runner": "^7.16.7",
-    "@babel/plugin-transform-modules-commonjs": "^7.16.7",
+    "@babel/plugin-transform-modules-commonjs": "^7.16.8",
     "@types/convert-source-map": "^1.5.1",
@@ -73,0 +73,0 @@ "@types/debug": "^4.1.0",

src/config/files/index.ts

@@ -24,7 +24,8 @@ type indexBrowserType = typeof import("./index-browser");
 } from "./types";
-export {
-  resolvePlugin,
-  resolvePreset,
-  loadPlugin,
-  loadPreset,
-} from "./plugins";
+export { loadPlugin, loadPreset } from "./plugins";
+
+import gensync from "gensync";
+import * as plugins from "./plugins";
+
+export const resolvePlugin = gensync(plugins.resolvePlugin).sync;
+export const resolvePreset = gensync(plugins.resolvePreset).sync;

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Environment variable access

Supply chain risk

Package accesses environment variables, which may be a sign of credential stuffing or data theft.

Found 2 instances in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

268354

increased by52.77%

Number of package files

63

increased by3.28%

Lines of code

8078

increased by51.5%

Worsened metrics

Number of low supply chain risk alerts

17

increased by13.33%

Dependency changes

• Updated@babel/generator@^7.16.8

• Updated@babel/parser@^7.16.10

• Updated@babel/traverse@^7.16.10

• Updated@babel/types@^7.16.8