@atlaspack/transformer-js 3.2.3-dev.55 → 3.2.3-dev.69

package/lib/JSTransformer.js

@@ -25,6 +25,13 @@ function _rust() {
   };
   return data;
 }
+function _core() {
+  const data = require("@atlaspack/core");
+  _core = function () {
+    return data;
+  };
+  return data;
+}
 function _browserslist() {
   const data = _interopRequireDefault(require("browserslist"));
   _browserslist = function () {
@@ -71,6 +78,7 @@ 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
@@ -160,25 +168,25 @@ var _default = exports.default = new (_plugin().Transformer)({
     config,
     options
   }) {
-    let pkg = await config.getPackage();
+    let packageJson = await config.getPackage();
     let isJSX, pragma, pragmaFrag, jsxImportSource, automaticJSXRuntime, reactRefresh, decorators, useDefineForClassFields;
     if (config.isSource) {
-      var _pkg$dependencies2, _pkg$devDependencies2, _pkg$peerDependencies2, _await$config$getConf, _await$config$getConf2;
+      var _packageJson$dependen2, _packageJson$devDepen2, _packageJson$peerDepe2, _await$config$getConf;
       let reactLib;
-      if (pkg !== null && pkg !== void 0 && pkg.alias && pkg.alias['react']) {
+      if (packageJson !== null && packageJson !== void 0 && packageJson.alias && packageJson.alias['react']) {
         // e.g.: `{ alias: { "react": "preact/compat" } }`
         reactLib = 'react';
       } else {
         // Find a dependency that we can map to a JSX pragma
         reactLib = Object.keys(JSX_PRAGMA).find(libName => {
-          var _pkg$dependencies, _pkg$devDependencies, _pkg$peerDependencies;
-          return (pkg === null || pkg === void 0 || (_pkg$dependencies = pkg.dependencies) === null || _pkg$dependencies === void 0 ? void 0 : _pkg$dependencies[libName]) || (pkg === null || pkg === void 0 || (_pkg$devDependencies = pkg.devDependencies) === null || _pkg$devDependencies === void 0 ? void 0 : _pkg$devDependencies[libName]) || (pkg === null || pkg === void 0 || (_pkg$peerDependencies = pkg.peerDependencies) === null || _pkg$peerDependencies === void 0 ? void 0 : _pkg$peerDependencies[libName]);
+          var _packageJson$dependen, _packageJson$devDepen, _packageJson$peerDepe;
+          return (packageJson === null || packageJson === void 0 || (_packageJson$dependen = packageJson.dependencies) === null || _packageJson$dependen === void 0 ? void 0 : _packageJson$dependen[libName]) || (packageJson === null || packageJson === void 0 || (_packageJson$devDepen = packageJson.devDependencies) === null || _packageJson$devDepen === void 0 ? void 0 : _packageJson$devDepen[libName]) || (packageJson === null || packageJson === void 0 || (_packageJson$peerDepe = packageJson.peerDependencies) === null || _packageJson$peerDepe === void 0 ? void 0 : _packageJson$peerDepe[libName]);
         });
       }
-      reactRefresh = options.hmrOptions && options.mode === 'development' && Boolean((pkg === null || pkg === void 0 || (_pkg$dependencies2 = pkg.dependencies) === null || _pkg$dependencies2 === void 0 ? void 0 : _pkg$dependencies2.react) || (pkg === null || pkg === void 0 || (_pkg$devDependencies2 = pkg.devDependencies) === null || _pkg$devDependencies2 === void 0 ? void 0 : _pkg$devDependencies2.react) || (pkg === null || pkg === void 0 || (_pkg$peerDependencies2 = pkg.peerDependencies) === null || _pkg$peerDependencies2 === void 0 ? void 0 : _pkg$peerDependencies2.react));
-      const compilerOptions = (0, _featureFlags().getFeatureFlag)('granularTsConfigInvalidation') ? (_await$config$getConf = await config.getConfigFrom(options.projectRoot + '/index', ['tsconfig.json', 'jsconfig.json'], {
-        configKey: 'compilerOptions'
-      })) === null || _await$config$getConf === void 0 ? void 0 : _await$config$getConf.contents : (_await$config$getConf2 = await config.getConfigFrom(options.projectRoot + '/index', ['tsconfig.json', 'jsconfig.json'])) === null || _await$config$getConf2 === void 0 || (_await$config$getConf2 = _await$config$getConf2.contents) === null || _await$config$getConf2 === void 0 ? void 0 : _await$config$getConf2.compilerOptions;
+      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')
+      })) === 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.
       pragma = (compilerOptions === null || compilerOptions === void 0 ? void 0 : compilerOptions.jsxFactory) || (reactLib ? JSX_PRAGMA[reactLib].pragma : undefined);
@@ -187,10 +195,10 @@ var _default = exports.default = new (_plugin().Transformer)({
         jsxImportSource = compilerOptions === null || compilerOptions === void 0 ? void 0 : compilerOptions.jsxImportSource;
         automaticJSXRuntime = true;
       } else if (reactLib) {
-        var _JSX_PRAGMA$effective, _pkg$dependencies3, _pkg$devDependencies3, _pkg$peerDependencies3, _semver$minVersion;
-        let effectiveReactLib = pkg !== null && pkg !== void 0 && pkg.alias && pkg.alias['react'] === 'preact/compat' ? 'preact' : reactLib;
+        var _JSX_PRAGMA$effective, _packageJson$dependen3, _packageJson$devDepen3, _packageJson$peerDepe3, _semver$minVersion;
+        let effectiveReactLib = packageJson !== null && packageJson !== void 0 && packageJson.alias && packageJson.alias['react'] === 'preact/compat' ? 'preact' : reactLib;
         let automaticVersion = (_JSX_PRAGMA$effective = JSX_PRAGMA[effectiveReactLib]) === null || _JSX_PRAGMA$effective === void 0 ? void 0 : _JSX_PRAGMA$effective.automatic;
-        let reactLibVersion = (pkg === null || pkg === void 0 || (_pkg$dependencies3 = pkg.dependencies) === null || _pkg$dependencies3 === void 0 ? void 0 : _pkg$dependencies3[effectiveReactLib]) || (pkg === null || pkg === void 0 || (_pkg$devDependencies3 = pkg.devDependencies) === null || _pkg$devDependencies3 === void 0 ? void 0 : _pkg$devDependencies3[effectiveReactLib]) || (pkg === null || pkg === void 0 || (_pkg$peerDependencies3 = pkg.peerDependencies) === null || _pkg$peerDependencies3 === void 0 ? void 0 : _pkg$peerDependencies3[effectiveReactLib]);
+        let reactLibVersion = (packageJson === null || packageJson === void 0 || (_packageJson$dependen3 = packageJson.dependencies) === null || _packageJson$dependen3 === void 0 ? void 0 : _packageJson$dependen3[effectiveReactLib]) || (packageJson === null || packageJson === void 0 || (_packageJson$devDepen3 = packageJson.devDependencies) === null || _packageJson$devDepen3 === void 0 ? void 0 : _packageJson$devDepen3[effectiveReactLib]) || (packageJson === null || packageJson === void 0 || (_packageJson$peerDepe3 = packageJson.peerDependencies) === null || _packageJson$peerDepe3 === void 0 ? void 0 : _packageJson$peerDepe3[effectiveReactLib]);
         reactLibVersion = reactLibVersion ? _semver().default.validRange(reactLibVersion) : null;
         let minReactLibVersion = reactLibVersion !== null && reactLibVersion !== '*' ? (_semver$minVersion = _semver().default.minVersion(reactLibVersion)) === null || _semver$minVersion === void 0 ? void 0 : _semver$minVersion.toString() : null;
         automaticJSXRuntime = automaticVersion && !(compilerOptions !== null && compilerOptions !== void 0 && compilerOptions.jsxFactory) && minReactLibVersion != null && _semver().default.satisfies(minReactLibVersion, automaticVersion, {
@@ -216,7 +224,7 @@ var _default = exports.default = new (_plugin().Transformer)({
 
     // Check if we should ignore fs calls
     // See https://github.com/defunctzombie/node-browser-resolve#skip
-    let ignoreFS = pkg && pkg.browser && typeof pkg.browser === 'object' && pkg.browser.fs === false;
+    let ignoreFS = packageJson && packageJson.browser && typeof packageJson.browser === 'object' && packageJson.browser.fs === false;
     let conf = await config.getConfigFrom(options.projectRoot + '/index', [], {
       packageKey: '@atlaspack/transformer-js'
     });
@@ -306,9 +314,6 @@ 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]);
@@ -349,7 +354,7 @@ var _default = exports.default = new (_plugin().Transformer)({
       module_id: asset.id,
       project_root: options.projectRoot,
       replace_env: !asset.env.isNode(),
-      inline_fs: Boolean(config === null || config === void 0 ? void 0 : config.inlineFS) && !asset.env.isNode(),
+      inline_fs: process.env.ATLASPACK_SUPER_BUILD === 'true' || 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(),
@@ -378,6 +383,7 @@ var _default = exports.default = new (_plugin().Transformer)({
       inline_constants: config.inlineConstants,
       conditional_bundling: options.featureFlags.conditionalBundlingApi,
       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 {
@@ -402,7 +408,7 @@ var _default = exports.default = new (_plugin().Transformer)({
         }
         try {
           if (typeof mod[exportName] === 'function') {
-            let ctx = {
+            return mod[exportName].apply({
               // Allows macros to emit additional assets to add as dependencies (e.g. css).
               addAsset(a) {
                 let k = String(macroAssets.length);
@@ -461,8 +467,7 @@ var _default = exports.default = new (_plugin().Transformer)({
               invalidateOnBuild() {
                 asset.invalidateOnBuild();
               }
-            };
-            return mod[exportName].apply(ctx, args);
+            }, args);
           } else {
             throw new Error(`"${exportName}" in "${src}" is not a function.`);
           }
@@ -471,7 +476,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(__filename)) {
+            if (line.includes( /*#__ATLASPACK_IGNORE__*/__filename)) {
               break;
             }
             message += '\n' + line;
@@ -709,7 +714,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 ? __filename : undefined,
+          resolveFrom: isHelper ? /*#__ATLASPACK_IGNORE__*/__filename : undefined,
           range,
           env
         });
@@ -871,16 +876,29 @@ var _default = exports.default = new (_plugin().Transformer)({
         }
       }
       if (needs_esm_helpers) {
-        asset.addDependency({
-          specifier: '@atlaspack/transformer-js/src/esmodule-helpers.js',
-          specifierType: 'esm',
-          resolveFrom: __filename,
-          env: {
-            includeNodeModules: {
-              '@atlaspack/transformer-js': true
+        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.type = 'js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/transformer-js",
-  "version": "3.2.3-dev.55+5a11f33c5",
+  "version": "3.2.3-dev.69+67cb517ae",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -21,13 +21,16 @@
     "lib",
     "src"
   ],
+  "atlaspackReferences": [
+    "src/esmodule-helpers.js"
+  ],
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-dev.123+5a11f33c5",
-    "@atlaspack/feature-flags": "2.14.1-dev.123+5a11f33c5",
-    "@atlaspack/plugin": "2.14.5-dev.55+5a11f33c5",
-    "@atlaspack/rust": "3.2.1-dev.55+5a11f33c5",
-    "@atlaspack/utils": "2.14.5-dev.55+5a11f33c5",
-    "@atlaspack/workers": "2.14.5-dev.55+5a11f33c5",
+    "@atlaspack/diagnostic": "2.14.1-dev.137+67cb517ae",
+    "@atlaspack/feature-flags": "2.14.1-dev.137+67cb517ae",
+    "@atlaspack/plugin": "2.14.5-dev.69+67cb517ae",
+    "@atlaspack/rust": "3.2.1-dev.69+67cb517ae",
+    "@atlaspack/utils": "2.14.5-dev.69+67cb517ae",
+    "@atlaspack/workers": "2.14.5-dev.69+67cb517ae",
     "@parcel/source-map": "^2.1.1",
     "@swc/helpers": "^0.5.15",
     "browserslist": "^4.6.6",
@@ -39,5 +42,5 @@
     "@atlaspack/core": "^2.13.1"
   },
   "type": "commonjs",
-  "gitHead": "5a11f33c51ff74d1cf8d4b72cfa0fda833aa980a"
+  "gitHead": "67cb517ae793046fb5a0d2ef02ba74510fefccf3"
 }

package/src/JSTransformer.js

@@ -12,6 +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 browserslist from 'browserslist';
 import semver from 'semver';
 import nullthrows from 'nullthrows';
@@ -23,6 +24,10 @@ 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,
@@ -173,7 +178,7 @@ type MacroContext = {|
 
 export default (new Transformer({
   async loadConfig({config, options}) {
-    let pkg = await config.getPackage();
+    let packageJson = await config.getPackage();
     let isJSX,
       pragma,
       pragmaFrag,
@@ -184,16 +189,16 @@ export default (new Transformer({
       useDefineForClassFields;
     if (config.isSource) {
       let reactLib;
-      if (pkg?.alias && pkg.alias['react']) {
+      if (packageJson?.alias && packageJson.alias['react']) {
         // e.g.: `{ alias: { "react": "preact/compat" } }`
         reactLib = 'react';
       } else {
         // Find a dependency that we can map to a JSX pragma
         reactLib = Object.keys(JSX_PRAGMA).find(
           (libName) =>
-            pkg?.dependencies?.[libName] ||
-            pkg?.devDependencies?.[libName] ||
-            pkg?.peerDependencies?.[libName],
+            packageJson?.dependencies?.[libName] ||
+            packageJson?.devDependencies?.[libName] ||
+            packageJson?.peerDependencies?.[libName],
         );
       }
 
@@ -201,27 +206,20 @@ export default (new Transformer({
         options.hmrOptions &&
         options.mode === 'development' &&
         Boolean(
-          pkg?.dependencies?.react ||
-            pkg?.devDependencies?.react ||
-            pkg?.peerDependencies?.react,
+          packageJson?.dependencies?.react ||
+            packageJson?.devDependencies?.react ||
+            packageJson?.peerDependencies?.react,
         );
 
-      const compilerOptions: TSConfig['compilerOptions'] = getFeatureFlag(
-        'granularTsConfigInvalidation',
-      )
-        ? (
-            await config.getConfigFrom<TSConfig['compilerOptions']>(
-              options.projectRoot + '/index',
-              ['tsconfig.json', 'jsconfig.json'],
-              {configKey: 'compilerOptions'},
-            )
-          )?.contents
-        : (
-            await config.getConfigFrom<TSConfig>(
-              options.projectRoot + '/index',
-              ['tsconfig.json', 'jsconfig.json'],
-            )
-          )?.contents?.compilerOptions;
+      const compilerOptions: TSConfig['compilerOptions'] = (
+        await config.getConfigFrom<TSConfig>(
+          options.projectRoot + '/index',
+          ['tsconfig.json', 'jsconfig.json'],
+          {
+            readTracking: getFeatureFlag('granularTsConfigInvalidation'),
+          },
+        )
+      )?.contents?.compilerOptions;
 
       // Use explicitly defined JSX options in tsconfig.json over inferred values from dependencies.
       pragma =
@@ -240,14 +238,14 @@ export default (new Transformer({
         automaticJSXRuntime = true;
       } else if (reactLib) {
         let effectiveReactLib =
-          pkg?.alias && pkg.alias['react'] === 'preact/compat'
+          packageJson?.alias && packageJson.alias['react'] === 'preact/compat'
             ? 'preact'
             : reactLib;
         let automaticVersion = JSX_PRAGMA[effectiveReactLib]?.automatic;
         let reactLibVersion =
-          pkg?.dependencies?.[effectiveReactLib] ||
-          pkg?.devDependencies?.[effectiveReactLib] ||
-          pkg?.peerDependencies?.[effectiveReactLib];
+          packageJson?.dependencies?.[effectiveReactLib] ||
+          packageJson?.devDependencies?.[effectiveReactLib] ||
+          packageJson?.peerDependencies?.[effectiveReactLib];
         reactLibVersion = reactLibVersion
           ? semver.validRange(reactLibVersion)
           : null;
@@ -289,10 +287,10 @@ export default (new Transformer({
     // Check if we should ignore fs calls
     // See https://github.com/defunctzombie/node-browser-resolve#skip
     let ignoreFS =
-      pkg &&
-      pkg.browser &&
-      typeof pkg.browser === 'object' &&
-      pkg.browser.fs === false;
+      packageJson &&
+      packageJson.browser &&
+      typeof packageJson.browser === 'object' &&
+      packageJson.browser.fs === false;
 
     let conf = await config.getConfigFrom(options.projectRoot + '/index', [], {
       packageKey: '@atlaspack/transformer-js',
@@ -446,7 +444,9 @@ export default (new Transformer({
       module_id: asset.id,
       project_root: options.projectRoot,
       replace_env: !asset.env.isNode(),
-      inline_fs: Boolean(config?.inlineFS) && !asset.env.isNode(),
+      inline_fs:
+        process.env.ATLASPACK_SUPER_BUILD === 'true' ||
+        (Boolean(config?.inlineFS) && !asset.env.isNode()),
       insert_node_globals:
         !asset.env.isNode() && asset.env.sourceType !== 'script',
       node_replacer: asset.env.isNode(),
@@ -482,6 +482,7 @@ export default (new Transformer({
       inline_constants: config.inlineConstants,
       conditional_bundling: options.featureFlags.conditionalBundlingApi,
       magic_comments: Boolean(config?.magicComments),
+      esm_helpers_specifier,
       callMacro: asset.isSource
         ? async (err, src, exportName, args, loc) => {
             let mod;
@@ -585,7 +586,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(__filename)) {
+                if (line.includes(/*#__ATLASPACK_IGNORE__*/ __filename)) {
                   break;
                 }
                 message += '\n' + line;
@@ -889,7 +890,9 @@ export default (new Transformer({
               : 'sync',
           isOptional: dep.is_optional,
           meta,
-          resolveFrom: isHelper ? __filename : undefined,
+          resolveFrom: isHelper
+            ? /*#__ATLASPACK_IGNORE__*/ __filename
+            : undefined,
           range,
           env,
         });
@@ -1077,16 +1080,29 @@ export default (new Transformer({
       }
 
       if (needs_esm_helpers) {
-        asset.addDependency({
-          specifier: '@atlaspack/transformer-js/src/esmodule-helpers.js',
-          specifierType: 'esm',
-          resolveFrom: __filename,
-          env: {
-            includeNodeModules: {
-              '@atlaspack/transformer-js': true,
+        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,
+              },
+            },
+          });
+        }
       }
     }