@parcel/packager-js 2.0.0-dev.1424 → 2.0.0-dev.1426

package/lib/ESMOutputFormat.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ESMOutputFormat = void 0;
+var _utils = require("./utils");
 class ESMOutputFormat {
   constructor(packager) {
     this.packager = packager;
@@ -22,6 +23,9 @@ class ESMOutputFormat {
           namespaceSpecifier = `* as ${symbol}`;
         } else {
           let specifier = imported;
+          if (!(0, _utils.isValidIdentifier)(specifier)) {
+            specifier = JSON.stringify(specifier);
+          }
           if (symbol !== imported) {
             specifier += ` as ${symbol}`;
           }
@@ -78,7 +82,10 @@ class ESMOutputFormat {
       }
       for (let as of exportAs) {
         let specifier = local;
-        if (exportAs !== local) {
+        if (as !== local) {
+          if (!(0, _utils.isValidIdentifier)(as)) {
+            as = JSON.stringify(as);
+          }
           specifier += ` as ${as}`;
         }
         exportSpecifiers.push(specifier);

package/lib/ScopeHoistingPackager.js

@@ -61,11 +61,6 @@ var _utils2 = require("./utils");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-// https://262.ecma-international.org/6.0/#sec-names-and-keywords
-const IDENTIFIER_RE = /^[$_\p{ID_Start}][$_\u200C\u200D\p{ID_Continue}]*$/u;
-const ID_START_RE = /^[$_\p{ID_Start}]/u;
-const NON_ID_CONTINUE_RE = /[^$_\u200C\u200D\p{ID_Continue}]/gu;
-
 // General regex used to replace imports with the resolved code, references with resolutions,
 // and count the number of newlines in the file for source maps.
 const REPLACEMENT_RE = /\n|import\s+"([0-9a-f]{16}:.+?)";|(?:\$[0-9a-f]{16}\$exports)|(?:\$[0-9a-f]{16}\$(?:import|importAsync|require)\$[0-9a-f]+(?:\$[0-9a-f]+)?)/g;
@@ -116,23 +111,10 @@ class ScopeHoistingPackager {
     // of each bundle group pointing at the sibling bundles. These can be
     // picked up by another bundler later at which point runtimes will be added.
     if (this.bundle.env.isLibrary || this.bundle.env.outputFormat === 'commonjs') {
-      for (let b of this.bundleGraph.getReferencedBundles(this.bundle)) {
-        let entry = b.getMainEntry();
-        let symbols = new Map();
-        if (entry && !this.isAsyncBundle && entry.type === 'js') {
-          this.externalAssets.add(entry);
-          let usedSymbols = this.bundleGraph.getUsedSymbols(entry) || new Set();
-          for (let s of usedSymbols) {
-            // If the referenced bundle is ESM, and we are importing '*', use 'default' instead.
-            // This matches the logic below in buildExportedSymbols.
-            let imported = s;
-            if (imported === '*' && b.env.outputFormat === 'esmodule') {
-              imported = 'default';
-            }
-            symbols.set(imported, this.getSymbolResolution(entry, entry, s));
-          }
-        }
-        this.externals.set((0, _utils().relativeBundlePath)(this.bundle, b), symbols);
+      for (let b of this.bundleGraph.getReferencedBundles(this.bundle, {
+        recursive: false
+      })) {
+        this.externals.set((0, _utils().relativeBundlePath)(this.bundle, b), new Map());
       }
     }
     let res = '';
@@ -256,7 +238,7 @@ class ScopeHoistingPackager {
           map
         }];
       });
-      if (asset.meta.shouldWrap || this.isAsyncBundle || this.bundle.env.sourceType === 'script' || this.bundleGraph.isAssetReferenced(this.bundle, asset) || this.bundleGraph.getIncomingDependencies(asset).some(dep => dep.meta.shouldWrap && dep.specifierType !== 'url')) {
+      if (asset.meta.shouldWrap || this.bundle.env.sourceType === 'script' || this.bundleGraph.isAssetReferenced(this.bundle, asset) || this.bundleGraph.getIncomingDependencies(asset).some(dep => dep.meta.shouldWrap && dep.specifierType !== 'url')) {
         if (!asset.meta.isConstantModule) {
           this.wrappedAssets.add(asset.id);
           wrapped.push(asset);
@@ -282,13 +264,14 @@ class ScopeHoistingPackager {
     return wrapped;
   }
   buildExportedSymbols() {
-    if (this.isAsyncBundle || !this.bundle.env.isLibrary || this.bundle.env.outputFormat !== 'esmodule') {
+    if (!this.bundle.env.isLibrary || this.bundle.env.outputFormat !== 'esmodule') {
       return;
     }
 
     // TODO: handle ESM exports of wrapped entry assets...
     let entry = this.bundle.getMainEntry();
     if (entry && !this.wrappedAssets.has(entry.id)) {
+      let hasNamespace = entry.symbols.hasExportSymbol('*');
       for (let {
         asset,
         exportAs,
@@ -297,6 +280,12 @@ class ScopeHoistingPackager {
       } of this.bundleGraph.getExportedSymbols(entry)) {
         if (typeof symbol === 'string') {
           var _this$exportedSymbols, _entry$symbols$get2;
+          // If the module has a namespace (e.g. commonjs), and this is not an entry, only export the namespace
+          // as default, without individual exports. This mirrors the importing logic in addExternal, avoiding
+          // extra unused exports and potential for non-identifier export names.
+          if (hasNamespace && this.isAsyncBundle && exportAs !== '*') {
+            continue;
+          }
           let symbols = (_this$exportedSymbols = this.exportedSymbols.get(symbol === '*' ? (0, _nullthrows().default)((_entry$symbols$get2 = entry.symbols.get('*')) === null || _entry$symbols$get2 === void 0 ? void 0 : _entry$symbols$get2.local) : symbol)) === null || _this$exportedSymbols === void 0 ? void 0 : _this$exportedSymbols.exportAs;
           if (!symbols) {
             symbols = [];
@@ -331,8 +320,8 @@ class ScopeHoistingPackager {
     }
   }
   getTopLevelName(name) {
-    name = name.replace(NON_ID_CONTINUE_RE, '');
-    if (!ID_START_RE.test(name) || this.globalNames.has(name)) {
+    name = (0, _utils2.makeValidIdentifier)(name);
+    if (this.globalNames.has(name)) {
       name = '_' + name;
     }
     let count = this.topLevelNames.get(name);
@@ -344,7 +333,7 @@ class ScopeHoistingPackager {
     return name + count;
   }
   getPropertyAccess(obj, property) {
-    if (IDENTIFIER_RE.test(property)) {
+    if ((0, _utils2.isValidIdentifier)(property)) {
       return `${obj}.${property}`;
     }
     return `${obj}[${JSON.stringify(property)}]`;
@@ -401,7 +390,7 @@ class ScopeHoistingPackager {
       code = code.replace('$parcel$filenameReplace', relPath);
     }
     let [depMap, replacements] = this.buildReplacements(asset, deps);
-    let [prepend, prependLines, append] = this.buildAssetPrelude(asset, deps);
+    let [prepend, prependLines, append] = this.buildAssetPrelude(asset, deps, replacements);
     if (prependLines > 0) {
       sourceMap === null || sourceMap === void 0 || sourceMap.offsetLines(1, prependLines);
       code = prepend + code;
@@ -543,6 +532,16 @@ ${code}
       if (!resolved) {
         continue;
       }
+
+      // Handle imports from other bundles in libraries.
+      if (this.bundle.env.isLibrary && !this.bundle.hasAsset(resolved)) {
+        let referencedBundle = this.bundleGraph.getReferencedBundle(dep, this.bundle);
+        if (referencedBundle && referencedBundle.getMainEntry() === resolved && referencedBundle.type === 'js' && !this.bundleGraph.isAssetReferenced(referencedBundle, resolved)) {
+          this.addExternal(dep, replacements, referencedBundle);
+          this.externalAssets.add(resolved);
+          continue;
+        }
+      }
       for (let [imported, {
         local
       }] of dep.symbols) {
@@ -575,7 +574,7 @@ ${code}
     }
     return [depMap, replacements];
   }
-  addExternal(dep, replacements) {
+  addExternal(dep, replacements, referencedBundle) {
     if (this.bundle.env.outputFormat === 'global') {
       throw new (_diagnostic().default)({
         diagnostic: {
@@ -587,12 +586,16 @@ ${code}
         }
       });
     }
+    let specifier = dep.specifier;
+    if (referencedBundle) {
+      specifier = (0, _utils().relativeBundlePath)(this.bundle, referencedBundle);
+    }
 
     // Map of DependencySpecifier -> Map<ExportedSymbol, Identifier>>
-    let external = this.externals.get(dep.specifier);
+    let external = this.externals.get(specifier);
     if (!external) {
       external = new Map();
-      this.externals.set(dep.specifier, external);
+      this.externals.set(specifier, external);
     }
     for (let [imported, {
       local
@@ -609,7 +612,13 @@ ${code}
       if (this.bundle.env.outputFormat === 'commonjs') {
         renamed = external.get('*');
         if (!renamed) {
-          renamed = this.getTopLevelName(`$${this.bundle.publicId}$${dep.specifier}`);
+          if (referencedBundle) {
+            var _entry$symbols$get$lo, _entry$symbols$get3;
+            let entry = (0, _nullthrows().default)(referencedBundle.getMainEntry());
+            renamed = (_entry$symbols$get$lo = (_entry$symbols$get3 = entry.symbols.get('*')) === null || _entry$symbols$get3 === void 0 ? void 0 : _entry$symbols$get3.local) !== null && _entry$symbols$get$lo !== void 0 ? _entry$symbols$get$lo : `$${String(entry.meta.id)}$exports`;
+          } else {
+            renamed = this.getTopLevelName(`$${this.bundle.publicId}$${specifier}`);
+          }
           external.set('*', renamed);
         }
         if (local !== '*' && replacements) {
@@ -625,19 +634,55 @@ ${code}
           replacements.set(local, replacement);
         }
       } else {
+        let property;
+        if (referencedBundle) {
+          let entry = (0, _nullthrows().default)(referencedBundle.getMainEntry());
+          if (entry.symbols.hasExportSymbol('*')) {
+            // If importing * and the referenced module has a * export (e.g. CJS), use default instead.
+            // This mirrors the logic in buildExportedSymbols.
+            property = imported;
+            imported = (referencedBundle === null || referencedBundle === void 0 ? void 0 : referencedBundle.env.outputFormat) === 'esmodule' ? 'default' : '*';
+          } else {
+            if (imported === '*') {
+              let exportedSymbols = this.bundleGraph.getExportedSymbols(entry);
+              if (local === '*') {
+                // Re-export all symbols.
+                for (let exported of exportedSymbols) {
+                  if (exported.symbol) {
+                    external.set(exported.exportSymbol, exported.symbol);
+                  }
+                }
+                continue;
+              }
+            }
+            renamed = this.bundleGraph.getSymbolResolution(entry, imported, this.bundle).symbol;
+          }
+        }
+
         // Rename the specifier so that multiple local imports of the same imported specifier
         // are deduplicated. We have to prefix the imported name with the bundle id so that
         // local variables do not shadow it.
-        if (this.exportedSymbols.has(local)) {
-          renamed = local;
-        } else if (imported === 'default' || imported === '*') {
-          renamed = this.getTopLevelName(`$${this.bundle.publicId}$${dep.specifier}`);
-        } else {
-          renamed = this.getTopLevelName(`$${this.bundle.publicId}$${imported}`);
+        if (!renamed) {
+          if (this.exportedSymbols.has(local)) {
+            renamed = local;
+          } else if (imported === 'default' || imported === '*') {
+            renamed = this.getTopLevelName(`$${this.bundle.publicId}$${specifier}`);
+          } else {
+            renamed = this.getTopLevelName(`$${this.bundle.publicId}$${imported}`);
+          }
         }
         external.set(imported, renamed);
         if (local !== '*' && replacements) {
-          replacements.set(local, renamed);
+          let replacement = renamed;
+          if (property === '*') {
+            replacement = renamed;
+          } else if (property === 'default') {
+            replacement = `($parcel$interopDefault(${renamed}))`;
+            this.usedHelpers.add('$parcel$interopDefault');
+          } else if (property) {
+            replacement = this.getPropertyAccess(renamed, property);
+          }
+          replacements.set(local, replacement);
         }
       }
     }
@@ -649,8 +694,7 @@ ${code}
     }
     return !this.bundle.hasAsset(resolved) && !this.externalAssets.has(resolved) || this.wrappedAssets.has(resolved.id) && resolved !== parentAsset;
   }
-  getSymbolResolution(parentAsset, resolved, imported, dep) {
-    var _resolvedAsset$symbol;
+  getSymbolResolution(parentAsset, resolved, imported, dep, replacements) {
     let {
       asset: resolvedAsset,
       exportSymbol,
@@ -696,9 +740,17 @@ ${code}
     // namespace export symbol.
     let assetId = resolvedAsset.meta.id;
     (0, _assert().default)(typeof assetId === 'string');
-    let obj = isWrapped && (!dep || dep !== null && dep !== void 0 && dep.meta.shouldWrap) ?
-    // Wrap in extra parenthesis to not change semantics, e.g.`new (parcelRequire("..."))()`.
-    `(parcelRequire(${JSON.stringify(publicId)}))` : isWrapped && dep ? `$${publicId}` : ((_resolvedAsset$symbol = resolvedAsset.symbols.get('*')) === null || _resolvedAsset$symbol === void 0 ? void 0 : _resolvedAsset$symbol.local) || `$${assetId}$exports`;
+    let obj;
+    if (isWrapped && (!dep || dep !== null && dep !== void 0 && dep.meta.shouldWrap)) {
+      // Wrap in extra parenthesis to not change semantics, e.g.`new (parcelRequire("..."))()`.
+      obj = `(parcelRequire(${JSON.stringify(publicId)}))`;
+    } else if (isWrapped && dep) {
+      obj = `$${publicId}`;
+    } else {
+      var _resolvedAsset$symbol;
+      obj = ((_resolvedAsset$symbol = resolvedAsset.symbols.get('*')) === null || _resolvedAsset$symbol === void 0 ? void 0 : _resolvedAsset$symbol.local) || `$${assetId}$exports`;
+      obj = (replacements === null || replacements === void 0 ? void 0 : replacements.get(obj)) || obj;
+    }
     if (imported === '*' || exportSymbol === '*' || isDefaultInterop) {
       // Resolve to the namespace object if requested or this is a CJS default interop reqiure.
       if (parentAsset === resolvedAsset && this.wrappedAssets.has(resolvedAsset.id)) {
@@ -722,7 +774,7 @@ ${code}
     } else if (!symbol) {
       (0, _assert().default)(false, 'Asset was skipped or not found.');
     } else {
-      return symbol;
+      return (replacements === null || replacements === void 0 ? void 0 : replacements.get(symbol)) || symbol;
     }
   }
   getHoistedParcelRequires(parentAsset, dep, resolved) {
@@ -749,7 +801,7 @@ ${code}
     }
     return [res, lineCount];
   }
-  buildAssetPrelude(asset, deps) {
+  buildAssetPrelude(asset, deps, replacements) {
     let prepend = '';
     let prependLineCount = 0;
     let append = '';
@@ -767,13 +819,15 @@ ${code}
     // The one case where this isn't true is in ESM library entries, where the only
     // dependency on * is the entry dependency. In this case, we will use ESM exports
     // instead of the namespace object.
-    usedSymbols.has('*') && (this.bundle.env.outputFormat !== 'esmodule' || !this.bundle.env.isLibrary || asset !== this.bundle.getMainEntry() || this.bundleGraph.getIncomingDependencies(asset).some(dep => !dep.isEntry && (0, _nullthrows().default)(this.bundleGraph.getUsedSymbols(dep)).has('*'))) ||
+    usedSymbols.has('*') && (this.bundle.env.outputFormat !== 'esmodule' || !this.bundle.env.isLibrary || asset !== this.bundle.getMainEntry() || this.bundleGraph.getIncomingDependencies(asset).some(dep => !dep.isEntry && this.bundle.hasDependency(dep) && (0, _nullthrows().default)(this.bundleGraph.getUsedSymbols(dep)).has('*'))) ||
     // If a symbol is imported (used) from a CJS asset but isn't listed in the symbols,
     // we fallback on the namespace object.
     asset.symbols.hasExportSymbol('*') && [...usedSymbols].some(s => !asset.symbols.hasExportSymbol(s)) ||
     // If the exports has this asset's namespace (e.g. ESM output from CJS input),
     // include the namespace object for the default export.
-    this.exportedSymbols.has(`$${assetId}$exports`);
+    this.exportedSymbols.has(`$${assetId}$exports`) ||
+    // CommonJS library bundle entries always need a namespace.
+    this.bundle.env.isLibrary && this.bundle.env.outputFormat === 'commonjs' && asset === this.bundle.getMainEntry();
 
     // If the asset doesn't have static exports, should wrap, the namespace is used,
     // or we need default interop, then we need to synthesize a namespace object for
@@ -824,7 +878,7 @@ ${code}
             if (isWrapped || resolved.meta.staticExports === false || (0, _nullthrows().default)(this.bundleGraph.getUsedSymbols(resolved)).has('*') ||
             // an empty asset
             !resolved.meta.hasCJSExports && resolved.symbols.hasExportSymbol('*')) {
-              let obj = this.getSymbolResolution(asset, resolved, '*', dep);
+              let obj = this.getSymbolResolution(asset, resolved, '*', dep, replacements);
               append += `$parcel$exportWildcard($${assetId}$exports, ${obj});\n`;
               this.usedHelpers.add('$parcel$exportWildcard');
             } else {
@@ -834,7 +888,7 @@ ${code}
                 symbol === '__esModule') {
                   continue;
                 }
-                let resolvedSymbol = this.getSymbolResolution(asset, resolved, symbol);
+                let resolvedSymbol = this.getSymbolResolution(asset, resolved, symbol, undefined, replacements);
                 let get = this.buildFunctionExpression([], resolvedSymbol);
                 let set = asset.meta.hasCJSExports ? ', ' + this.buildFunctionExpression(['v'], `${resolvedSymbol} = v`) : '';
                 prepend += `$parcel$export($${assetId}$exports, ${JSON.stringify(symbol)}, ${get}${set});\n`;
@@ -873,7 +927,7 @@ ${code}
         // additional assignments after each mutation of the original binding.
         prepend += `\n${usedExports.map(exp => {
           var _asset$symbols$get2;
-          let resolved = this.getSymbolResolution(asset, asset, exp);
+          let resolved = this.getSymbolResolution(asset, asset, exp, undefined, replacements);
           let get = this.buildFunctionExpression([], resolved);
           let isEsmExport = !!((_asset$symbols$get2 = asset.symbols.get(exp)) !== null && _asset$symbols$get2 !== void 0 && (_asset$symbols$get2 = _asset$symbols$get2.meta) !== null && _asset$symbols$get2 !== void 0 && _asset$symbols$get2.isEsm);
           let set = !isEsmExport && asset.meta.hasCJSExports ? ', ' + this.buildFunctionExpression(['v'], `${resolved} = v`) : '';

package/lib/index.js

@@ -32,13 +32,6 @@ function _rust() {
   };
   return data;
 }
-function _path() {
-  const data = _interopRequireDefault(require("path"));
-  _path = function () {
-    return data;
-  };
-  return data;
-}
 function _nullthrows() {
   const data = _interopRequireDefault(require("nullthrows"));
   _nullthrows = function () {
@@ -63,23 +56,29 @@ var _default = exports.default = new (_plugin().Packager)({
     config,
     options
   }) {
-    var _pkg$contents$name, _pkg$contents, _pkg$contents$package;
-    // Generate a name for the global parcelRequire function that is unique to this project.
-    // This allows multiple parcel builds to coexist on the same page.
-    let pkg = await config.getConfigFrom(_path().default.join(options.projectRoot, 'index'), ['package.json']);
+    var _packageName$contents, _packageName$contents2, _conf$contents;
     let packageKey = '@parcel/packager-js';
-    if (pkg !== null && pkg !== void 0 && pkg.contents[packageKey]) {
+    let conf = await config.getConfigFrom(options.projectRoot + '/index', [], {
+      packageKey
+    });
+    if (conf !== null && conf !== void 0 && conf.contents) {
       _utils().validateSchema.diagnostic(CONFIG_SCHEMA, {
-        data: pkg === null || pkg === void 0 ? void 0 : pkg.contents[packageKey],
-        source: await options.inputFS.readFile(pkg.filePath, 'utf8'),
-        filePath: pkg.filePath,
+        data: conf === null || conf === void 0 ? void 0 : conf.contents,
+        source: await options.inputFS.readFile(conf.filePath, 'utf8'),
+        filePath: conf.filePath,
         prependKey: `/${(0, _diagnostic().encodeJSONKeyComponent)(packageKey)}`
       }, packageKey, `Invalid config for ${packageKey}`);
     }
-    let name = (_pkg$contents$name = pkg === null || pkg === void 0 || (_pkg$contents = pkg.contents) === null || _pkg$contents === void 0 ? void 0 : _pkg$contents.name) !== null && _pkg$contents$name !== void 0 ? _pkg$contents$name : '';
+
+    // Generate a name for the global parcelRequire function that is unique to this project.
+    // This allows multiple parcel builds to coexist on the same page.
+    let packageName = await config.getConfigFrom(options.projectRoot + '/index', [], {
+      packageKey: 'name'
+    });
+    let name = (_packageName$contents = packageName === null || packageName === void 0 || (_packageName$contents2 = packageName.contents) === null || _packageName$contents2 === void 0 ? void 0 : _packageName$contents2.name) !== null && _packageName$contents !== void 0 ? _packageName$contents : '';
     return {
       parcelRequireName: 'parcelRequire' + (0, _rust().hashString)(name).slice(-4),
-      unstable_asyncBundleRuntime: Boolean(pkg === null || pkg === void 0 || (_pkg$contents$package = pkg.contents[packageKey]) === null || _pkg$contents$package === void 0 ? void 0 : _pkg$contents$package.unstable_asyncBundleRuntime)
+      unstable_asyncBundleRuntime: Boolean(conf === null || conf === void 0 || (_conf$contents = conf.contents) === null || _conf$contents === void 0 ? void 0 : _conf$contents.unstable_asyncBundleRuntime)
     };
   },
   async package({

package/lib/utils.js

@@ -4,6 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getSpecifier = getSpecifier;
+exports.isValidIdentifier = isValidIdentifier;
+exports.makeValidIdentifier = makeValidIdentifier;
 exports.replaceScriptDependencies = replaceScriptDependencies;
 function _nullthrows() {
   const data = _interopRequireDefault(require("nullthrows"));
@@ -48,4 +50,19 @@ function getSpecifier(dep) {
     return dep.meta.placeholder;
   }
   return dep.specifier;
+}
+
+// https://262.ecma-international.org/6.0/#sec-names-and-keywords
+const IDENTIFIER_RE = /^[$_\p{ID_Start}][$_\u200C\u200D\p{ID_Continue}]*$/u;
+const ID_START_RE = /^[$_\p{ID_Start}]/u;
+const NON_ID_CONTINUE_RE = /[^$_\u200C\u200D\p{ID_Continue}]/gu;
+function isValidIdentifier(id) {
+  return IDENTIFIER_RE.test(id);
+}
+function makeValidIdentifier(name) {
+  name = name.replace(NON_ID_CONTINUE_RE, '');
+  if (!ID_START_RE.test(name)) {
+    name = '_' + name;
+  }
+  return name;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/packager-js",
-  "version": "2.0.0-dev.1424+7f6b4dbbc",
+  "version": "2.0.0-dev.1426+2369415b7",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,17 +17,17 @@
   "source": "src/index.js",
   "engines": {
     "node": ">= 12.0.0",
-    "parcel": "^2.0.0-dev.1422+7f6b4dbbc"
+    "parcel": "^2.0.0-dev.1424+2369415b7"
   },
   "dependencies": {
-    "@parcel/diagnostic": "2.0.0-dev.1424+7f6b4dbbc",
-    "@parcel/plugin": "2.0.0-dev.1424+7f6b4dbbc",
-    "@parcel/rust": "2.12.1-dev.3238+7f6b4dbbc",
+    "@parcel/diagnostic": "2.0.0-dev.1426+2369415b7",
+    "@parcel/plugin": "2.0.0-dev.1426+2369415b7",
+    "@parcel/rust": "2.12.1-dev.3263+2369415b7",
     "@parcel/source-map": "^2.1.1",
-    "@parcel/types": "2.0.0-dev.1424+7f6b4dbbc",
-    "@parcel/utils": "2.0.0-dev.1424+7f6b4dbbc",
+    "@parcel/types": "2.0.0-dev.1426+2369415b7",
+    "@parcel/utils": "2.0.0-dev.1426+2369415b7",
     "globals": "^13.2.0",
     "nullthrows": "^1.1.1"
   },
-  "gitHead": "7f6b4dbbc56a203e0fce8794856c03598c4f6708"
+  "gitHead": "2369415b703a85196b2e76d18cf748bad349932b"
 }

package/src/ESMOutputFormat.js

@@ -3,6 +3,7 @@ import type {
   ScopeHoistingPackager,
   OutputFormat,
 } from './ScopeHoistingPackager';
+import {isValidIdentifier} from './utils';
 
 export class ESMOutputFormat implements OutputFormat {
   packager: ScopeHoistingPackager;
@@ -25,6 +26,9 @@ export class ESMOutputFormat implements OutputFormat {
           namespaceSpecifier = `* as ${symbol}`;
         } else {
           let specifier = imported;
+          if (!isValidIdentifier(specifier)) {
+            specifier = JSON.stringify(specifier);
+          }
           if (symbol !== imported) {
             specifier += ` as ${symbol}`;
           }
@@ -93,7 +97,10 @@ export class ESMOutputFormat implements OutputFormat {
 
       for (let as of exportAs) {
         let specifier = local;
-        if (exportAs !== local) {
+        if (as !== local) {
+          if (!isValidIdentifier(as)) {
+            as = JSON.stringify(as);
+          }
           specifier += ` as ${as}`;
         }
 

package/src/ScopeHoistingPackager.js

@@ -28,12 +28,12 @@ import {ESMOutputFormat} from './ESMOutputFormat';
 import {CJSOutputFormat} from './CJSOutputFormat';
 import {GlobalOutputFormat} from './GlobalOutputFormat';
 import {prelude, helpers, bundleQueuePrelude, fnExpr} from './helpers';
-import {replaceScriptDependencies, getSpecifier} from './utils';
-
-// https://262.ecma-international.org/6.0/#sec-names-and-keywords
-const IDENTIFIER_RE = /^[$_\p{ID_Start}][$_\u200C\u200D\p{ID_Continue}]*$/u;
-const ID_START_RE = /^[$_\p{ID_Start}]/u;
-const NON_ID_CONTINUE_RE = /[^$_\u200C\u200D\p{ID_Continue}]/gu;
+import {
+  replaceScriptDependencies,
+  getSpecifier,
+  isValidIdentifier,
+  makeValidIdentifier,
+} from './utils';
 
 // General regex used to replace imports with the resolved code, references with resolutions,
 // and count the number of newlines in the file for source maps.
@@ -134,25 +134,10 @@ export class ScopeHoistingPackager {
       this.bundle.env.isLibrary ||
       this.bundle.env.outputFormat === 'commonjs'
     ) {
-      for (let b of this.bundleGraph.getReferencedBundles(this.bundle)) {
-        let entry = b.getMainEntry();
-        let symbols = new Map();
-        if (entry && !this.isAsyncBundle && entry.type === 'js') {
-          this.externalAssets.add(entry);
-
-          let usedSymbols = this.bundleGraph.getUsedSymbols(entry) || new Set();
-          for (let s of usedSymbols) {
-            // If the referenced bundle is ESM, and we are importing '*', use 'default' instead.
-            // This matches the logic below in buildExportedSymbols.
-            let imported = s;
-            if (imported === '*' && b.env.outputFormat === 'esmodule') {
-              imported = 'default';
-            }
-            symbols.set(imported, this.getSymbolResolution(entry, entry, s));
-          }
-        }
-
-        this.externals.set(relativeBundlePath(this.bundle, b), symbols);
+      for (let b of this.bundleGraph.getReferencedBundles(this.bundle, {
+        recursive: false,
+      })) {
+        this.externals.set(relativeBundlePath(this.bundle, b), new Map());
       }
     }
 
@@ -324,7 +309,6 @@ export class ScopeHoistingPackager {
 
       if (
         asset.meta.shouldWrap ||
-        this.isAsyncBundle ||
         this.bundle.env.sourceType === 'script' ||
         this.bundleGraph.isAssetReferenced(this.bundle, asset) ||
         this.bundleGraph
@@ -361,7 +345,6 @@ export class ScopeHoistingPackager {
 
   buildExportedSymbols() {
     if (
-      this.isAsyncBundle ||
       !this.bundle.env.isLibrary ||
       this.bundle.env.outputFormat !== 'esmodule'
     ) {
@@ -371,6 +354,8 @@ export class ScopeHoistingPackager {
     // TODO: handle ESM exports of wrapped entry assets...
     let entry = this.bundle.getMainEntry();
     if (entry && !this.wrappedAssets.has(entry.id)) {
+      let hasNamespace = entry.symbols.hasExportSymbol('*');
+
       for (let {
         asset,
         exportAs,
@@ -378,6 +363,13 @@ export class ScopeHoistingPackager {
         exportSymbol,
       } of this.bundleGraph.getExportedSymbols(entry)) {
         if (typeof symbol === 'string') {
+          // If the module has a namespace (e.g. commonjs), and this is not an entry, only export the namespace
+          // as default, without individual exports. This mirrors the importing logic in addExternal, avoiding
+          // extra unused exports and potential for non-identifier export names.
+          if (hasNamespace && this.isAsyncBundle && exportAs !== '*') {
+            continue;
+          }
+
           let symbols = this.exportedSymbols.get(
             symbol === '*' ? nullthrows(entry.symbols.get('*')?.local) : symbol,
           )?.exportAs;
@@ -418,8 +410,8 @@ export class ScopeHoistingPackager {
   }
 
   getTopLevelName(name: string): string {
-    name = name.replace(NON_ID_CONTINUE_RE, '');
-    if (!ID_START_RE.test(name) || this.globalNames.has(name)) {
+    name = makeValidIdentifier(name);
+    if (this.globalNames.has(name)) {
       name = '_' + name;
     }
 
@@ -434,7 +426,7 @@ export class ScopeHoistingPackager {
   }
 
   getPropertyAccess(obj: string, property: string): string {
-    if (IDENTIFIER_RE.test(property)) {
+    if (isValidIdentifier(property)) {
       return `${obj}.${property}`;
     }
 
@@ -511,7 +503,11 @@ export class ScopeHoistingPackager {
     }
 
     let [depMap, replacements] = this.buildReplacements(asset, deps);
-    let [prepend, prependLines, append] = this.buildAssetPrelude(asset, deps);
+    let [prepend, prependLines, append] = this.buildAssetPrelude(
+      asset,
+      deps,
+      replacements,
+    );
     if (prependLines > 0) {
       sourceMap?.offsetLines(1, prependLines);
       code = prepend + code;
@@ -703,6 +699,24 @@ ${code}
         continue;
       }
 
+      // Handle imports from other bundles in libraries.
+      if (this.bundle.env.isLibrary && !this.bundle.hasAsset(resolved)) {
+        let referencedBundle = this.bundleGraph.getReferencedBundle(
+          dep,
+          this.bundle,
+        );
+        if (
+          referencedBundle &&
+          referencedBundle.getMainEntry() === resolved &&
+          referencedBundle.type === 'js' &&
+          !this.bundleGraph.isAssetReferenced(referencedBundle, resolved)
+        ) {
+          this.addExternal(dep, replacements, referencedBundle);
+          this.externalAssets.add(resolved);
+          continue;
+        }
+      }
+
       for (let [imported, {local}] of dep.symbols) {
         if (local === '*') {
           continue;
@@ -748,7 +762,11 @@ ${code}
     return [depMap, replacements];
   }
 
-  addExternal(dep: Dependency, replacements?: Map<string, string>) {
+  addExternal(
+    dep: Dependency,
+    replacements?: Map<string, string>,
+    referencedBundle?: NamedBundle,
+  ) {
     if (this.bundle.env.outputFormat === 'global') {
       throw new ThrowableDiagnostic({
         diagnostic: {
@@ -766,11 +784,16 @@ ${code}
       });
     }
 
+    let specifier = dep.specifier;
+    if (referencedBundle) {
+      specifier = relativeBundlePath(this.bundle, referencedBundle);
+    }
+
     // Map of DependencySpecifier -> Map<ExportedSymbol, Identifier>>
-    let external = this.externals.get(dep.specifier);
+    let external = this.externals.get(specifier);
     if (!external) {
       external = new Map();
-      this.externals.set(dep.specifier, external);
+      this.externals.set(specifier, external);
     }
 
     for (let [imported, {local}] of dep.symbols) {
@@ -786,9 +809,16 @@ ${code}
       if (this.bundle.env.outputFormat === 'commonjs') {
         renamed = external.get('*');
         if (!renamed) {
-          renamed = this.getTopLevelName(
-            `$${this.bundle.publicId}$${dep.specifier}`,
-          );
+          if (referencedBundle) {
+            let entry = nullthrows(referencedBundle.getMainEntry());
+            renamed =
+              entry.symbols.get('*')?.local ??
+              `$${String(entry.meta.id)}$exports`;
+          } else {
+            renamed = this.getTopLevelName(
+              `$${this.bundle.publicId}$${specifier}`,
+            );
+          }
 
           external.set('*', renamed);
         }
@@ -807,24 +837,67 @@ ${code}
           replacements.set(local, replacement);
         }
       } else {
+        let property;
+        if (referencedBundle) {
+          let entry = nullthrows(referencedBundle.getMainEntry());
+          if (entry.symbols.hasExportSymbol('*')) {
+            // If importing * and the referenced module has a * export (e.g. CJS), use default instead.
+            // This mirrors the logic in buildExportedSymbols.
+            property = imported;
+            imported =
+              referencedBundle?.env.outputFormat === 'esmodule'
+                ? 'default'
+                : '*';
+          } else {
+            if (imported === '*') {
+              let exportedSymbols = this.bundleGraph.getExportedSymbols(entry);
+              if (local === '*') {
+                // Re-export all symbols.
+                for (let exported of exportedSymbols) {
+                  if (exported.symbol) {
+                    external.set(exported.exportSymbol, exported.symbol);
+                  }
+                }
+                continue;
+              }
+            }
+            renamed = this.bundleGraph.getSymbolResolution(
+              entry,
+              imported,
+              this.bundle,
+            ).symbol;
+          }
+        }
+
         // Rename the specifier so that multiple local imports of the same imported specifier
         // are deduplicated. We have to prefix the imported name with the bundle id so that
         // local variables do not shadow it.
-        if (this.exportedSymbols.has(local)) {
-          renamed = local;
-        } else if (imported === 'default' || imported === '*') {
-          renamed = this.getTopLevelName(
-            `$${this.bundle.publicId}$${dep.specifier}`,
-          );
-        } else {
-          renamed = this.getTopLevelName(
-            `$${this.bundle.publicId}$${imported}`,
-          );
+        if (!renamed) {
+          if (this.exportedSymbols.has(local)) {
+            renamed = local;
+          } else if (imported === 'default' || imported === '*') {
+            renamed = this.getTopLevelName(
+              `$${this.bundle.publicId}$${specifier}`,
+            );
+          } else {
+            renamed = this.getTopLevelName(
+              `$${this.bundle.publicId}$${imported}`,
+            );
+          }
         }
 
         external.set(imported, renamed);
         if (local !== '*' && replacements) {
-          replacements.set(local, renamed);
+          let replacement = renamed;
+          if (property === '*') {
+            replacement = renamed;
+          } else if (property === 'default') {
+            replacement = `($parcel$interopDefault(${renamed}))`;
+            this.usedHelpers.add('$parcel$interopDefault');
+          } else if (property) {
+            replacement = this.getPropertyAccess(renamed, property);
+          }
+          replacements.set(local, replacement);
         }
       }
     }
@@ -849,6 +922,7 @@ ${code}
     resolved: Asset,
     imported: string,
     dep?: Dependency,
+    replacements?: Map<string, string>,
   ): string {
     let {
       asset: resolvedAsset,
@@ -922,13 +996,16 @@ ${code}
     // namespace export symbol.
     let assetId = resolvedAsset.meta.id;
     invariant(typeof assetId === 'string');
-    let obj =
-      isWrapped && (!dep || dep?.meta.shouldWrap)
-        ? // Wrap in extra parenthesis to not change semantics, e.g.`new (parcelRequire("..."))()`.
-          `(parcelRequire(${JSON.stringify(publicId)}))`
-        : isWrapped && dep
-        ? `$${publicId}`
-        : resolvedAsset.symbols.get('*')?.local || `$${assetId}$exports`;
+    let obj;
+    if (isWrapped && (!dep || dep?.meta.shouldWrap)) {
+      // Wrap in extra parenthesis to not change semantics, e.g.`new (parcelRequire("..."))()`.
+      obj = `(parcelRequire(${JSON.stringify(publicId)}))`;
+    } else if (isWrapped && dep) {
+      obj = `$${publicId}`;
+    } else {
+      obj = resolvedAsset.symbols.get('*')?.local || `$${assetId}$exports`;
+      obj = replacements?.get(obj) || obj;
+    }
 
     if (imported === '*' || exportSymbol === '*' || isDefaultInterop) {
       // Resolve to the namespace object if requested or this is a CJS default interop reqiure.
@@ -963,7 +1040,7 @@ ${code}
     } else if (!symbol) {
       invariant(false, 'Asset was skipped or not found.');
     } else {
-      return symbol;
+      return replacements?.get(symbol) || symbol;
     }
   }
 
@@ -1010,6 +1087,7 @@ ${code}
   buildAssetPrelude(
     asset: Asset,
     deps: Array<Dependency>,
+    replacements: Map<string, string>,
   ): [string, number, string] {
     let prepend = '';
     let prependLineCount = 0;
@@ -1042,6 +1120,7 @@ ${code}
             .some(
               dep =>
                 !dep.isEntry &&
+                this.bundle.hasDependency(dep) &&
                 nullthrows(this.bundleGraph.getUsedSymbols(dep)).has('*'),
             ))) ||
       // If a symbol is imported (used) from a CJS asset but isn't listed in the symbols,
@@ -1050,7 +1129,11 @@ ${code}
         [...usedSymbols].some(s => !asset.symbols.hasExportSymbol(s))) ||
       // If the exports has this asset's namespace (e.g. ESM output from CJS input),
       // include the namespace object for the default export.
-      this.exportedSymbols.has(`$${assetId}$exports`);
+      this.exportedSymbols.has(`$${assetId}$exports`) ||
+      // CommonJS library bundle entries always need a namespace.
+      (this.bundle.env.isLibrary &&
+        this.bundle.env.outputFormat === 'commonjs' &&
+        asset === this.bundle.getMainEntry());
 
     // If the asset doesn't have static exports, should wrap, the namespace is used,
     // or we need default interop, then we need to synthesize a namespace object for
@@ -1117,7 +1200,13 @@ ${code}
               (!resolved.meta.hasCJSExports &&
                 resolved.symbols.hasExportSymbol('*'))
             ) {
-              let obj = this.getSymbolResolution(asset, resolved, '*', dep);
+              let obj = this.getSymbolResolution(
+                asset,
+                resolved,
+                '*',
+                dep,
+                replacements,
+              );
               append += `$parcel$exportWildcard($${assetId}$exports, ${obj});\n`;
               this.usedHelpers.add('$parcel$exportWildcard');
             } else {
@@ -1135,6 +1224,8 @@ ${code}
                   asset,
                   resolved,
                   symbol,
+                  undefined,
+                  replacements,
                 );
                 let get = this.buildFunctionExpression([], resolvedSymbol);
                 let set = asset.meta.hasCJSExports
@@ -1181,7 +1272,13 @@ ${code}
         // additional assignments after each mutation of the original binding.
         prepend += `\n${usedExports
           .map(exp => {
-            let resolved = this.getSymbolResolution(asset, asset, exp);
+            let resolved = this.getSymbolResolution(
+              asset,
+              asset,
+              exp,
+              undefined,
+              replacements,
+            );
             let get = this.buildFunctionExpression([], resolved);
             let isEsmExport = !!asset.symbols.get(exp)?.meta?.isEsm;
             let set =

package/src/index.js

@@ -10,7 +10,6 @@ import {
 } from '@parcel/utils';
 import {encodeJSONKeyComponent} from '@parcel/diagnostic';
 import {hashString} from '@parcel/rust';
-import path from 'path';
 import nullthrows from 'nullthrows';
 import {DevPackager} from './DevPackager';
 import {ScopeHoistingPackager} from './ScopeHoistingPackager';
@@ -32,22 +31,18 @@ const CONFIG_SCHEMA: SchemaEntity = {
 
 export default (new Packager({
   async loadConfig({config, options}): Promise<JSPackagerConfig> {
-    // Generate a name for the global parcelRequire function that is unique to this project.
-    // This allows multiple parcel builds to coexist on the same page.
-    let pkg = await config.getConfigFrom(
-      path.join(options.projectRoot, 'index'),
-      ['package.json'],
-    );
-
     let packageKey = '@parcel/packager-js';
+    let conf = await config.getConfigFrom(options.projectRoot + '/index', [], {
+      packageKey,
+    });
 
-    if (pkg?.contents[packageKey]) {
+    if (conf?.contents) {
       validateSchema.diagnostic(
         CONFIG_SCHEMA,
         {
-          data: pkg?.contents[packageKey],
-          source: await options.inputFS.readFile(pkg.filePath, 'utf8'),
-          filePath: pkg.filePath,
+          data: conf?.contents,
+          source: await options.inputFS.readFile(conf.filePath, 'utf8'),
+          filePath: conf.filePath,
           prependKey: `/${encodeJSONKeyComponent(packageKey)}`,
         },
         packageKey,
@@ -55,11 +50,21 @@ export default (new Packager({
       );
     }
 
-    let name = pkg?.contents?.name ?? '';
+    // Generate a name for the global parcelRequire function that is unique to this project.
+    // This allows multiple parcel builds to coexist on the same page.
+    let packageName = await config.getConfigFrom(
+      options.projectRoot + '/index',
+      [],
+      {
+        packageKey: 'name',
+      },
+    );
+
+    let name = packageName?.contents?.name ?? '';
     return {
       parcelRequireName: 'parcelRequire' + hashString(name).slice(-4),
       unstable_asyncBundleRuntime: Boolean(
-        pkg?.contents[packageKey]?.unstable_asyncBundleRuntime,
+        conf?.contents?.unstable_asyncBundleRuntime,
       ),
     };
   },

package/src/utils.js

@@ -55,3 +55,20 @@ export function getSpecifier(dep: Dependency): string {
 
   return dep.specifier;
 }
+
+// https://262.ecma-international.org/6.0/#sec-names-and-keywords
+const IDENTIFIER_RE = /^[$_\p{ID_Start}][$_\u200C\u200D\p{ID_Continue}]*$/u;
+const ID_START_RE = /^[$_\p{ID_Start}]/u;
+const NON_ID_CONTINUE_RE = /[^$_\u200C\u200D\p{ID_Continue}]/gu;
+
+export function isValidIdentifier(id: string): boolean {
+  return IDENTIFIER_RE.test(id);
+}
+
+export function makeValidIdentifier(name: string): string {
+  name = name.replace(NON_ID_CONTINUE_RE, '');
+  if (!ID_START_RE.test(name)) {
+    name = '_' + name;
+  }
+  return name;
+}