@parcel/packager-js 2.0.0-nightly.1349 → 2.0.0-nightly.1350

package/lib/ScopeHoistingPackager.js

@@ -93,6 +93,7 @@ class ScopeHoistingPackager {
   hoistedRequires = new Map();
   needsPrelude = false;
   usedHelpers = new Set();
+  externalAssets = new Set();
   constructor(options, bundleGraph, bundle, parcelRequireName) {
     this.options = options;
     this.bundleGraph = bundleGraph;
@@ -114,9 +115,23 @@ 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') {
-      let bundles = this.bundleGraph.getReferencedBundles(this.bundle);
-      for (let b of bundles) {
-        this.externals.set((0, _utils().relativeBundlePath)(this.bundle, b), new Map());
+      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);
       }
     }
     let res = '';
@@ -602,6 +617,9 @@ ${code}
       }
     }
   }
+  isWrapped(resolved, parentAsset) {
+    return !this.bundle.hasAsset(resolved) && !this.externalAssets.has(resolved) || this.wrappedAssets.has(resolved.id) && resolved !== parentAsset;
+  }
   getSymbolResolution(parentAsset, resolved, imported, dep) {
     var _resolvedAsset$symbol;
     let {
@@ -614,10 +632,14 @@ ${code}
       // that is actually unused but we still need a placeholder value.
       return '{}';
     }
-    let isWrapped = !this.bundle.hasAsset(resolvedAsset) || this.wrappedAssets.has(resolvedAsset.id) && resolvedAsset !== parentAsset;
+    let isWrapped = this.isWrapped(resolvedAsset, parentAsset);
     let staticExports = resolvedAsset.meta.staticExports !== false;
     let publicId = this.bundleGraph.getAssetPublicId(resolvedAsset);
 
+    // External CommonJS dependencies need to be accessed as an object property rather than imported
+    // directly to maintain live binding.
+    let isExternalCommonJS = !isWrapped && this.bundle.env.isLibrary && this.bundle.env.outputFormat === 'commonjs' && !this.bundle.hasAsset(resolvedAsset);
+
     // If the resolved asset is wrapped, but imported at the top-level by this asset,
     // then we hoist parcelRequire calls to the top of this asset so side effects run immediately.
     if (isWrapped && dep && !(dep !== null && dep !== void 0 && dep.meta.shouldWrap) && symbol !== false && (
@@ -656,7 +678,7 @@ ${code}
       } else {
         return obj;
       }
-    } else if ((!staticExports || isWrapped || !symbol) && resolvedAsset !== parentAsset) {
+    } else if ((!staticExports || isWrapped || !symbol || isExternalCommonJS) && resolvedAsset !== parentAsset) {
       // If the resolved asset is wrapped or has non-static exports,
       // we need to use a member access off the namespace object rather
       // than a direct reference. If importing default from a CJS module,
@@ -681,7 +703,7 @@ ${code}
     let hoisted = this.hoistedRequires.get(dep.id);
     let res = '';
     let lineCount = 0;
-    let isWrapped = !this.bundle.hasAsset(resolved) || this.wrappedAssets.has(resolved.id) && resolved !== parentAsset;
+    let isWrapped = this.isWrapped(resolved, parentAsset);
 
     // If the resolved asset is wrapped and is imported in the top-level by this asset,
     // we need to run side effects when this asset runs. If the resolved asset is not

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/packager-js",
-  "version": "2.0.0-nightly.1349+824ddbe70",
+  "version": "2.0.0-nightly.1350+4b8323477",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,16 +17,16 @@
   "source": "src/index.js",
   "engines": {
     "node": ">= 12.0.0",
-    "parcel": "2.0.0-nightly.1347+824ddbe70"
+    "parcel": "2.0.0-nightly.1348+4b8323477"
   },
   "dependencies": {
-    "@parcel/diagnostic": "2.0.0-nightly.1349+824ddbe70",
-    "@parcel/hash": "2.9.4-nightly.2972+824ddbe70",
-    "@parcel/plugin": "2.0.0-nightly.1349+824ddbe70",
+    "@parcel/diagnostic": "2.0.0-nightly.1350+4b8323477",
+    "@parcel/hash": "2.9.4-nightly.2973+4b8323477",
+    "@parcel/plugin": "2.0.0-nightly.1350+4b8323477",
     "@parcel/source-map": "^2.1.1",
-    "@parcel/utils": "2.0.0-nightly.1349+824ddbe70",
+    "@parcel/utils": "2.0.0-nightly.1350+4b8323477",
     "globals": "^13.2.0",
     "nullthrows": "^1.1.1"
   },
-  "gitHead": "824ddbe70ac5c513062a114eb6dc0f163e4d234c"
+  "gitHead": "4b8323477dc806796d88c770aa96429d8095dc5d"
 }

package/src/ScopeHoistingPackager.js

@@ -94,6 +94,7 @@ export class ScopeHoistingPackager {
   hoistedRequires: Map<string, Map<string, string>> = new Map();
   needsPrelude: boolean = false;
   usedHelpers: Set<string> = new Set();
+  externalAssets: Set<Asset> = new Set();
 
   constructor(
     options: PluginOptions,
@@ -130,9 +131,25 @@ export class ScopeHoistingPackager {
       this.bundle.env.isLibrary ||
       this.bundle.env.outputFormat === 'commonjs'
     ) {
-      let bundles = this.bundleGraph.getReferencedBundles(this.bundle);
-      for (let b of bundles) {
-        this.externals.set(relativeBundlePath(this.bundle, b), new Map());
+      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);
       }
     }
 
@@ -756,6 +773,13 @@ ${code}
     }
   }
 
+  isWrapped(resolved: Asset, parentAsset: Asset): boolean {
+    return (
+      (!this.bundle.hasAsset(resolved) && !this.externalAssets.has(resolved)) ||
+      (this.wrappedAssets.has(resolved.id) && resolved !== parentAsset)
+    );
+  }
+
   getSymbolResolution(
     parentAsset: Asset,
     resolved: Asset,
@@ -777,13 +801,18 @@ ${code}
       return '{}';
     }
 
-    let isWrapped =
-      !this.bundle.hasAsset(resolvedAsset) ||
-      (this.wrappedAssets.has(resolvedAsset.id) &&
-        resolvedAsset !== parentAsset);
+    let isWrapped = this.isWrapped(resolvedAsset, parentAsset);
     let staticExports = resolvedAsset.meta.staticExports !== false;
     let publicId = this.bundleGraph.getAssetPublicId(resolvedAsset);
 
+    // External CommonJS dependencies need to be accessed as an object property rather than imported
+    // directly to maintain live binding.
+    let isExternalCommonJS =
+      !isWrapped &&
+      this.bundle.env.isLibrary &&
+      this.bundle.env.outputFormat === 'commonjs' &&
+      !this.bundle.hasAsset(resolvedAsset);
+
     // If the resolved asset is wrapped, but imported at the top-level by this asset,
     // then we hoist parcelRequire calls to the top of this asset so side effects run immediately.
     if (
@@ -849,7 +878,7 @@ ${code}
         return obj;
       }
     } else if (
-      (!staticExports || isWrapped || !symbol) &&
+      (!staticExports || isWrapped || !symbol || isExternalCommonJS) &&
       resolvedAsset !== parentAsset
     ) {
       // If the resolved asset is wrapped or has non-static exports,
@@ -887,9 +916,7 @@ ${code}
     let hoisted = this.hoistedRequires.get(dep.id);
     let res = '';
     let lineCount = 0;
-    let isWrapped =
-      !this.bundle.hasAsset(resolved) ||
-      (this.wrappedAssets.has(resolved.id) && resolved !== parentAsset);
+    let isWrapped = this.isWrapped(resolved, parentAsset);
 
     // If the resolved asset is wrapped and is imported in the top-level by this asset,
     // we need to run side effects when this asset runs. If the resolved asset is not