@atlaspack/transformer-js 3.2.3-canary.30 → 3.2.3-canary.301

package/lib/JSTransformer.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 function _sourceMap() {
-  const data = _interopRequireDefault(require("@parcel/source-map"));
+  const data = _interopRequireDefault(require("@atlaspack/source-map"));
   _sourceMap = function () {
     return data;
   };
@@ -25,6 +25,13 @@ function _rust() {
   };
   return data;
 }
+function _assert() {
+  const data = _interopRequireDefault(require("assert"));
+  _assert = function () {
+    return data;
+  };
+  return data;
+}
 function _browserslist() {
   const data = _interopRequireDefault(require("browserslist"));
   _browserslist = function () {
@@ -130,6 +137,9 @@ const CONFIG_SCHEMA = {
         }
       }]
     },
+    addReactDisplayName: {
+      type: 'boolean'
+    },
     magicComments: {
       type: 'boolean'
     },
@@ -158,40 +168,49 @@ const SCRIPT_ERRORS = {
 var _default = exports.default = new (_plugin().Transformer)({
   async loadConfig({
     config,
-    options
+    options,
+    logger
   }) {
-    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, _tsconfig$contents;
+      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));
-      let tsconfig = await config.getConfigFrom(options.projectRoot + '/index', ['tsconfig.json', 'jsconfig.json']);
-      let compilerOptions = tsconfig === null || tsconfig === void 0 || (_tsconfig$contents = tsconfig.contents) === null || _tsconfig$contents === void 0 ? void 0 : _tsconfig$contents.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: 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.
-      pragma = (compilerOptions === null || compilerOptions === void 0 ? void 0 : compilerOptions.jsxFactory) || (reactLib ? JSX_PRAGMA[reactLib].pragma : undefined);
-      pragmaFrag = (compilerOptions === null || compilerOptions === void 0 ? void 0 : compilerOptions.jsxFragmentFactory) || (reactLib ? JSX_PRAGMA[reactLib].pragmaFrag : undefined);
+      pragma = (compilerOptions === null || compilerOptions === void 0 ? void 0 : compilerOptions.jsxFactory) || (
+      // @ts-expect-error TS7053
+      reactLib ? JSX_PRAGMA[reactLib].pragma : undefined);
+      pragmaFrag = (compilerOptions === null || compilerOptions === void 0 ? void 0 : compilerOptions.jsxFragmentFactory) || (
+      // @ts-expect-error TS7053
+      reactLib ? JSX_PRAGMA[reactLib].pragmaFrag : undefined);
       if ((compilerOptions === null || compilerOptions === void 0 ? void 0 : compilerOptions.jsx) === 'react-jsx' || (compilerOptions === null || compilerOptions === void 0 ? void 0 : compilerOptions.jsx) === 'react-jsxdev' || compilerOptions !== null && compilerOptions !== void 0 && compilerOptions.jsxImportSource) {
         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;
+        // @ts-expect-error TS7053
         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]);
+        // @ts-expect-error TS2322
         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;
+        let minReactLibVersion = reactLibVersion !== null && reactLibVersion !== '*' ? // @ts-expect-error TS2345
+        (_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, {
           includePrerelease: true
         });
@@ -215,7 +234,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'
     });
@@ -223,21 +242,33 @@ var _default = exports.default = new (_plugin().Transformer)({
     let inlineFS = !ignoreFS;
     let inlineConstants = false;
     let magicComments = false;
+    let addReactDisplayName = false;
+    let enableGlobalThisAliaser = options.env.NATIVE_GLOBAL_THIS_ALIASER === 'true';
+    let enableLazyLoadingTransformer = options.env.NATIVE_LAZY_LOADING_TRANSFORMER === 'true';
+    let enableDeadReturnsRemover = options.env.NATIVE_DEAD_RETURNS_REMOVER === 'true';
+    let enableUnusedBindingsRemover = options.env.NATIVE_UNUSED_BINDINGS_REMOVER === 'true';
     if (conf && conf.contents) {
-      var _conf$contents, _conf$contents2, _conf$contents3, _conf$contents4;
+      var _conf$contents, _conf$contents2, _conf$contents3, _conf$contents4, _conf$contents5;
       _utils().validateSchema.diagnostic(CONFIG_SCHEMA, {
         data: conf.contents,
-        // FIXME
-        source: await options.inputFS.readFile(conf.filePath, 'utf8'),
+        source: () => options.inputFS.readFileSync(conf.filePath, 'utf8'),
         filePath: conf.filePath,
         prependKey: `/${(0, _diagnostic().encodeJSONKeyComponent)('@atlaspack/transformer-js')}`
       },
       // FIXME
       '@atlaspack/transformer-js', 'Invalid config for @atlaspack/transformer-js');
-      magicComments = ((_conf$contents = conf.contents) === null || _conf$contents === void 0 ? void 0 : _conf$contents.magicComments) ?? magicComments;
-      inlineEnvironment = ((_conf$contents2 = conf.contents) === null || _conf$contents2 === void 0 ? void 0 : _conf$contents2.inlineEnvironment) ?? inlineEnvironment;
-      inlineFS = ((_conf$contents3 = conf.contents) === null || _conf$contents3 === void 0 ? void 0 : _conf$contents3.inlineFS) ?? inlineFS;
-      inlineConstants = ((_conf$contents4 = conf.contents) === null || _conf$contents4 === void 0 ? void 0 : _conf$contents4.unstable_inlineConstants) ?? inlineConstants;
+      addReactDisplayName =
+      // @ts-expect-error TS2339
+      ((_conf$contents = conf.contents) === null || _conf$contents === void 0 ? void 0 : _conf$contents.addReactDisplayName) ?? addReactDisplayName;
+      // @ts-expect-error TS2339
+      magicComments = ((_conf$contents2 = conf.contents) === null || _conf$contents2 === void 0 ? void 0 : _conf$contents2.magicComments) ?? magicComments;
+      // @ts-expect-error TS2339
+      inlineEnvironment = ((_conf$contents3 = conf.contents) === null || _conf$contents3 === void 0 ? void 0 : _conf$contents3.inlineEnvironment) ?? inlineEnvironment;
+      // @ts-expect-error TS2339
+      inlineFS = ((_conf$contents4 = conf.contents) === null || _conf$contents4 === void 0 ? void 0 : _conf$contents4.inlineFS) ?? inlineFS;
+      inlineConstants =
+      // @ts-expect-error TS2339
+      ((_conf$contents5 = conf.contents) === null || _conf$contents5 === void 0 ? void 0 : _conf$contents5.unstable_inlineConstants) ?? inlineConstants;
     }
     return {
       isJSX,
@@ -248,10 +279,15 @@ var _default = exports.default = new (_plugin().Transformer)({
       inlineEnvironment,
       inlineFS,
       inlineConstants,
+      addReactDisplayName,
       reactRefresh,
       decorators,
       useDefineForClassFields,
-      magicComments
+      magicComments,
+      enableGlobalThisAliaser,
+      enableLazyLoadingTransformer,
+      enableDeadReturnsRemover,
+      enableUnusedBindingsRemover
     };
   },
   async transform({
@@ -280,17 +316,22 @@ var _default = exports.default = new (_plugin().Transformer)({
       for (let browser of browsers) {
         let [name, version] = browser.split(' ');
         if (BROWSER_MAPPING.hasOwnProperty(name)) {
+          // @ts-expect-error TS7053
           name = BROWSER_MAPPING[name];
           if (!name) {
             continue;
           }
         }
         let [major, minor = '0', patch = '0'] = version.split('-')[0].split('.');
+        // @ts-expect-error TS2345
         if (isNaN(major) || isNaN(minor) || isNaN(patch)) {
           continue;
         }
         let semverVersion = `${major}.${minor}.${patch}`;
+
+        // @ts-expect-error TS2345
         if (targets[name] == null || _semver().default.gt(targets[name], semverVersion)) {
+          // @ts-expect-error TS7053
           targets[name] = semverVersion;
         }
       }
@@ -305,6 +346,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]);
@@ -322,23 +366,40 @@ var _default = exports.default = new (_plugin().Transformer)({
       if (asset.type === 'ts') {
         isJSX = false;
       } else if (!isJSX) {
+        // @ts-expect-error TS7053
         isJSX = Boolean(JSX_EXTENSIONS[asset.type]);
       }
     }
     let macroAssets = [];
     let {
+      // @ts-expect-error TS2339
       dependencies,
+      // @ts-expect-error TS2339
       code: compiledCode,
+      // @ts-expect-error TS2339
       map,
+      // @ts-expect-error TS2339
       shebang,
+      // @ts-expect-error TS2339
       hoist_result,
+      // @ts-expect-error TS2339
       symbol_result,
+      // @ts-expect-error TS2339
+      is_empty_or_empty_export,
+      // @ts-expect-error TS2339
       needs_esm_helpers,
+      // @ts-expect-error TS2339
       diagnostics,
+      // @ts-expect-error TS2339
       used_env,
+      // @ts-expect-error TS2339
       has_node_replacements,
+      // @ts-expect-error TS2339
       is_constant_module,
-      conditions
+      // @ts-expect-error TS2339
+      conditions,
+      // @ts-expect-error TS2339
+      magic_comments
     } = await (_rust().transformAsync || _rust().transform)({
       filename: asset.filePath,
       code,
@@ -349,7 +410,7 @@ var _default = exports.default = new (_plugin().Transformer)({
       insert_node_globals: !asset.env.isNode() && asset.env.sourceType !== 'script',
       node_replacer: asset.env.isNode(),
       is_browser: asset.env.isBrowser(),
-      is_worker: asset.env.isWorker(),
+      is_worker: asset.env.isWorker() || asset.env.isTesseract(),
       env,
       is_type_script: asset.type === 'ts' || asset.type === 'tsx',
       is_jsx: isJSX,
@@ -358,7 +419,7 @@ var _default = exports.default = new (_plugin().Transformer)({
       automatic_jsx_runtime: Boolean(config === null || config === void 0 ? void 0 : config.automaticJSXRuntime),
       jsx_import_source: config === null || config === void 0 ? void 0 : config.jsxImportSource,
       is_development: options.mode === 'development',
-      react_refresh: asset.env.isBrowser() && !asset.env.isLibrary && !asset.env.isWorker() && !asset.env.isWorklet() && Boolean(config === null || config === void 0 ? void 0 : config.reactRefresh),
+      react_refresh: asset.env.isBrowser() && !asset.env.isLibrary && !asset.env.isWorker() && !asset.env.isTesseract() && !asset.env.isWorklet() && Boolean(config === null || config === void 0 ? void 0 : config.reactRefresh),
       decorators: Boolean(config === null || config === void 0 ? void 0 : config.decorators),
       use_define_for_class_fields: Boolean(config === null || config === void 0 ? void 0 : config.useDefineForClassFields),
       targets,
@@ -373,16 +434,23 @@ var _default = exports.default = new (_plugin().Transformer)({
       standalone: asset.query.has('standalone'),
       inline_constants: config.inlineConstants,
       conditional_bundling: options.featureFlags.conditionalBundlingApi,
-      magic_comments: Boolean(config === null || config === void 0 ? void 0 : config.magicComments),
+      hmr_improvements: options.featureFlags.hmrImprovements,
+      add_display_name: Boolean(config.addReactDisplayName),
+      exports_rebinding_optimisation: options.featureFlags.exportsRebindingOptimisation,
+      magic_comments: Boolean(config === null || config === void 0 ? void 0 : config.magicComments) || (0, _featureFlags().getFeatureFlag)('supportWebpackChunkName'),
+      is_source: asset.isSource,
+      enable_global_this_aliaser: Boolean(config.enableGlobalThisAliaser),
+      enable_lazy_loading_transformer: Boolean(config.enableLazyLoadingTransformer),
+      nested_promise_import_fix: options.featureFlags.nestedPromiseImportFix,
+      enable_dead_returns_remover: Boolean(config.enableDeadReturnsRemover),
+      enable_unused_bindings_remover: Boolean(config.enableUnusedBindingsRemover),
       callMacro: asset.isSource ? async (err, src, exportName, args, loc) => {
         let mod;
         try {
           mod = await options.packageManager.require(src, asset.filePath);
 
           // Default interop for CommonJS modules.
-          if (exportName === 'default' && !mod.__esModule &&
-          // $FlowFixMe
-          Object.prototype.toString.call(config) !== '[object Module]') {
+          if (exportName === 'default' && !mod.__esModule && Object.prototype.toString.call(config) !== '[object Module]') {
             mod = {
               default: mod
             };
@@ -398,7 +466,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);
@@ -406,6 +474,7 @@ var _default = exports.default = new (_plugin().Transformer)({
                 if (asset.env.sourceMap) {
                   // Generate a source map that maps each line of the asset to the original macro call.
                   map = new (_sourceMap().default)(options.projectRoot);
+                  // @ts-expect-error TS2304
                   let mappings = [];
                   let line = 1;
                   for (let i = 0; i <= a.content.length; i++) {
@@ -428,7 +497,9 @@ var _default = exports.default = new (_plugin().Transformer)({
                   if (originalMap) {
                     map.extends(originalMap);
                   } else {
-                    map.setSourceContent(asset.filePath, code.toString());
+                    if (!(0, _featureFlags().getFeatureFlag)('omitSourcesContentInMemory')) {
+                      map.setSourceContent(asset.filePath, code.toString());
+                    }
                   }
                 }
                 macroAssets.push({
@@ -457,7 +528,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.`);
           }
@@ -479,11 +551,7 @@ var _default = exports.default = new (_plugin().Transformer)({
       } : null
     });
     if ((0, _featureFlags().getFeatureFlag)('conditionalBundlingApi')) {
-      asset.meta.conditions = conditions.map(c => ({
-        key: c.key,
-        ifTruePlaceholder: c.if_true_placeholder,
-        ifFalsePlaceholder: c.if_false_placeholder
-      }));
+      asset.meta.conditions = conditions;
     }
     if (is_constant_module) {
       asset.meta.isConstantModule = true;
@@ -503,17 +571,22 @@ var _default = exports.default = new (_plugin().Transformer)({
 
       // If there is an original source map, use it to remap to the original source location.
       if (originalMap) {
-        location = (0, _utils().remapSourceLocation)(location, originalMap);
+        location = (0, _utils().remapSourceLocation)(location, originalMap, options.projectRoot);
       }
       return location;
     };
     if (diagnostics) {
-      let errors = diagnostics.filter(d => d.severity === 'Error' || d.severity === 'SourceError' && asset.isSource);
-      let warnings = diagnostics.filter(d => d.severity === 'Warning' || d.severity === 'SourceError' && !asset.isSource);
+      let errors = diagnostics.filter(
+      // @ts-expect-error TS7006
+      d => d.severity === 'Error' || d.severity === 'SourceError' && asset.isSource);
+      let warnings = diagnostics.filter(
+      // @ts-expect-error TS7006
+      d => d.severity === 'Warning' || d.severity === 'SourceError' && !asset.isSource);
       let convertDiagnostic = diagnostic => {
         var _diagnostic$code_high;
         let message = diagnostic.message;
         if (message === 'SCRIPT_ERROR') {
+          // @ts-expect-error TS7053
           let err = SCRIPT_ERRORS[asset.env.context];
           message = (err === null || err === void 0 ? void 0 : err.message) || SCRIPT_ERRORS.browser.message;
         }
@@ -536,6 +609,8 @@ var _default = exports.default = new (_plugin().Transformer)({
               codeHighlights: [(0, _diagnostic().convertSourceLocationToHighlight)(asset.env.loc, 'The environment was originally created here')]
             });
           }
+
+          // @ts-expect-error TS7053
           let err = SCRIPT_ERRORS[asset.env.context];
           if (err) {
             if (!res.hints) {
@@ -580,6 +655,7 @@ var _default = exports.default = new (_plugin().Transformer)({
           env: {
             context: 'web-worker',
             sourceType: dep.source_type === 'Module' ? 'module' : 'script',
+            // @ts-expect-error TS2322
             outputFormat,
             loc
           },
@@ -629,6 +705,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
@@ -676,6 +759,12 @@ var _default = exports.default = new (_plugin().Transformer)({
             outputFormat,
             loc: convertLoc(dep.loc)
           };
+          if ((0, _featureFlags().getFeatureFlag)('supportWebpackChunkName')) {
+            let chunkName = magic_comments[dep.specifier];
+            if (chunkName) {
+              meta.chunkName = chunkName;
+            }
+          }
         }
 
         // Always bundle helpers, even with includeNodeModules: false, except if this is a library.
@@ -695,6 +784,7 @@ var _default = exports.default = new (_plugin().Transformer)({
             idx = dep.specifier.indexOf('/', idx + 1);
           }
           let module = idx >= 0 ? dep.specifier.slice(0, idx) : dep.specifier;
+          // @ts-expect-error TS7053
           range = _package.default.dependencies[module];
         }
         asset.addDependency({
@@ -706,6 +796,7 @@ var _default = exports.default = new (_plugin().Transformer)({
           meta,
           resolveFrom: isHelper ? __filename : undefined,
           range,
+          // @ts-expect-error TS2322
           env
         });
       }
@@ -717,10 +808,12 @@ var _default = exports.default = new (_plugin().Transformer)({
         exported,
         local,
         loc,
-        is_esm
+        is_esm,
+        is_static_binding_safe
       } of hoist_result.exported_symbols) {
         asset.symbols.set(exported, local, convertLoc(loc), {
-          isEsm: is_esm
+          isEsm: is_esm,
+          isStaticBindingSafe: is_static_binding_safe
         });
       }
 
@@ -802,6 +895,9 @@ var _default = exports.default = new (_plugin().Transformer)({
       // (and the asset has side effects), or the asset is wrapped.
       // This allows accessing symbols that don't exist without errors in symbol propagation.
       if (hoist_result.has_cjs_exports || !hoist_result.is_esm && asset.sideEffects && deps.size === 0 && Object.keys(hoist_result.exported_symbols).length === 0 || hoist_result.should_wrap && !asset.symbols.hasExportSymbol('*')) {
+        if (is_empty_or_empty_export) {
+          asset.meta.emptyFileStarReexport = true;
+        }
         asset.symbols.set('*', `$${asset.id}$exports`);
       }
       asset.meta.hasCJSExports = hoist_result.has_cjs_exports;

package/lib/types/JSTransformer.d.ts

@@ -0,0 +1,3 @@
+import { Transformer } from '@atlaspack/plugin';
+declare const _default: Transformer<unknown>;
+export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/transformer-js",
-  "version": "3.2.3-canary.30+c41daba65",
+  "version": "3.2.3-canary.301+25fee723d",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -9,10 +9,12 @@
     "type": "git",
     "url": "https://github.com/atlassian-labs/atlaspack.git"
   },
-  "main": "lib/JSTransformer.js",
-  "source": "src/JSTransformer.js",
+  "main": "./lib/JSTransformer.js",
+  "source": "./src/JSTransformer.ts",
+  "types": "./lib/types/JSTransformer.d.ts",
   "scripts": {
-    "test": "mocha"
+    "test": "mocha",
+    "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
   },
   "engines": {
     "node": ">= 16.0.0"
@@ -22,13 +24,13 @@
     "src"
   ],
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-canary.98+c41daba65",
-    "@atlaspack/feature-flags": "2.14.1-canary.98+c41daba65",
-    "@atlaspack/plugin": "2.14.5-canary.30+c41daba65",
-    "@atlaspack/rust": "3.2.1-canary.30+c41daba65",
-    "@atlaspack/utils": "2.14.5-canary.30+c41daba65",
-    "@atlaspack/workers": "2.14.5-canary.30+c41daba65",
-    "@parcel/source-map": "^2.1.1",
+    "@atlaspack/diagnostic": "2.14.1-canary.369+25fee723d",
+    "@atlaspack/feature-flags": "2.14.1-canary.369+25fee723d",
+    "@atlaspack/plugin": "2.14.5-canary.301+25fee723d",
+    "@atlaspack/rust": "3.2.1-canary.301+25fee723d",
+    "@atlaspack/source-map": "3.1.1-canary.4080+25fee723d",
+    "@atlaspack/utils": "2.14.5-canary.301+25fee723d",
+    "@atlaspack/workers": "2.14.5-canary.301+25fee723d",
     "@swc/helpers": "^0.5.15",
     "browserslist": "^4.6.6",
     "nullthrows": "^1.1.1",
@@ -36,8 +38,8 @@
     "semver": "^7.5.2"
   },
   "peerDependencies": {
-    "@atlaspack/core": "^2.13.1"
+    "@atlaspack/core": "2.28.0"
   },
   "type": "commonjs",
-  "gitHead": "c41daba6521e3d746cbea2fc3db55a8a3c006cb7"
-}
+  "gitHead": "25fee723d2228d0482ec8a8f1b8379ccd2977ce7"
+}

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

@@ -1,17 +1,16 @@
-// @flow
 import type {
   JSONObject,
   EnvMap,
   SourceLocation,
   FilePath,
   FileCreateInvalidation,
-  ConditionMeta,
 } from '@atlaspack/types';
 import type {SchemaEntity} from '@atlaspack/utils';
 import type {Diagnostic} from '@atlaspack/diagnostic';
-import SourceMap from '@parcel/source-map';
+import SourceMap from '@atlaspack/source-map';
 import {Transformer} from '@atlaspack/plugin';
 import {transform, transformAsync} from '@atlaspack/rust';
+import invariant from 'assert';
 import browserslist from 'browserslist';
 import semver from 'semver';
 import nullthrows from 'nullthrows';
@@ -26,7 +25,7 @@ import {getFeatureFlag} from '@atlaspack/feature-flags';
 const JSX_EXTENSIONS = {
   jsx: true,
   tsx: true,
-};
+} as const;
 
 const JSX_PRAGMA = {
   react: {
@@ -49,7 +48,7 @@ const JSX_PRAGMA = {
     pragmaFrag: undefined,
     automatic: undefined,
   },
-};
+} as const;
 
 const BROWSER_MAPPING = {
   and_chr: 'chrome',
@@ -63,7 +62,7 @@ const BROWSER_MAPPING = {
   bb: null,
   kaios: null,
   op_mini: null,
-};
+} as const;
 
 // List of browsers to exclude when the esmodule target is specified.
 // Based on https://caniuse.com/#feat=es6-module
@@ -108,6 +107,9 @@ const CONFIG_SCHEMA: SchemaEntity = {
         },
       ],
     },
+    addReactDisplayName: {
+      type: 'boolean',
+    },
     magicComments: {
       type: 'boolean',
     },
@@ -133,47 +135,45 @@ const SCRIPT_ERRORS = {
       'Service workers cannot have imports or exports without the `type: "module"` option.',
     hint: "Add {type: 'module'} as a second argument to the navigator.serviceWorker.register() call.",
   },
-};
+} as const;
 
 type TSConfig = {
   compilerOptions?: {
     // https://www.typescriptlang.org/tsconfig#jsx
-    jsx?: 'react' | 'react-jsx' | 'react-jsxdev' | 'preserve' | 'react-native',
+    jsx?: 'react' | 'react-jsx' | 'react-jsxdev' | 'preserve' | 'react-native';
     // https://www.typescriptlang.org/tsconfig#jsxFactory
-    jsxFactory?: string,
+    jsxFactory?: string;
     // https://www.typescriptlang.org/tsconfig#jsxFragmentFactory
-    jsxFragmentFactory?: string,
+    jsxFragmentFactory?: string;
     // https://www.typescriptlang.org/tsconfig#jsxImportSource
-    jsxImportSource?: string,
+    jsxImportSource?: string;
     // https://www.typescriptlang.org/tsconfig#experimentalDecorators
-    experimentalDecorators?: boolean,
+    experimentalDecorators?: boolean;
     // https://www.typescriptlang.org/tsconfig#useDefineForClassFields
-    useDefineForClassFields?: boolean,
+    useDefineForClassFields?: boolean;
     // https://www.typescriptlang.org/tsconfig#target
-    target?: string, // 'es3' | 'es5' | 'es6' | 'es2015' | ...  |'es2022' | ... | 'esnext'
-    ...
-  },
-  ...
+    target?: string; // 'es3' | 'es5' | 'es6' | 'es2015' | ...  |'es2022' | ... | 'esnext';
+  };
 };
 
-type MacroAsset = {|
-  type: string,
-  content: string,
-|};
+type MacroAsset = {
+  type: string;
+  content: string;
+};
 
 // NOTE: Make sure this is in sync with the TypeScript definition in the @atlaspack/macros package.
-type MacroContext = {|
-  addAsset(asset: MacroAsset): void,
-  invalidateOnFileChange(FilePath): void,
-  invalidateOnFileCreate(FileCreateInvalidation): void,
-  invalidateOnEnvChange(string): void,
-  invalidateOnStartup(): void,
-  invalidateOnBuild(): void,
-|};
-
-export default (new Transformer({
-  async loadConfig({config, options}) {
-    let pkg = await config.getPackage();
+type MacroContext = {
+  addAsset(asset: MacroAsset): void;
+  invalidateOnFileChange(arg1: FilePath): void;
+  invalidateOnFileCreate(arg1: FileCreateInvalidation): void;
+  invalidateOnEnvChange(arg1: string): void;
+  invalidateOnStartup(): void;
+  invalidateOnBuild(): void;
+};
+
+export default new Transformer({
+  async loadConfig({config, options, logger}) {
+    let packageJson = await config.getPackage();
     let isJSX,
       pragma,
       pragmaFrag,
@@ -184,16 +184,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,23 +201,29 @@ 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,
         );
 
-      let tsconfig = await config.getConfigFrom<TSConfig>(
-        options.projectRoot + '/index',
-        ['tsconfig.json', 'jsconfig.json'],
-      );
-      let compilerOptions = tsconfig?.contents?.compilerOptions;
+      const compilerOptions: TSConfig['compilerOptions'] = (
+        await config.getConfigFrom<TSConfig>(
+          options.projectRoot + '/index',
+          ['tsconfig.json', 'jsconfig.json'],
+          {
+            readTracking: true,
+          },
+        )
+      )?.contents?.compilerOptions;
 
       // Use explicitly defined JSX options in tsconfig.json over inferred values from dependencies.
       pragma =
         compilerOptions?.jsxFactory ||
+        // @ts-expect-error TS7053
         (reactLib ? JSX_PRAGMA[reactLib].pragma : undefined);
       pragmaFrag =
         compilerOptions?.jsxFragmentFactory ||
+        // @ts-expect-error TS7053
         (reactLib ? JSX_PRAGMA[reactLib].pragmaFrag : undefined);
 
       if (
@@ -229,20 +235,23 @@ 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;
+        // @ts-expect-error TS7053
         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];
+        // @ts-expect-error TS2322
         reactLibVersion = reactLibVersion
           ? semver.validRange(reactLibVersion)
           : null;
         let minReactLibVersion =
           reactLibVersion !== null && reactLibVersion !== '*'
-            ? semver.minVersion(reactLibVersion)?.toString()
+            ? // @ts-expect-error TS2345
+              semver.minVersion(reactLibVersion)?.toString()
             : null;
 
         automaticJSXRuntime =
@@ -278,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',
@@ -291,14 +300,23 @@ export default (new Transformer({
     let inlineFS = !ignoreFS;
     let inlineConstants = false;
     let magicComments = false;
+    let addReactDisplayName = false;
+
+    let enableGlobalThisAliaser =
+      options.env.NATIVE_GLOBAL_THIS_ALIASER === 'true';
+    let enableLazyLoadingTransformer =
+      options.env.NATIVE_LAZY_LOADING_TRANSFORMER === 'true';
+    let enableDeadReturnsRemover =
+      options.env.NATIVE_DEAD_RETURNS_REMOVER === 'true';
+    let enableUnusedBindingsRemover =
+      options.env.NATIVE_UNUSED_BINDINGS_REMOVER === 'true';
 
     if (conf && conf.contents) {
       validateSchema.diagnostic(
         CONFIG_SCHEMA,
         {
           data: conf.contents,
-          // FIXME
-          source: await options.inputFS.readFile(conf.filePath, 'utf8'),
+          source: () => options.inputFS.readFileSync(conf.filePath, 'utf8'),
           filePath: conf.filePath,
           prependKey: `/${encodeJSONKeyComponent('@atlaspack/transformer-js')}`,
         },
@@ -307,10 +325,17 @@ export default (new Transformer({
         'Invalid config for @atlaspack/transformer-js',
       );
 
+      addReactDisplayName =
+        // @ts-expect-error TS2339
+        conf.contents?.addReactDisplayName ?? addReactDisplayName;
+      // @ts-expect-error TS2339
       magicComments = conf.contents?.magicComments ?? magicComments;
+      // @ts-expect-error TS2339
       inlineEnvironment = conf.contents?.inlineEnvironment ?? inlineEnvironment;
+      // @ts-expect-error TS2339
       inlineFS = conf.contents?.inlineFS ?? inlineFS;
       inlineConstants =
+        // @ts-expect-error TS2339
         conf.contents?.unstable_inlineConstants ?? inlineConstants;
     }
 
@@ -323,10 +348,15 @@ export default (new Transformer({
       inlineEnvironment,
       inlineFS,
       inlineConstants,
+      addReactDisplayName,
       reactRefresh,
       decorators,
       useDefineForClassFields,
       magicComments,
+      enableGlobalThisAliaser,
+      enableLazyLoadingTransformer,
+      enableDeadReturnsRemover,
+      enableUnusedBindingsRemover,
     };
   },
   async transform({asset, config, options, logger}) {
@@ -357,6 +387,7 @@ export default (new Transformer({
       for (let browser of browsers) {
         let [name, version] = browser.split(' ');
         if (BROWSER_MAPPING.hasOwnProperty(name)) {
+          // @ts-expect-error TS7053
           name = BROWSER_MAPPING[name];
           if (!name) {
             continue;
@@ -366,12 +397,15 @@ export default (new Transformer({
         let [major, minor = '0', patch = '0'] = version
           .split('-')[0]
           .split('.');
+        // @ts-expect-error TS2345
         if (isNaN(major) || isNaN(minor) || isNaN(patch)) {
           continue;
         }
         let semverVersion = `${major}.${minor}.${patch}`;
 
+        // @ts-expect-error TS2345
         if (targets[name] == null || semver.gt(targets[name], semverVersion)) {
+          // @ts-expect-error TS7053
           targets[name] = semverVersion;
         }
       }
@@ -411,24 +445,47 @@ export default (new Transformer({
       if (asset.type === 'ts') {
         isJSX = false;
       } else if (!isJSX) {
+        // @ts-expect-error TS7053
         isJSX = Boolean(JSX_EXTENSIONS[asset.type]);
       }
     }
 
-    let macroAssets = [];
+    let macroAssets: Array<{
+      content: string;
+      // @ts-expect-error TS2552
+      map: undefined | NodeSourceMap;
+      type: string;
+      uniqueKey: string;
+    }> = [];
     let {
+      // @ts-expect-error TS2339
       dependencies,
+      // @ts-expect-error TS2339
       code: compiledCode,
+      // @ts-expect-error TS2339
       map,
+      // @ts-expect-error TS2339
       shebang,
+      // @ts-expect-error TS2339
       hoist_result,
+      // @ts-expect-error TS2339
       symbol_result,
+      // @ts-expect-error TS2339
+      is_empty_or_empty_export,
+      // @ts-expect-error TS2339
       needs_esm_helpers,
+      // @ts-expect-error TS2339
       diagnostics,
+      // @ts-expect-error TS2339
       used_env,
+      // @ts-expect-error TS2339
       has_node_replacements,
+      // @ts-expect-error TS2339
       is_constant_module,
+      // @ts-expect-error TS2339
       conditions,
+      // @ts-expect-error TS2339
+      magic_comments,
     } = await (transformAsync || transform)({
       filename: asset.filePath,
       code,
@@ -440,7 +497,7 @@ export default (new Transformer({
         !asset.env.isNode() && asset.env.sourceType !== 'script',
       node_replacer: asset.env.isNode(),
       is_browser: asset.env.isBrowser(),
-      is_worker: asset.env.isWorker(),
+      is_worker: asset.env.isWorker() || asset.env.isTesseract(),
       env,
       is_type_script: asset.type === 'ts' || asset.type === 'tsx',
       is_jsx: isJSX,
@@ -453,6 +510,7 @@ export default (new Transformer({
         asset.env.isBrowser() &&
         !asset.env.isLibrary &&
         !asset.env.isWorker() &&
+        !asset.env.isTesseract() &&
         !asset.env.isWorklet() &&
         Boolean(config?.reactRefresh),
       decorators: Boolean(config?.decorators),
@@ -470,9 +528,25 @@ export default (new Transformer({
       standalone: asset.query.has('standalone'),
       inline_constants: config.inlineConstants,
       conditional_bundling: options.featureFlags.conditionalBundlingApi,
-      magic_comments: Boolean(config?.magicComments),
+      hmr_improvements: options.featureFlags.hmrImprovements,
+      add_display_name: Boolean(config.addReactDisplayName),
+      exports_rebinding_optimisation:
+        options.featureFlags.exportsRebindingOptimisation,
+      magic_comments:
+        Boolean(config?.magicComments) ||
+        getFeatureFlag('supportWebpackChunkName'),
+      is_source: asset.isSource,
+      enable_global_this_aliaser: Boolean(config.enableGlobalThisAliaser),
+      enable_lazy_loading_transformer: Boolean(
+        config.enableLazyLoadingTransformer,
+      ),
+      nested_promise_import_fix: options.featureFlags.nestedPromiseImportFix,
+      enable_dead_returns_remover: Boolean(config.enableDeadReturnsRemover),
+      enable_unused_bindings_remover: Boolean(
+        config.enableUnusedBindingsRemover,
+      ),
       callMacro: asset.isSource
-        ? async (err, src, exportName, args, loc) => {
+        ? async (err: any, src: any, exportName: any, args: any, loc: any) => {
             let mod;
             try {
               mod = await options.packageManager.require(src, asset.filePath);
@@ -481,7 +555,6 @@ export default (new Transformer({
               if (
                 exportName === 'default' &&
                 !mod.__esModule &&
-                // $FlowFixMe
                 Object.prototype.toString.call(config) !== '[object Module]'
               ) {
                 mod = {default: mod};
@@ -490,7 +563,7 @@ export default (new Transformer({
               if (!Object.hasOwnProperty.call(mod, exportName)) {
                 throw new Error(`"${src}" does not export "${exportName}".`);
               }
-            } catch (err) {
+            } catch (err: any) {
               throw {
                 kind: 1,
                 message: err.message,
@@ -507,7 +580,8 @@ export default (new Transformer({
                     if (asset.env.sourceMap) {
                       // Generate a source map that maps each line of the asset to the original macro call.
                       map = new SourceMap(options.projectRoot);
-                      let mappings = [];
+                      // @ts-expect-error TS2304
+                      let mappings: Array<IndexedMapping<string>> = [];
                       let line = 1;
                       for (let i = 0; i <= a.content.length; i++) {
                         if (i === a.content.length || a.content[i] === '\n') {
@@ -530,7 +604,9 @@ export default (new Transformer({
                       if (originalMap) {
                         map.extends(originalMap);
                       } else {
-                        map.setSourceContent(asset.filePath, code.toString());
+                        if (!getFeatureFlag('omitSourcesContentInMemory')) {
+                          map.setSourceContent(asset.filePath, code.toString());
+                        }
                       }
                     }
 
@@ -546,13 +622,13 @@ export default (new Transformer({
                       specifierType: 'esm',
                     });
                   },
-                  invalidateOnFileChange(filePath) {
+                  invalidateOnFileChange(filePath: FilePath) {
                     asset.invalidateOnFileChange(filePath);
                   },
-                  invalidateOnFileCreate(invalidation) {
+                  invalidateOnFileCreate(invalidation: FileCreateInvalidation) {
                     asset.invalidateOnFileCreate(invalidation);
                   },
-                  invalidateOnEnvChange(env) {
+                  invalidateOnEnvChange(env: string) {
                     asset.invalidateOnEnvChange(env);
                   },
                   invalidateOnStartup() {
@@ -569,7 +645,7 @@ export default (new Transformer({
                   `"${exportName}" in "${src}" is not a function.`,
                 );
               }
-            } catch (err) {
+            } catch (err: any) {
               // Remove atlaspack core from stack and build string so Rust can process errors more easily.
               let stack = (err.stack || '').split('\n').slice(1);
               let message = err.message;
@@ -589,18 +665,14 @@ export default (new Transformer({
     });
 
     if (getFeatureFlag('conditionalBundlingApi')) {
-      asset.meta.conditions = conditions.map((c): ConditionMeta => ({
-        key: c.key,
-        ifTruePlaceholder: c.if_true_placeholder,
-        ifFalsePlaceholder: c.if_false_placeholder,
-      }));
+      asset.meta.conditions = conditions;
     }
 
     if (is_constant_module) {
       asset.meta.isConstantModule = true;
     }
 
-    let convertLoc = (loc): SourceLocation => {
+    let convertLoc = (loc: any): SourceLocation => {
       let location = {
         filePath: asset.filePath,
         start: {
@@ -615,7 +687,11 @@ export default (new Transformer({
 
       // If there is an original source map, use it to remap to the original source location.
       if (originalMap) {
-        location = remapSourceLocation(location, originalMap);
+        location = remapSourceLocation(
+          location,
+          originalMap,
+          options.projectRoot,
+        );
       }
 
       return location;
@@ -623,19 +699,22 @@ export default (new Transformer({
 
     if (diagnostics) {
       let errors = diagnostics.filter(
+        // @ts-expect-error TS7006
         (d) =>
           d.severity === 'Error' ||
           (d.severity === 'SourceError' && asset.isSource),
       );
       let warnings = diagnostics.filter(
+        // @ts-expect-error TS7006
         (d) =>
           d.severity === 'Warning' ||
           (d.severity === 'SourceError' && !asset.isSource),
       );
-      let convertDiagnostic = (diagnostic) => {
+      let convertDiagnostic = (diagnostic: any) => {
         let message = diagnostic.message;
         if (message === 'SCRIPT_ERROR') {
-          let err = SCRIPT_ERRORS[(asset.env.context: string)];
+          // @ts-expect-error TS7053
+          let err = SCRIPT_ERRORS[asset.env.context as string];
           message = err?.message || SCRIPT_ERRORS.browser.message;
         }
 
@@ -644,11 +723,12 @@ export default (new Transformer({
           codeFrames: [
             {
               filePath: asset.filePath,
-              codeHighlights: diagnostic.code_highlights?.map((highlight) =>
-                convertSourceLocationToHighlight(
-                  convertLoc(highlight.loc),
-                  highlight.message ?? undefined,
-                ),
+              codeHighlights: diagnostic.code_highlights?.map(
+                (highlight: any) =>
+                  convertSourceLocationToHighlight(
+                    convertLoc(highlight.loc),
+                    highlight.message ?? undefined,
+                  ),
               ),
             },
           ],
@@ -672,7 +752,8 @@ export default (new Transformer({
             });
           }
 
-          let err = SCRIPT_ERRORS[(asset.env.context: string)];
+          // @ts-expect-error TS7053
+          let err = SCRIPT_ERRORS[asset.env.context as string];
           if (err) {
             if (!res.hints) {
               res.hints = [err.hint];
@@ -729,6 +810,7 @@ export default (new Transformer({
           env: {
             context: 'web-worker',
             sourceType: dep.source_type === 'Module' ? 'module' : 'script',
+            // @ts-expect-error TS2322
             outputFormat,
             loc,
           },
@@ -776,6 +858,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) {
@@ -839,6 +928,13 @@ export default (new Transformer({
             outputFormat,
             loc: convertLoc(dep.loc),
           };
+
+          if (getFeatureFlag('supportWebpackChunkName')) {
+            let chunkName = magic_comments[dep.specifier];
+            if (chunkName) {
+              meta.chunkName = chunkName;
+            }
+          }
         }
 
         // Always bundle helpers, even with includeNodeModules: false, except if this is a library.
@@ -863,6 +959,7 @@ export default (new Transformer({
             idx = dep.specifier.indexOf('/', idx + 1);
           }
           let module = idx >= 0 ? dep.specifier.slice(0, idx) : dep.specifier;
+          // @ts-expect-error TS7053
           range = pkg.dependencies[module];
         }
 
@@ -874,12 +971,13 @@ export default (new Transformer({
             dep.kind === 'DynamicImport'
               ? 'lazy'
               : dep.kind === 'ConditionalImport'
-              ? 'conditional'
-              : 'sync',
+                ? 'conditional'
+                : 'sync',
           isOptional: dep.is_optional,
           meta,
           resolveFrom: isHelper ? __filename : undefined,
           range,
+          // @ts-expect-error TS2322
           env,
         });
       }
@@ -893,8 +991,12 @@ export default (new Transformer({
         local,
         loc,
         is_esm,
+        is_static_binding_safe,
       } of hoist_result.exported_symbols) {
-        asset.symbols.set(exported, local, convertLoc(loc), {isEsm: is_esm});
+        asset.symbols.set(exported, local, convertLoc(loc), {
+          isEsm: is_esm,
+          isStaticBindingSafe: is_static_binding_safe,
+        });
       }
 
       // deps is a map of dependencies that are keyed by placeholder or specifier
@@ -991,6 +1093,9 @@ export default (new Transformer({
           Object.keys(hoist_result.exported_symbols).length === 0) ||
         (hoist_result.should_wrap && !asset.symbols.hasExportSymbol('*'))
       ) {
+        if (is_empty_or_empty_export) {
+          asset.meta.emptyFileStarReexport = true;
+        }
         asset.symbols.set('*', `$${asset.id}$exports`);
       }
 
@@ -1093,4 +1198,4 @@ export default (new Transformer({
 
     return [asset, ...macroAssets];
   },
-}): Transformer);
+}) as Transformer<unknown>;