@atlaspack/transformer-js 10.1.1-dev-d5e4c77df.0 → 10.2.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.2.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.6",
+    "@atlaspack/diagnostic": "2.14.4",
+    "@atlaspack/feature-flags": "2.27.3",
+    "@atlaspack/plugin": "2.14.42",
+    "@atlaspack/rust": "3.14.0",
+    "@atlaspack/source-map": "3.1.3",
+    "@atlaspack/utils": "3.2.3",
+    "@atlaspack/workers": "2.14.42",
     "@swc/helpers": "^0.5.15",
     "browserslist": "^4.6.6",
     "nullthrows": "^1.1.1",
@@ -39,8 +39,7 @@
     "semver": "^7.5.2"
   },
   "peerDependencies": {
-    "@atlaspack/core": "2.29.1"
+    "@atlaspack/core": "2.29.2"
   },
-  "type": "commonjs",
-  "gitHead": "d5e4c77df7fca42afe20b7d46e9c77583978ba74"
+  "type": "commonjs"
 }

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,

package/LICENSE

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright (c) 2024 Atlassian US., Inc.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.