@parcel/packager-js 2.0.0-dev.1608 → 2.0.0-dev.1652

package/lib/ScopeHoistingPackager.js

@@ -26,7 +26,7 @@ function _nullthrows() {
   return data;
 }
 function _assert() {
-  const data = _interopRequireDefault(require("assert"));
+  const data = _interopRequireWildcard(require("assert"));
   _assert = function () {
     return data;
   };
@@ -214,7 +214,9 @@ class ScopeHoistingPackager {
     };
   }
   shouldBundleQueue(bundle) {
-    return this.useAsyncBundleRuntime && bundle.type === 'js' && bundle.bundleBehavior !== 'inline' && bundle.env.outputFormat === 'esmodule' && !bundle.env.isIsolated() && bundle.bundleBehavior !== 'isolated' && !this.bundleGraph.hasParentBundleOfType(bundle, 'js');
+    let referencingBundles = this.bundleGraph.getReferencingBundles(bundle);
+    let hasHtmlReference = referencingBundles.some(b => b.type === 'html');
+    return this.useAsyncBundleRuntime && bundle.type === 'js' && bundle.bundleBehavior !== 'inline' && bundle.env.outputFormat === 'esmodule' && !bundle.env.isIsolated() && bundle.bundleBehavior !== 'isolated' && hasHtmlReference;
   }
   runWhenReady(bundle, codeToRun) {
     let deps = this.bundleGraph.getReferencedBundles(bundle).filter(b => this.shouldBundleQueue(b)).map(b => b.publicId);
@@ -239,7 +241,8 @@ class ScopeHoistingPackager {
         }];
       });
       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) {
+        // Don't wrap constant "entry" modules _except_ if they are referenced by any lazy dependency
+        if (!asset.meta.isConstantModule || this.bundleGraph.getIncomingDependencies(asset).some(dep => dep.priority === 'lazy')) {
           this.wrappedAssets.add(asset.id);
           wrapped.push(asset);
         }
@@ -625,8 +628,17 @@ ${code}
           if (imported === '*') {
             replacement = renamed;
           } else if (imported === 'default') {
-            replacement = `($parcel$interopDefault(${renamed}))`;
-            this.usedHelpers.add('$parcel$interopDefault');
+            let needsDefaultInterop = true;
+            if (referencedBundle) {
+              let entry = (0, _nullthrows().default)(referencedBundle.getMainEntry());
+              needsDefaultInterop = this.needsDefaultInterop(entry);
+            }
+            if (needsDefaultInterop) {
+              replacement = `($parcel$interopDefault(${renamed}))`;
+              this.usedHelpers.add('$parcel$interopDefault');
+            } else {
+              replacement = `${renamed}.default`;
+            }
           } else {
             replacement = this.getPropertyAccess(renamed, imported);
           }
@@ -688,7 +700,11 @@ ${code}
   }
   isWrapped(resolved, parentAsset) {
     if (resolved.meta.isConstantModule) {
-      (0, _assert().default)(this.bundle.hasAsset(resolved), 'Constant module not found in bundle');
+      if (!this.bundle.hasAsset(resolved)) {
+        throw new (_assert().AssertionError)({
+          message: `Constant module ${_path().default.relative(this.options.projectRoot, resolved.filePath)} referenced from ${_path().default.relative(this.options.projectRoot, parentAsset.filePath)} not found in bundle ${this.bundle.name}`
+        });
+      }
       return false;
     }
     return !this.bundle.hasAsset(resolved) && !this.externalAssets.has(resolved) || this.wrappedAssets.has(resolved.id) && resolved !== parentAsset;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/packager-js",
-  "version": "2.0.0-dev.1608+5b10f3ae4",
+  "version": "2.0.0-dev.1652+8b017703f",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,17 +17,17 @@
   "source": "src/index.js",
   "engines": {
     "node": ">= 16.0.0",
-    "parcel": "^2.0.0-dev.1606+5b10f3ae4"
+    "parcel": "^2.0.0-dev.1650+8b017703f"
   },
   "dependencies": {
-    "@parcel/diagnostic": "2.0.0-dev.1608+5b10f3ae4",
-    "@parcel/plugin": "2.0.0-dev.1608+5b10f3ae4",
-    "@parcel/rust": "2.12.1-dev.3231+5b10f3ae4",
+    "@parcel/diagnostic": "2.0.0-dev.1652+8b017703f",
+    "@parcel/plugin": "2.0.0-dev.1652+8b017703f",
+    "@parcel/rust": "2.12.1-dev.3275+8b017703f",
     "@parcel/source-map": "^2.1.1",
-    "@parcel/types": "2.0.0-dev.1608+5b10f3ae4",
-    "@parcel/utils": "2.0.0-dev.1608+5b10f3ae4",
+    "@parcel/types": "2.0.0-dev.1652+8b017703f",
+    "@parcel/utils": "2.0.0-dev.1652+8b017703f",
     "globals": "^13.2.0",
     "nullthrows": "^1.1.1"
   },
-  "gitHead": "5b10f3ae49b33948e5de2d3ebc88c4a6d32a8a95"
+  "gitHead": "8b017703fdf4a90a643ce0190cdd7482060dc86b"
 }

package/src/ScopeHoistingPackager.js

@@ -17,7 +17,7 @@ import {
 } from '@parcel/utils';
 import SourceMap from '@parcel/source-map';
 import nullthrows from 'nullthrows';
-import invariant from 'assert';
+import invariant, {AssertionError} from 'assert';
 import ThrowableDiagnostic, {
   convertSourceLocationToHighlight,
 } from '@parcel/diagnostic';
@@ -34,7 +34,6 @@ import {
   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.
 const REPLACEMENT_RE =
@@ -264,6 +263,9 @@ export class ScopeHoistingPackager {
   }
 
   shouldBundleQueue(bundle: NamedBundle): boolean {
+    let referencingBundles = this.bundleGraph.getReferencingBundles(bundle);
+    let hasHtmlReference = referencingBundles.some(b => b.type === 'html');
+
     return (
       this.useAsyncBundleRuntime &&
       bundle.type === 'js' &&
@@ -271,7 +273,7 @@ export class ScopeHoistingPackager {
       bundle.env.outputFormat === 'esmodule' &&
       !bundle.env.isIsolated() &&
       bundle.bundleBehavior !== 'isolated' &&
-      !this.bundleGraph.hasParentBundleOfType(bundle, 'js')
+      hasHtmlReference
     );
   }
 
@@ -315,7 +317,13 @@ export class ScopeHoistingPackager {
           .getIncomingDependencies(asset)
           .some(dep => dep.meta.shouldWrap && dep.specifierType !== 'url')
       ) {
-        if (!asset.meta.isConstantModule) {
+        // Don't wrap constant "entry" modules _except_ if they are referenced by any lazy dependency
+        if (
+          !asset.meta.isConstantModule ||
+          this.bundleGraph
+            .getIncomingDependencies(asset)
+            .some(dep => dep.priority === 'lazy')
+        ) {
           this.wrappedAssets.add(asset.id);
           wrapped.push(asset);
         }
@@ -828,8 +836,17 @@ ${code}
           if (imported === '*') {
             replacement = renamed;
           } else if (imported === 'default') {
-            replacement = `($parcel$interopDefault(${renamed}))`;
-            this.usedHelpers.add('$parcel$interopDefault');
+            let needsDefaultInterop = true;
+            if (referencedBundle) {
+              let entry = nullthrows(referencedBundle.getMainEntry());
+              needsDefaultInterop = this.needsDefaultInterop(entry);
+            }
+            if (needsDefaultInterop) {
+              replacement = `($parcel$interopDefault(${renamed}))`;
+              this.usedHelpers.add('$parcel$interopDefault');
+            } else {
+              replacement = `${renamed}.default`;
+            }
           } else {
             replacement = this.getPropertyAccess(renamed, imported);
           }
@@ -905,10 +922,17 @@ ${code}
 
   isWrapped(resolved: Asset, parentAsset: Asset): boolean {
     if (resolved.meta.isConstantModule) {
-      invariant(
-        this.bundle.hasAsset(resolved),
-        'Constant module not found in bundle',
-      );
+      if (!this.bundle.hasAsset(resolved)) {
+        throw new AssertionError({
+          message: `Constant module ${path.relative(
+            this.options.projectRoot,
+            resolved.filePath,
+          )} referenced from ${path.relative(
+            this.options.projectRoot,
+            parentAsset.filePath,
+          )} not found in bundle ${this.bundle.name}`,
+        });
+      }
       return false;
     }
     return (