@atlaspack/transformer-js 10.1.1-dev-d5e4c77df.0 → 10.1.1-dev-a76a48b52.0

package/lib/JSTransformer.js

@@ -152,10 +152,16 @@ const CONFIG_SCHEMA = {
     },
     unstable_inlineConstants: {
       type: 'boolean'
+    },
+    jsx: {
+      type: 'object'
     }
   },
   additionalProperties: false
 };
+
+// Mirrors the CONFIG_SCHEMA
+
 const configCache = (0, _buildCache().createBuildCache)();
 const SCRIPT_ERRORS = {
   browser: {
@@ -173,60 +179,100 @@ const SCRIPT_ERRORS = {
 };
 
 // NOTE: Make sure this is in sync with the TypeScript definition in the @atlaspack/macros package.
+
+async function legacyDetemineJsxConfig(config, options) {
+  let packageJson = await config.getPackage();
+  let isJSX, jsxPragma, jsxPragmaFrag, jsxImportSource, automaticJSXRuntime, reactRefresh;
+  if (config.isSource) {
+    var _packageJson$dependen2, _packageJson$devDepen2, _packageJson$peerDepe2, _await$config$getConf;
+    let reactLib;
+    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 _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 = 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.
+    jsxPragma = (compilerOptions === null || compilerOptions === void 0 ? void 0 : compilerOptions.jsxFactory) || (
+    // @ts-expect-error TS7053
+    reactLib ? JSX_PRAGMA[reactLib].pragma : undefined);
+    jsxPragmaFrag = (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, _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 = (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 !== '*' ? // @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
+      });
+      if (automaticJSXRuntime) {
+        jsxImportSource = reactLib;
+      }
+    }
+    isJSX = Boolean((compilerOptions === null || compilerOptions === void 0 ? void 0 : compilerOptions.jsx) || jsxPragma);
+  }
+  return {
+    isJSX,
+    jsxPragma,
+    jsxPragmaFrag,
+    jsxImportSource,
+    automaticJSXRuntime,
+    reactRefresh
+  };
+}
 var _default = exports.default = new (_plugin().Transformer)({
   async loadConfig({
     config,
-    options,
-    logger
+    options
   }) {
+    var _conf$contents;
+    let conf = await config.getConfigFrom(options.projectRoot + '/index', [], {
+      packageKey: '@atlaspack/transformer-js'
+    });
+    if (conf && conf.contents) {
+      _utils().validateSchema.diagnostic(CONFIG_SCHEMA, {
+        data: conf.contents,
+        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');
+    }
     let packageJson = await config.getPackage();
-    let isJSX, pragma, pragmaFrag, jsxImportSource, automaticJSXRuntime, reactRefresh, decorators, useDefineForClassFields;
+    let decorators, useDefineForClassFields;
+    let {
+      isJSX,
+      jsxPragma,
+      jsxPragmaFrag,
+      jsxImportSource,
+      automaticJSXRuntime,
+      reactRefresh
+    } = options.featureFlags.newJsxConfig ? (0, _rust().determineJsxConfiguration)(config.searchPath, config.isSource, conf === null || conf === void 0 || (_conf$contents = conf.contents) === null || _conf$contents === void 0 ? void 0 : _conf$contents.jsx, options.projectRoot) : await legacyDetemineJsxConfig(config, options);
     if (config.isSource) {
-      var _packageJson$dependen2, _packageJson$devDepen2, _packageJson$peerDepe2, _await$config$getConf;
-      let reactLib;
-      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 _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((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'], {
+      var _await$config$getConf2;
+      const compilerOptions = (_await$config$getConf2 = 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) || (
-      // @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, _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 = (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 !== '*' ? // @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
-        });
-        if (automaticJSXRuntime) {
-          jsxImportSource = reactLib;
-        }
-      }
-      isJSX = Boolean((compilerOptions === null || compilerOptions === void 0 ? void 0 : compilerOptions.jsx) || pragma);
+      })) === 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;
       decorators = compilerOptions === null || compilerOptions === void 0 ? void 0 : compilerOptions.experimentalDecorators;
       useDefineForClassFields = compilerOptions === null || compilerOptions === void 0 ? void 0 : compilerOptions.useDefineForClassFields;
       if (useDefineForClassFields === undefined && (compilerOptions === null || compilerOptions === void 0 ? void 0 : compilerOptions.target) != null) {
@@ -243,9 +289,6 @@ 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 = packageJson && packageJson.browser && typeof packageJson.browser === 'object' && packageJson.browser.fs === false;
-    let conf = await config.getConfigFrom(options.projectRoot + '/index', [], {
-      packageKey: '@atlaspack/transformer-js'
-    });
     let inlineEnvironment = config.isSource;
     let inlineFS = !ignoreFS;
     let inlineConstants = false;
@@ -288,34 +331,20 @@ var _default = exports.default = new (_plugin().Transformer)({
     }
     config.invalidateOnEnvChange('SYNC_DYNAMIC_IMPORT_CONFIG');
     if (conf && conf.contents) {
-      var _conf$contents, _conf$contents2, _conf$contents3, _conf$contents4, _conf$contents5;
-      _utils().validateSchema.diagnostic(CONFIG_SCHEMA, {
-        data: conf.contents,
-        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');
-      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;
+      var _conf$contents2, _conf$contents3, _conf$contents4, _conf$contents5, _conf$contents6;
+      addReactDisplayName = ((_conf$contents2 = conf.contents) === null || _conf$contents2 === void 0 ? void 0 : _conf$contents2.addReactDisplayName) ?? addReactDisplayName;
+      magicComments = ((_conf$contents3 = conf.contents) === null || _conf$contents3 === void 0 ? void 0 : _conf$contents3.magicComments) ?? magicComments;
+      // @ts-expect-error TS2322
+      inlineEnvironment = ((_conf$contents4 = conf.contents) === null || _conf$contents4 === void 0 ? void 0 : _conf$contents4.inlineEnvironment) ?? inlineEnvironment;
+      inlineFS = ((_conf$contents5 = conf.contents) === null || _conf$contents5 === void 0 ? void 0 : _conf$contents5.inlineFS) ?? inlineFS;
+      inlineConstants = ((_conf$contents6 = conf.contents) === null || _conf$contents6 === void 0 ? void 0 : _conf$contents6.unstable_inlineConstants) ?? inlineConstants;
     }
     return {
       isJSX,
       automaticJSXRuntime,
       jsxImportSource,
-      pragma,
-      pragmaFrag,
+      pragma: jsxPragma,
+      pragmaFrag: jsxPragmaFrag,
       inlineEnvironment,
       inlineFS,
       inlineConstants,
@@ -466,7 +495,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.isTesseract() && !asset.env.isWorklet() && Boolean(config === null || config === void 0 ? void 0 : config.reactRefresh),
+      react_refresh: Boolean(asset.env.isBrowser() && !asset.env.isLibrary && !asset.env.isWorker() && !asset.env.isTesseract() && !asset.env.isWorklet() && (config === null || config === void 0 ? void 0 : config.reactRefresh) && options.hmrOptions && options.mode === 'development'),
       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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/transformer-js",
-  "version": "10.1.1-dev-d5e4c77df.0",
+  "version": "10.1.1-dev-a76a48b52.0",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -24,14 +24,14 @@
     "src"
   ],
   "dependencies": {
-    "@atlaspack/build-cache": "2.13.7-dev-d5e4c77df.0",
-    "@atlaspack/diagnostic": "2.14.5-dev-d5e4c77df.0",
-    "@atlaspack/feature-flags": "2.27.3-dev-d5e4c77df.0",
-    "@atlaspack/plugin": "2.14.42-dev-d5e4c77df.0",
-    "@atlaspack/rust": "3.13.1-dev-d5e4c77df.0",
-    "@atlaspack/source-map": "3.1.3-dev-d5e4c77df.0",
-    "@atlaspack/utils": "3.2.3-dev-d5e4c77df.0",
-    "@atlaspack/workers": "2.14.42-dev-d5e4c77df.0",
+    "@atlaspack/build-cache": "2.13.7-dev-a76a48b52.0",
+    "@atlaspack/diagnostic": "2.14.5-dev-a76a48b52.0",
+    "@atlaspack/feature-flags": "2.27.3-dev-a76a48b52.0",
+    "@atlaspack/plugin": "2.14.42-dev-a76a48b52.0",
+    "@atlaspack/rust": "3.13.1-dev-a76a48b52.0",
+    "@atlaspack/source-map": "3.1.3-dev-a76a48b52.0",
+    "@atlaspack/utils": "3.2.3-dev-a76a48b52.0",
+    "@atlaspack/workers": "2.14.42-dev-a76a48b52.0",
     "@swc/helpers": "^0.5.15",
     "browserslist": "^4.6.6",
     "nullthrows": "^1.1.1",
@@ -42,5 +42,5 @@
     "@atlaspack/core": "2.29.1"
   },
   "type": "commonjs",
-  "gitHead": "d5e4c77df7fca42afe20b7d46e9c77583978ba74"
+  "gitHead": "a76a48b520292ce37f17315cbafebc46417aed27"
 }

package/src/JSTransformer.ts

@@ -4,13 +4,19 @@ import type {
   SourceLocation,
   FilePath,
   FileCreateInvalidation,
+  Config,
+  PluginOptions,
 } from '@atlaspack/types';
 import {createBuildCache} from '@atlaspack/build-cache';
 import type {SchemaEntity} from '@atlaspack/utils';
 import type {Diagnostic} from '@atlaspack/diagnostic';
 import SourceMap from '@atlaspack/source-map';
 import {Transformer} from '@atlaspack/plugin';
-import {transform, transformAsync} from '@atlaspack/rust';
+import {
+  transform,
+  transformAsync,
+  determineJsxConfiguration,
+} from '@atlaspack/rust';
 import invariant from 'assert';
 import browserslist from 'browserslist';
 import semver from 'semver';
@@ -117,10 +123,24 @@ const CONFIG_SCHEMA: SchemaEntity = {
     unstable_inlineConstants: {
       type: 'boolean',
     },
+    jsx: {
+      type: 'object',
+    },
   },
   additionalProperties: false,
 };
 
+// Mirrors the CONFIG_SCHEMA
+interface JsTransformerConfig {
+  inlineFS?: boolean;
+  inlineEnvironment?: boolean | string[];
+  addReactDisplayName?: boolean;
+  magicComments?: boolean;
+  unstable_inlineConstants?: boolean;
+  // This is exclusively used in Rust so not worth typing
+  jsx: any;
+}
+
 const configCache = createBuildCache();
 
 const SCRIPT_ERRORS = {
@@ -174,41 +194,167 @@ type MacroContext = {
   invalidateOnBuild(): void;
 };
 
+interface JsxConfig {
+  isJSX: boolean | undefined;
+  jsxPragma: string | undefined;
+  jsxPragmaFrag: string | undefined;
+  jsxImportSource: string | undefined;
+  automaticJSXRuntime: boolean | undefined;
+  reactRefresh: boolean | null | undefined;
+}
+
+async function legacyDetemineJsxConfig(
+  config: Config,
+  options: PluginOptions,
+): Promise<JsxConfig> {
+  let packageJson = await config.getPackage();
+  let isJSX,
+    jsxPragma,
+    jsxPragmaFrag,
+    jsxImportSource,
+    automaticJSXRuntime,
+    reactRefresh;
+
+  if (config.isSource) {
+    let reactLib;
+    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) =>
+          packageJson?.dependencies?.[libName] ||
+          packageJson?.devDependencies?.[libName] ||
+          packageJson?.peerDependencies?.[libName],
+      );
+    }
+
+    reactRefresh = Boolean(
+      packageJson?.dependencies?.react ||
+        packageJson?.devDependencies?.react ||
+        packageJson?.peerDependencies?.react,
+    );
+
+    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.
+    jsxPragma =
+      compilerOptions?.jsxFactory ||
+      // @ts-expect-error TS7053
+      (reactLib ? JSX_PRAGMA[reactLib].pragma : undefined);
+    jsxPragmaFrag =
+      compilerOptions?.jsxFragmentFactory ||
+      // @ts-expect-error TS7053
+      (reactLib ? JSX_PRAGMA[reactLib].pragmaFrag : undefined);
+
+    if (
+      compilerOptions?.jsx === 'react-jsx' ||
+      compilerOptions?.jsx === 'react-jsxdev' ||
+      compilerOptions?.jsxImportSource
+    ) {
+      jsxImportSource = compilerOptions?.jsxImportSource;
+      automaticJSXRuntime = true;
+    } else if (reactLib) {
+      let effectiveReactLib =
+        packageJson?.alias && packageJson.alias['react'] === 'preact/compat'
+          ? 'preact'
+          : reactLib;
+      // @ts-expect-error TS7053
+      let automaticVersion = JSX_PRAGMA[effectiveReactLib]?.automatic;
+      let reactLibVersion =
+        packageJson?.dependencies?.[effectiveReactLib] ||
+        packageJson?.devDependencies?.[effectiveReactLib] ||
+        packageJson?.peerDependencies?.[effectiveReactLib];
+      // @ts-expect-error TS2322
+      reactLibVersion = reactLibVersion
+        ? semver.validRange(reactLibVersion)
+        : null;
+      let minReactLibVersion =
+        reactLibVersion !== null && reactLibVersion !== '*'
+          ? // @ts-expect-error TS2345
+            semver.minVersion(reactLibVersion)?.toString()
+          : null;
+
+      automaticJSXRuntime =
+        automaticVersion &&
+        !compilerOptions?.jsxFactory &&
+        minReactLibVersion != null &&
+        semver.satisfies(minReactLibVersion, automaticVersion, {
+          includePrerelease: true,
+        });
+
+      if (automaticJSXRuntime) {
+        jsxImportSource = reactLib;
+      }
+    }
+
+    isJSX = Boolean(compilerOptions?.jsx || jsxPragma);
+  }
+
+  return {
+    isJSX,
+    jsxPragma,
+    jsxPragmaFrag,
+    jsxImportSource,
+    automaticJSXRuntime,
+    reactRefresh,
+  };
+}
+
 export default new Transformer({
-  async loadConfig({config, options, logger}) {
+  async loadConfig({config, options}) {
+    let conf = await config.getConfigFrom<JsTransformerConfig>(
+      options.projectRoot + '/index',
+      [],
+      {
+        packageKey: '@atlaspack/transformer-js',
+      },
+    );
+
+    if (conf && conf.contents) {
+      validateSchema.diagnostic(
+        CONFIG_SCHEMA,
+        {
+          data: conf.contents,
+          source: () => options.inputFS.readFileSync(conf.filePath, 'utf8'),
+          filePath: conf.filePath,
+          prependKey: `/${encodeJSONKeyComponent('@atlaspack/transformer-js')}`,
+        },
+        // FIXME
+        '@atlaspack/transformer-js',
+        'Invalid config for @atlaspack/transformer-js',
+      );
+    }
+
     let packageJson = await config.getPackage();
-    let isJSX,
-      pragma,
-      pragmaFrag,
+    let decorators, useDefineForClassFields;
+
+    let {
+      isJSX,
+      jsxPragma,
+      jsxPragmaFrag,
       jsxImportSource,
       automaticJSXRuntime,
       reactRefresh,
-      decorators,
-      useDefineForClassFields;
-    if (config.isSource) {
-      let reactLib;
-      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) =>
-            packageJson?.dependencies?.[libName] ||
-            packageJson?.devDependencies?.[libName] ||
-            packageJson?.peerDependencies?.[libName],
-        );
-      }
-
-      reactRefresh =
-        options.hmrOptions &&
-        options.mode === 'development' &&
-        Boolean(
-          packageJson?.dependencies?.react ||
-            packageJson?.devDependencies?.react ||
-            packageJson?.peerDependencies?.react,
-        );
+    } = options.featureFlags.newJsxConfig
+      ? (determineJsxConfiguration(
+          config.searchPath,
+          config.isSource,
+          conf?.contents?.jsx,
+          options.projectRoot,
+        ) as JsxConfig)
+      : await legacyDetemineJsxConfig(config, options);
 
+    if (config.isSource) {
       const compilerOptions: TSConfig['compilerOptions'] = (
         await config.getConfigFrom<TSConfig>(
           options.projectRoot + '/index',
@@ -219,58 +365,6 @@ export default new Transformer({
         )
       )?.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 (
-        compilerOptions?.jsx === 'react-jsx' ||
-        compilerOptions?.jsx === 'react-jsxdev' ||
-        compilerOptions?.jsxImportSource
-      ) {
-        jsxImportSource = compilerOptions?.jsxImportSource;
-        automaticJSXRuntime = true;
-      } else if (reactLib) {
-        let effectiveReactLib =
-          packageJson?.alias && packageJson.alias['react'] === 'preact/compat'
-            ? 'preact'
-            : reactLib;
-        // @ts-expect-error TS7053
-        let automaticVersion = JSX_PRAGMA[effectiveReactLib]?.automatic;
-        let reactLibVersion =
-          packageJson?.dependencies?.[effectiveReactLib] ||
-          packageJson?.devDependencies?.[effectiveReactLib] ||
-          packageJson?.peerDependencies?.[effectiveReactLib];
-        // @ts-expect-error TS2322
-        reactLibVersion = reactLibVersion
-          ? semver.validRange(reactLibVersion)
-          : null;
-        let minReactLibVersion =
-          reactLibVersion !== null && reactLibVersion !== '*'
-            ? // @ts-expect-error TS2345
-              semver.minVersion(reactLibVersion)?.toString()
-            : null;
-
-        automaticJSXRuntime =
-          automaticVersion &&
-          !compilerOptions?.jsxFactory &&
-          minReactLibVersion != null &&
-          semver.satisfies(minReactLibVersion, automaticVersion, {
-            includePrerelease: true,
-          });
-
-        if (automaticJSXRuntime) {
-          jsxImportSource = reactLib;
-        }
-      }
-
-      isJSX = Boolean(compilerOptions?.jsx || pragma);
       decorators = compilerOptions?.experimentalDecorators;
       useDefineForClassFields = compilerOptions?.useDefineForClassFields;
       if (
@@ -295,10 +389,6 @@ export default new Transformer({
       typeof packageJson.browser === 'object' &&
       packageJson.browser.fs === false;
 
-    let conf = await config.getConfigFrom(options.projectRoot + '/index', [], {
-      packageKey: '@atlaspack/transformer-js',
-    });
-
     let inlineEnvironment = config.isSource;
     let inlineFS = !ignoreFS;
     let inlineConstants = false;
@@ -367,30 +457,13 @@ export default new Transformer({
     config.invalidateOnEnvChange('SYNC_DYNAMIC_IMPORT_CONFIG');
 
     if (conf && conf.contents) {
-      validateSchema.diagnostic(
-        CONFIG_SCHEMA,
-        {
-          data: conf.contents,
-          source: () => options.inputFS.readFileSync(conf.filePath, 'utf8'),
-          filePath: conf.filePath,
-          prependKey: `/${encodeJSONKeyComponent('@atlaspack/transformer-js')}`,
-        },
-        // FIXME
-        '@atlaspack/transformer-js',
-        '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
+      // @ts-expect-error TS2322
       inlineEnvironment = conf.contents?.inlineEnvironment ?? inlineEnvironment;
-      // @ts-expect-error TS2339
       inlineFS = conf.contents?.inlineFS ?? inlineFS;
       inlineConstants =
-        // @ts-expect-error TS2339
         conf.contents?.unstable_inlineConstants ?? inlineConstants;
     }
 
@@ -398,8 +471,8 @@ export default new Transformer({
       isJSX,
       automaticJSXRuntime,
       jsxImportSource,
-      pragma,
-      pragmaFrag,
+      pragma: jsxPragma,
+      pragmaFrag: jsxPragmaFrag,
       inlineEnvironment,
       inlineFS,
       inlineConstants,
@@ -568,13 +641,16 @@ export default new Transformer({
       automatic_jsx_runtime: Boolean(config?.automaticJSXRuntime),
       jsx_import_source: config?.jsxImportSource,
       is_development: options.mode === 'development',
-      react_refresh:
+      react_refresh: Boolean(
         asset.env.isBrowser() &&
-        !asset.env.isLibrary &&
-        !asset.env.isWorker() &&
-        !asset.env.isTesseract() &&
-        !asset.env.isWorklet() &&
-        Boolean(config?.reactRefresh),
+          !asset.env.isLibrary &&
+          !asset.env.isWorker() &&
+          !asset.env.isTesseract() &&
+          !asset.env.isWorklet() &&
+          config?.reactRefresh &&
+          options.hmrOptions &&
+          options.mode === 'development',
+      ),
       decorators: Boolean(config?.decorators),
       use_define_for_class_fields: Boolean(config?.useDefineForClassFields),
       targets,