@parcel/optimizer-swc 2.8.3 → 2.8.4-nightly.0

package/lib/SwcOptimizer.js

@@ -55,6 +55,16 @@ function _sourceMap() {
   return data;
 }
 
+function _diagnostic() {
+  const data = _interopRequireWildcard(require("@parcel/diagnostic"));
+
+  _diagnostic = function () {
+    return data;
+  };
+
+  return data;
+}
+
 function _path() {
   const data = _interopRequireDefault(require("path"));
 
@@ -65,6 +75,10 @@ function _path() {
   return data;
 }
 
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var _default = new (_plugin().Optimizer)({
@@ -72,16 +86,7 @@ var _default = new (_plugin().Optimizer)({
     config,
     options
   }) {
-    let userConfig = await config.getConfigFrom(_path().default.join(options.projectRoot, 'index'), ['.terserrc', '.terserrc.js', '.terserrc.cjs']);
-
-    if (userConfig) {
-      let isJavascript = _path().default.extname(userConfig.filePath) === '.js';
-
-      if (isJavascript) {
-        config.invalidateOnStartup();
-      }
-    }
-
+    let userConfig = await config.getConfigFrom(_path().default.join(options.projectRoot, 'index'), ['.terserrc', '.terserrc.js', '.terserrc.cjs', '.terserrc.mjs']);
     return userConfig === null || userConfig === void 0 ? void 0 : userConfig.contents;
   },
 
@@ -101,17 +106,83 @@ var _default = new (_plugin().Optimizer)({
     }
 
     let code = await (0, _utils().blobToString)(contents);
-    let config = {
-      mangle: true,
-      compress: true,
-      ...userConfig,
-      sourceMap: bundle.env.sourceMap ? {
-        filename: _path().default.relative(options.projectRoot, _path().default.join(bundle.target.distDir, bundle.name))
-      } : false,
-      toplevel: bundle.env.outputFormat === 'esmodule' || bundle.env.outputFormat === 'commonjs',
-      module: bundle.env.outputFormat === 'esmodule'
-    };
-    let result = await (0, _core().minify)(code, config);
+    let result;
+
+    try {
+      result = await (0, _core().transform)(code, {
+        jsc: {
+          target: 'es2022',
+          minify: {
+            mangle: true,
+            compress: true,
+            ...userConfig,
+            toplevel: bundle.env.outputFormat === 'esmodule' || bundle.env.outputFormat === 'commonjs',
+            module: bundle.env.outputFormat === 'esmodule'
+          }
+        },
+        minify: true,
+        sourceMaps: !!bundle.env.sourceMap,
+        configFile: false,
+        swcrc: false
+      });
+    } catch (err) {
+      // SWC doesn't give us nice error objects, so we need to parse the message.
+      let message = (0, _diagnostic().escapeMarkdown)(((0, _utils().stripAnsi)(err.message).split('\n').find(line => line.trim().length > 0) || '').trim().replace(/^(×|x)\s+/, ''));
+      let location = err.message.match(/(?:╭─|,-)\[(\d+):(\d+)\]/);
+
+      if (location) {
+        let line = Number(location[1]);
+        let col = Number(location[1]);
+        let mapping = originalMap === null || originalMap === void 0 ? void 0 : originalMap.findClosestMapping(line, col);
+
+        if (mapping && mapping.original && mapping.source) {
+          let {
+            source,
+            original
+          } = mapping;
+
+          let filePath = _path().default.resolve(options.projectRoot, source);
+
+          throw new (_diagnostic().default)({
+            diagnostic: {
+              message,
+              origin: '@parcel/optimizer-swc',
+              codeFrames: [{
+                language: 'js',
+                filePath,
+                codeHighlights: [{
+                  start: original,
+                  end: original
+                }]
+              }]
+            }
+          });
+        }
+
+        let loc = {
+          line: line,
+          column: col
+        };
+        throw new (_diagnostic().default)({
+          diagnostic: {
+            message,
+            origin: '@parcel/optimizer-swc',
+            codeFrames: [{
+              language: 'js',
+              filePath: undefined,
+              code,
+              codeHighlights: [{
+                start: loc,
+                end: loc
+              }]
+            }]
+          }
+        });
+      }
+
+      throw err;
+    }
+
     let sourceMap = null;
     let minifiedContents = (0, _nullthrows().default)(result.code);
     let resultMap = result.map;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/optimizer-swc",
-  "version": "2.8.3",
+  "version": "2.8.4-nightly.0+7b79c6d",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,14 +17,15 @@
   "source": "src/SwcOptimizer.js",
   "engines": {
     "node": ">= 12.0.0",
-    "parcel": "^2.8.3"
+    "parcel": "2.8.4-nightly.0+7b79c6d"
   },
   "dependencies": {
-    "@parcel/plugin": "2.8.3",
+    "@parcel/diagnostic": "2.8.4-nightly.0+7b79c6d",
+    "@parcel/plugin": "2.8.4-nightly.0+7b79c6d",
     "@parcel/source-map": "^2.1.1",
-    "@parcel/utils": "2.8.3",
-    "@swc/core": "^1.2.106",
+    "@parcel/utils": "2.8.4-nightly.0+7b79c6d",
+    "@swc/core": "^1.3.36",
     "nullthrows": "^1.1.1"
   },
-  "gitHead": "349a6caf40ec8abb6a49fcae0765f8f8deb2073d"
+  "gitHead": "7b79c6d69ffabef89810a8db61e9abdeb70d6990"
 }

package/src/SwcOptimizer.js

@@ -1,27 +1,20 @@
 // @flow
 
 import nullthrows from 'nullthrows';
-import {minify} from '@swc/core';
+import {transform} from '@swc/core';
 import {Optimizer} from '@parcel/plugin';
-import {blobToString} from '@parcel/utils';
+import {blobToString, stripAnsi} from '@parcel/utils';
 import SourceMap from '@parcel/source-map';
-
+import ThrowableDiagnostic, {escapeMarkdown} from '@parcel/diagnostic';
 import path from 'path';
 
 export default (new Optimizer({
   async loadConfig({config, options}) {
     let userConfig = await config.getConfigFrom(
       path.join(options.projectRoot, 'index'),
-      ['.terserrc', '.terserrc.js', '.terserrc.cjs'],
+      ['.terserrc', '.terserrc.js', '.terserrc.cjs', '.terserrc.mjs'],
     );
 
-    if (userConfig) {
-      let isJavascript = path.extname(userConfig.filePath) === '.js';
-      if (isJavascript) {
-        config.invalidateOnStartup();
-      }
-    }
-
     return userConfig?.contents;
   },
   async optimize({
@@ -37,25 +30,83 @@ export default (new Optimizer({
     }
 
     let code = await blobToString(contents);
-    let config = {
-      mangle: true,
-      compress: true,
-      ...userConfig,
-      sourceMap: bundle.env.sourceMap
-        ? {
-            filename: path.relative(
-              options.projectRoot,
-              path.join(bundle.target.distDir, bundle.name),
-            ),
-          }
-        : false,
-      toplevel:
-        bundle.env.outputFormat === 'esmodule' ||
-        bundle.env.outputFormat === 'commonjs',
-      module: bundle.env.outputFormat === 'esmodule',
-    };
+    let result;
+    try {
+      result = await transform(code, {
+        jsc: {
+          target: 'es2022',
+          minify: {
+            mangle: true,
+            compress: true,
+            ...userConfig,
+            toplevel:
+              bundle.env.outputFormat === 'esmodule' ||
+              bundle.env.outputFormat === 'commonjs',
+            module: bundle.env.outputFormat === 'esmodule',
+          },
+        },
+        minify: true,
+        sourceMaps: !!bundle.env.sourceMap,
+        configFile: false,
+        swcrc: false,
+      });
+    } catch (err) {
+      // SWC doesn't give us nice error objects, so we need to parse the message.
+      let message = escapeMarkdown(
+        (
+          stripAnsi(err.message)
+            .split('\n')
+            .find(line => line.trim().length > 0) || ''
+        )
+          .trim()
+          .replace(/^(×|x)\s+/, ''),
+      );
+      let location = err.message.match(/(?:╭─|,-)\[(\d+):(\d+)\]/);
+      if (location) {
+        let line = Number(location[1]);
+        let col = Number(location[1]);
+        let mapping = originalMap?.findClosestMapping(line, col);
+        if (mapping && mapping.original && mapping.source) {
+          let {source, original} = mapping;
+          let filePath = path.resolve(options.projectRoot, source);
+          throw new ThrowableDiagnostic({
+            diagnostic: {
+              message,
+              origin: '@parcel/optimizer-swc',
+              codeFrames: [
+                {
+                  language: 'js',
+                  filePath,
+                  codeHighlights: [{start: original, end: original}],
+                },
+              ],
+            },
+          });
+        }
 
-    let result = await minify(code, config);
+        let loc = {
+          line: line,
+          column: col,
+        };
+
+        throw new ThrowableDiagnostic({
+          diagnostic: {
+            message,
+            origin: '@parcel/optimizer-swc',
+            codeFrames: [
+              {
+                language: 'js',
+                filePath: undefined,
+                code,
+                codeHighlights: [{start: loc, end: loc}],
+              },
+            ],
+          },
+        });
+      }
+
+      throw err;
+    }
 
     let sourceMap = null;
     let minifiedContents: string = nullthrows(result.code);