@parcel/packager-js 2.0.0-dev.1789 → 2.0.0-dev.1795

package/lib/DevPackager.js

@@ -174,7 +174,12 @@ class DevPackager {
       contents += ', null';
     }
     if (usedHelpers & 2) {
-      contents += ', ' + JSON.stringify(this.bundle.target.publicUrl);
+      // Ensure the public url always ends with a slash to code can easily join paths to it.
+      let publicUrl = this.bundle.target.publicUrl;
+      if (!publicUrl.endsWith('/')) {
+        publicUrl += '/';
+      }
+      contents += ', ' + JSON.stringify(publicUrl);
     }
     contents += ')\n';
 

package/lib/ScopeHoistingPackager.js

@@ -1011,7 +1011,7 @@ ${code}
       // Add the prelude if this is potentially the first JS bundle to load in a
       // particular context (e.g. entry scripts in HTML, workers, etc.).
       let parentBundles = this.bundleGraph.getParentBundles(this.bundle);
-      let mightBeFirstJS = parentBundles.length === 0 || parentBundles.some(b => b.type !== 'js') || this.bundleGraph.getBundleGroupsContainingBundle(this.bundle).some(g => this.bundleGraph.isEntryBundleGroup(g)) || this.bundle.env.isIsolated() || this.bundle.bundleBehavior === 'isolated';
+      let mightBeFirstJS = parentBundles.length === 0 || parentBundles.some(b => b.type !== 'js' || b.env.context !== this.bundle.env.context) || this.bundleGraph.getBundleGroupsContainingBundle(this.bundle).some(g => this.bundleGraph.isEntryBundleGroup(g)) || this.bundle.env.isIsolated() || this.bundle.bundleBehavior === 'isolated';
       if (mightBeFirstJS) {
         let preludeCode = (0, _helpers.prelude)(this.parcelRequireName);
         res += preludeCode;

package/lib/helpers.js

@@ -144,7 +144,12 @@ const $parcel$distDir = (env, bundle) => {
   return `var $parcel$distDir = ${JSON.stringify(distDir)};\n`;
 };
 const $parcel$publicUrl = (env, bundle) => {
-  return `var $parcel$publicUrl = ${JSON.stringify(bundle.target.publicUrl)};\n`;
+  // Ensure the public url always ends with a slash to code can easily join paths to it.
+  let publicUrl = bundle.target.publicUrl;
+  if (!publicUrl.endsWith('/')) {
+    publicUrl += '/';
+  }
+  return `var $parcel$publicUrl = ${JSON.stringify(publicUrl)};\n`;
 };
 const $parcel$import = env => {
   return `var $parcel$import = ${fnExpr(env, ['url'], ['return import($parcel$distDir + "/" + url);'])};\n`;

package/lib/index.js

@@ -56,7 +56,7 @@ var _default = exports.default = new (_plugin().Packager)({
     config,
     options
   }) {
-    var _packageName$contents, _conf$contents;
+    var _conf$contents;
     let packageKey = '@parcel/packager-js';
     let conf = await config.getConfigFrom(options.projectRoot + '/index', [], {
       packageKey
@@ -75,7 +75,7 @@ var _default = exports.default = new (_plugin().Packager)({
     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) ?? '';
+    let name = (packageName === null || packageName === void 0 ? void 0 : packageName.contents) ?? '';
     return {
       parcelRequireName: 'parcelRequire' + (0, _rust().hashString)(name).slice(-4),
       unstable_asyncBundleRuntime: Boolean(conf === null || conf === void 0 || (_conf$contents = conf.contents) === null || _conf$contents === void 0 ? void 0 : _conf$contents.unstable_asyncBundleRuntime)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/packager-js",
-  "version": "2.0.0-dev.1789+0b82b13d6",
+  "version": "2.0.0-dev.1795+9f297b15c",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,17 +17,17 @@
   "source": "src/index.js",
   "engines": {
     "node": ">= 16.0.0",
-    "parcel": "^2.0.0-dev.1787+0b82b13d6"
+    "parcel": "^2.0.0-dev.1793+9f297b15c"
   },
   "dependencies": {
-    "@parcel/diagnostic": "2.0.0-dev.1789+0b82b13d6",
-    "@parcel/plugin": "2.0.0-dev.1789+0b82b13d6",
-    "@parcel/rust": "2.13.3-dev.3412+0b82b13d6",
+    "@parcel/diagnostic": "2.0.0-dev.1795+9f297b15c",
+    "@parcel/plugin": "2.0.0-dev.1795+9f297b15c",
+    "@parcel/rust": "2.13.3-dev.3418+9f297b15c",
     "@parcel/source-map": "^2.1.1",
-    "@parcel/types": "2.0.0-dev.1789+0b82b13d6",
-    "@parcel/utils": "2.0.0-dev.1789+0b82b13d6",
+    "@parcel/types": "2.0.0-dev.1795+9f297b15c",
+    "@parcel/utils": "2.0.0-dev.1795+9f297b15c",
     "globals": "^13.2.0",
     "nullthrows": "^1.1.1"
   },
-  "gitHead": "0b82b13d6c0dae58ae636983bbd57dbcf94fff89"
+  "gitHead": "9f297b15c3cc3b74136232040b3149f0baae0060"
 }

package/src/DevPackager.js

@@ -220,7 +220,12 @@ export class DevPackager {
     }
 
     if (usedHelpers & 2) {
-      contents += ', ' + JSON.stringify(this.bundle.target.publicUrl);
+      // Ensure the public url always ends with a slash to code can easily join paths to it.
+      let publicUrl = this.bundle.target.publicUrl;
+      if (!publicUrl.endsWith('/')) {
+        publicUrl += '/';
+      }
+      contents += ', ' + JSON.stringify(publicUrl);
     }
 
     contents += ')\n';

package/src/ScopeHoistingPackager.js

@@ -1398,7 +1398,9 @@ ${code}
       let parentBundles = this.bundleGraph.getParentBundles(this.bundle);
       let mightBeFirstJS =
         parentBundles.length === 0 ||
-        parentBundles.some(b => b.type !== 'js') ||
+        parentBundles.some(
+          b => b.type !== 'js' || b.env.context !== this.bundle.env.context,
+        ) ||
         this.bundleGraph
           .getBundleGroupsContainingBundle(this.bundle)
           .some(g => this.bundleGraph.isEntryBundleGroup(g)) ||

package/src/helpers.js

@@ -172,9 +172,12 @@ const $parcel$distDir = (env: Environment, bundle: NamedBundle): string => {
 };
 
 const $parcel$publicUrl = (env: Environment, bundle: NamedBundle): string => {
-  return `var $parcel$publicUrl = ${JSON.stringify(
-    bundle.target.publicUrl,
-  )};\n`;
+  // Ensure the public url always ends with a slash to code can easily join paths to it.
+  let publicUrl = bundle.target.publicUrl;
+  if (!publicUrl.endsWith('/')) {
+    publicUrl += '/';
+  }
+  return `var $parcel$publicUrl = ${JSON.stringify(publicUrl)};\n`;
 };
 
 const $parcel$import = (env: Environment): string => {

package/src/index.js

@@ -60,7 +60,7 @@ export default (new Packager({
       },
     );
 
-    let name = packageName?.contents?.name ?? '';
+    let name = packageName?.contents ?? '';
     return {
       parcelRequireName: 'parcelRequire' + hashString(name).slice(-4),
       unstable_asyncBundleRuntime: Boolean(