npm - @atlaspack/transformer-compiled - Versions diffs - 0.1.1-canary.4113 → 0.1.1-dev-swc44-3ef36b21e.0 - Mend

@atlaspack/transformer-compiled 0.1.1-canary.4113 → 0.1.1-dev-swc44-3ef36b21e.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/lib/CompiledTransformer.js +74 -74
package/lib/types/CompiledTransformer.d.ts +1 -7
package/package.json +6 -8
package/src/CompiledTransformer.ts +93 -93

package/lib/CompiledTransformer.js CHANGED Viewed

@@ -10,7 +10,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * allowing users to transition without any change in functionality.
  */
 const path_1 = require("path");
-const assert_1 = __importDefault(require("assert"));
 const core_1 = require("@babel/core");
 const generator_1 = __importDefault(require("@babel/generator"));
 const utils_1 = require("@compiled/utils");
@@ -18,14 +17,6 @@ const plugin_1 = require("@atlaspack/plugin");
 const source_map_1 = __importDefault(require("@atlaspack/source-map"));
 const utils_2 = require("@atlaspack/utils");
 const utils_3 = require("./utils");
-const babel_plugin_1 = __importDefault(require("@compiled/babel-plugin"));
-const babel_plugin_strip_runtime_1 = __importDefault(require("@compiled/babel-plugin-strip-runtime"));
-// @ts-expect-error no declaration file
-// eslint-disable-next-line import/no-extraneous-dependencies
-const plugin_syntax_jsx_1 = __importDefault(require("@babel/plugin-syntax-jsx"));
-// @ts-expect-error no declaration file
-// eslint-disable-next-line import/no-extraneous-dependencies
-const plugin_syntax_typescript_1 = __importDefault(require("@babel/plugin-syntax-typescript"));
 const configFiles = [
     '.compiledcssrc',
     '.compiledcssrc.json',
@@ -37,7 +28,7 @@ const packageKey = '@atlaspack/transformer-compiled';
  * Atlaspack Compiled transformer.
  */
 exports.default = new plugin_1.Transformer({
-    async setup({ config, options }) {
+    async loadConfig({ config, options }) {
         const conf = await config.getConfigFrom((0, path_1.join)(options.projectRoot, 'index'), configFiles, {
             packageKey,
         });
@@ -67,72 +58,68 @@ exports.default = new plugin_1.Transformer({
             }
             Object.assign(contents, conf.contents);
         }
-        let importSourceMatches = [
-            ...utils_1.DEFAULT_IMPORT_SOURCES,
-            ...(contents.importSources || []),
-        ];
-        return {
-            config: {
-                compiledConfig: contents,
-                mode: options.mode,
-                projectRoot: options.projectRoot,
-            },
-            conditions: {
-                codeMatch: importSourceMatches,
-            },
-            env: [
-                // TODO revisit this list, since we may have added variables in here that were actually enumarated rather than accessed directly
-                'BABEL_ENV',
-                'BABEL_SHOW_CONFIG_FOR',
-                'BROWSERSLIST',
-                'BROWSERSLIST_CONFIG',
-                'BROWSERSLIST_DISABLE_CACHE',
-                'BROWSERSLIST_ENV',
-                'BROWSERSLIST_IGNORE_OLD_DATA',
-                'BABEL_TYPES_8_BREAKING',
-                'BROWSERSLIST_ROOT_PATH',
-                'BROWSERSLIST_STATS',
-                'AUTOPREFIXER',
-                'AUTOPREFIXER_GRID',
-                'TEST_PKG_VERSION',
-                'FORCE_COLOR',
-                'DEBUG',
-                'NODE_DEBUG',
-                'CI',
-                'COLORTERM',
-            ],
-        };
+        return contents;
     },
-    async transform({ asset, config }) {
-        if (config.compiledConfig.extract &&
-            config.compiledConfig.classHashPrefix) {
-            throw new Error('`@atlaspack/transformer-compiled` is mixing `extract: true` and `classHashPrefix` options, which will not supported and will result in bundle size bloat.');
-        }
+    canReuseAST() {
+        // Compiled should run before any other JS transformer.
+        return false;
+    },
+    async parse({ asset, config, options }) {
         // Disable stylesheet extraction locally due to https://github.com/atlassian-labs/compiled/issues/1306
-        const extract = config.compiledConfig.extract && config.mode !== 'development';
+        const extract = config.extract && options.mode !== 'development';
         if (!asset.isSource && !extract) {
             // Only parse source (pre-built code should already have been baked) or if stylesheet extraction is enabled
-            return [asset];
+            return undefined;
         }
         const code = await asset.getCode();
         if (
         // If neither Compiled (default) nor any of the additional import sources are found in the code, we bail out.
-        [
-            ...utils_1.DEFAULT_IMPORT_SOURCES,
-            ...(config.compiledConfig.importSources || []),
-        ].every((importSource) => !code.includes(importSource))) {
+        [...utils_1.DEFAULT_IMPORT_SOURCES, ...(config.importSources || [])].every((importSource) => !code.includes(importSource))) {
             // We only want to parse files that are actually using Compiled.
             // For everything else we bail out.
-            return [asset];
+            return undefined;
         }
         if (code.includes('/* COMPILED_TRANSFORMED_ASSET */')) {
             // If we're dealing with a pre-transformed asset, we bail out to avoid performing the expensive parse operation.
             // We add this marker to the code to indicate that the asset has already been transformed.
+            return undefined;
+        }
+        const program = await (0, core_1.parseAsync)(code, {
+            filename: asset.filePath,
+            babelrc: false,
+            configFile: false,
+            caller: { name: 'compiled' },
+            rootMode: 'upward-optional',
+            parserOpts: {
+                // @ts-expect-error - Type mismatch between @babel/parser and @compiled/utils versions
+                plugins: config.parserBabelPlugins ?? utils_1.DEFAULT_PARSER_BABEL_PLUGINS,
+            },
+            plugins: config.transformerBabelPlugins ?? undefined,
+        });
+        if (program) {
+            return {
+                type: 'babel',
+                version: '7.0.0',
+                program,
+            };
+        }
+        return undefined;
+    },
+    async transform({ asset, config, options }) {
+        if (config.extract && config.classHashPrefix) {
+            throw new Error('`@atlaspack/transformer-compiled` is mixing `extract: true` and `classHashPrefix` options, which will not supported and will result in bundle size bloat.');
+        }
+        const ast = await asset.getAST();
+        if (!(ast?.type === 'babel' && ast.program)) {
+            // We will only receive ASTs for assets we're interested in.
+            // Since this is undefined (or in node modules) we aren't interested in it.
             return [asset];
         }
         // Disable stylesheet extraction locally due to https://github.com/atlassian-labs/compiled/issues/1306
+        const extract = config.extract && options.mode !== 'development';
         const includedFiles = [];
-        const result = await (0, core_1.transformAsync)(code, {
+        const code = asset.isASTDirty() ? undefined : await asset.getCode();
+        const result = await (0, core_1.transformFromAstAsync)(ast.program, code, {
             code: false,
             ast: true,
             filename: asset.filePath,
@@ -140,27 +127,29 @@ exports.default = new plugin_1.Transformer({
             configFile: false,
             sourceMaps: !!asset.env.sourceMap,
             compact: false,
+            parserOpts: {
+                // @ts-expect-error - Type mismatch between @babel/parser and @compiled/utils versions
+                plugins: config.parserBabelPlugins ?? utils_1.DEFAULT_PARSER_BABEL_PLUGINS,
+            },
             plugins: [
-                plugin_syntax_jsx_1.default,
-                [plugin_syntax_typescript_1.default, { isTSX: true }],
+                ...(config.transformerBabelPlugins ?? []),
                 asset.isSource && [
-                    babel_plugin_1.default,
+                    '@compiled/babel-plugin',
                     {
                         ...config,
-                        classNameCompressionMap: config.compiledConfig.extract &&
-                            config.compiledConfig.classNameCompressionMap,
+                        classNameCompressionMap: config.extract && config.classNameCompressionMap,
                         onIncludedFiles: (files) => includedFiles.push(...files),
-                        resolver: config.compiledConfig.resolver
-                            ? config.compiledConfig.resolver
-                            : (0, utils_3.createDefaultResolver)(config.compiledConfig),
+                        resolver: config.resolver
+                            ? config.resolver
+                            : (0, utils_3.createDefaultResolver)(config),
                         cache: false,
                     },
                 ],
                 extract && [
-                    babel_plugin_strip_runtime_1.default,
+                    '@compiled/babel-plugin-strip-runtime',
                     {
                         compiledRequireExclude: true,
-                        extractStylesToDirectory: config.compiledConfig.extractStylesToDirectory,
+                        extractStylesToDirectory: config.extractStylesToDirectory,
                     },
                 ],
             ].filter(utils_1.toBoolean),
@@ -182,16 +171,24 @@ exports.default = new plugin_1.Transformer({
                 ...(metadata.styleRules ?? []),
             ];
         }
+        if (result?.ast) {
+            asset.setAST({
+                type: 'babel',
+                version: '7.0.0',
+                program: result.ast,
+            });
+        }
+        return [asset];
+    },
+    async generate({ asset, ast, options }) {
         const originalSourceMap = await asset.getMap();
-        const sourceFileName = (0, utils_2.relativeUrl)(config.projectRoot, asset.filePath);
-        (0, assert_1.default)(result?.ast, 'Babel transform returned no AST');
-        const { code: generatedCode, rawMappings } = (0, generator_1.default)(result.ast.program, {
+        const sourceFileName = (0, utils_2.relativeUrl)(options.projectRoot, asset.filePath);
+        const { code, rawMappings } = (0, generator_1.default)(ast.program, {
             sourceFileName,
             sourceMaps: !!asset.env.sourceMap,
             comments: true,
         });
-        asset.setCode(generatedCode);
-        const map = new source_map_1.default(config.projectRoot);
+        const map = new source_map_1.default(options.projectRoot);
         if (rawMappings) {
             map.addIndexedMappings(rawMappings);
         }
@@ -206,6 +203,9 @@ exports.default = new plugin_1.Transformer({
                 }
             }
         }
-        return [asset];
+        return {
+            content: code,
+            map,
+        };
     },
 });

package/lib/types/CompiledTransformer.d.ts CHANGED Viewed

@@ -1,13 +1,7 @@
 import { Transformer } from '@atlaspack/plugin';
 import type { CompiledTransformerOpts } from './types';
-import { BuildMode } from '@atlaspack/types';
-interface Config {
-    compiledConfig: CompiledTransformerOpts;
-    mode: BuildMode;
-    projectRoot: string;
-}
 /**
  * Atlaspack Compiled transformer.
  */
-declare const _default: Transformer<Config>;
+declare const _default: Transformer<CompiledTransformerOpts>;
 export default _default;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/transformer-compiled",
-  "version": "0.1.1-canary.4113+02cc8b32c",
+  "version": "0.1.1-dev-swc44-3ef36b21e.0",
   "description": "Atlaspack transformer for Compiled CSS-in-JS (insourced from @compiled/parcel-transformer)",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
@@ -21,24 +21,22 @@
     "src"
   ],
   "dependencies": {
-    "@atlaspack/plugin": "2.14.5-canary.334+02cc8b32c",
-    "@atlaspack/source-map": "3.2.1-canary.4113+02cc8b32c",
-    "@atlaspack/utils": "2.14.5-canary.334+02cc8b32c",
+    "@atlaspack/plugin": "2.14.46-dev-swc44-3ef36b21e.0",
+    "@atlaspack/source-map": "3.2.1-dev-swc44-3ef36b21e.0",
+    "@atlaspack/utils": "3.2.7-dev-swc44-3ef36b21e.0",
     "@babel/core": "^7.22.11",
     "@babel/generator": "^7.22.10",
-    "@babel/plugin-syntax-jsx": "^7.27.1",
-    "@babel/plugin-syntax-typescript": "^7.27.1",
     "@compiled/babel-plugin": "^0.38.0",
     "@compiled/babel-plugin-strip-runtime": "^0.38.0",
     "@compiled/utils": "^0.13.1",
     "enhanced-resolve": "^5.18.1"
   },
   "devDependencies": {
-    "@atlaspack/types": "2.14.5-canary.334+02cc8b32c"
+    "@atlaspack/types": "2.15.36-dev-swc44-3ef36b21e.0"
   },
   "type": "commonjs",
   "scripts": {
     "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
   },
-  "gitHead": "02cc8b32c06ca6b51806b33f6f707ca06e55e957"
+  "gitHead": "3ef36b21e388934416729737de94a47adf5e6ca4"
 }

package/src/CompiledTransformer.ts CHANGED Viewed

@@ -5,31 +5,25 @@
  * allowing users to transition without any change in functionality.
  */
 import {join} from 'path';
-import assert from 'assert';
-import {transformAsync} from '@babel/core';
+import {parseAsync, transformFromAstAsync} from '@babel/core';
 import generate from '@babel/generator';
 import type {PluginOptions as BabelPluginOptions} from '@compiled/babel-plugin';
 import type {
   PluginOptions as BabelStripRuntimePluginOptions,
   BabelFileMetadata,
 } from '@compiled/babel-plugin-strip-runtime';
-import {DEFAULT_IMPORT_SOURCES, toBoolean} from '@compiled/utils';
+import {
+  DEFAULT_IMPORT_SOURCES,
+  DEFAULT_PARSER_BABEL_PLUGINS,
+  toBoolean,
+} from '@compiled/utils';
 import {Transformer} from '@atlaspack/plugin';
 import SourceMap from '@atlaspack/source-map';
 import {relativeUrl} from '@atlaspack/utils';
 import type {CompiledTransformerOpts} from './types';
 import {createDefaultResolver} from './utils';
-import {BuildMode} from '@atlaspack/types';
-import CompiledBabelPlugin from '@compiled/babel-plugin';
-import CompiledBabelPluginStripRuntime from '@compiled/babel-plugin-strip-runtime';
-// @ts-expect-error no declaration file
-// eslint-disable-next-line import/no-extraneous-dependencies
-import BabelPluginSyntaxJsx from '@babel/plugin-syntax-jsx';
-// @ts-expect-error no declaration file
-// eslint-disable-next-line import/no-extraneous-dependencies
-import BabelPluginSyntaxTypescript from '@babel/plugin-syntax-typescript';
 const configFiles = [
   '.compiledcssrc',
@@ -40,17 +34,11 @@ const configFiles = [
 const packageKey = '@atlaspack/transformer-compiled';
-interface Config {
-  compiledConfig: CompiledTransformerOpts;
-  mode: BuildMode;
-  projectRoot: string;
-}
 /**
  * Atlaspack Compiled transformer.
  */
-export default new Transformer<Config>({
-  async setup({config, options}) {
+export default new Transformer<CompiledTransformerOpts>({
+  async loadConfig({config, options}) {
     const conf = await config.getConfigFrom<CompiledTransformerOpts>(
       join(options.projectRoot, 'index'),
       configFiles,
@@ -96,84 +84,84 @@ export default new Transformer<Config>({
       Object.assign(contents, conf.contents);
     }
-    let importSourceMatches = [
-      ...DEFAULT_IMPORT_SOURCES,
-      ...(contents.importSources || []),
-    ];
-    return {
-      config: {
-        compiledConfig: contents,
-        mode: options.mode,
-        projectRoot: options.projectRoot,
-      },
-      conditions: {
-        codeMatch: importSourceMatches,
-      },
-      env: [
-        // TODO revisit this list, since we may have added variables in here that were actually enumarated rather than accessed directly
-        'BABEL_ENV',
-        'BABEL_SHOW_CONFIG_FOR',
-        'BROWSERSLIST',
-        'BROWSERSLIST_CONFIG',
-        'BROWSERSLIST_DISABLE_CACHE',
-        'BROWSERSLIST_ENV',
-        'BROWSERSLIST_IGNORE_OLD_DATA',
-        'BABEL_TYPES_8_BREAKING',
-        'BROWSERSLIST_ROOT_PATH',
-        'BROWSERSLIST_STATS',
-        'AUTOPREFIXER',
-        'AUTOPREFIXER_GRID',
-        'TEST_PKG_VERSION',
-        'FORCE_COLOR',
-        'DEBUG',
-        'NODE_DEBUG',
-        'CI',
-        'COLORTERM',
-      ],
-    };
+    return contents;
   },
-  async transform({asset, config}) {
-    if (
-      config.compiledConfig.extract &&
-      config.compiledConfig.classHashPrefix
-    ) {
-      throw new Error(
-        '`@atlaspack/transformer-compiled` is mixing `extract: true` and `classHashPrefix` options, which will not supported and will result in bundle size bloat.',
-      );
-    }
+  canReuseAST() {
+    // Compiled should run before any other JS transformer.
+    return false;
+  },
+  async parse({asset, config, options}) {
     // Disable stylesheet extraction locally due to https://github.com/atlassian-labs/compiled/issues/1306
-    const extract =
-      config.compiledConfig.extract && config.mode !== 'development';
+    const extract = config.extract && options.mode !== 'development';
     if (!asset.isSource && !extract) {
       // Only parse source (pre-built code should already have been baked) or if stylesheet extraction is enabled
-      return [asset];
+      return undefined;
     }
     const code = await asset.getCode();
     if (
       // If neither Compiled (default) nor any of the additional import sources are found in the code, we bail out.
-      [
-        ...DEFAULT_IMPORT_SOURCES,
-        ...(config.compiledConfig.importSources || []),
-      ].every((importSource) => !code.includes(importSource))
+      [...DEFAULT_IMPORT_SOURCES, ...(config.importSources || [])].every(
+        (importSource) => !code.includes(importSource),
+      )
     ) {
       // We only want to parse files that are actually using Compiled.
       // For everything else we bail out.
-      return [asset];
+      return undefined;
     }
     if (code.includes('/* COMPILED_TRANSFORMED_ASSET */')) {
       // If we're dealing with a pre-transformed asset, we bail out to avoid performing the expensive parse operation.
       // We add this marker to the code to indicate that the asset has already been transformed.
+      return undefined;
+    }
+    const program = await parseAsync(code, {
+      filename: asset.filePath,
+      babelrc: false,
+      configFile: false,
+      caller: {name: 'compiled'},
+      rootMode: 'upward-optional',
+      parserOpts: {
+        // @ts-expect-error - Type mismatch between @babel/parser and @compiled/utils versions
+        plugins: config.parserBabelPlugins ?? DEFAULT_PARSER_BABEL_PLUGINS,
+      },
+      plugins: config.transformerBabelPlugins ?? undefined,
+    });
+    if (program) {
+      return {
+        type: 'babel',
+        version: '7.0.0',
+        program,
+      };
+    }
+    return undefined;
+  },
+  async transform({asset, config, options}) {
+    if (config.extract && config.classHashPrefix) {
+      throw new Error(
+        '`@atlaspack/transformer-compiled` is mixing `extract: true` and `classHashPrefix` options, which will not supported and will result in bundle size bloat.',
+      );
+    }
+    const ast = await asset.getAST();
+    if (!(ast?.type === 'babel' && ast.program)) {
+      // We will only receive ASTs for assets we're interested in.
+      // Since this is undefined (or in node modules) we aren't interested in it.
       return [asset];
     }
     // Disable stylesheet extraction locally due to https://github.com/atlassian-labs/compiled/issues/1306
+    const extract = config.extract && options.mode !== 'development';
     const includedFiles: string[] = [];
+    const code = asset.isASTDirty() ? undefined : await asset.getCode();
-    const result = await transformAsync(code, {
+    const result = await transformFromAstAsync(ast.program, code, {
       code: false,
       ast: true,
       filename: asset.filePath,
@@ -181,29 +169,30 @@ export default new Transformer<Config>({
       configFile: false,
       sourceMaps: !!asset.env.sourceMap,
       compact: false,
+      parserOpts: {
+        // @ts-expect-error - Type mismatch between @babel/parser and @compiled/utils versions
+        plugins: config.parserBabelPlugins ?? DEFAULT_PARSER_BABEL_PLUGINS,
+      },
       plugins: [
-        BabelPluginSyntaxJsx,
-        [BabelPluginSyntaxTypescript, {isTSX: true}],
+        ...(config.transformerBabelPlugins ?? []),
         asset.isSource && [
-          CompiledBabelPlugin,
+          '@compiled/babel-plugin',
           {
             ...config,
             classNameCompressionMap:
-              config.compiledConfig.extract &&
-              config.compiledConfig.classNameCompressionMap,
+              config.extract && config.classNameCompressionMap,
             onIncludedFiles: (files: string[]) => includedFiles.push(...files),
-            resolver: config.compiledConfig.resolver
-              ? config.compiledConfig.resolver
-              : createDefaultResolver(config.compiledConfig),
+            resolver: config.resolver
+              ? config.resolver
+              : createDefaultResolver(config),
             cache: false,
           } as BabelPluginOptions,
         ],
         extract && [
-          CompiledBabelPluginStripRuntime,
+          '@compiled/babel-plugin-strip-runtime',
           {
             compiledRequireExclude: true,
-            extractStylesToDirectory:
-              config.compiledConfig.extractStylesToDirectory,
+            extractStylesToDirectory: config.extractStylesToDirectory,
           } as BabelStripRuntimePluginOptions,
         ],
       ].filter(toBoolean),
@@ -228,15 +217,25 @@ export default new Transformer<Config>({
       ];
     }
+    if (result?.ast) {
+      asset.setAST({
+        type: 'babel',
+        version: '7.0.0',
+        program: result.ast,
+      });
+    }
+    return [asset];
+  },
+  async generate({asset, ast, options}) {
     const originalSourceMap = await asset.getMap();
     const sourceFileName: string = relativeUrl(
-      config.projectRoot,
+      options.projectRoot,
       asset.filePath,
     );
-    assert(result?.ast, 'Babel transform returned no AST');
-    const {code: generatedCode, rawMappings} = generate(result.ast.program, {
+    const {code, rawMappings} = generate(ast.program, {
       sourceFileName,
       sourceMaps: !!asset.env.sourceMap,
       comments: true,
@@ -250,9 +249,7 @@ export default new Transformer<Config>({
       }>;
     };
-    asset.setCode(generatedCode);
-    const map = new SourceMap(config.projectRoot);
+    const map = new SourceMap(options.projectRoot);
     if (rawMappings) {
       map.addIndexedMappings(rawMappings);
     }
@@ -269,6 +266,9 @@ export default new Transformer<Config>({
       }
     }
-    return [asset];
+    return {
+      content: code,
+      map,
+    };
   },
 });