@atlaspack/transformer-compiled-css-in-js 0.0.15-canary.4135 → 0.0.15-canary.4137

package/lib/CompiledCssInJsTransformer.js

@@ -25,13 +25,6 @@ function _index() {
   };
   return data;
 }
-function _path() {
-  const data = require("path");
-  _path = function () {
-    return data;
-  };
-  return data;
-}
 function _sourceMap() {
   const data = _interopRequireDefault(require("@atlaspack/source-map"));
   _sourceMap = function () {
@@ -40,7 +33,7 @@ function _sourceMap() {
   return data;
 }
 function _diagnostic() {
-  const data = require("@atlaspack/diagnostic");
+  const data = _interopRequireWildcard(require("@atlaspack/diagnostic"));
   _diagnostic = function () {
     return data;
   };
@@ -53,32 +46,26 @@ function _utils() {
   };
   return data;
 }
+function _transformerJs() {
+  const data = require("@atlaspack/transformer-js");
+  _transformerJs = 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 }; }
-const configFiles = ['.compiledcssrc', '.compiledcssrc.json'];
-const PACKAGE_KEY = '@atlaspack/transformer-compiled-css-in-js';
 var _default = exports.default = new (_plugin().Transformer)({
+  // eslint-disable-next-line require-await
   async loadConfig({
     config,
     options
   }) {
-    var _contents$importSourc;
     if (!(0, _featureFlags().getFeatureFlag)('compiledCssInJsTransformer')) {
-      return {};
+      return undefined;
     }
-    const conf = await config.getConfigFrom((0, _path().join)(options.projectRoot, 'index'), configFiles, {
-      packageKey: PACKAGE_KEY
-    });
-    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;
+    return (0, _transformerJs().loadCompiledCssInJsConfig)(config, options);
   },
   async transform({
     asset,
@@ -87,12 +74,33 @@ var _default = exports.default = new (_plugin().Transformer)({
     logger
   }) {
     var _config$importSources, _result$diagnostics;
-    if (!(0, _featureFlags().getFeatureFlag)('compiledCssInJsTransformer')) {
+    if (!(0, _featureFlags().getFeatureFlag)('compiledCssInJsTransformer') || !config) {
       return [asset];
     }
     if (!asset.isSource && !config.extract) {
       return [asset];
     }
+    const code = await asset.getCode();
+    if ((_config$importSources = config.importSources) !== null && _config$importSources !== void 0 && _config$importSources.every(source => !code.includes(source) || code.includes(source + '/runtime'))) {
+      return [asset];
+    }
+    if ((0, _featureFlags().getFeatureFlag)('compiledCssInJsTransformer') && (config !== null && config !== void 0 && config.unsafeReportSafeAssetsForMigration || config !== null && config !== void 0 && config.unsafeUseSafeAssets)) {
+      asset.meta.compiledCodeHash ??= (0, _index().hashCode)(code);
+    }
+    if (config !== null && config !== void 0 && config.unsafeUseSafeAssets) {
+      if (!config.configPath) {
+        throw new Error('configPath is required when unsafeUseSafeAssets is enabled');
+      }
+      asset.meta.useRustCompiledTransform ??= (0, _index().isSafeFromJs)(asset.meta.compiledCodeHash, config.configPath);
+    }
+    if ((0, _featureFlags().getFeatureFlag)('coreTokensAndCompiledCssInJsTransform')) {
+      // Skipping if we're using the compiled CSS in JS transform from the core pass
+      return [asset];
+    }
+    if (config.unsafeUseSafeAssets && !asset.meta.useRustCompiledTransform) {
+      // Fallback to the legacy transform if we know the asset is not safe
+      return [asset];
+    }
     const mapPromise = asset.getMap();
     let originalMap;
     const ensureOriginalMap = async () => {
@@ -101,10 +109,6 @@ var _default = exports.default = new (_plugin().Transformer)({
       }
       return originalMap;
     };
-    const code = await asset.getCode();
-    if ((_config$importSources = config.importSources) !== null && _config$importSources !== void 0 && _config$importSources.every(source => !code.includes(source) || code.includes(source + '/runtime'))) {
-      return [asset];
-    }
     const codeBuffer = Buffer.from(code);
     const result = await (0, _index().applyCompiledCssInJsPlugin)(codeBuffer, {
       filename: asset.filePath,
@@ -158,8 +162,14 @@ var _default = exports.default = new (_plugin().Transformer)({
       };
       const errors = diagnostics.filter(diagnostic => diagnostic.severity === 'Error' || diagnostic.severity === 'SourceError' && asset.isSource);
       if (errors.length > 0) {
-        for (const error of errors) {
-          logger.error(convertDiagnostic(error));
+        if (config.unsafeUseSafeAssets || config.unsafeReportSafeAssetsForMigration) {
+          for (const error of errors) {
+            logger.warn(convertDiagnostic(error));
+          }
+        } else {
+          throw new (_diagnostic().default)({
+            diagnostic: errors.map(convertDiagnostic)
+          });
         }
       }
       const warnings = diagnostics.filter(diagnostic => diagnostic.severity === 'Warning' || diagnostic.severity === 'SourceError' && !asset.isSource);
@@ -172,10 +182,6 @@ var _default = exports.default = new (_plugin().Transformer)({
     if (config.unsafeReportSafeAssetsForMigration) {
       // We need to run the transform without returning the result, so we can report the safe assets
       asset.meta.swcStyleRules = result.styleRules;
-      if (!result.codeHash) {
-        throw new Error('Code hash is required');
-      }
-      asset.meta.compiledCodeHash = result.codeHash;
       asset.meta.compiledCssDiagnostics = result.diagnostics.map(d => d.message);
       asset.meta.compiledBailOut = result.bailOut;
       return [asset];

package/lib/types/CompiledCssInJsTransformer.d.ts

@@ -1,4 +1,3 @@
 import { Transformer } from '@atlaspack/plugin';
-import { type CompiledCssInJsConfig } from '@atlaspack/rust/index';
-declare const _default: Transformer<CompiledCssInJsConfig>;
+declare const _default: Transformer<import("@atlaspack/rust/index").CompiledCssInJsConfigPlugin | undefined>;
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/transformer-compiled-css-in-js",
-  "version": "0.0.15-canary.4135+b990de6b7",
+  "version": "0.0.15-canary.4137+f33f9c48d",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -20,16 +20,17 @@
     "src"
   ],
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-canary.424+b990de6b7",
-    "@atlaspack/feature-flags": "2.14.1-canary.424+b990de6b7",
-    "@atlaspack/plugin": "2.14.5-canary.356+b990de6b7",
-    "@atlaspack/rust": "3.2.1-canary.356+b990de6b7",
-    "@atlaspack/source-map": "3.2.4-canary.4135+b990de6b7",
-    "@atlaspack/utils": "2.14.5-canary.356+b990de6b7"
+    "@atlaspack/diagnostic": "2.14.1-canary.426+f33f9c48d",
+    "@atlaspack/feature-flags": "2.14.1-canary.426+f33f9c48d",
+    "@atlaspack/plugin": "2.14.5-canary.358+f33f9c48d",
+    "@atlaspack/rust": "3.2.1-canary.358+f33f9c48d",
+    "@atlaspack/source-map": "3.2.4-canary.4137+f33f9c48d",
+    "@atlaspack/transformer-js": "3.2.3-canary.358+f33f9c48d",
+    "@atlaspack/utils": "2.14.5-canary.358+f33f9c48d"
   },
   "type": "commonjs",
   "scripts": {
     "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
   },
-  "gitHead": "b990de6b7a28556f453e1af657563e32d0228027"
+  "gitHead": "f33f9c48dd24b319df352d197e4a83cbb1b053bc"
 }

package/src/CompiledCssInJsTransformer.ts

@@ -4,9 +4,9 @@ import {Transformer} from '@atlaspack/plugin';
 import {
   applyCompiledCssInJsPlugin,
   CompiledCssInJsPluginResult,
-  type CompiledCssInJsConfig,
+  hashCode,
+  isSafeFromJs,
 } from '@atlaspack/rust/index';
-import {join} from 'path';
 import SourceMap from '@atlaspack/source-map';
 import type {Diagnostic} from '@atlaspack/diagnostic';
 import ThrowableDiagnostic, {
@@ -14,45 +14,65 @@ import ThrowableDiagnostic, {
 } from '@atlaspack/diagnostic';
 import {remapSourceLocation} from '@atlaspack/utils';
 
-const configFiles = ['.compiledcssrc', '.compiledcssrc.json'];
-
-const PACKAGE_KEY = '@atlaspack/transformer-compiled-css-in-js';
+import {loadCompiledCssInJsConfig} from '@atlaspack/transformer-js';
 
 export default new Transformer({
+  // eslint-disable-next-line require-await
   async loadConfig({config, options}) {
     if (!getFeatureFlag('compiledCssInJsTransformer')) {
-      return {};
+      return undefined;
     }
 
-    const conf = await config.getConfigFrom<CompiledCssInJsConfig>(
-      join(options.projectRoot, 'index'),
-      configFiles,
-      {
-        packageKey: PACKAGE_KEY,
-      },
-    );
-
-    const contents: CompiledCssInJsConfig = {
-      configPath: conf?.filePath,
-      importSources: ['@compiled/react', '@atlaskit/css'],
-    };
+    return loadCompiledCssInJsConfig(config, options);
+  },
+  async transform({asset, options, config, logger}) {
+    if (!getFeatureFlag('compiledCssInJsTransformer') || !config) {
+      return [asset];
+    }
 
-    Object.assign(contents, conf?.contents);
+    if (!asset.isSource && !config.extract) {
+      return [asset];
+    }
+
+    const code = await asset.getCode();
 
-    if (!contents.importSources?.includes('@compiled/react')) {
-      contents.importSources?.push('@compiled/react');
+    if (
+      config.importSources?.every(
+        (source) =>
+          !code.includes(source) || code.includes(source + '/runtime'),
+      )
+    ) {
+      return [asset];
     }
 
-    contents.extract = contents.extract && options.mode !== 'development';
+    if (
+      getFeatureFlag('compiledCssInJsTransformer') &&
+      (config?.unsafeReportSafeAssetsForMigration ||
+        config?.unsafeUseSafeAssets)
+    ) {
+      asset.meta.compiledCodeHash ??= hashCode(code);
+    }
 
-    return contents;
-  },
-  async transform({asset, options, config, logger}) {
-    if (!getFeatureFlag('compiledCssInJsTransformer')) {
+    if (config?.unsafeUseSafeAssets) {
+      if (!config.configPath) {
+        throw new Error(
+          'configPath is required when unsafeUseSafeAssets is enabled',
+        );
+      }
+
+      asset.meta.useRustCompiledTransform ??= isSafeFromJs(
+        asset.meta.compiledCodeHash as string,
+        config.configPath,
+      );
+    }
+
+    if (getFeatureFlag('coreTokensAndCompiledCssInJsTransform')) {
+      // Skipping if we're using the compiled CSS in JS transform from the core pass
       return [asset];
     }
 
-    if (!asset.isSource && !config.extract) {
+    if (config.unsafeUseSafeAssets && !asset.meta.useRustCompiledTransform) {
+      // Fallback to the legacy transform if we know the asset is not safe
       return [asset];
     }
 
@@ -65,15 +85,6 @@ export default new Transformer({
 
       return originalMap;
     };
-    const code = await asset.getCode();
-    if (
-      config.importSources?.every(
-        (source) =>
-          !code.includes(source) || code.includes(source + '/runtime'),
-      )
-    ) {
-      return [asset];
-    }
 
     const codeBuffer = Buffer.from(code);
 
@@ -167,8 +178,17 @@ export default new Transformer({
           (diagnostic.severity === 'SourceError' && asset.isSource),
       );
       if (errors.length > 0) {
-        for (const error of errors) {
-          logger.error(convertDiagnostic(error));
+        if (
+          config.unsafeUseSafeAssets ||
+          config.unsafeReportSafeAssetsForMigration
+        ) {
+          for (const error of errors) {
+            logger.warn(convertDiagnostic(error));
+          }
+        } else {
+          throw new ThrowableDiagnostic({
+            diagnostic: errors.map(convertDiagnostic),
+          });
         }
       }
 
@@ -187,14 +207,11 @@ export default new Transformer({
     if (config.unsafeReportSafeAssetsForMigration) {
       // We need to run the transform without returning the result, so we can report the safe assets
       asset.meta.swcStyleRules = result.styleRules;
-      if (!result.codeHash) {
-        throw new Error('Code hash is required');
-      }
-      asset.meta.compiledCodeHash = result.codeHash;
       asset.meta.compiledCssDiagnostics = result.diagnostics.map(
         (d) => d.message,
       );
       asset.meta.compiledBailOut = result.bailOut;
+
       return [asset];
     }