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

package/lib/JSRuntime.js

@@ -46,24 +46,7 @@ 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',
@@ -180,7 +163,7 @@ var _default = exports.default = new (_plugin().Runtime)({
           // return a simple runtime of `Promise.resolve(internalRequire(assetId))`.
           // The linker handles this for scope-hoisting.
           assets.push({
-            filePath: filename,
+            filePath: __filename,
             code: `module.exports = Promise.resolve(module.bundle.root(${JSON.stringify(bundleGraph.getAssetPublicId(resolved.value))}))`,
             dependency,
             env: {
@@ -194,7 +177,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: {
@@ -225,7 +208,7 @@ var _default = exports.default = new (_plugin().Runtime)({
         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
@@ -243,7 +226,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: {
@@ -260,7 +243,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: {
@@ -278,15 +261,6 @@ 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') {
@@ -314,7 +288,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: {
@@ -325,7 +299,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: {
@@ -435,7 +409,7 @@ function getLoaderRuntime({
       let publicId = JSON.stringify(to.publicId);
       absoluteUrlExpr = `require('./helpers/bundle-manifest').resolve(${publicId})`;
       if (shardingConfig) {
-        absoluteUrlExpr = `require('${domainShardingImports.specifier}').shardUrl(${absoluteUrlExpr}, ${shardingConfig.maxShards})`;
+        absoluteUrlExpr = `require('@atlaspack/domain-sharding').shardUrl(${absoluteUrlExpr}, ${shardingConfig.maxShards})`;
       }
     } else {
       absoluteUrlExpr = getAbsoluteUrlExpr(relativePathExpr, bundle, shardingConfig);
@@ -527,7 +501,7 @@ function getLoaderRuntime({
         });
       }})`;
     return {
-      filePath: filename,
+      filePath: __filename,
       code: loaderCode,
       dependency,
       env: {
@@ -537,12 +511,12 @@ function getLoaderRuntime({
   }
   let code = [];
   if (needsEsmLoadPrelude) {
-    let preludeLoad = shardingConfig ? `let load = require('${domainShardingImports.helper}')(${shardingConfig.maxShards});` : `let load = require('./helpers/browser/esm-js-loader');`;
+    let preludeLoad = shardingConfig ? `let load = require('./helpers/browser/esm-js-loader-shards')(${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: {
@@ -608,7 +582,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('${domainShardingImports.specifier}').shardUrl(url, ${shardingConfig.maxShards});`;
+        code += `url = require('@atlaspack/domain-sharding').shardUrl(url, ${shardingConfig.maxShards});`;
       }
       code += `module.exports = workerURL(url, bundleURL.getOrigin(url), ${String(from.env.outputFormat === 'esmodule')});`;
     }
@@ -616,7 +590,7 @@ function getURLRuntime(dependency, from, to, options, shardingConfig) {
     code = `module.exports = ${getAbsoluteUrlExpr(relativePathExpr, from, shardingConfig)};`;
   }
   return {
-    filePath: filename,
+    filePath: __filename,
     code,
     dependency,
     env: {
@@ -670,7 +644,7 @@ function getAbsoluteUrlExpr(relativePathExpr, fromBundle, shardingConfig) {
   if (!shardingConfig) {
     return regularBundleUrl;
   }
-  return `require('${domainShardingImports.specifier}').shardUrl(${regularBundleUrl}, ${shardingConfig.maxShards})`;
+  return `require('@atlaspack/domain-sharding').shardUrl(${regularBundleUrl}, ${shardingConfig.maxShards})`;
 }
 function shouldUseRuntimeManifest(bundle, options) {
   let env = bundle.env;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/runtime-js",
-  "version": "2.14.5-dev.72+9840480de",
+  "version": "2.14.5-dev.73+84eec3484",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -11,20 +11,17 @@
   },
   "main": "lib/JSRuntime.js",
   "source": "src/JSRuntime.js",
-  "atlaspackReferences": [
-    "./src/helpers/**/*"
-  ],
   "engines": {
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-dev.140+9840480de",
-    "@atlaspack/domain-sharding": "2.14.1-dev.140+9840480de",
-    "@atlaspack/feature-flags": "2.14.1-dev.140+9840480de",
-    "@atlaspack/plugin": "2.14.5-dev.72+9840480de",
-    "@atlaspack/utils": "2.14.5-dev.72+9840480de",
+    "@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",
     "nullthrows": "^1.1.1"
   },
   "type": "commonjs",
-  "gitHead": "9840480de27511f558d8f5b8cf82220de977b4fb"
+  "gitHead": "84eec348413c647de4872f902c4bc8ff54c347f3"
 }

package/src/JSRuntime.js

@@ -19,20 +19,6 @@ 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 = {
@@ -171,7 +157,7 @@ export default (new Runtime({
           // return a simple runtime of `Promise.resolve(internalRequire(assetId))`.
           // The linker handles this for scope-hoisting.
           assets.push({
-            filePath: filename,
+            filePath: __filename,
             code: `module.exports = Promise.resolve(module.bundle.root(${JSON.stringify(
               bundleGraph.getAssetPublicId(resolved.value),
             )}))`,
@@ -188,7 +174,10 @@ 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,
             )});`,
@@ -233,7 +222,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
@@ -253,7 +242,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'},
@@ -268,7 +257,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'},
@@ -288,19 +277,6 @@ 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') {
@@ -348,7 +324,7 @@ export default (new Runtime({
           config.domainSharding,
         )})`;
         assets.push({
-          filePath: filename,
+          filePath: __filename,
           code: loaderCode,
           isEntry: true,
           env: {sourceType: 'module'},
@@ -364,7 +340,7 @@ export default (new Runtime({
       isNewContext(bundle, bundleGraph)
     ) {
       assets.push({
-        filePath: filename,
+        filePath: __filename,
         code: getRegisterCode(bundle, bundleGraph),
         isEntry: true,
         env: {sourceType: 'module'},
@@ -513,7 +489,7 @@ function getLoaderRuntime({
       absoluteUrlExpr = `require('./helpers/bundle-manifest').resolve(${publicId})`;
 
       if (shardingConfig) {
-        absoluteUrlExpr = `require('${domainShardingImports.specifier}').shardUrl(${absoluteUrlExpr}, ${shardingConfig.maxShards})`;
+        absoluteUrlExpr = `require('@atlaspack/domain-sharding').shardUrl(${absoluteUrlExpr}, ${shardingConfig.maxShards})`;
       }
     } else {
       absoluteUrlExpr = getAbsoluteUrlExpr(
@@ -709,7 +685,7 @@ function getLoaderRuntime({
       }})`;
 
     return {
-      filePath: filename,
+      filePath: __filename,
       code: loaderCode,
       dependency,
       env: {sourceType: 'module'},
@@ -720,7 +696,7 @@ function getLoaderRuntime({
 
   if (needsEsmLoadPrelude) {
     let preludeLoad = shardingConfig
-      ? `let load = require('${domainShardingImports.helper}')(${shardingConfig.maxShards});`
+      ? `let load = require('./helpers/browser/esm-js-loader-shards')(${shardingConfig.maxShards});`
       : `let load = require('./helpers/browser/esm-js-loader');`;
 
     code.push(preludeLoad);
@@ -729,7 +705,7 @@ function getLoaderRuntime({
   code.push(`module.exports = ${loaderCode};`);
 
   return {
-    filePath: filename,
+    filePath: __filename,
     code: code.join('\n'),
     dependency,
     env: {sourceType: 'module'},
@@ -842,7 +818,7 @@ function getURLRuntime(
       code += `let bundleURL = require('./helpers/bundle-url');\n`;
       code += `let url = bundleURL.getBundleURL('${from.publicId}') + ${relativePathExpr};`;
       if (shardingConfig) {
-        code += `url = require('${domainShardingImports.specifier}').shardUrl(url, ${shardingConfig.maxShards});`;
+        code += `url = require('@atlaspack/domain-sharding').shardUrl(url, ${shardingConfig.maxShards});`;
       }
       code += `module.exports = workerURL(url, bundleURL.getOrigin(url), ${String(
         from.env.outputFormat === 'esmodule',
@@ -857,7 +833,7 @@ function getURLRuntime(
   }
 
   return {
-    filePath: filename,
+    filePath: __filename,
     code,
     dependency,
     env: {sourceType: 'module'},
@@ -943,7 +919,7 @@ function getAbsoluteUrlExpr(
     return regularBundleUrl;
   }
 
-  return `require('${domainShardingImports.specifier}').shardUrl(${regularBundleUrl}, ${shardingConfig.maxShards})`;
+  return `require('@atlaspack/domain-sharding').shardUrl(${regularBundleUrl}, ${shardingConfig.maxShards})`;
 }
 
 function shouldUseRuntimeManifest(

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

@@ -1,7 +0,0 @@
-"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/src/helpers/browser/esm-js-loader-shards-super.js

@@ -1,11 +0,0 @@
-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;