@atlaspack/runtime-js 2.14.5-dev.73 → 2.14.5-dev.93

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # @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

package/lib/JSRuntime.js

@@ -162,9 +162,11 @@ 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(module.bundle.root(${JSON.stringify(bundleGraph.getAssetPublicId(resolved.value))}))`,
+            code: `module.exports = Promise.resolve(${requireName}(${JSON.stringify(bundleGraph.getAssetPublicId(resolved.value))}))`,
             dependency,
             env: {
               sourceType: 'module'
@@ -205,7 +207,7 @@ 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 = bundle.env.shouldScopeHoist ? 'parcelRequire' : '__parcel__require__';
+        const requireName = (0, _featureFlags().getFeatureFlag)('hmrImprovements') || 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`),
@@ -488,7 +490,7 @@ function getLoaderRuntime({
     loaderCode = `(${loaderCode})`;
   }
   if (mainBundle.type === 'js') {
-    let parcelRequire = bundle.env.shouldScopeHoist ? 'parcelRequire' : 'module.bundle.root';
+    let parcelRequire = (0, _featureFlags().getFeatureFlag)('hmrImprovements') || bundle.env.shouldScopeHoist ? 'parcelRequire' : 'module.bundle.root';
     loaderCode += `.then(() => ${parcelRequire}('${bundleGraph.getAssetPublicId(bundleGraph.getAssetById(bundleGroup.entryAssetId))}'))`;
   }
   if (needsEsmLoadPrelude && options.featureFlags.importRetry) {
@@ -571,7 +573,12 @@ 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 = getRelativePathExpr(from, to, options);
+  let relativePathExpr;
+  if ((0, _featureFlags().getFeatureFlag)('hmrImprovements')) {
+    relativePathExpr = getRelativePathExpr(from, to, options, true);
+  } else {
+    relativePathExpr = getRelativePathExpr(from, to, options);
+  }
   let code;
   if (dependency.meta.webworker === true && !from.env.isLibrary) {
     code = `let workerURL = require('./helpers/get-worker-url');\n`;
@@ -625,13 +632,19 @@ 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) {
+function getRelativePathExpr(from, to, options, isURL = to.type !== 'js') {
   let relativePath = (0, _utils().relativeBundlePath)(from, to, {
     leadingDotSlash: false
   });
   let res = JSON.stringify(relativePath);
-  if (options.hmrOptions) {
-    res += ' + "?" + Date.now()';
+  if ((0, _featureFlags().getFeatureFlag)('hmrImprovements')) {
+    if (isURL && options.hmrOptions) {
+      res += ' + "?" + Date.now()';
+    }
+  } else {
+    if (options.hmrOptions) {
+      res += ' + "?" + Date.now()';
+    }
   }
   return res;
 }

package/lib/helpers/browser/css-loader.js

@@ -1,13 +1,14 @@
 "use strict";
 
 const cacheLoader = require('../cacheLoader');
-module.exports = cacheLoader(function (bundle) {
+module.exports = cacheLoader(function loadCSSBundle(bundle) {
   return new Promise(function (resolve, reject) {
     // Don't insert the same link element twice (e.g. if it was already in the HTML)
     let existingLinks = document.getElementsByTagName('link');
-    if ([].concat(existingLinks).some(function (link) {
+    let isCurrentBundle = function (link) {
       return link.href === bundle && link.rel.indexOf('stylesheet') > -1;
-    })) {
+    };
+    if ([].concat(existingLinks).some(isCurrentBundle)) {
       resolve();
       return;
     }

package/lib/helpers/browser/html-loader.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const cacheLoader = require('../cacheLoader');
-module.exports = cacheLoader(function (bundle) {
+module.exports = cacheLoader(function loadHTMLBundle(bundle) {
   return fetch(bundle).then(function (res) {
     return res.text();
   });

package/lib/helpers/browser/import-polyfill.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const cacheLoader = require('../cacheLoader');
-module.exports = cacheLoader(function (bundle) {
+module.exports = cacheLoader(function importModule(bundle) {
   return new Promise((resolve, reject) => {
     // Add a global function to handle when the script loads.
     let globalName = `i${('' + Math.random()).slice(2)}`;

package/lib/helpers/browser/js-loader.js

@@ -1,13 +1,14 @@
 "use strict";
 
 const cacheLoader = require('../cacheLoader');
-module.exports = cacheLoader(function (bundle) {
+module.exports = cacheLoader(function loadJSBundle(bundle) {
   return new Promise(function (resolve, reject) {
     // Don't insert the same script twice (e.g. if it was already in the HTML)
     let existingScripts = document.getElementsByTagName('script');
-    if ([].concat(existingScripts).some(function (script) {
+    let isCurrentBundle = function (script) {
       return script.src === bundle;
-    })) {
+    };
+    if ([].concat(existingScripts).some(isCurrentBundle)) {
       resolve();
       return;
     }

package/lib/helpers/browser/prefetch-loader.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const cacheLoader = require('../cacheLoader');
-module.exports = cacheLoader(function (bundle, priority) {
+module.exports = cacheLoader(function prefetchJSBundle(bundle, priority) {
   var link = document.createElement('link');
   link.rel = 'prefetch';
   link.href = bundle;

package/lib/helpers/browser/preload-loader.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const cacheLoader = require('../cacheLoader');
-module.exports = cacheLoader(function (bundle, priority, isModule) {
+module.exports = cacheLoader(function preloadJSBundle(bundle, priority, isModule) {
   var link = document.createElement('link');
   link.charset = 'utf-8';
   link.rel = isModule ? 'modulepreload' : 'preload';

package/lib/helpers/browser/wasm-loader.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const cacheLoader = require('../cacheLoader');
-module.exports = cacheLoader(function (bundle) {
+module.exports = cacheLoader(function loadWASMBundle(bundle) {
   return fetch(bundle).then(function (res) {
     if (WebAssembly.instantiateStreaming) {
       return WebAssembly.instantiateStreaming(res);

package/lib/helpers/cacheLoader.js

@@ -13,7 +13,7 @@ function getCache(type) {
       return cachedBundles;
   }
 }
-module.exports = function (loader, type) {
+module.exports = function cacheLoader(loader, type) {
   return function (bundle) {
     let cache = getCache(type);
     if (cache[bundle]) {

package/lib/helpers/conditional-loader-dev.js

@@ -1,6 +1,6 @@
 "use strict";
 
-module.exports = function (cond, ifTrue, ifFalse) {
+module.exports = function loadCond(cond, ifTrue, ifFalse) {
   if (typeof globalThis.__MCOND !== 'function') {
     throw new TypeError('"globalThis.__MCOND" was not set to an object. Ensure the function is set to return the key condition for conditional bundles to load with.');
   }

package/lib/helpers/conditional-loader.js

@@ -1,5 +1,5 @@
 "use strict";
 
-module.exports = function (cond, ifTrue, ifFalse) {
+module.exports = function loadCond(cond, ifTrue, ifFalse) {
   return globalThis.__MCOND && globalThis.__MCOND(cond) ? ifTrue() : ifFalse();
 };

package/lib/helpers/get-worker-url.js

@@ -1,6 +1,6 @@
 "use strict";
 
-module.exports = function (workerUrl, origin, isESM) {
+module.exports = function loadWorker(workerUrl, origin, isESM) {
   if (origin === self.location.origin) {
     // If the worker bundle's url is on the same origin as the document,
     // use the worker bundle's own url.

package/lib/helpers/node/css-loader.js

@@ -1,6 +1,6 @@
 "use strict";
 
 // loading a CSS style is a no-op in Node.js
-module.exports = function () {
+module.exports = function loadCSSBundle() {
   return Promise.resolve();
 };

package/lib/helpers/node/html-loader.js

@@ -2,7 +2,7 @@
 
 const fs = require('fs');
 const cacheLoader = require('../cacheLoader');
-module.exports = cacheLoader(function (bundle) {
+module.exports = cacheLoader(function loadHTMLBundle(bundle) {
   return new Promise(function (resolve, reject) {
     fs.readFile(__dirname + bundle, 'utf8', function (err, data) {
       if (err) {

package/lib/helpers/node/js-loader.js

@@ -2,7 +2,7 @@
 
 const fs = require('fs');
 const cacheLoader = require('../cacheLoader');
-module.exports = cacheLoader(function (bundle) {
+module.exports = cacheLoader(function loadJSBundle(bundle) {
   return new Promise(function (resolve, reject) {
     fs.readFile(__dirname + bundle, 'utf8', function (err, data) {
       if (err) {

package/lib/helpers/node/wasm-loader.js

@@ -2,7 +2,7 @@
 
 const fs = require('fs');
 const cacheLoader = require('../cacheLoader');
-module.exports = cacheLoader(function (bundle) {
+module.exports = cacheLoader(function loadWASMBundle(bundle) {
   return new Promise(function (resolve, reject) {
     fs.readFile(__dirname + bundle, function (err, data) {
       if (err) {

package/lib/helpers/worker/js-loader.js

@@ -2,7 +2,7 @@
 
 /* global __parcel__importScripts__:readonly*/
 const cacheLoader = require('../cacheLoader');
-module.exports = cacheLoader(function (bundle) {
+module.exports = cacheLoader(function loadJSBundle(bundle) {
   return new Promise(function (resolve, reject) {
     try {
       __parcel__importScripts__(bundle);

package/lib/helpers/worker/wasm-loader.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const cacheLoader = require('../cacheLoader');
-module.exports = cacheLoader(function (bundle) {
+module.exports = cacheLoader(function loadWASMBundle(bundle) {
   return fetch(bundle).then(function (res) {
     if (WebAssembly.instantiateStreaming) {
       return WebAssembly.instantiateStreaming(res);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/runtime-js",
-  "version": "2.14.5-dev.73+84eec3484",
+  "version": "2.14.5-dev.93+207d003c0",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -15,13 +15,13 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-dev.141+84eec3484",
-    "@atlaspack/domain-sharding": "2.14.1-dev.141+84eec3484",
-    "@atlaspack/feature-flags": "2.14.1-dev.141+84eec3484",
-    "@atlaspack/plugin": "2.14.5-dev.73+84eec3484",
-    "@atlaspack/utils": "2.14.5-dev.73+84eec3484",
+    "@atlaspack/diagnostic": "2.14.1-dev.161+207d003c0",
+    "@atlaspack/domain-sharding": "2.14.1-dev.161+207d003c0",
+    "@atlaspack/feature-flags": "2.14.1-dev.161+207d003c0",
+    "@atlaspack/plugin": "2.14.5-dev.93+207d003c0",
+    "@atlaspack/utils": "2.14.5-dev.93+207d003c0",
     "nullthrows": "^1.1.1"
   },
   "type": "commonjs",
-  "gitHead": "84eec348413c647de4872f902c4bc8ff54c347f3"
+  "gitHead": "207d003c0f1d4ffa6a1c52d2f8841d998616c523"
 }

package/src/JSRuntime.js

@@ -156,9 +156,14 @@ 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,
@@ -211,9 +216,10 @@ export default (new Runtime({
         bundle,
       );
       for (const cond of conditions) {
-        const requireName = bundle.env.shouldScopeHoist
-          ? 'parcelRequire'
-          : '__parcel__require__';
+        const requireName =
+          getFeatureFlag('hmrImprovements') || bundle.env.shouldScopeHoist
+            ? 'parcelRequire'
+            : '__parcel__require__';
 
         const assetCode = `module.exports = require('../helpers/conditional-loader${
           options.mode === 'development' ? '-dev' : ''
@@ -666,9 +672,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),
     )}'))`;
@@ -801,7 +809,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) {
@@ -889,11 +902,18 @@ 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) {
+      res += ' + "?" + Date.now()';
+    }
+  } else {
+    if (options.hmrOptions) {
+      res += ' + "?" + Date.now()';
+    }
   }
 
   return res;