@atlaspack/transformer-js 3.2.3-dev.72 → 3.2.3-dev.93

package/lib/JSTransformer.js

@@ -25,9 +25,9 @@ function _rust() {
   };
   return data;
 }
-function _core() {
-  const data = require("@atlaspack/core");
-  _core = function () {
+function _assert() {
+  const data = _interopRequireDefault(require("assert"));
+  _assert = function () {
     return data;
   };
   return data;
@@ -78,7 +78,6 @@ function _featureFlags() {
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const esm_helpers_specifier = (0, _core().isSuperPackage)() ? './esmodule-helpers.js' : '@atlaspack/transformer-js/src/esmodule-helpers.js';
 const JSX_EXTENSIONS = {
   jsx: true,
   tsx: true
@@ -185,7 +184,7 @@ var _default = exports.default = new (_plugin().Transformer)({
       }
       reactRefresh = options.hmrOptions && options.mode === 'development' && Boolean((packageJson === null || packageJson === void 0 || (_packageJson$dependen2 = packageJson.dependencies) === null || _packageJson$dependen2 === void 0 ? void 0 : _packageJson$dependen2.react) || (packageJson === null || packageJson === void 0 || (_packageJson$devDepen2 = packageJson.devDependencies) === null || _packageJson$devDepen2 === void 0 ? void 0 : _packageJson$devDepen2.react) || (packageJson === null || packageJson === void 0 || (_packageJson$peerDepe2 = packageJson.peerDependencies) === null || _packageJson$peerDepe2 === void 0 ? void 0 : _packageJson$peerDepe2.react));
       const compilerOptions = (_await$config$getConf = await config.getConfigFrom(options.projectRoot + '/index', ['tsconfig.json', 'jsconfig.json'], {
-        readTracking: (0, _featureFlags().getFeatureFlag)('granularTsConfigInvalidation')
+        readTracking: true
       })) === null || _await$config$getConf === void 0 || (_await$config$getConf = _await$config$getConf.contents) === null || _await$config$getConf === void 0 ? void 0 : _await$config$getConf.compilerOptions;
 
       // Use explicitly defined JSX options in tsconfig.json over inferred values from dependencies.
@@ -314,6 +313,9 @@ var _default = exports.default = new (_plugin().Transformer)({
       if (options.env.NODE_ENV != null) {
         env.NODE_ENV = options.env.NODE_ENV;
       }
+      if (process.env.ATLASPACK_BUILD_ENV === 'test') {
+        env.ATLASPACK_BUILD_ENV = 'test';
+      }
     } else if (Array.isArray(config === null || config === void 0 ? void 0 : config.inlineEnvironment)) {
       for (let match of (0, _utils().globMatch)(Object.keys(options.env), config.inlineEnvironment)) {
         env[match] = String(options.env[match]);
@@ -354,7 +356,7 @@ var _default = exports.default = new (_plugin().Transformer)({
       module_id: asset.id,
       project_root: options.projectRoot,
       replace_env: !asset.env.isNode(),
-      inline_fs: process.env.ATLASPACK_SUPER_BUILD === 'true' || Boolean(config === null || config === void 0 ? void 0 : config.inlineFS) && !asset.env.isNode(),
+      inline_fs: Boolean(config === null || config === void 0 ? void 0 : config.inlineFS) && !asset.env.isNode(),
       insert_node_globals: !asset.env.isNode() && asset.env.sourceType !== 'script',
       node_replacer: asset.env.isNode(),
       is_browser: asset.env.isBrowser(),
@@ -382,8 +384,8 @@ var _default = exports.default = new (_plugin().Transformer)({
       standalone: asset.query.has('standalone'),
       inline_constants: config.inlineConstants,
       conditional_bundling: options.featureFlags.conditionalBundlingApi,
+      hmr_improvements: options.featureFlags.hmrImprovements,
       magic_comments: Boolean(config === null || config === void 0 ? void 0 : config.magicComments),
-      esm_helpers_specifier,
       callMacro: asset.isSource ? async (err, src, exportName, args, loc) => {
         let mod;
         try {
@@ -408,7 +410,7 @@ var _default = exports.default = new (_plugin().Transformer)({
         }
         try {
           if (typeof mod[exportName] === 'function') {
-            return mod[exportName].apply({
+            let ctx = {
               // Allows macros to emit additional assets to add as dependencies (e.g. css).
               addAsset(a) {
                 let k = String(macroAssets.length);
@@ -467,7 +469,8 @@ var _default = exports.default = new (_plugin().Transformer)({
               invalidateOnBuild() {
                 asset.invalidateOnBuild();
               }
-            }, args);
+            };
+            return mod[exportName].apply(ctx, args);
           } else {
             throw new Error(`"${exportName}" in "${src}" is not a function.`);
           }
@@ -476,7 +479,7 @@ var _default = exports.default = new (_plugin().Transformer)({
           let stack = (err.stack || '').split('\n').slice(1);
           let message = err.message;
           for (let line of stack) {
-            if (line.includes( /*#__ATLASPACK_IGNORE__*/__filename)) {
+            if (line.includes(__filename)) {
               break;
             }
             message += '\n' + line;
@@ -639,6 +642,13 @@ var _default = exports.default = new (_plugin().Transformer)({
         });
       } else if (dep.kind === 'File') {
         asset.invalidateOnFileChange(dep.specifier);
+      } else if (dep.kind === 'Id') {
+        // Record parcelRequire calls so that the dev packager can add them as dependencies.
+        // This allows the HMR runtime to collect parents across async boundaries (through runtimes).
+        // TODO: ideally this would result as an actual dep in the graph rather than asset.meta.
+        asset.meta.hmrDeps ??= [];
+        (0, _assert().default)(Array.isArray(asset.meta.hmrDeps));
+        asset.meta.hmrDeps.push(dep.specifier);
       } else {
         let meta = {
           kind: dep.kind
@@ -714,7 +724,7 @@ var _default = exports.default = new (_plugin().Transformer)({
           priority: dep.kind === 'DynamicImport' ? 'lazy' : dep.kind === 'ConditionalImport' ? 'conditional' : 'sync',
           isOptional: dep.is_optional,
           meta,
-          resolveFrom: isHelper ? /*#__ATLASPACK_IGNORE__*/__filename : undefined,
+          resolveFrom: isHelper ? __filename : undefined,
           range,
           env
         });
@@ -876,29 +886,16 @@ var _default = exports.default = new (_plugin().Transformer)({
         }
       }
       if (needs_esm_helpers) {
-        if ((0, _core().isSuperPackage)()) {
-          asset.addDependency({
-            specifier: esm_helpers_specifier,
-            specifierType: 'esm',
-            resolveFrom: /*#__ATLASPACK_IGNORE__*/__filename,
-            env: {
-              includeNodeModules: {
-                atlaspack: true
-              }
-            }
-          });
-        } else {
-          asset.addDependency({
-            specifier: esm_helpers_specifier,
-            specifierType: 'esm',
-            resolveFrom: /*#__ATLASPACK_IGNORE__*/__filename,
-            env: {
-              includeNodeModules: {
-                '@atlaspack/transformer-js': true
-              }
+        asset.addDependency({
+          specifier: '@atlaspack/transformer-js/src/esmodule-helpers.js',
+          specifierType: 'esm',
+          resolveFrom: __filename,
+          env: {
+            includeNodeModules: {
+              '@atlaspack/transformer-js': true
             }
-          });
-        }
+          }
+        });
       }
     }
     asset.type = 'js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/transformer-js",
-  "version": "3.2.3-dev.72+9840480de",
+  "version": "3.2.3-dev.93+207d003c0",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -21,16 +21,13 @@
     "lib",
     "src"
   ],
-  "atlaspackReferences": [
-    "src/esmodule-helpers.js"
-  ],
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-dev.140+9840480de",
-    "@atlaspack/feature-flags": "2.14.1-dev.140+9840480de",
-    "@atlaspack/plugin": "2.14.5-dev.72+9840480de",
-    "@atlaspack/rust": "3.2.1-dev.72+9840480de",
-    "@atlaspack/utils": "2.14.5-dev.72+9840480de",
-    "@atlaspack/workers": "2.14.5-dev.72+9840480de",
+    "@atlaspack/diagnostic": "2.14.1-dev.161+207d003c0",
+    "@atlaspack/feature-flags": "2.14.1-dev.161+207d003c0",
+    "@atlaspack/plugin": "2.14.5-dev.93+207d003c0",
+    "@atlaspack/rust": "3.2.1-dev.93+207d003c0",
+    "@atlaspack/utils": "2.14.5-dev.93+207d003c0",
+    "@atlaspack/workers": "2.14.5-dev.93+207d003c0",
     "@parcel/source-map": "^2.1.1",
     "@swc/helpers": "^0.5.15",
     "browserslist": "^4.6.6",
@@ -42,5 +39,5 @@
     "@atlaspack/core": "^2.13.1"
   },
   "type": "commonjs",
-  "gitHead": "9840480de27511f558d8f5b8cf82220de977b4fb"
+  "gitHead": "207d003c0f1d4ffa6a1c52d2f8841d998616c523"
 }

package/src/JSTransformer.js

@@ -12,7 +12,7 @@ import type {Diagnostic} from '@atlaspack/diagnostic';
 import SourceMap from '@parcel/source-map';
 import {Transformer} from '@atlaspack/plugin';
 import {transform, transformAsync} from '@atlaspack/rust';
-import {isSuperPackage} from '@atlaspack/core';
+import invariant from 'assert';
 import browserslist from 'browserslist';
 import semver from 'semver';
 import nullthrows from 'nullthrows';
@@ -24,10 +24,6 @@ import {validateSchema, remapSourceLocation, globMatch} from '@atlaspack/utils';
 import pkg from '../package.json';
 import {getFeatureFlag} from '@atlaspack/feature-flags';
 
-const esm_helpers_specifier = isSuperPackage()
-  ? './esmodule-helpers.js'
-  : '@atlaspack/transformer-js/src/esmodule-helpers.js';
-
 const JSX_EXTENSIONS = {
   jsx: true,
   tsx: true,
@@ -216,7 +212,7 @@ export default (new Transformer({
           options.projectRoot + '/index',
           ['tsconfig.json', 'jsconfig.json'],
           {
-            readTracking: getFeatureFlag('granularTsConfigInvalidation'),
+            readTracking: true,
           },
         )
       )?.contents?.compilerOptions;
@@ -444,9 +440,7 @@ export default (new Transformer({
       module_id: asset.id,
       project_root: options.projectRoot,
       replace_env: !asset.env.isNode(),
-      inline_fs:
-        process.env.ATLASPACK_SUPER_BUILD === 'true' ||
-        (Boolean(config?.inlineFS) && !asset.env.isNode()),
+      inline_fs: Boolean(config?.inlineFS) && !asset.env.isNode(),
       insert_node_globals:
         !asset.env.isNode() && asset.env.sourceType !== 'script',
       node_replacer: asset.env.isNode(),
@@ -481,8 +475,8 @@ export default (new Transformer({
       standalone: asset.query.has('standalone'),
       inline_constants: config.inlineConstants,
       conditional_bundling: options.featureFlags.conditionalBundlingApi,
+      hmr_improvements: options.featureFlags.hmrImprovements,
       magic_comments: Boolean(config?.magicComments),
-      esm_helpers_specifier,
       callMacro: asset.isSource
         ? async (err, src, exportName, args, loc) => {
             let mod;
@@ -586,7 +580,7 @@ export default (new Transformer({
               let stack = (err.stack || '').split('\n').slice(1);
               let message = err.message;
               for (let line of stack) {
-                if (line.includes(/*#__ATLASPACK_IGNORE__*/ __filename)) {
+                if (line.includes(__filename)) {
                   break;
                 }
                 message += '\n' + line;
@@ -788,6 +782,13 @@ export default (new Transformer({
         });
       } else if (dep.kind === 'File') {
         asset.invalidateOnFileChange(dep.specifier);
+      } else if (dep.kind === 'Id') {
+        // Record parcelRequire calls so that the dev packager can add them as dependencies.
+        // This allows the HMR runtime to collect parents across async boundaries (through runtimes).
+        // TODO: ideally this would result as an actual dep in the graph rather than asset.meta.
+        asset.meta.hmrDeps ??= [];
+        invariant(Array.isArray(asset.meta.hmrDeps));
+        asset.meta.hmrDeps.push(dep.specifier);
       } else {
         let meta: JSONObject = {kind: dep.kind};
         if (dep.attributes) {
@@ -890,9 +891,7 @@ export default (new Transformer({
               : 'sync',
           isOptional: dep.is_optional,
           meta,
-          resolveFrom: isHelper
-            ? /*#__ATLASPACK_IGNORE__*/ __filename
-            : undefined,
+          resolveFrom: isHelper ? __filename : undefined,
           range,
           env,
         });
@@ -1080,29 +1079,16 @@ export default (new Transformer({
       }
 
       if (needs_esm_helpers) {
-        if (isSuperPackage()) {
-          asset.addDependency({
-            specifier: esm_helpers_specifier,
-            specifierType: 'esm',
-            resolveFrom: /*#__ATLASPACK_IGNORE__*/ __filename,
-            env: {
-              includeNodeModules: {
-                atlaspack: true,
-              },
-            },
-          });
-        } else {
-          asset.addDependency({
-            specifier: esm_helpers_specifier,
-            specifierType: 'esm',
-            resolveFrom: /*#__ATLASPACK_IGNORE__*/ __filename,
-            env: {
-              includeNodeModules: {
-                '@atlaspack/transformer-js': true,
-              },
+        asset.addDependency({
+          specifier: '@atlaspack/transformer-js/src/esmodule-helpers.js',
+          specifierType: 'esm',
+          resolveFrom: __filename,
+          env: {
+            includeNodeModules: {
+              '@atlaspack/transformer-js': true,
             },
-          });
-        }
+          },
+        });
       }
     }