@parcel/packager-js 2.0.0-dev.1528 → 2.0.0-dev.1557

package/lib/ScopeHoistingPackager.js

@@ -271,6 +271,7 @@ 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,
@@ -279,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 = [];
@@ -403,7 +410,6 @@ class ScopeHoistingPackager {
       let offset = 0;
       let columnStartIndex = 0;
       code = code.replace(REPLACEMENT_RE, (m, d, i) => {
-        var _replacements$get;
         if (m === '\n') {
           columnStartIndex = i + offset + 1;
           lineCount++;
@@ -463,7 +469,7 @@ class ScopeHoistingPackager {
         }
 
         // If it wasn't a dependency, then it was an inline replacement (e.g. $id$import$foo -> $id$export$foo).
-        let replacement = (_replacements$get = replacements.get(m)) !== null && _replacements$get !== void 0 ? _replacements$get : m;
+        let replacement = replacements.get(m) ?? m;
         if (sourceMap) {
           // Offset the source map columns for this line if the replacement was a different length.
           // This assumes that the match and replacement both do not contain any newlines.
@@ -606,9 +612,9 @@ ${code}
         renamed = external.get('*');
         if (!renamed) {
           if (referencedBundle) {
-            var _entry$symbols$get$lo, _entry$symbols$get3;
+            var _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`;
+            renamed = ((_entry$symbols$get3 = entry.symbols.get('*')) === null || _entry$symbols$get3 === void 0 ? void 0 : _entry$symbols$get3.local) ?? `$${String(entry.meta.id)}$exports`;
           } else {
             renamed = this.getTopLevelName(`$${this.bundle.publicId}$${specifier}`);
           }

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, _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 === null || packageName === void 0 || (_packageName$contents = packageName.contents) === null || _packageName$contents === void 0 ? void 0 : _packageName$contents.name) ?? '';
     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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/packager-js",
-  "version": "2.0.0-dev.1528+70889ca07",
+  "version": "2.0.0-dev.1557+e87c13686",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -16,18 +16,18 @@
   "main": "lib/index.js",
   "source": "src/index.js",
   "engines": {
-    "node": ">= 12.0.0",
-    "parcel": "^2.0.0-dev.1526+70889ca07"
+    "node": ">= 16.0.0",
+    "parcel": "^2.0.0-dev.1555+e87c13686"
   },
   "dependencies": {
-    "@parcel/diagnostic": "2.0.0-dev.1528+70889ca07",
-    "@parcel/plugin": "2.0.0-dev.1528+70889ca07",
-    "@parcel/rust": "2.12.1-dev.3151+70889ca07",
+    "@parcel/diagnostic": "2.0.0-dev.1557+e87c13686",
+    "@parcel/plugin": "2.0.0-dev.1557+e87c13686",
+    "@parcel/rust": "2.12.1-dev.3204+e87c13686",
     "@parcel/source-map": "^2.1.1",
-    "@parcel/types": "2.0.0-dev.1528+70889ca07",
-    "@parcel/utils": "2.0.0-dev.1528+70889ca07",
+    "@parcel/types": "2.0.0-dev.1557+e87c13686",
+    "@parcel/utils": "2.0.0-dev.1557+e87c13686",
     "globals": "^13.2.0",
     "nullthrows": "^1.1.1"
   },
-  "gitHead": "70889ca07dccb95e21e4c6a2844d632e3723faf4"
+  "gitHead": "e87c13686e8fa4ad96cc61c19d9e4fcf9c372f2e"
 }

package/src/ScopeHoistingPackager.js

@@ -354,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,
@@ -361,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;

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,
       ),
     };
   },