@atlaspack/transformer-js 3.2.3-canary.357 → 3.2.3-canary.359

package/lib/JSTransformer.js

@@ -4,6 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+exports.loadCompiledCssInJsConfig = loadCompiledCssInJsConfig;
+exports.loadTokensConfig = loadTokensConfig;
 function _buildCache() {
   const data = require("@atlaspack/build-cache");
   _buildCache = function () {
@@ -82,6 +84,13 @@ function _featureFlags() {
   };
   return data;
 }
+function _path() {
+  const data = _interopRequireWildcard(require("path"));
+  _path = function () {
+    return data;
+  };
+  return data;
+}
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -180,6 +189,31 @@ const SCRIPT_ERRORS = {
 
 // NOTE: Make sure this is in sync with the TypeScript definition in the @atlaspack/macros package.
 
+const TOKENS_CONFIG_SCHEMA = {
+  type: 'object',
+  properties: {
+    shouldUseAutoFallback: {
+      type: 'boolean'
+    },
+    shouldForceAutoFallback: {
+      type: 'boolean'
+    },
+    forceAutoFallbackExemptions: {
+      type: 'array',
+      items: {
+        type: 'string'
+      }
+    },
+    defaultTheme: {
+      type: 'string',
+      enum: ['light', 'legacy-light']
+    },
+    tokenDataPath: {
+      type: 'string'
+    }
+  },
+  additionalProperties: false
+};
 async function legacyDetemineJsxConfig(config, options) {
   let packageJson = await config.getPackage();
   let isJSX, jsxPragma, jsxPragmaFrag, jsxImportSource, automaticJSXRuntime, reactRefresh;
@@ -239,6 +273,47 @@ async function legacyDetemineJsxConfig(config, options) {
     reactRefresh
   };
 }
+async function loadTokensConfig(config, options) {
+  const conf = await config.getConfigFrom(options.projectRoot + '/index', [], {
+    packageKey: '@atlaspack/transformer-tokens'
+  });
+  if (conf && conf.contents) {
+    _utils().validateSchema.diagnostic(TOKENS_CONFIG_SCHEMA, {
+      data: conf.contents,
+      source: () => options.inputFS.readFileSync(conf.filePath, 'utf8'),
+      filePath: conf.filePath,
+      prependKey: `/${(0, _diagnostic().encodeJSONKeyComponent)('@atlaspack/transformer-tokens')}`
+    }, '@atlaspack/transformer-tokens', 'Invalid config for @atlaspack/transformer-tokens');
+
+    // @ts-expect-error TS2339
+    const tokensConfig = conf.contents;
+    let resolvedConfig = {
+      shouldUseAutoFallback: tokensConfig.shouldUseAutoFallback ?? true,
+      shouldForceAutoFallback: tokensConfig.shouldForceAutoFallback ?? true,
+      forceAutoFallbackExemptions: tokensConfig.forceAutoFallbackExemptions ?? [],
+      defaultTheme: tokensConfig.defaultTheme ?? 'light',
+      tokenDataPath: _path().default.join(options.projectRoot, tokensConfig.tokenDataPath)
+    };
+    return resolvedConfig;
+  }
+}
+async function loadCompiledCssInJsConfig(config, options) {
+  var _contents$importSourc;
+  const conf = await config.getConfigFrom((0, _path().join)(options.projectRoot, 'index'), ['.compiledcssrc', '.compiledcssrc.json'], {
+    packageKey: '@atlaspack/transformer-compiled-css-in-js'
+  });
+  const contents = {
+    configPath: conf === null || conf === void 0 ? void 0 : conf.filePath,
+    importSources: ['@compiled/react', '@atlaskit/css']
+  };
+  Object.assign(contents, conf === null || conf === void 0 ? void 0 : conf.contents);
+  if (!((_contents$importSourc = contents.importSources) !== null && _contents$importSourc !== void 0 && _contents$importSourc.includes('@compiled/react'))) {
+    var _contents$importSourc2;
+    (_contents$importSourc2 = contents.importSources) === null || _contents$importSourc2 === void 0 || _contents$importSourc2.push('@compiled/react');
+  }
+  contents.extract = contents.extract && options.mode !== 'development';
+  return contents;
+}
 var _default = exports.default = new (_plugin().Transformer)({
   async loadConfig({
     config,
@@ -330,6 +405,8 @@ var _default = exports.default = new (_plugin().Transformer)({
       }
     }
     config.invalidateOnEnvChange('SYNC_DYNAMIC_IMPORT_CONFIG');
+    const tokensConfig = (0, _featureFlags().getFeatureFlag)('coreTokensAndCompiledCssInJsTransform') ? await loadTokensConfig(config, options) : undefined;
+    const compiledCssInJsConfig = (0, _featureFlags().getFeatureFlag)('coreTokensAndCompiledCssInJsTransform') ? await loadCompiledCssInJsConfig(config, options) : undefined;
     if (conf && conf.contents) {
       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;
@@ -363,7 +440,9 @@ var _default = exports.default = new (_plugin().Transformer)({
       syncDynamicImportConfig,
       enableReactAsyncImportLift,
       reactAsyncLiftByDefault,
-      reactAsyncLiftReportLevel
+      reactAsyncLiftReportLevel,
+      tokensConfig: tokensConfig,
+      compiledCssInJsConfig: compiledCssInJsConfig
     };
   },
   async transform({
@@ -475,7 +554,9 @@ var _default = exports.default = new (_plugin().Transformer)({
       // @ts-expect-error TS2339
       conditions,
       // @ts-expect-error TS2339
-      magic_comments
+      magic_comments,
+      // @ts-expect-error TS2339
+      style_rules
     } = await (_rust().transformAsync || _rust().transform)({
       filename: asset.filePath,
       code,
@@ -527,6 +608,9 @@ var _default = exports.default = new (_plugin().Transformer)({
       react_async_lift_by_default: Boolean(config.reactAsyncLiftByDefault),
       react_async_lift_report_level: String(config.reactAsyncLiftReportLevel),
       sync_dynamic_import_config: config.syncDynamicImportConfig,
+      enable_tokens_and_compiled_css_in_js_transform: (0, _featureFlags().getFeatureFlag)('coreTokensAndCompiledCssInJsTransform'),
+      tokens_config: config.tokensConfig,
+      compiled_css_in_js_config: config.compiledCssInJsConfig,
       callMacro: asset.isSource ? async (err, src, exportName, args, loc) => {
         let mod;
         try {
@@ -636,6 +720,9 @@ var _default = exports.default = new (_plugin().Transformer)({
     if ((0, _featureFlags().getFeatureFlag)('conditionalBundlingApi')) {
       asset.meta.conditions = conditions;
     }
+    if (style_rules) {
+      asset.meta.styleRules = style_rules;
+    }
     if (is_constant_module) {
       asset.meta.isConstantModule = true;
     }

package/lib/types/JSTransformer.d.ts

@@ -1,3 +1,14 @@
+import type { Config, PluginOptions } from '@atlaspack/types';
 import { Transformer } from '@atlaspack/plugin';
+import { type CompiledCssInJsConfigPlugin } from '@atlaspack/rust/index';
+type AtlaskitTokensConfigPartial = {
+    shouldUseAutoFallback?: boolean;
+    shouldForceAutoFallback?: boolean;
+    forceAutoFallbackExemptions?: Array<string>;
+    defaultTheme?: 'light' | 'legacy-light';
+    tokenDataPath: string;
+};
+export declare function loadTokensConfig(config: Config, options: PluginOptions): Promise<Required<AtlaskitTokensConfigPartial> | undefined>;
+export declare function loadCompiledCssInJsConfig(config: Config, options: PluginOptions): Promise<CompiledCssInJsConfigPlugin>;
 declare const _default: Transformer<unknown>;
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/transformer-js",
-  "version": "3.2.3-canary.357+e15fb6c88",
+  "version": "3.2.3-canary.359+53da21632",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -24,14 +24,14 @@
     "src"
   ],
   "dependencies": {
-    "@atlaspack/build-cache": "2.13.3-canary.425+e15fb6c88",
-    "@atlaspack/diagnostic": "2.14.1-canary.425+e15fb6c88",
-    "@atlaspack/feature-flags": "2.14.1-canary.425+e15fb6c88",
-    "@atlaspack/plugin": "2.14.5-canary.357+e15fb6c88",
-    "@atlaspack/rust": "3.2.1-canary.357+e15fb6c88",
-    "@atlaspack/source-map": "3.2.4-canary.4136+e15fb6c88",
-    "@atlaspack/utils": "2.14.5-canary.357+e15fb6c88",
-    "@atlaspack/workers": "2.14.5-canary.357+e15fb6c88",
+    "@atlaspack/build-cache": "2.13.3-canary.427+53da21632",
+    "@atlaspack/diagnostic": "2.14.1-canary.427+53da21632",
+    "@atlaspack/feature-flags": "2.14.1-canary.427+53da21632",
+    "@atlaspack/plugin": "2.14.5-canary.359+53da21632",
+    "@atlaspack/rust": "3.2.1-canary.359+53da21632",
+    "@atlaspack/source-map": "3.2.4-canary.4138+53da21632",
+    "@atlaspack/utils": "2.14.5-canary.359+53da21632",
+    "@atlaspack/workers": "2.14.5-canary.359+53da21632",
     "@swc/helpers": "^0.5.15",
     "browserslist": "^4.6.6",
     "nullthrows": "^1.1.1",
@@ -42,5 +42,5 @@
     "@atlaspack/core": "2.31.2"
   },
   "type": "commonjs",
-  "gitHead": "e15fb6c885c6354c6c02283de35ce18abc8c9e18"
+  "gitHead": "53da216320e19c9b71b001386eb420d05f111db8"
 }

package/src/JSTransformer.ts

@@ -17,6 +17,7 @@ import {
   transformAsync,
   determineJsxConfiguration,
 } from '@atlaspack/rust';
+import {type CompiledCssInJsConfigPlugin} from '@atlaspack/rust/index';
 import invariant from 'assert';
 import browserslist from 'browserslist';
 import semver from 'semver';
@@ -28,6 +29,7 @@ import ThrowableDiagnostic, {
 import {validateSchema, remapSourceLocation, globMatch} from '@atlaspack/utils';
 import pkg from '../package.json';
 import {getFeatureFlag} from '@atlaspack/feature-flags';
+import path, {join} from 'path';
 
 const JSX_EXTENSIONS = {
   jsx: true,
@@ -194,6 +196,31 @@ type MacroContext = {
   invalidateOnBuild(): void;
 };
 
+type AtlaskitTokensConfigPartial = {
+  shouldUseAutoFallback?: boolean;
+  shouldForceAutoFallback?: boolean;
+  forceAutoFallbackExemptions?: Array<string>;
+  defaultTheme?: 'light' | 'legacy-light';
+  tokenDataPath: string;
+};
+
+type AtlaskitTokensConfig = Required<AtlaskitTokensConfigPartial>;
+
+const TOKENS_CONFIG_SCHEMA = {
+  type: 'object',
+  properties: {
+    shouldUseAutoFallback: {type: 'boolean'},
+    shouldForceAutoFallback: {type: 'boolean'},
+    forceAutoFallbackExemptions: {
+      type: 'array',
+      items: {type: 'string'},
+    },
+    defaultTheme: {type: 'string', enum: ['light', 'legacy-light']},
+    tokenDataPath: {type: 'string'},
+  },
+  additionalProperties: false,
+} as const;
+
 interface JsxConfig {
   isJSX: boolean | undefined;
   jsxPragma: string | undefined;
@@ -310,6 +337,67 @@ async function legacyDetemineJsxConfig(
   };
 }
 
+export async function loadTokensConfig(config: Config, options: PluginOptions) {
+  const conf = await config.getConfigFrom(options.projectRoot + '/index', [], {
+    packageKey: '@atlaspack/transformer-tokens',
+  });
+
+  if (conf && conf.contents) {
+    validateSchema.diagnostic(
+      TOKENS_CONFIG_SCHEMA,
+      {
+        data: conf.contents,
+        source: () => options.inputFS.readFileSync(conf.filePath, 'utf8'),
+        filePath: conf.filePath,
+        prependKey: `/${encodeJSONKeyComponent('@atlaspack/transformer-tokens')}`,
+      },
+      '@atlaspack/transformer-tokens',
+      'Invalid config for @atlaspack/transformer-tokens',
+    );
+
+    // @ts-expect-error TS2339
+    const tokensConfig: AtlaskitTokensConfigPartial = conf.contents;
+
+    let resolvedConfig: AtlaskitTokensConfig = {
+      shouldUseAutoFallback: tokensConfig.shouldUseAutoFallback ?? true,
+      shouldForceAutoFallback: tokensConfig.shouldForceAutoFallback ?? true,
+      forceAutoFallbackExemptions:
+        tokensConfig.forceAutoFallbackExemptions ?? [],
+      defaultTheme: tokensConfig.defaultTheme ?? 'light',
+      tokenDataPath: path.join(options.projectRoot, tokensConfig.tokenDataPath),
+    };
+    return resolvedConfig;
+  }
+}
+
+export async function loadCompiledCssInJsConfig(
+  config: Config,
+  options: PluginOptions,
+): Promise<CompiledCssInJsConfigPlugin> {
+  const conf = await config.getConfigFrom<CompiledCssInJsConfigPlugin>(
+    join(options.projectRoot, 'index'),
+    ['.compiledcssrc', '.compiledcssrc.json'],
+    {
+      packageKey: '@atlaspack/transformer-compiled-css-in-js',
+    },
+  );
+
+  const contents: CompiledCssInJsConfigPlugin = {
+    configPath: conf?.filePath,
+    importSources: ['@compiled/react', '@atlaskit/css'],
+  };
+
+  Object.assign(contents, conf?.contents);
+
+  if (!contents.importSources?.includes('@compiled/react')) {
+    contents.importSources?.push('@compiled/react');
+  }
+
+  contents.extract = contents.extract && options.mode !== 'development';
+
+  return contents;
+}
+
 export default new Transformer({
   async loadConfig({config, options}) {
     let conf = await config.getConfigFrom<JsTransformerConfig>(
@@ -456,6 +544,16 @@ export default new Transformer({
 
     config.invalidateOnEnvChange('SYNC_DYNAMIC_IMPORT_CONFIG');
 
+    const tokensConfig = getFeatureFlag('coreTokensAndCompiledCssInJsTransform')
+      ? await loadTokensConfig(config, options)
+      : undefined;
+
+    const compiledCssInJsConfig = getFeatureFlag(
+      'coreTokensAndCompiledCssInJsTransform',
+    )
+      ? await loadCompiledCssInJsConfig(config, options)
+      : undefined;
+
     if (conf && conf.contents) {
       addReactDisplayName =
         conf.contents?.addReactDisplayName ?? addReactDisplayName;
@@ -492,6 +590,8 @@ export default new Transformer({
       enableReactAsyncImportLift,
       reactAsyncLiftByDefault,
       reactAsyncLiftReportLevel,
+      tokensConfig: tokensConfig,
+      compiledCssInJsConfig: compiledCssInJsConfig,
     };
   },
   async transform({asset, config, options, logger}) {
@@ -621,6 +721,8 @@ export default new Transformer({
       conditions,
       // @ts-expect-error TS2339
       magic_comments,
+      // @ts-expect-error TS2339
+      style_rules,
     } = await (transformAsync || transform)({
       filename: asset.filePath,
       code,
@@ -690,6 +792,11 @@ export default new Transformer({
       react_async_lift_by_default: Boolean(config.reactAsyncLiftByDefault),
       react_async_lift_report_level: String(config.reactAsyncLiftReportLevel),
       sync_dynamic_import_config: config.syncDynamicImportConfig,
+      enable_tokens_and_compiled_css_in_js_transform: getFeatureFlag(
+        'coreTokensAndCompiledCssInJsTransform',
+      ),
+      tokens_config: config.tokensConfig,
+      compiled_css_in_js_config: config.compiledCssInJsConfig,
       callMacro: asset.isSource
         ? async (err: any, src: any, exportName: any, args: any, loc: any) => {
             let mod;
@@ -813,6 +920,10 @@ export default new Transformer({
       asset.meta.conditions = conditions;
     }
 
+    if (style_rules) {
+      asset.meta.styleRules = style_rules;
+    }
+
     if (is_constant_module) {
       asset.meta.isConstantModule = true;
     }