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

package/lib/DevPackager.js

@@ -71,7 +71,7 @@ class DevPackager {
     let prefix = this.getPrefix();
     let lineOffset = (0, _utils().countLines)(prefix);
     let script = null;
-    let usedMetaProps = 0;
+    let usedHelpers = 0;
     this.bundle.traverse(node => {
       let wrapped = first ? '' : ',';
       if (node.type === 'dependency') {
@@ -88,8 +88,8 @@ class DevPackager {
       if (node.type === 'asset') {
         let asset = node.value;
         (0, _assert().default)(asset.type === 'js', 'all assets in a js bundle must be js assets');
-        if (typeof asset.meta.importMetaProps === 'number') {
-          usedMetaProps |= asset.meta.importMetaProps;
+        if (typeof asset.meta.usedHelpers === 'number') {
+          usedHelpers |= asset.meta.usedHelpers;
         }
 
         // If this is the main entry of a script rather than a module, we need to hoist it
@@ -159,19 +159,27 @@ class DevPackager {
       });
       mainEntry = null;
     }
+    if (usedHelpers & 4) {
+      prefix = prefix.replace('// INSERT_LOAD_HERE', 'newRequire.load = function (url) { return import(distDir + "/" + url); }');
+    }
     let contents = prefix + '({' + assets + '},' + JSON.stringify(entries.map(asset => this.bundleGraph.getAssetPublicId(asset))) + ', ' + JSON.stringify(mainEntry ? this.bundleGraph.getAssetPublicId(mainEntry) : null) + ', ' + JSON.stringify(this.parcelRequireName);
-    if (usedMetaProps & 1) {
+    if (usedHelpers & 1) {
       // Generate a relative path from this bundle to the root of the dist dir.
       let distDir = (0, _utils().relativePath)(_path().default.dirname(this.bundle.name), '');
       if (distDir.endsWith('/')) {
         distDir = distDir.slice(0, -1);
       }
       contents += ', ' + JSON.stringify(distDir);
-    } else if (usedMetaProps & 2) {
+    } else if (usedHelpers & 2) {
       contents += ', null';
     }
-    if (usedMetaProps & 2) {
-      contents += ', ' + JSON.stringify(this.bundle.target.publicUrl);
+    if (usedHelpers & 2) {
+      // 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

@@ -393,14 +393,17 @@ class ScopeHoistingPackager {
     if (code.includes('$parcel$global')) {
       this.usedHelpers.add('$parcel$global');
     }
-    let importMetaProps = asset.meta.importMetaProps;
-    if (typeof importMetaProps === 'number') {
-      if (importMetaProps & 1) {
+    let usedHelpers = asset.meta.usedHelpers;
+    if (typeof usedHelpers === 'number') {
+      if (usedHelpers & 1) {
         this.usedHelpers.add('$parcel$distDir');
       }
-      if (importMetaProps & 2) {
+      if (usedHelpers & 2) {
         this.usedHelpers.add('$parcel$publicUrl');
       }
+      if (usedHelpers & 4) {
+        this.usedHelpers.add('$parcel$import');
+      }
     }
     if (this.bundle.env.isNode() && asset.meta.has_node_replacements) {
       const relPath = (0, _utils().normalizeSeparators)(_path().default.relative(this.bundle.target.distDir, _path().default.dirname(asset.filePath)));
@@ -1008,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/dev-prelude.js

@@ -112,6 +112,10 @@
     ];
   };
 
+  // Only insert newRequire.load when it is actually used.
+  // The code in this file is linted against ES5, so dynamic import is not allowed.
+  // INSERT_LOAD_HERE
+
   Object.defineProperty(newRequire, 'root', {
     get: function () {
       return globalObject[parcelRequireName];

package/lib/helpers.js

@@ -141,10 +141,18 @@ const $parcel$distDir = (env, bundle) => {
   if (distDir.endsWith('/')) {
     distDir = distDir.slice(0, -1);
   }
-  return `const $parcel$distDir = ${JSON.stringify(distDir)};\n`;
+  return `var $parcel$distDir = ${JSON.stringify(distDir)};\n`;
 };
 const $parcel$publicUrl = (env, bundle) => {
-  return `const $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`;
 };
 const helpers = exports.helpers = {
   $parcel$export,
@@ -153,5 +161,6 @@ const helpers = exports.helpers = {
   $parcel$global,
   $parcel$defineInteropFlag,
   $parcel$distDir,
-  $parcel$publicUrl
+  $parcel$publicUrl,
+  $parcel$import
 };

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.1781+61f02c2f3",
+  "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.1779+61f02c2f3"
+    "parcel": "^2.0.0-dev.1793+9f297b15c"
   },
   "dependencies": {
-    "@parcel/diagnostic": "2.0.0-dev.1781+61f02c2f3",
-    "@parcel/plugin": "2.0.0-dev.1781+61f02c2f3",
-    "@parcel/rust": "2.13.3-dev.3404+61f02c2f3",
+    "@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.1781+61f02c2f3",
-    "@parcel/utils": "2.0.0-dev.1781+61f02c2f3",
+    "@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": "61f02c2f339013deb2ce38ff59edbe15d62e7cb5"
+  "gitHead": "9f297b15c3cc3b74136232040b3149f0baae0060"
 }

package/src/DevPackager.js

@@ -61,7 +61,7 @@ export class DevPackager {
     let lineOffset = countLines(prefix);
     let script: ?{|code: string, mapBuffer: ?Buffer|} = null;
 
-    let usedMetaProps = 0;
+    let usedHelpers = 0;
     this.bundle.traverse(node => {
       let wrapped = first ? '' : ',';
 
@@ -89,8 +89,8 @@ export class DevPackager {
           'all assets in a js bundle must be js assets',
         );
 
-        if (typeof asset.meta.importMetaProps === 'number') {
-          usedMetaProps |= asset.meta.importMetaProps;
+        if (typeof asset.meta.usedHelpers === 'number') {
+          usedHelpers |= asset.meta.usedHelpers;
         }
 
         // If this is the main entry of a script rather than a module, we need to hoist it
@@ -186,6 +186,13 @@ export class DevPackager {
       mainEntry = null;
     }
 
+    if (usedHelpers & 4) {
+      prefix = prefix.replace(
+        '// INSERT_LOAD_HERE',
+        'newRequire.load = function (url) { return import(distDir + "/" + url); }',
+      );
+    }
+
     let contents =
       prefix +
       '({' +
@@ -201,19 +208,24 @@ export class DevPackager {
       ', ' +
       JSON.stringify(this.parcelRequireName);
 
-    if (usedMetaProps & 1) {
+    if (usedHelpers & 1) {
       // Generate a relative path from this bundle to the root of the dist dir.
       let distDir = relativePath(path.dirname(this.bundle.name), '');
       if (distDir.endsWith('/')) {
         distDir = distDir.slice(0, -1);
       }
       contents += ', ' + JSON.stringify(distDir);
-    } else if (usedMetaProps & 2) {
+    } else if (usedHelpers & 2) {
       contents += ', null';
     }
 
-    if (usedMetaProps & 2) {
-      contents += ', ' + JSON.stringify(this.bundle.target.publicUrl);
+    if (usedHelpers & 2) {
+      // 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

@@ -516,14 +516,17 @@ export class ScopeHoistingPackager {
       this.usedHelpers.add('$parcel$global');
     }
 
-    let importMetaProps = asset.meta.importMetaProps;
-    if (typeof importMetaProps === 'number') {
-      if (importMetaProps & 1) {
+    let usedHelpers = asset.meta.usedHelpers;
+    if (typeof usedHelpers === 'number') {
+      if (usedHelpers & 1) {
         this.usedHelpers.add('$parcel$distDir');
       }
-      if (importMetaProps & 2) {
+      if (usedHelpers & 2) {
         this.usedHelpers.add('$parcel$publicUrl');
       }
+      if (usedHelpers & 4) {
+        this.usedHelpers.add('$parcel$import');
+      }
     }
 
     if (this.bundle.env.isNode() && asset.meta.has_node_replacements) {
@@ -1395,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/dev-prelude.js

@@ -112,6 +112,10 @@
     ];
   };
 
+  // Only insert newRequire.load when it is actually used.
+  // The code in this file is linted against ES5, so dynamic import is not allowed.
+  // INSERT_LOAD_HERE
+
   Object.defineProperty(newRequire, 'root', {
     get: function () {
       return globalObject[parcelRequireName];

package/src/helpers.js

@@ -168,12 +168,23 @@ const $parcel$distDir = (env: Environment, bundle: NamedBundle): string => {
   if (distDir.endsWith('/')) {
     distDir = distDir.slice(0, -1);
   }
-  return `const $parcel$distDir = ${JSON.stringify(distDir)};\n`;
+  return `var $parcel$distDir = ${JSON.stringify(distDir)};\n`;
 };
 
 const $parcel$publicUrl = (env: Environment, bundle: NamedBundle): string => {
-  return `const $parcel$publicUrl = ${JSON.stringify(
-    bundle.target.publicUrl,
+  // 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 => {
+  return `var $parcel$import = ${fnExpr(
+    env,
+    ['url'],
+    ['return import($parcel$distDir + "/" + url);'],
   )};\n`;
 };
 
@@ -185,4 +196,5 @@ export const helpers = {
   $parcel$defineInteropFlag,
   $parcel$distDir,
   $parcel$publicUrl,
+  $parcel$import,
 };

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(