@atlaspack/optimizer-swc 2.16.10-dev-fix-sourcemaps-50acc1acf.0 → 2.16.10

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaspack/optimizer-swc
 
+## 2.16.10
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/source-map@3.3.8
+  - @atlaspack/utils@3.4.6
+  - @atlaspack/plugin@2.14.64
+
 ## 2.16.9
 
 ### Patch Changes

package/dist/SwcOptimizer.js

@@ -36,11 +36,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const nullthrows_1 = __importDefault(require("nullthrows"));
+const core_1 = require("@swc/core");
 const plugin_1 = require("@atlaspack/plugin");
 const utils_1 = require("@atlaspack/utils");
+const source_map_1 = __importDefault(require("@atlaspack/source-map"));
 const diagnostic_1 = __importStar(require("@atlaspack/diagnostic"));
 const path_1 = __importDefault(require("path"));
-const minifyWithSourceMap_1 = require("./minifyWithSourceMap");
 exports.default = new plugin_1.Optimizer({
     async loadConfig({ config, options }) {
         let userConfig = await config.getConfigFrom(path_1.default.join(options.projectRoot, 'index'), ['.terserrc', '.terserrc.js', '.terserrc.cjs', '.terserrc.mjs']);
@@ -53,15 +55,23 @@ exports.default = new plugin_1.Optimizer({
         let code = await (0, utils_1.blobToString)(contents);
         let result;
         try {
-            result = await (0, minifyWithSourceMap_1.minifyWithSourceMap)(code, bundle.env.sourceMap ? (originalMap ?? null) : null, {
-                target: 'es2022',
-                mangle: true,
-                compress: true,
-                toplevel: bundle.env.outputFormat === 'esmodule' ||
-                    bundle.env.outputFormat === 'commonjs',
-                module: bundle.env.outputFormat === 'esmodule',
-                userConfig: userConfig,
-                projectRoot: options.projectRoot,
+            result = await (0, core_1.transform)(code, {
+                jsc: {
+                    target: 'es2022',
+                    minify: {
+                        mangle: true,
+                        compress: true,
+                        // @ts-expect-error TS2698
+                        ...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) {
@@ -114,9 +124,15 @@ exports.default = new plugin_1.Optimizer({
             }
             throw err;
         }
-        let minifiedContents = result.code;
-        const sourceMap = result.map;
-        if (sourceMap) {
+        let sourceMap = null;
+        let minifiedContents = (0, nullthrows_1.default)(result.code);
+        let resultMap = result.map;
+        if (resultMap) {
+            sourceMap = new source_map_1.default(options.projectRoot);
+            sourceMap.addVLQMap(JSON.parse(resultMap));
+            if (originalMap) {
+                sourceMap.extends(originalMap);
+            }
             let sourcemapReference = await getSourceMapReference(sourceMap);
             if (sourcemapReference) {
                 minifiedContents += `\n//# sourceMappingURL=${sourcemapReference}\n`;

package/lib/SwcOptimizer.js

@@ -4,6 +4,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+function _nullthrows() {
+  const data = _interopRequireDefault(require("nullthrows"));
+  _nullthrows = function () {
+    return data;
+  };
+  return data;
+}
+function _core() {
+  const data = require("@swc/core");
+  _core = function () {
+    return data;
+  };
+  return data;
+}
 function _plugin() {
   const data = require("@atlaspack/plugin");
   _plugin = function () {
@@ -18,6 +32,13 @@ function _utils() {
   };
   return data;
 }
+function _sourceMap() {
+  const data = _interopRequireDefault(require("@atlaspack/source-map"));
+  _sourceMap = function () {
+    return data;
+  };
+  return data;
+}
 function _diagnostic() {
   const data = _interopRequireWildcard(require("@atlaspack/diagnostic"));
   _diagnostic = function () {
@@ -32,9 +53,8 @@ function _path() {
   };
   return data;
 }
-var _minifyWithSourceMap = require("./minifyWithSourceMap");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 var _default = exports.default = new (_plugin().Optimizer)({
   async loadConfig({
     config,
@@ -60,14 +80,22 @@ var _default = exports.default = new (_plugin().Optimizer)({
     let code = await (0, _utils().blobToString)(contents);
     let result;
     try {
-      result = await (0, _minifyWithSourceMap.minifyWithSourceMap)(code, bundle.env.sourceMap ? originalMap ?? null : null, {
-        target: 'es2022',
-        mangle: true,
-        compress: true,
-        toplevel: bundle.env.outputFormat === 'esmodule' || bundle.env.outputFormat === 'commonjs',
-        module: bundle.env.outputFormat === 'esmodule',
-        userConfig: userConfig,
-        projectRoot: options.projectRoot
+      result = await (0, _core().transform)(code, {
+        jsc: {
+          target: 'es2022',
+          minify: {
+            mangle: true,
+            compress: true,
+            // @ts-expect-error TS2698
+            ...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.
@@ -120,9 +148,15 @@ var _default = exports.default = new (_plugin().Optimizer)({
       }
       throw err;
     }
-    let minifiedContents = result.code;
-    const sourceMap = result.map;
-    if (sourceMap) {
+    let sourceMap = null;
+    let minifiedContents = (0, _nullthrows().default)(result.code);
+    let resultMap = result.map;
+    if (resultMap) {
+      sourceMap = new (_sourceMap().default)(options.projectRoot);
+      sourceMap.addVLQMap(JSON.parse(resultMap));
+      if (originalMap) {
+        sourceMap.extends(originalMap);
+      }
       let sourcemapReference = await getSourceMapReference(sourceMap);
       if (sourcemapReference) {
         minifiedContents += `\n//# sourceMappingURL=${sourcemapReference}\n`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/optimizer-swc",
-  "version": "2.16.10-dev-fix-sourcemaps-50acc1acf.0",
+  "version": "2.16.10",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -16,16 +16,15 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.5-dev-fix-sourcemaps-50acc1acf.0",
-    "@atlaspack/plugin": "2.14.64-dev-fix-sourcemaps-50acc1acf.0",
-    "@atlaspack/source-map": "3.3.8-dev-fix-sourcemaps-50acc1acf.0",
-    "@atlaspack/utils": "3.4.6-dev-fix-sourcemaps-50acc1acf.0",
+    "@atlaspack/diagnostic": "2.14.4",
+    "@atlaspack/plugin": "2.14.64",
+    "@atlaspack/source-map": "3.3.8",
+    "@atlaspack/utils": "3.4.6",
     "@swc/core": "1.15.11",
     "nullthrows": "^1.1.1"
   },
   "type": "commonjs",
   "scripts": {
     "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
-  },
-  "gitHead": "50acc1acf31d5c8415a8154841a8ed09264e665a"
+  }
 }

package/src/SwcOptimizer.ts

@@ -1,10 +1,11 @@
+import nullthrows from 'nullthrows';
+import {transform} from '@swc/core';
 import {Optimizer} from '@atlaspack/plugin';
 import {blobToString, stripAnsi} from '@atlaspack/utils';
+import SourceMap from '@atlaspack/source-map';
 import ThrowableDiagnostic, {escapeMarkdown} from '@atlaspack/diagnostic';
 import path from 'path';
 
-import {minifyWithSourceMap} from './minifyWithSourceMap';
-
 export default new Optimizer({
   async loadConfig({config, options}) {
     let userConfig = await config.getConfigFrom(
@@ -29,21 +30,25 @@ export default new Optimizer({
     let code = await blobToString(contents);
     let result;
     try {
-      result = await minifyWithSourceMap(
-        code,
-        bundle.env.sourceMap ? (originalMap ?? null) : null,
-        {
+      result = await transform(code, {
+        jsc: {
           target: 'es2022',
-          mangle: true,
-          compress: true,
-          toplevel:
-            bundle.env.outputFormat === 'esmodule' ||
-            bundle.env.outputFormat === 'commonjs',
-          module: bundle.env.outputFormat === 'esmodule',
-          userConfig: userConfig as Record<string, unknown> | undefined,
-          projectRoot: options.projectRoot,
+          minify: {
+            mangle: true,
+            compress: true,
+            // @ts-expect-error TS2698
+            ...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: any) {
       // SWC doesn't give us nice error objects, so we need to parse the message.
       let message = escapeMarkdown(
@@ -102,9 +107,15 @@ export default new Optimizer({
       throw err;
     }
 
-    let minifiedContents: string = result.code;
-    const sourceMap = result.map;
-    if (sourceMap) {
+    let sourceMap = null;
+    let minifiedContents: string = nullthrows(result.code);
+    let resultMap = result.map;
+    if (resultMap) {
+      sourceMap = new SourceMap(options.projectRoot);
+      sourceMap.addVLQMap(JSON.parse(resultMap));
+      if (originalMap) {
+        sourceMap.extends(originalMap);
+      }
       let sourcemapReference = await getSourceMapReference(sourceMap);
       if (sourcemapReference) {
         minifiedContents += `\n//# sourceMappingURL=${sourcemapReference}\n`;