@atlaspack/runtime-js 2.14.5-canary.49 → 2.14.5-canary.491

package/src/{JSRuntime.js → JSRuntime.ts}

@@ -1,4 +1,3 @@
-// @flow strict-local
 import type {
   BundleGraph,
   BundleGroup,
@@ -7,13 +6,13 @@ import type {
   PluginOptions,
   NamedBundle,
   RuntimeAsset,
-} from '@atlaspack/types';
+} from '@atlaspack/types-internal';
 
 import {Runtime} from '@atlaspack/plugin';
 import {
   relativeBundlePath,
   validateSchema,
-  type SchemaEntity,
+  SchemaEntity,
 } from '@atlaspack/utils';
 import {encodeJSONKeyComponent} from '@atlaspack/diagnostic';
 import path from 'path';
@@ -24,7 +23,7 @@ import {getFeatureFlag} from '@atlaspack/feature-flags';
 const TYPE_TO_RESOURCE_PRIORITY = {
   css: 'style',
   js: 'script',
-};
+} as const;
 
 const BROWSER_PRELOAD_LOADER = './helpers/browser/preload-loader';
 const BROWSER_PREFETCH_LOADER = './helpers/browser/prefetch-loader';
@@ -49,13 +48,20 @@ const LOADERS = {
     wasm: './helpers/node/wasm-loader',
     IMPORT_POLYFILL: null,
   },
-};
+} as const;
 
-function getLoaders(
-  ctx: Environment,
-): ?{[string]: string, IMPORT_POLYFILL: null | false | string, ...} {
-  if (ctx.isWorker()) return LOADERS.worker;
+function getLoaders(ctx: Environment):
+  | {
+      // @ts-expect-error TS2411
+      IMPORT_POLYFILL: null | false | string;
+      [key: string]: string;
+    }
+  | null
+  | undefined {
+  // @ts-expect-error TS2322
+  if (ctx.isWorker() || ctx.isTesseract()) return LOADERS.worker;
   if (ctx.isBrowser()) return LOADERS.browser;
+  // @ts-expect-error TS2322
   if (ctx.isNode()) return LOADERS.node;
   return null;
 }
@@ -64,19 +70,19 @@ function getLoaders(
 // This can happen when we reuse the BundleGraph between subsequent builds
 let bundleDependencies = new WeakMap<
   NamedBundle,
-  {|
-    asyncDependencies: Array<Dependency>,
-    conditionalDependencies: Array<Dependency>,
-    otherDependencies: Array<Dependency>,
-  |},
+  {
+    asyncDependencies: Array<Dependency>;
+    conditionalDependencies: Array<Dependency>;
+    otherDependencies: Array<Dependency>;
+  }
 >();
 
-type JSRuntimeConfig = {|
-  splitManifestThreshold: number,
-  domainSharding?: {|
-    maxShards: number,
-  |},
-|};
+type JSRuntimeConfig = {
+  splitManifestThreshold: number;
+  domainSharding?: {
+    maxShards: number;
+  };
+};
 
 let defaultConfig: JSRuntimeConfig = {
   splitManifestThreshold: 100000,
@@ -102,7 +108,7 @@ const CONFIG_SCHEMA: SchemaEntity = {
   additionalProperties: false,
 };
 
-export default (new Runtime({
+export default new Runtime({
   async loadConfig({config, options}): Promise<JSRuntimeConfig> {
     let packageKey = '@atlaspack/runtime-js';
     let conf = await config.getConfig<JSRuntimeConfig>([], {
@@ -144,7 +150,7 @@ export default (new Runtime({
     let {asyncDependencies, conditionalDependencies, otherDependencies} =
       getDependencies(bundle);
 
-    let assets = [];
+    let assets: Array<RuntimeAsset> = [];
     for (let dependency of asyncDependencies) {
       let resolved = bundleGraph.resolveAsyncDependency(dependency, bundle);
       if (resolved == null) {
@@ -156,13 +162,25 @@ 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(module.bundle.root(${JSON.stringify(
+            code: `module.exports = Promise.resolve(${requireName}(${JSON.stringify(
               bundleGraph.getAssetPublicId(resolved.value),
             )}))`,
             dependency,
             env: {sourceType: 'module'},
+            // Pre-computed symbols: exports Promise, no external dependencies (uses global)
+            symbolData: {
+              symbols: new Map([
+                ['default', {local: 'module.exports', loc: null}],
+              ]),
+              dependencies: [],
+            },
           });
         }
       } else {
@@ -172,7 +190,10 @@ export default (new Runtime({
           dependency,
           bundle,
         );
-        if (referencedBundle?.bundleBehavior === 'inline') {
+        if (
+          referencedBundle?.bundleBehavior === 'inline' ||
+          referencedBundle?.bundleBehavior === 'inlineIsolated'
+        ) {
           assets.push({
             filePath: path.join(
               __dirname,
@@ -183,6 +204,13 @@ export default (new Runtime({
             )});`,
             dependency,
             env: {sourceType: 'module'},
+            // Pre-computed symbols: exports Promise, no external dependencies
+            symbolData: {
+              symbols: new Map([
+                ['default', {local: 'module.exports', loc: null}],
+              ]),
+              dependencies: [],
+            },
           });
           continue;
         }
@@ -211,24 +239,98 @@ export default (new Runtime({
         bundle,
       );
       for (const cond of conditions) {
-        const requireName = bundle.env.shouldScopeHoist
-          ? 'parcelRequire'
-          : '__parcel__require__';
-
-        const assetCode = `module.exports = require('../helpers/conditional-loader${
+        const requireName =
+          getFeatureFlag('hmrImprovements') || bundle.env.shouldScopeHoist
+            ? 'parcelRequire'
+            : '__parcel__require__';
+
+        // We have fallback behaviour that can be used in development mode, so we need to handle both types of packagers
+        const getFallbackArgs = (cond: {
+          ifTrueBundles: NamedBundle[];
+          ifFalseBundles: NamedBundle[];
+        }) => {
+          const fallbackUrls = () => {
+            return `urls: [${[...cond.ifTrueBundles, ...cond.ifFalseBundles]
+              .map((target) => {
+                let relativePathExpr = getRelativePathExpr(
+                  bundle,
+                  target,
+                  options,
+                );
+                return getAbsoluteUrlExpr(
+                  relativePathExpr,
+                  bundle,
+                  config.domainSharding,
+                );
+              })
+              .join(',')}]`;
+          };
+
+          const fallbackBundleIds = () => {
+            return `i: [${[...cond.ifTrueBundles, ...cond.ifFalseBundles]
+              .map((target) => `"${target.publicId}"`)
+              .join(',')}]`;
+          };
+
+          return `, {l: require('./helpers/browser/sync-js-loader'), ${
+            options.mode === 'development'
+              ? fallbackUrls()
+              : fallbackBundleIds()
+          }}`;
+        };
+
+        const shouldUseFallback =
+          options.mode === 'development'
+            ? getFeatureFlag('condbDevFallbackDev')
+            : getFeatureFlag('condbDevFallbackProd');
+
+        const loaderPath = `./helpers/conditional-loader${
           options.mode === 'development' ? '-dev' : ''
-        }')('${cond.key}', function (){return ${requireName}('${
-          cond.ifTrueAssetId
-        }')}, function (){return ${requireName}('${cond.ifFalseAssetId}')})`;
+        }`;
+
+        const ifTrue = `function (){return ${requireName}('${cond.ifTrueAssetId}')}`;
+        const ifFalse = `function (){return ${requireName}('${cond.ifFalseAssetId}')}`;
+
+        const assetCode = `module.exports = require('${loaderPath}')('${
+          cond.key
+        }', ${ifTrue}, ${ifFalse}${
+          shouldUseFallback ? getFallbackArgs(cond) : ''
+        })`;
 
         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
           // (rather than the actual conditional deps)
           dependency: cond.ifFalseDependency,
           env: {sourceType: 'module'},
+          // Pre-computed symbols: conditional loader with potential sync-js-loader fallback
+          symbolData: {
+            symbols: new Map([
+              ['default', {local: 'module.exports', loc: null}],
+            ]),
+            dependencies: [
+              {
+                specifier: loaderPath,
+                symbols: new Map([
+                  ['default', {local: 'default', loc: null, isWeak: false}],
+                ]),
+                usedSymbols: new Set(['default']),
+              },
+              ...(shouldUseFallback
+                ? [
+                    {
+                      specifier: './helpers/browser/sync-js-loader',
+                      symbols: new Map([
+                        ['default', {local: 'l', loc: null, isWeak: false}],
+                      ]),
+                      usedSymbols: new Set(['default']),
+                    },
+                  ]
+                : []),
+            ],
+          },
         });
       }
     }
@@ -240,12 +342,22 @@ export default (new Runtime({
         dependency,
         bundle,
       );
-      if (referencedBundle?.bundleBehavior === 'inline') {
+      if (
+        referencedBundle?.bundleBehavior === 'inline' ||
+        referencedBundle?.bundleBehavior === 'inlineIsolated'
+      ) {
         assets.push({
           filePath: path.join(__dirname, `/bundles/${referencedBundle.id}.js`),
           code: `module.exports = ${JSON.stringify(dependency.id)};`,
           dependency,
           env: {sourceType: 'module'},
+          // Pre-computed symbols: simple export with no dependencies
+          symbolData: {
+            symbols: new Map([
+              ['default', {local: 'module.exports', loc: null}],
+            ]),
+            dependencies: [],
+          },
         });
         continue;
       }
@@ -261,6 +373,13 @@ export default (new Runtime({
           code: `module.exports = ${JSON.stringify(dependency.specifier)}`,
           dependency,
           env: {sourceType: 'module'},
+          // Pre-computed symbols: simple export with no dependencies
+          symbolData: {
+            symbols: new Map([
+              ['default', {local: 'module.exports', loc: null}],
+            ]),
+            dependencies: [],
+          },
         });
         continue;
       }
@@ -279,7 +398,11 @@ export default (new Runtime({
 
       // 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') {
+      if (
+        bundle.env.isLibrary &&
+        mainBundle.bundleBehavior !== 'isolated' &&
+        mainBundle.bundleBehavior !== 'inlineIsolated'
+      ) {
         continue;
       }
 
@@ -328,6 +451,19 @@ export default (new Runtime({
           code: loaderCode,
           isEntry: true,
           env: {sourceType: 'module'},
+          // Pre-computed symbols: lazy bundle loader, requires specific loader helper
+          symbolData: {
+            symbols: new Map(), // No exports, just side effects
+            dependencies: [
+              {
+                specifier: loader,
+                symbols: new Map([
+                  ['default', {local: 'default', loc: null, isWeak: false}],
+                ]),
+                usedSymbols: new Set(['default']),
+              },
+            ],
+          },
         });
       }
     }
@@ -336,7 +472,11 @@ export default (new Runtime({
       shouldUseRuntimeManifest(bundle, options) &&
       bundleGraph
         .getChildBundles(bundle)
-        .some((b) => b.bundleBehavior !== 'inline') &&
+        .some(
+          (b) =>
+            b.bundleBehavior !== 'inline' &&
+            b.bundleBehavior !== 'inlineIsolated',
+        ) &&
       isNewContext(bundle, bundleGraph)
     ) {
       assets.push({
@@ -344,31 +484,45 @@ export default (new Runtime({
         code: getRegisterCode(bundle, bundleGraph),
         isEntry: true,
         env: {sourceType: 'module'},
+        runtimeAssetRequiringExecutionOnLoad: true,
         priority: getManifestBundlePriority(
           bundleGraph,
           bundle,
           config.splitManifestThreshold,
         ),
+        // Pre-computed symbols: requires bundle-manifest helper
+        symbolData: {
+          symbols: new Map(), // No exports, just executes
+          dependencies: [
+            {
+              specifier: './helpers/bundle-manifest',
+              symbols: new Map([
+                ['register', {local: 'register', loc: null, isWeak: false}],
+              ]),
+              usedSymbols: new Set(['register']),
+            },
+          ],
+        },
       });
     }
 
     return assets;
   },
-}): Runtime);
+}) as Runtime<JSRuntimeConfig>;
 
-function getDependencies(bundle: NamedBundle): {|
-  asyncDependencies: Array<Dependency>,
-  conditionalDependencies: Array<Dependency>,
-  otherDependencies: Array<Dependency>,
-|} {
+function getDependencies(bundle: NamedBundle): {
+  asyncDependencies: Array<Dependency>;
+  conditionalDependencies: Array<Dependency>;
+  otherDependencies: Array<Dependency>;
+} {
   let cachedDependencies = bundleDependencies.get(bundle);
 
   if (cachedDependencies) {
     return cachedDependencies;
   } else {
-    let asyncDependencies = [];
-    let otherDependencies = [];
-    let conditionalDependencies = [];
+    let asyncDependencies: Array<Dependency> = [];
+    let otherDependencies: Array<Dependency> = [];
+    let conditionalDependencies: Array<Dependency> = [];
     bundle.traverse((node) => {
       if (node.type !== 'dependency') {
         return;
@@ -402,25 +556,35 @@ function getLoaderRuntime({
   bundleGraph,
   options,
   shardingConfig,
-}: {|
-  bundle: NamedBundle,
-  dependency: Dependency,
-  bundleGroup: BundleGroup,
-  bundleGraph: BundleGraph<NamedBundle>,
-  options: PluginOptions,
-  shardingConfig: JSRuntimeConfig['domainSharding'],
-|}): ?RuntimeAsset {
+}: {
+  bundle: NamedBundle;
+  dependency: Dependency;
+  bundleGroup: BundleGroup;
+  bundleGraph: BundleGraph<NamedBundle>;
+  options: PluginOptions;
+  shardingConfig: JSRuntimeConfig['domainSharding'];
+}): RuntimeAsset | null | undefined {
   let loaders = getLoaders(bundle.env);
   if (loaders == null) {
     return;
   }
 
   let externalBundles = bundleGraph.getBundlesInBundleGroup(bundleGroup);
-  let mainBundle = nullthrows(
-    externalBundles.find(
+  let potentialMainBundle;
+
+  if (getFeatureFlag('supportWebpackChunkName')) {
+    potentialMainBundle = externalBundles.find((bundle) =>
+      bundle
+        .getEntryAssets()
+        .some((asset) => asset.id === bundleGroup.entryAssetId),
+    );
+  } else {
+    potentialMainBundle = externalBundles.find(
       (bundle) => bundle.getMainEntry()?.id === bundleGroup.entryAssetId,
-    ),
-  );
+    );
+  }
+
+  let mainBundle = nullthrows(potentialMainBundle);
 
   // CommonJS is a synchronous module system, so there is no need to load bundles in parallel.
   // Importing of the other bundles will be handled by the bundle group entry.
@@ -451,7 +615,8 @@ function getLoaderRuntime({
     bundle: NamedBundle,
     to: NamedBundle,
     shardingConfig: JSRuntimeConfig['domainSharding'],
-  ): string | void {
+  ): string | undefined {
+    // @ts-expect-error TS18049
     let loader = loaders[to.type];
     if (!loader) {
       return;
@@ -475,7 +640,9 @@ function getLoaderRuntime({
         return `__parcel__import__("./" + ${relativePathExpr})`;
       }
 
+      // @ts-expect-error TS2322
       loader = nullthrows(
+        // @ts-expect-error TS18049
         loaders.IMPORT_POLYFILL,
         `No import() polyfill available for context '${bundle.env.context}'`,
       );
@@ -528,7 +695,7 @@ function getLoaderRuntime({
       sourceBundle,
     );
 
-    const loaders = [];
+    const loaders: Array<string> = [];
     for (const cond of conditions) {
       // This bundle has a conditional dependency, we need to load the bundle group
       const ifTrueLoaders = cond.ifTrueBundles
@@ -539,7 +706,9 @@ function getLoaderRuntime({
           ),
         )
         .concat(
+          // @ts-expect-error TS2769
           cond.ifTrueBundles.map((targetBundle) =>
+            // @ts-expect-error TS2554
             getLoaderForBundle(sourceBundle, targetBundle),
           ),
         );
@@ -552,7 +721,9 @@ function getLoaderRuntime({
           ),
         )
         .concat(
+          // @ts-expect-error TS2769
           cond.ifFalseBundles.map((targetBundle) =>
+            // @ts-expect-error TS2554
             getLoaderForBundle(sourceBundle, targetBundle),
           ),
         );
@@ -577,46 +748,13 @@ function getLoaderRuntime({
   }
 
   if (getFeatureFlag('conditionalBundlingApi')) {
-    if (getFeatureFlag('conditionalBundlingNestedRuntime')) {
-      let conditionalDependencies = externalBundles.flatMap(
-        (to) => getDependencies(to).conditionalDependencies,
-      );
-
-      loaderModules.push(
-        ...getConditionalLoadersForCondition(conditionalDependencies, bundle),
-      );
-    } else {
-      let conditionalDependencies = externalBundles.flatMap(
-        (to) => getDependencies(to).conditionalDependencies,
-      );
-      for (const cond of bundleGraph.getConditionsForDependencies(
-        conditionalDependencies,
-        bundle,
-      )) {
-        // This bundle has a conditional dependency, we need to load the bundle group
-        const ifTrueLoaders = cond.ifTrueBundles.map((targetBundle) =>
-          getLoaderForBundle(bundle, targetBundle),
-        );
-        const ifFalseLoaders = cond.ifFalseBundles.map((targetBundle) =>
-          getLoaderForBundle(bundle, targetBundle),
-        );
+    let conditionalDependencies = externalBundles.flatMap(
+      (to) => getDependencies(to).conditionalDependencies,
+    );
 
-        if (ifTrueLoaders.length > 0 || ifFalseLoaders.length > 0) {
-          // Load conditional bundles with helper (and a dev mode with additional hints)
-          loaderModules.push(
-            `require('./helpers/conditional-loader${
-              options.mode === 'development' ? '-dev' : ''
-            }')('${
-              cond.key
-            }', function (){return Promise.all([${ifTrueLoaders.join(
-              ',',
-            )}]);}, function (){return Promise.all([${ifFalseLoaders.join(
-              ',',
-            )}]);})`,
-          );
-        }
-      }
-    }
+    loaderModules.push(
+      ...getConditionalLoadersForCondition(conditionalDependencies, bundle),
+    );
   }
 
   for (let to of externalBundles) {
@@ -666,9 +804,11 @@ function getLoaderRuntime({
   }
 
   if (mainBundle.type === 'js') {
-    let parcelRequire = bundle.env.shouldScopeHoist
-      ? 'parcelRequire'
-      : 'module.bundle.root';
+    let parcelRequire =
+      getFeatureFlag('hmrImprovements') || bundle.env.shouldScopeHoist
+        ? 'parcelRequire'
+        : 'module.bundle.root';
+
     loaderCode += `.then(() => ${parcelRequire}('${bundleGraph.getAssetPublicId(
       bundleGraph.getAssetById(bundleGroup.entryAssetId),
     )}'))`;
@@ -689,10 +829,23 @@ function getLoaderRuntime({
       code: loaderCode,
       dependency,
       env: {sourceType: 'module'},
+      // Pre-computed symbols: ESM loader with retry, requires esm-js-loader-retry helper
+      symbolData: {
+        symbols: new Map([['default', {local: 'module.exports', loc: null}]]),
+        dependencies: [
+          {
+            specifier: './helpers/browser/esm-js-loader-retry',
+            symbols: new Map([
+              ['default', {local: 'default', loc: null, isWeak: false}],
+            ]),
+            usedSymbols: new Set(['default']),
+          },
+        ],
+      },
     };
   }
 
-  let code = [];
+  let code: Array<string> = [];
 
   if (needsEsmLoadPrelude) {
     let preludeLoad = shardingConfig
@@ -704,35 +857,174 @@ function getLoaderRuntime({
 
   code.push(`module.exports = ${loaderCode};`);
 
+  // Collect all potential helper dependencies used in loader runtime
+  let helperDependencies: Array<{
+    specifier: string;
+    symbols: Map<string, {local: string; loc: null; isWeak: boolean}>;
+    usedSymbols: Set<string>;
+  }> = [];
+
+  // Always potential dependencies based on the code patterns
+  if (needsEsmLoadPrelude) {
+    if (shardingConfig) {
+      helperDependencies.push({
+        specifier: './helpers/browser/esm-js-loader-shards',
+        symbols: new Map([
+          ['default', {local: 'default', loc: null, isWeak: false}],
+        ]),
+        usedSymbols: new Set(['default']),
+      });
+    } else {
+      helperDependencies.push({
+        specifier: './helpers/browser/esm-js-loader',
+        symbols: new Map([
+          ['default', {local: 'default', loc: null, isWeak: false}],
+        ]),
+        usedSymbols: new Set(['default']),
+      });
+    }
+  }
+
+  // Bundle manifest dependency if using runtime manifest
+  if (shouldUseRuntimeManifest(bundle, options)) {
+    helperDependencies.push({
+      specifier: './helpers/bundle-manifest',
+      symbols: new Map([
+        ['resolve', {local: 'resolve', loc: null, isWeak: false}],
+      ]),
+      usedSymbols: new Set(['resolve']),
+    });
+  }
+
+  // Domain sharding dependency if configured
+  if (shardingConfig) {
+    helperDependencies.push({
+      specifier: '@atlaspack/domain-sharding',
+      symbols: new Map([
+        ['shardUrl', {local: 'shardUrl', loc: null, isWeak: false}],
+      ]),
+      usedSymbols: new Set(['shardUrl']),
+    });
+  }
+
+  // Various loader dependencies based on bundle types in externalBundles
+  for (let to of externalBundles) {
+    let loader = loaders[to.type];
+    if (loader && typeof loader === 'string') {
+      helperDependencies.push({
+        specifier: loader,
+        symbols: new Map([
+          ['default', {local: 'default', loc: null, isWeak: false}],
+        ]),
+        usedSymbols: new Set(['default']),
+      });
+    }
+  }
+
+  // Import polyfill if needed
+  if (needsDynamicImportPolyfill && loaders?.IMPORT_POLYFILL) {
+    helperDependencies.push({
+      specifier: loaders.IMPORT_POLYFILL,
+      symbols: new Map([
+        ['default', {local: 'default', loc: null, isWeak: false}],
+      ]),
+      usedSymbols: new Set(['default']),
+    });
+  }
+
+  // Conditional loaders if using conditional bundling
+  if (getFeatureFlag('conditionalBundlingApi')) {
+    const loaderPath = `./helpers/conditional-loader${
+      options.mode === 'development' ? '-dev' : ''
+    }`;
+    helperDependencies.push({
+      specifier: loaderPath,
+      symbols: new Map([
+        ['default', {local: 'default', loc: null, isWeak: false}],
+      ]),
+      usedSymbols: new Set(['default']),
+    });
+
+    // Sync loader for fallback
+    if (options.mode === 'development') {
+      helperDependencies.push({
+        specifier: './helpers/browser/sync-js-loader',
+        symbols: new Map([
+          ['default', {local: 'default', loc: null, isWeak: false}],
+        ]),
+        usedSymbols: new Set(['default']),
+      });
+    }
+  }
+
+  // Preload/prefetch loaders for browser context
+  if (bundle.env.context === 'browser') {
+    helperDependencies.push({
+      specifier: BROWSER_PRELOAD_LOADER,
+      symbols: new Map([
+        ['default', {local: 'default', loc: null, isWeak: false}],
+      ]),
+      usedSymbols: new Set(['default']),
+    });
+    helperDependencies.push({
+      specifier: BROWSER_PREFETCH_LOADER,
+      symbols: new Map([
+        ['default', {local: 'default', loc: null, isWeak: false}],
+      ]),
+      usedSymbols: new Set(['default']),
+    });
+  }
+
+  // ESM loader retry if using import retry feature
+  if (needsEsmLoadPrelude && options.featureFlags.importRetry) {
+    helperDependencies.push({
+      specifier: './helpers/browser/esm-js-loader-retry',
+      symbols: new Map([
+        ['default', {local: 'default', loc: null, isWeak: false}],
+      ]),
+      usedSymbols: new Set(['default']),
+    });
+  }
+
   return {
     filePath: __filename,
     code: code.join('\n'),
     dependency,
     env: {sourceType: 'module'},
+    // Pre-computed symbols: loader runtime with comprehensive helper dependencies
+    symbolData: {
+      symbols: new Map([['default', {local: 'module.exports', loc: null}]]),
+      dependencies: helperDependencies,
+    },
   };
 }
 
 function getHintedBundleGroups(
   bundleGraph: BundleGraph<NamedBundle>,
   bundle: NamedBundle,
-): {|preload: Array<BundleGroup>, prefetch: Array<BundleGroup>|} {
-  let preload = [];
-  let prefetch = [];
+): {
+  preload: Array<BundleGroup>;
+  prefetch: Array<BundleGroup>;
+} {
+  let preload: Array<BundleGroup> = [];
+  let prefetch: Array<BundleGroup> = [];
   let {asyncDependencies} = getDependencies(bundle);
   for (let dependency of asyncDependencies) {
     let attributes = dependency.meta?.importAttributes;
     if (
       typeof attributes === 'object' &&
       attributes != null &&
-      // $FlowFixMe
+      // @ts-expect-error TS2339
       (attributes.preload || attributes.prefetch)
     ) {
       let resolved = bundleGraph.resolveAsyncDependency(dependency, bundle);
       if (resolved?.type === 'bundle_group') {
         // === true for flow
+        // @ts-expect-error TS2339
         if (attributes.preload === true) {
           preload.push(resolved.value);
         }
+        // @ts-expect-error TS2339
         if (attributes.prefetch === true) {
           prefetch.push(resolved.value);
         }
@@ -750,7 +1042,7 @@ function getHintLoaders(
   loader: string,
   options: PluginOptions,
 ): Array<string> {
-  let hintLoaders = [];
+  let hintLoaders: Array<string> = [];
   for (let bundleGroupToPreload of bundleGroups) {
     let bundlesToPreload =
       bundleGraph.getBundlesInBundleGroup(bundleGroupToPreload);
@@ -761,8 +1053,10 @@ function getHintLoaders(
         bundleToPreload,
         options,
       );
+      // @ts-expect-error TS7053
       let priority = TYPE_TO_RESOURCE_PRIORITY[bundleToPreload.type];
       hintLoaders.push(
+        // @ts-expect-error TS2554
         `require(${JSON.stringify(loader)})(${getAbsoluteUrlExpr(
           relativePathExpr,
           from,
@@ -801,7 +1095,12 @@ function getURLRuntime(
   options: PluginOptions,
   shardingConfig: JSRuntimeConfig['domainSharding'],
 ): RuntimeAsset {
-  let relativePathExpr = getRelativePathExpr(from, to, options);
+  let relativePathExpr;
+  if (getFeatureFlag('hmrImprovements')) {
+    relativePathExpr = getRelativePathExpr(from, to, options, true);
+  } else {
+    relativePathExpr = getRelativePathExpr(from, to, options);
+  }
   let code;
 
   if (dependency.meta.webworker === true && !from.env.isLibrary) {
@@ -832,11 +1131,89 @@ function getURLRuntime(
     )};`;
   }
 
+  // Collect dependencies based on the URL runtime code patterns
+  let urlRuntimeDependencies: Array<{
+    specifier: string;
+    symbols: Map<string, {local: string; loc: null; isWeak: boolean}>;
+    usedSymbols: Set<string>;
+  }> = [];
+
+  if (dependency.meta.webworker === true && !from.env.isLibrary) {
+    // Web worker runtime requires get-worker-url helper
+    urlRuntimeDependencies.push({
+      specifier: './helpers/get-worker-url',
+      symbols: new Map([
+        ['default', {local: 'workerURL', loc: null, isWeak: false}],
+      ]),
+      usedSymbols: new Set(['default']),
+    });
+
+    if (
+      !(
+        from.env.outputFormat === 'esmodule' &&
+        from.env.supports('import-meta-url')
+      )
+    ) {
+      // Also requires bundle-url helper in non-ESM environments
+      urlRuntimeDependencies.push({
+        specifier: './helpers/bundle-url',
+        symbols: new Map([
+          ['getBundleURL', {local: 'getBundleURL', loc: null, isWeak: false}],
+          ['getOrigin', {local: 'getOrigin', loc: null, isWeak: false}],
+        ]),
+        usedSymbols: new Set(['getBundleURL', 'getOrigin']),
+      });
+
+      // Domain sharding if configured
+      if (shardingConfig) {
+        urlRuntimeDependencies.push({
+          specifier: '@atlaspack/domain-sharding',
+          symbols: new Map([
+            ['shardUrl', {local: 'shardUrl', loc: null, isWeak: false}],
+          ]),
+          usedSymbols: new Set(['shardUrl']),
+        });
+      }
+    }
+  } else {
+    // Regular URL runtime may use bundle-url helper
+    if (
+      !(
+        from.env.outputFormat === 'esmodule' &&
+        from.env.supports('import-meta-url')
+      ) &&
+      !(from.env.outputFormat === 'commonjs')
+    ) {
+      urlRuntimeDependencies.push({
+        specifier: './helpers/bundle-url',
+        symbols: new Map([
+          ['getBundleURL', {local: 'getBundleURL', loc: null, isWeak: false}],
+        ]),
+        usedSymbols: new Set(['getBundleURL']),
+      });
+
+      if (shardingConfig) {
+        urlRuntimeDependencies.push({
+          specifier: '@atlaspack/domain-sharding',
+          symbols: new Map([
+            ['shardUrl', {local: 'shardUrl', loc: null, isWeak: false}],
+          ]),
+          usedSymbols: new Set(['shardUrl']),
+        });
+      }
+    }
+  }
+
   return {
     filePath: __filename,
     code,
     dependency,
     env: {sourceType: 'module'},
+    // Pre-computed symbols: URL runtime with helper dependencies
+    symbolData: {
+      symbols: new Map([['default', {local: 'module.exports', loc: null}]]),
+      dependencies: urlRuntimeDependencies,
+    },
   };
 }
 
@@ -844,9 +1221,13 @@ function getRegisterCode(
   entryBundle: NamedBundle,
   bundleGraph: BundleGraph<NamedBundle>,
 ): string {
-  let mappings = [];
+  // @ts-expect-error TS2304
+  let mappings: Array<FilePath | string> = [];
   bundleGraph.traverseBundles((bundle, _, actions) => {
-    if (bundle.bundleBehavior === 'inline') {
+    if (
+      bundle.bundleBehavior === 'inline' ||
+      bundle.bundleBehavior === 'inlineIsolated'
+    ) {
       return;
     }
 
@@ -889,11 +1270,36 @@ 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 (options.hmrOptions) {
-    res += ' + "?" + Date.now()';
+  if (getFeatureFlag('hmrImprovements')) {
+    if (isURL && options.hmrOptions) {
+      if (getFeatureFlag('hmrBundleVersioning')) {
+        res +=
+          ' + (globalThis.__parcel__hmrBundleVersion == null' +
+          ' ? ""' +
+          ' : (' +
+          JSON.stringify(relativePath) +
+          '.includes("?") ? "&" : "?") + "t=" + globalThis.__parcel__hmrBundleVersion)';
+      } else {
+        res += ' + "?" + Date.now()';
+      }
+    }
+  } else {
+    if (options.hmrOptions) {
+      if (getFeatureFlag('hmrBundleVersioning')) {
+        res +=
+          ' + (globalThis.__parcel__hmrBundleVersion == null' +
+          ' ? ""' +
+          ' : (' +
+          JSON.stringify(relativePath) +
+          '.includes("?") ? "&" : "?") + "t=" + globalThis.__parcel__hmrBundleVersion)';
+      } else {
+        res += ' + "?" + Date.now()';
+      }
+    }
   }
 
   return res;
@@ -930,6 +1336,7 @@ function shouldUseRuntimeManifest(
   return (
     !env.isLibrary &&
     bundle.bundleBehavior !== 'inline' &&
+    bundle.bundleBehavior !== 'inlineIsolated' &&
     env.isBrowser() &&
     options.mode === 'production'
   );
@@ -939,7 +1346,7 @@ function getManifestBundlePriority(
   bundleGraph: BundleGraph<NamedBundle>,
   bundle: NamedBundle,
   threshold: number,
-): $PropertyType<RuntimeAsset, 'priority'> {
+): RuntimeAsset['priority'] {
   let bundleSize = 0;
 
   bundle.traverseAssets((asset, _, actions) => {