@compiled/parcel-transformer 0.6.20 → 0.7.2

package/dist/transformer.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@babel/core");
 const generator_1 = __importDefault(require("@babel/generator"));
 const plugin_1 = require("@parcel/plugin");
+const source_map_1 = __importDefault(require("@parcel/source-map"));
 const configFiles = [
     '.compiledcssrc',
     '.compiledcssrc.json',
@@ -22,11 +23,10 @@ exports.default = new plugin_1.Transformer({
         });
         const contents = {};
         if (conf) {
-            config.shouldInvalidateOnStartup();
+            config.invalidateOnStartup();
             Object.assign(contents, conf.contents);
         }
-        // We always set a result so it's only evaluated once.
-        config.setResult(contents);
+        return contents;
     },
     canReuseAST() {
         // Compiled should run before any other JS transformer.
@@ -42,12 +42,16 @@ exports.default = new plugin_1.Transformer({
             // For everything else we bail out.
             return undefined;
         }
-        const ast = await (0, core_1.parseAsync)(code, {
+        const program = await (0, core_1.parseAsync)(code, {
             filename: asset.filePath,
             caller: { name: 'compiled' },
             rootMode: 'upward-optional',
         });
-        return ast;
+        return {
+            type: 'babel',
+            version: '7.0.0',
+            program,
+        };
     },
     async transform({ asset, config }) {
         const ast = await asset.getAST();
@@ -79,7 +83,7 @@ exports.default = new plugin_1.Transformer({
             // Included files are those which have been statically evaluated into this asset.
             // This tells parcel that if any of those files change this asset should be transformed
             // again.
-            asset.addIncludedFile(file);
+            asset.invalidateOnFileChange(file);
         });
         if (result === null || result === void 0 ? void 0 : result.ast) {
             asset.setAST({
@@ -92,14 +96,19 @@ exports.default = new plugin_1.Transformer({
         }
         return [asset];
     },
-    generate({ ast, asset }) {
+    async generate({ asset, ast }) {
         // TODO: We're using babels standard generator. Internally parcel does some hacks in
         // the official Babel transformer to make it faster - using ASTree directly.
         // Perhaps we should do the same thing.
-        const { code, map } = (0, generator_1.default)(ast.program, {
+        const { code, map: babelMap } = (0, generator_1.default)(ast.program, {
             filename: asset.filePath,
+            sourceMaps: true,
+            sourceFileName: asset.filePath,
         });
-        return { content: code, map };
+        return {
+            content: code,
+            map: babelMap ? new source_map_1.default().addVLQMap(babelMap) : null,
+        };
     },
 });
 //# sourceMappingURL=transformer.js.map

package/dist/transformer.js.map

@@ -1 +1 @@
-{"version":3,"file":"transformer.js","sourceRoot":"","sources":["../src/transformer.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"transformer.js","sourceRoot":"","sources":["../src/transformer.tsx"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@compiled/parcel-transformer",
-  "version": "0.6.20",
+  "version": "0.7.2",
   "description": "A familiar and performant compile time CSS-in-JS library for React.",
   "homepage": "https://compiledcssinjs.com/docs/pkg-parcel-transformer",
   "bugs": "https://github.com/atlassian-labs/compiled/issues/new?assignees=&labels=bug&template=bug_report.md",
@@ -21,16 +21,17 @@
     "README.md"
   ],
   "dependencies": {
-    "@babel/core": "^7.16.5",
-    "@babel/generator": "^7.16.5",
-    "@compiled/babel-plugin": "^0.11.4",
+    "@babel/core": "^7.17.5",
+    "@babel/generator": "^7.17.3",
+    "@compiled/babel-plugin": "^0.13.0",
     "@compiled/utils": "^0.6.13",
-    "@parcel/plugin": "^2.0.0-nightly.657"
+    "@parcel/plugin": "^2.3.2",
+    "@parcel/source-map": "^2.0.2"
   },
   "devDependencies": {
     "@types/babel__core": "^7.1.18"
   },
   "engines": {
-    "parcel": "^2.0.0 || ^2.0.0-beta.1"
+    "parcel": "^2.0.0"
   }
 }

package/src/transformer.tsx

@@ -2,6 +2,7 @@ import { parseAsync, transformFromAstAsync } from '@babel/core';
 import generate from '@babel/generator';
 import type { PluginOptions } from '@compiled/babel-plugin';
 import { Transformer } from '@parcel/plugin';
+import SourceMap from '@parcel/source-map';
 
 type UserlandOpts = Omit<PluginOptions, 'cache' | 'onIncludedFiles'>;
 
@@ -24,12 +25,11 @@ export default new Transformer<UserlandOpts>({
     const contents: UserlandOpts = {};
 
     if (conf) {
-      config.shouldInvalidateOnStartup();
+      config.invalidateOnStartup();
       Object.assign(contents, conf.contents);
     }
 
-    // We always set a result so it's only evaluated once.
-    config.setResult(contents);
+    return contents;
   },
 
   canReuseAST() {
@@ -49,13 +49,17 @@ export default new Transformer<UserlandOpts>({
       return undefined;
     }
 
-    const ast = await parseAsync(code, {
+    const program = await parseAsync(code, {
       filename: asset.filePath,
       caller: { name: 'compiled' },
       rootMode: 'upward-optional',
     });
 
-    return ast;
+    return {
+      type: 'babel',
+      version: '7.0.0',
+      program,
+    };
   },
 
   async transform({ asset, config }) {
@@ -95,7 +99,7 @@ export default new Transformer<UserlandOpts>({
       // Included files are those which have been statically evaluated into this asset.
       // This tells parcel that if any of those files change this asset should be transformed
       // again.
-      asset.addIncludedFile(file);
+      asset.invalidateOnFileChange(file);
     });
 
     if (result?.ast) {
@@ -111,14 +115,19 @@ export default new Transformer<UserlandOpts>({
     return [asset];
   },
 
-  generate({ ast, asset }) {
+  async generate({ asset, ast }) {
     // TODO: We're using babels standard generator. Internally parcel does some hacks in
     // the official Babel transformer to make it faster - using ASTree directly.
     // Perhaps we should do the same thing.
-    const { code, map } = generate(ast.program, {
+    const { code, map: babelMap } = generate(ast.program, {
       filename: asset.filePath,
+      sourceMaps: true,
+      sourceFileName: asset.filePath,
     });
 
-    return { content: code, map };
+    return {
+      content: code,
+      map: babelMap ? new SourceMap().addVLQMap(babelMap) : null,
+    };
   },
 });