@atlaspack/runtime-js 2.14.5-dev.1c70d50f9.99 → 2.14.5-dev.69

package/CHANGELOG.md

@@ -1,43 +1,5 @@
 # @atlaspack/runtime-js
 
-## 2.14.14
-
-### Patch Changes
-
-- Updated dependencies [[`644b157`](https://github.com/atlassian-labs/atlaspack/commit/644b157dee72a871acc2d0facf0b87b8eea51956)]:
-  - @atlaspack/feature-flags@2.18.2
-  - @atlaspack/utils@2.15.2
-  - @atlaspack/plugin@2.14.14
-
-## 2.14.13
-
-### Patch Changes
-
-- [#633](https://github.com/atlassian-labs/atlaspack/pull/633) [`26aa9c5`](https://github.com/atlassian-labs/atlaspack/commit/26aa9c599d2be45ce1438a74c5fa22f39b9b554b) Thanks [@sbhuiyan-atlassian](https://github.com/sbhuiyan-atlassian)! - Ported various HMR changes from Parcel
-
-- Updated dependencies [[`26aa9c5`](https://github.com/atlassian-labs/atlaspack/commit/26aa9c599d2be45ce1438a74c5fa22f39b9b554b), [`0501255`](https://github.com/atlassian-labs/atlaspack/commit/05012550da35b05ce7d356a8cc29311e7f9afdca)]:
-  - @atlaspack/feature-flags@2.18.1
-  - @atlaspack/utils@2.15.1
-  - @atlaspack/plugin@2.14.13
-
-## 2.14.12
-
-### Patch Changes
-
-- Updated dependencies [[`10fbcfb`](https://github.com/atlassian-labs/atlaspack/commit/10fbcfbfa49c7a83da5d7c40983e36e87f524a75), [`85c52d3`](https://github.com/atlassian-labs/atlaspack/commit/85c52d3f7717b3c84a118d18ab98cfbfd71dcbd2), [`e39c6cf`](https://github.com/atlassian-labs/atlaspack/commit/e39c6cf05f7e95ce5420dbcea66f401b1cbd397c)]:
-  - @atlaspack/feature-flags@2.18.0
-  - @atlaspack/utils@2.15.0
-  - @atlaspack/plugin@2.14.12
-
-## 2.14.11
-
-### Patch Changes
-
-- Updated dependencies [[`73ea3c4`](https://github.com/atlassian-labs/atlaspack/commit/73ea3c4d85d4401fdd15abcbf988237e890e7ad3), [`b1b3693`](https://github.com/atlassian-labs/atlaspack/commit/b1b369317c66f8a431c170df2ebba4fa5b2e38ef)]:
-  - @atlaspack/feature-flags@2.17.0
-  - @atlaspack/utils@2.14.11
-  - @atlaspack/plugin@2.14.11
-
 ## 2.14.10
 
 ### Patch Changes

package/lib/JSRuntime.js

@@ -46,7 +46,24 @@ function _featureFlags() {
   };
   return data;
 }
+function _core() {
+  const data = require("@atlaspack/core");
+  _core = function () {
+    return data;
+  };
+  return data;
+}
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const domainShardingImports = (0, _core().isSuperPackage)() ? {
+  specifier: 'atlaspack/lib/domain-sharding.js',
+  helper: './helpers/browser/esm-js-loader-shards-super.js'
+} : {
+  specifier: '@atlaspack/domain-sharding',
+  helper: './helpers/browser/esm-js-loader-shards.js'
+};
+const filename = /*#__ATLASPACK_IGNORE__*/__filename;
+const dirname = /*#__ATLASPACK_IGNORE__*/__dirname;
+
 // Used for as="" in preload/prefetch
 const TYPE_TO_RESOURCE_PRIORITY = {
   css: 'style',
@@ -162,11 +179,9 @@ var _default = exports.default = new (_plugin().Runtime)({
           // If this bundle already has the asset this dependency references,
           // return a simple runtime of `Promise.resolve(internalRequire(assetId))`.
           // The linker handles this for scope-hoisting.
-
-          const requireName = (0, _featureFlags().getFeatureFlag)('hmrImprovements') ? 'parcelRequire' : 'module.bundle.root';
           assets.push({
-            filePath: __filename,
-            code: `module.exports = Promise.resolve(${requireName}(${JSON.stringify(bundleGraph.getAssetPublicId(resolved.value))}))`,
+            filePath: filename,
+            code: `module.exports = Promise.resolve(module.bundle.root(${JSON.stringify(bundleGraph.getAssetPublicId(resolved.value))}))`,
             dependency,
             env: {
               sourceType: 'module'
@@ -179,7 +194,7 @@ var _default = exports.default = new (_plugin().Runtime)({
         let referencedBundle = bundleGraph.getReferencedBundle(dependency, bundle);
         if ((referencedBundle === null || referencedBundle === void 0 ? void 0 : referencedBundle.bundleBehavior) === 'inline') {
           assets.push({
-            filePath: _path().default.join(__dirname, `/bundles/${referencedBundle.id}.js`),
+            filePath: _path().default.join(dirname, `/bundles/${referencedBundle.id}.js`),
             code: `module.exports = Promise.resolve(${JSON.stringify(dependency.id)});`,
             dependency,
             env: {
@@ -207,10 +222,10 @@ var _default = exports.default = new (_plugin().Runtime)({
       // replaced with a reference to this asset to implement the selection.
       const conditions = bundleGraph.getConditionsForDependencies(conditionalDependencies, bundle);
       for (const cond of conditions) {
-        const requireName = (0, _featureFlags().getFeatureFlag)('hmrImprovements') || bundle.env.shouldScopeHoist ? 'parcelRequire' : '__parcel__require__';
+        const requireName = bundle.env.shouldScopeHoist ? 'parcelRequire' : '__parcel__require__';
         const assetCode = `module.exports = require('../helpers/conditional-loader${options.mode === 'development' ? '-dev' : ''}')('${cond.key}', function (){return ${requireName}('${cond.ifTrueAssetId}')}, function (){return ${requireName}('${cond.ifFalseAssetId}')})`;
         assets.push({
-          filePath: _path().default.join(__dirname, `/conditions/${cond.publicId}.js`),
+          filePath: _path().default.join(dirname, `/conditions/${cond.publicId}.js`),
           code: assetCode,
           // This dependency is important, as it's the last symbol handled in scope hoisting.
           // That means that scope hoisting will use the module id for this asset to replace the symbol
@@ -228,7 +243,7 @@ var _default = exports.default = new (_plugin().Runtime)({
       let referencedBundle = bundleGraph.getReferencedBundle(dependency, bundle);
       if ((referencedBundle === null || referencedBundle === void 0 ? void 0 : referencedBundle.bundleBehavior) === 'inline') {
         assets.push({
-          filePath: _path().default.join(__dirname, `/bundles/${referencedBundle.id}.js`),
+          filePath: _path().default.join(dirname, `/bundles/${referencedBundle.id}.js`),
           code: `module.exports = ${JSON.stringify(dependency.id)};`,
           dependency,
           env: {
@@ -245,7 +260,7 @@ var _default = exports.default = new (_plugin().Runtime)({
         // If a URL dependency was not able to be resolved, add a runtime that
         // exports the original specifier.
         assets.push({
-          filePath: __filename,
+          filePath: filename,
           code: `module.exports = ${JSON.stringify(dependency.specifier)}`,
           dependency,
           env: {
@@ -263,6 +278,15 @@ var _default = exports.default = new (_plugin().Runtime)({
         return entries.some(e => bundleGroup.entryAssetId === e.id);
       }));
 
+      // Skip URL runtime for native node imports as they need to be require
+      // directly
+      // Currently enabled only for internal builds
+      if (process.env.ATLASPACK_SUPER_BUILD === 'true') {
+        if (mainBundle.bundleBehavior === 'isolated' && mainBundle.env.context === 'node' && mainBundle.type === 'node') {
+          continue;
+        }
+      }
+
       // Skip URL runtimes for library builds. This is handled in packaging so that
       // the url is inlined and statically analyzable.
       if (bundle.env.isLibrary && mainBundle.bundleBehavior !== 'isolated') {
@@ -290,7 +314,7 @@ var _default = exports.default = new (_plugin().Runtime)({
         let relativePathExpr = getRelativePathExpr(bundle, referencedBundle, options);
         let loaderCode = `require(${JSON.stringify(loader)})(${getAbsoluteUrlExpr(relativePathExpr, bundle, config.domainSharding)})`;
         assets.push({
-          filePath: __filename,
+          filePath: filename,
           code: loaderCode,
           isEntry: true,
           env: {
@@ -301,7 +325,7 @@ var _default = exports.default = new (_plugin().Runtime)({
     }
     if (shouldUseRuntimeManifest(bundle, options) && bundleGraph.getChildBundles(bundle).some(b => b.bundleBehavior !== 'inline') && isNewContext(bundle, bundleGraph)) {
       assets.push({
-        filePath: __filename,
+        filePath: filename,
         code: getRegisterCode(bundle, bundleGraph),
         isEntry: true,
         env: {
@@ -411,7 +435,7 @@ function getLoaderRuntime({
       let publicId = JSON.stringify(to.publicId);
       absoluteUrlExpr = `require('./helpers/bundle-manifest').resolve(${publicId})`;
       if (shardingConfig) {
-        absoluteUrlExpr = `require('@atlaspack/domain-sharding').shardUrl(${absoluteUrlExpr}, ${shardingConfig.maxShards})`;
+        absoluteUrlExpr = `require('${domainShardingImports.specifier}').shardUrl(${absoluteUrlExpr}, ${shardingConfig.maxShards})`;
       }
     } else {
       absoluteUrlExpr = getAbsoluteUrlExpr(relativePathExpr, bundle, shardingConfig);
@@ -490,7 +514,7 @@ function getLoaderRuntime({
     loaderCode = `(${loaderCode})`;
   }
   if (mainBundle.type === 'js') {
-    let parcelRequire = (0, _featureFlags().getFeatureFlag)('hmrImprovements') || bundle.env.shouldScopeHoist ? 'parcelRequire' : 'module.bundle.root';
+    let parcelRequire = bundle.env.shouldScopeHoist ? 'parcelRequire' : 'module.bundle.root';
     loaderCode += `.then(() => ${parcelRequire}('${bundleGraph.getAssetPublicId(bundleGraph.getAssetById(bundleGroup.entryAssetId))}'))`;
   }
   if (needsEsmLoadPrelude && options.featureFlags.importRetry) {
@@ -503,7 +527,7 @@ function getLoaderRuntime({
         });
       }})`;
     return {
-      filePath: __filename,
+      filePath: filename,
       code: loaderCode,
       dependency,
       env: {
@@ -513,12 +537,12 @@ function getLoaderRuntime({
   }
   let code = [];
   if (needsEsmLoadPrelude) {
-    let preludeLoad = shardingConfig ? `let load = require('./helpers/browser/esm-js-loader-shards')(${shardingConfig.maxShards});` : `let load = require('./helpers/browser/esm-js-loader');`;
+    let preludeLoad = shardingConfig ? `let load = require('${domainShardingImports.helper}')(${shardingConfig.maxShards});` : `let load = require('./helpers/browser/esm-js-loader');`;
     code.push(preludeLoad);
   }
   code.push(`module.exports = ${loaderCode};`);
   return {
-    filePath: __filename,
+    filePath: filename,
     code: code.join('\n'),
     dependency,
     env: {
@@ -573,12 +597,7 @@ function isNewContext(bundle, bundleGraph) {
   return isInEntryBundleGroup || parents.length === 0 || parents.some(parent => parent.env.context !== bundle.env.context || parent.type !== 'js');
 }
 function getURLRuntime(dependency, from, to, options, shardingConfig) {
-  let relativePathExpr;
-  if ((0, _featureFlags().getFeatureFlag)('hmrImprovements')) {
-    relativePathExpr = getRelativePathExpr(from, to, options, true);
-  } else {
-    relativePathExpr = getRelativePathExpr(from, to, options);
-  }
+  let relativePathExpr = getRelativePathExpr(from, to, options);
   let code;
   if (dependency.meta.webworker === true && !from.env.isLibrary) {
     code = `let workerURL = require('./helpers/get-worker-url');\n`;
@@ -589,7 +608,7 @@ function getURLRuntime(dependency, from, to, options, shardingConfig) {
       code += `let bundleURL = require('./helpers/bundle-url');\n`;
       code += `let url = bundleURL.getBundleURL('${from.publicId}') + ${relativePathExpr};`;
       if (shardingConfig) {
-        code += `url = require('@atlaspack/domain-sharding').shardUrl(url, ${shardingConfig.maxShards});`;
+        code += `url = require('${domainShardingImports.specifier}').shardUrl(url, ${shardingConfig.maxShards});`;
       }
       code += `module.exports = workerURL(url, bundleURL.getOrigin(url), ${String(from.env.outputFormat === 'esmodule')});`;
     }
@@ -597,7 +616,7 @@ function getURLRuntime(dependency, from, to, options, shardingConfig) {
     code = `module.exports = ${getAbsoluteUrlExpr(relativePathExpr, from, shardingConfig)};`;
   }
   return {
-    filePath: __filename,
+    filePath: filename,
     code,
     dependency,
     env: {
@@ -632,19 +651,13 @@ function getRegisterCode(entryBundle, bundleGraph) {
   : `require('./helpers/bundle-url').getBundleURL('${entryBundle.publicId}')`;
   return `require('./helpers/bundle-manifest').register(${baseUrl},JSON.parse(${JSON.stringify(JSON.stringify(mappings))}));`;
 }
-function getRelativePathExpr(from, to, options, isURL = to.type !== 'js') {
+function getRelativePathExpr(from, to, options) {
   let relativePath = (0, _utils().relativeBundlePath)(from, to, {
     leadingDotSlash: false
   });
   let res = JSON.stringify(relativePath);
-  if ((0, _featureFlags().getFeatureFlag)('hmrImprovements')) {
-    if (isURL && options.hmrOptions) {
-      res += ' + "?" + Date.now()';
-    }
-  } else {
-    if (options.hmrOptions) {
-      res += ' + "?" + Date.now()';
-    }
+  if (options.hmrOptions) {
+    res += ' + "?" + Date.now()';
   }
   return res;
 }
@@ -657,7 +670,7 @@ function getAbsoluteUrlExpr(relativePathExpr, fromBundle, shardingConfig) {
   if (!shardingConfig) {
     return regularBundleUrl;
   }
-  return `require('@atlaspack/domain-sharding').shardUrl(${regularBundleUrl}, ${shardingConfig.maxShards})`;
+  return `require('${domainShardingImports.specifier}').shardUrl(${regularBundleUrl}, ${shardingConfig.maxShards})`;
 }
 function shouldUseRuntimeManifest(bundle, options) {
   let env = bundle.env;

package/lib/helpers/browser/esm-js-loader-shards-super.js

@@ -0,0 +1,7 @@
+"use strict";
+
+let load = maxShards => id => {
+  // eslint-disable-next-line no-undef
+  return __parcel__import__(require('atlaspack/lib/domain-sharding').shardUrl(require('../bundle-manifest').resolve(id), maxShards));
+};
+module.exports = load;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/runtime-js",
-  "version": "2.14.5-dev.1c70d50f9.99+1c70d50f9",
+  "version": "2.14.5-dev.69+67cb517ae",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -11,17 +11,20 @@
   },
   "main": "lib/JSRuntime.js",
   "source": "src/JSRuntime.js",
+  "atlaspackReferences": [
+    "./src/helpers/**/*"
+  ],
   "engines": {
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-dev.1c70d50f9.167+1c70d50f9",
-    "@atlaspack/domain-sharding": "2.14.1-dev.1c70d50f9.167+1c70d50f9",
-    "@atlaspack/feature-flags": "2.14.1-dev.1c70d50f9.167+1c70d50f9",
-    "@atlaspack/plugin": "2.14.5-dev.1c70d50f9.99+1c70d50f9",
-    "@atlaspack/utils": "2.14.5-dev.1c70d50f9.99+1c70d50f9",
+    "@atlaspack/diagnostic": "2.14.1-dev.137+67cb517ae",
+    "@atlaspack/domain-sharding": "2.14.1-dev.137+67cb517ae",
+    "@atlaspack/feature-flags": "2.14.1-dev.137+67cb517ae",
+    "@atlaspack/plugin": "2.14.5-dev.69+67cb517ae",
+    "@atlaspack/utils": "2.14.5-dev.69+67cb517ae",
     "nullthrows": "^1.1.1"
   },
   "type": "commonjs",
-  "gitHead": "1c70d50f914cb662515b0b61053e51a06f3af234"
+  "gitHead": "67cb517ae793046fb5a0d2ef02ba74510fefccf3"
 }

package/src/JSRuntime.js

@@ -19,6 +19,20 @@ import {encodeJSONKeyComponent} from '@atlaspack/diagnostic';
 import path from 'path';
 import nullthrows from 'nullthrows';
 import {getFeatureFlag} from '@atlaspack/feature-flags';
+import {isSuperPackage} from '@atlaspack/core';
+
+const domainShardingImports = isSuperPackage()
+  ? {
+      specifier: 'atlaspack/lib/domain-sharding.js',
+      helper: './helpers/browser/esm-js-loader-shards-super.js',
+    }
+  : {
+      specifier: '@atlaspack/domain-sharding',
+      helper: './helpers/browser/esm-js-loader-shards.js',
+    };
+
+const filename = /*#__ATLASPACK_IGNORE__*/ __filename;
+const dirname = /*#__ATLASPACK_IGNORE__*/ __dirname;
 
 // Used for as="" in preload/prefetch
 const TYPE_TO_RESOURCE_PRIORITY = {
@@ -156,14 +170,9 @@ export default (new Runtime({
           // If this bundle already has the asset this dependency references,
           // return a simple runtime of `Promise.resolve(internalRequire(assetId))`.
           // The linker handles this for scope-hoisting.
-
-          const requireName = getFeatureFlag('hmrImprovements')
-            ? 'parcelRequire'
-            : 'module.bundle.root';
-
           assets.push({
-            filePath: __filename,
-            code: `module.exports = Promise.resolve(${requireName}(${JSON.stringify(
+            filePath: filename,
+            code: `module.exports = Promise.resolve(module.bundle.root(${JSON.stringify(
               bundleGraph.getAssetPublicId(resolved.value),
             )}))`,
             dependency,
@@ -179,10 +188,7 @@ export default (new Runtime({
         );
         if (referencedBundle?.bundleBehavior === 'inline') {
           assets.push({
-            filePath: path.join(
-              __dirname,
-              `/bundles/${referencedBundle.id}.js`,
-            ),
+            filePath: path.join(dirname, `/bundles/${referencedBundle.id}.js`),
             code: `module.exports = Promise.resolve(${JSON.stringify(
               dependency.id,
             )});`,
@@ -216,10 +222,9 @@ export default (new Runtime({
         bundle,
       );
       for (const cond of conditions) {
-        const requireName =
-          getFeatureFlag('hmrImprovements') || bundle.env.shouldScopeHoist
-            ? 'parcelRequire'
-            : '__parcel__require__';
+        const requireName = bundle.env.shouldScopeHoist
+          ? 'parcelRequire'
+          : '__parcel__require__';
 
         const assetCode = `module.exports = require('../helpers/conditional-loader${
           options.mode === 'development' ? '-dev' : ''
@@ -228,7 +233,7 @@ export default (new Runtime({
         }')}, function (){return ${requireName}('${cond.ifFalseAssetId}')})`;
 
         assets.push({
-          filePath: path.join(__dirname, `/conditions/${cond.publicId}.js`),
+          filePath: path.join(dirname, `/conditions/${cond.publicId}.js`),
           code: assetCode,
           // This dependency is important, as it's the last symbol handled in scope hoisting.
           // That means that scope hoisting will use the module id for this asset to replace the symbol
@@ -248,7 +253,7 @@ export default (new Runtime({
       );
       if (referencedBundle?.bundleBehavior === 'inline') {
         assets.push({
-          filePath: path.join(__dirname, `/bundles/${referencedBundle.id}.js`),
+          filePath: path.join(dirname, `/bundles/${referencedBundle.id}.js`),
           code: `module.exports = ${JSON.stringify(dependency.id)};`,
           dependency,
           env: {sourceType: 'module'},
@@ -263,7 +268,7 @@ export default (new Runtime({
         // If a URL dependency was not able to be resolved, add a runtime that
         // exports the original specifier.
         assets.push({
-          filePath: __filename,
+          filePath: filename,
           code: `module.exports = ${JSON.stringify(dependency.specifier)}`,
           dependency,
           env: {sourceType: 'module'},
@@ -283,6 +288,19 @@ export default (new Runtime({
         }),
       );
 
+      // Skip URL runtime for native node imports as they need to be require
+      // directly
+      // Currently enabled only for internal builds
+      if (process.env.ATLASPACK_SUPER_BUILD === 'true') {
+        if (
+          mainBundle.bundleBehavior === 'isolated' &&
+          mainBundle.env.context === 'node' &&
+          mainBundle.type === 'node'
+        ) {
+          continue;
+        }
+      }
+
       // Skip URL runtimes for library builds. This is handled in packaging so that
       // the url is inlined and statically analyzable.
       if (bundle.env.isLibrary && mainBundle.bundleBehavior !== 'isolated') {
@@ -330,7 +348,7 @@ export default (new Runtime({
           config.domainSharding,
         )})`;
         assets.push({
-          filePath: __filename,
+          filePath: filename,
           code: loaderCode,
           isEntry: true,
           env: {sourceType: 'module'},
@@ -346,7 +364,7 @@ export default (new Runtime({
       isNewContext(bundle, bundleGraph)
     ) {
       assets.push({
-        filePath: __filename,
+        filePath: filename,
         code: getRegisterCode(bundle, bundleGraph),
         isEntry: true,
         env: {sourceType: 'module'},
@@ -495,7 +513,7 @@ function getLoaderRuntime({
       absoluteUrlExpr = `require('./helpers/bundle-manifest').resolve(${publicId})`;
 
       if (shardingConfig) {
-        absoluteUrlExpr = `require('@atlaspack/domain-sharding').shardUrl(${absoluteUrlExpr}, ${shardingConfig.maxShards})`;
+        absoluteUrlExpr = `require('${domainShardingImports.specifier}').shardUrl(${absoluteUrlExpr}, ${shardingConfig.maxShards})`;
       }
     } else {
       absoluteUrlExpr = getAbsoluteUrlExpr(
@@ -672,11 +690,9 @@ function getLoaderRuntime({
   }
 
   if (mainBundle.type === 'js') {
-    let parcelRequire =
-      getFeatureFlag('hmrImprovements') || bundle.env.shouldScopeHoist
-        ? 'parcelRequire'
-        : 'module.bundle.root';
-
+    let parcelRequire = bundle.env.shouldScopeHoist
+      ? 'parcelRequire'
+      : 'module.bundle.root';
     loaderCode += `.then(() => ${parcelRequire}('${bundleGraph.getAssetPublicId(
       bundleGraph.getAssetById(bundleGroup.entryAssetId),
     )}'))`;
@@ -693,7 +709,7 @@ function getLoaderRuntime({
       }})`;
 
     return {
-      filePath: __filename,
+      filePath: filename,
       code: loaderCode,
       dependency,
       env: {sourceType: 'module'},
@@ -704,7 +720,7 @@ function getLoaderRuntime({
 
   if (needsEsmLoadPrelude) {
     let preludeLoad = shardingConfig
-      ? `let load = require('./helpers/browser/esm-js-loader-shards')(${shardingConfig.maxShards});`
+      ? `let load = require('${domainShardingImports.helper}')(${shardingConfig.maxShards});`
       : `let load = require('./helpers/browser/esm-js-loader');`;
 
     code.push(preludeLoad);
@@ -713,7 +729,7 @@ function getLoaderRuntime({
   code.push(`module.exports = ${loaderCode};`);
 
   return {
-    filePath: __filename,
+    filePath: filename,
     code: code.join('\n'),
     dependency,
     env: {sourceType: 'module'},
@@ -809,12 +825,7 @@ function getURLRuntime(
   options: PluginOptions,
   shardingConfig: JSRuntimeConfig['domainSharding'],
 ): RuntimeAsset {
-  let relativePathExpr;
-  if (getFeatureFlag('hmrImprovements')) {
-    relativePathExpr = getRelativePathExpr(from, to, options, true);
-  } else {
-    relativePathExpr = getRelativePathExpr(from, to, options);
-  }
+  let relativePathExpr = getRelativePathExpr(from, to, options);
   let code;
 
   if (dependency.meta.webworker === true && !from.env.isLibrary) {
@@ -831,7 +842,7 @@ function getURLRuntime(
       code += `let bundleURL = require('./helpers/bundle-url');\n`;
       code += `let url = bundleURL.getBundleURL('${from.publicId}') + ${relativePathExpr};`;
       if (shardingConfig) {
-        code += `url = require('@atlaspack/domain-sharding').shardUrl(url, ${shardingConfig.maxShards});`;
+        code += `url = require('${domainShardingImports.specifier}').shardUrl(url, ${shardingConfig.maxShards});`;
       }
       code += `module.exports = workerURL(url, bundleURL.getOrigin(url), ${String(
         from.env.outputFormat === 'esmodule',
@@ -846,7 +857,7 @@ function getURLRuntime(
   }
 
   return {
-    filePath: __filename,
+    filePath: filename,
     code,
     dependency,
     env: {sourceType: 'module'},
@@ -902,18 +913,11 @@ function getRelativePathExpr(
   from: NamedBundle,
   to: NamedBundle,
   options: PluginOptions,
-  isURL = to.type !== 'js',
 ): string {
   let relativePath = relativeBundlePath(from, to, {leadingDotSlash: false});
   let res = JSON.stringify(relativePath);
-  if (getFeatureFlag('hmrImprovements')) {
-    if (isURL && options.hmrOptions) {
-      res += ' + "?" + Date.now()';
-    }
-  } else {
-    if (options.hmrOptions) {
-      res += ' + "?" + Date.now()';
-    }
+  if (options.hmrOptions) {
+    res += ' + "?" + Date.now()';
   }
 
   return res;
@@ -939,7 +943,7 @@ function getAbsoluteUrlExpr(
     return regularBundleUrl;
   }
 
-  return `require('@atlaspack/domain-sharding').shardUrl(${regularBundleUrl}, ${shardingConfig.maxShards})`;
+  return `require('${domainShardingImports.specifier}').shardUrl(${regularBundleUrl}, ${shardingConfig.maxShards})`;
 }
 
 function shouldUseRuntimeManifest(

package/src/helpers/browser/esm-js-loader-shards-super.js

@@ -0,0 +1,11 @@
+let load = (maxShards) => (id) => {
+  // eslint-disable-next-line no-undef
+  return __parcel__import__(
+    require('atlaspack/lib/domain-sharding').shardUrl(
+      require('../bundle-manifest').resolve(id),
+      maxShards,
+    ),
+  );
+};
+
+module.exports = load;