@parcel/packager-js 2.0.0-nightly.1056 → 2.0.0-nightly.1069

package/lib/ScopeHoistingPackager.js

@@ -714,10 +714,12 @@ ${code}
 
     let isWrapped = !this.bundle.hasAsset(resolvedAsset) || this.wrappedAssets.has(resolvedAsset.id) && resolvedAsset !== parentAsset;
     let staticExports = resolvedAsset.meta.staticExports !== false;
-    let publicId = this.bundleGraph.getAssetPublicId(resolvedAsset); // If the rsolved asset is wrapped, but imported at the top-level by this asset,
+    let publicId = this.bundleGraph.getAssetPublicId(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) {
+    if (isWrapped && dep && !(dep !== null && dep !== void 0 && dep.meta.shouldWrap) && symbol !== false && ( // Only do this if the asset is part of a different bundle (so it was definitely
+    // parcelRequire.register'ed there), or if it is indeed registered in this bundle.
+    !this.bundle.hasAsset(resolvedAsset) || !this.shouldSkipAsset(resolvedAsset))) {
       let hoisted = this.hoistedRequires.get(dep.id);
 
       if (!hoisted) {
@@ -746,7 +748,12 @@ ${code}
 
     if (imported === '*' || exportSymbol === '*' || isDefaultInterop) {
       // Resolve to the namespace object if requested or this is a CJS default interop reqiure.
-      return obj;
+      if (parentAsset === resolvedAsset && this.wrappedAssets.has(resolvedAsset.id)) {
+        // Directly use module.exports for wrapped assets importing themselves.
+        return 'module.exports';
+      } else {
+        return obj;
+      }
     } else if ((!staticExports || isWrapped || !symbol) && 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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/packager-js",
-  "version": "2.0.0-nightly.1056+7d2568d12",
+  "version": "2.0.0-nightly.1069+5cfb846d7",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,16 +17,16 @@
   "source": "src/index.js",
   "engines": {
     "node": ">= 12.0.0",
-    "parcel": "2.0.0-nightly.1054+7d2568d12"
+    "parcel": "2.0.0-nightly.1067+5cfb846d7"
   },
   "dependencies": {
-    "@parcel/diagnostic": "2.0.0-nightly.1056+7d2568d12",
-    "@parcel/hash": "2.4.2-nightly.2679+7d2568d12",
-    "@parcel/plugin": "2.0.0-nightly.1056+7d2568d12",
+    "@parcel/diagnostic": "2.0.0-nightly.1069+5cfb846d7",
+    "@parcel/hash": "2.5.1-nightly.2692+5cfb846d7",
+    "@parcel/plugin": "2.0.0-nightly.1069+5cfb846d7",
     "@parcel/source-map": "^2.0.0",
-    "@parcel/utils": "2.0.0-nightly.1056+7d2568d12",
+    "@parcel/utils": "2.0.0-nightly.1069+5cfb846d7",
     "globals": "^13.2.0",
     "nullthrows": "^1.1.1"
   },
-  "gitHead": "7d2568d1209859012d49a3d24f04842cbfa187ea"
+  "gitHead": "5cfb846d742eb86b1232e531be6e0e513551d838"
 }

package/src/ScopeHoistingPackager.js

@@ -760,9 +760,18 @@ ${code}
     let staticExports = resolvedAsset.meta.staticExports !== false;
     let publicId = this.bundleGraph.getAssetPublicId(resolvedAsset);
 
-    // If the rsolved asset is wrapped, but imported at the top-level by this asset,
+    // 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?.meta.shouldWrap && symbol !== false) {
+    if (
+      isWrapped &&
+      dep &&
+      !dep?.meta.shouldWrap &&
+      symbol !== false &&
+      // Only do this if the asset is part of a different bundle (so it was definitely
+      // parcelRequire.register'ed there), or if it is indeed registered in this bundle.
+      (!this.bundle.hasAsset(resolvedAsset) ||
+        !this.shouldSkipAsset(resolvedAsset))
+    ) {
       let hoisted = this.hoistedRequires.get(dep.id);
       if (!hoisted) {
         hoisted = new Map();
@@ -806,7 +815,15 @@ ${code}
 
     if (imported === '*' || exportSymbol === '*' || isDefaultInterop) {
       // Resolve to the namespace object if requested or this is a CJS default interop reqiure.
-      return obj;
+      if (
+        parentAsset === resolvedAsset &&
+        this.wrappedAssets.has(resolvedAsset.id)
+      ) {
+        // Directly use module.exports for wrapped assets importing themselves.
+        return 'module.exports';
+      } else {
+        return obj;
+      }
     } else if (
       (!staticExports || isWrapped || !symbol) &&
       resolvedAsset !== parentAsset