@parcel/optimizer-terser 2.0.0-beta.3.1 → 2.0.0-dev.1515

package/lib/TerserOptimizer.js

@@ -4,88 +4,71 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 function _nullthrows() {
   const data = _interopRequireDefault(require("nullthrows"));
-
   _nullthrows = function () {
     return data;
   };
-
   return data;
 }
-
 function _terser() {
   const data = require("terser");
-
   _terser = function () {
     return data;
   };
-
   return data;
 }
-
 function _plugin() {
   const data = require("@parcel/plugin");
-
   _plugin = function () {
     return data;
   };
-
   return data;
 }
-
 function _utils() {
   const data = require("@parcel/utils");
-
   _utils = function () {
     return data;
   };
-
   return data;
 }
-
 function _sourceMap() {
   const data = _interopRequireDefault(require("@parcel/source-map"));
-
   _sourceMap = function () {
     return data;
   };
-
   return data;
 }
-
 function _diagnostic() {
   const data = _interopRequireWildcard(require("@parcel/diagnostic"));
-
   _diagnostic = function () {
     return data;
   };
-
   return data;
 }
-
 function _path() {
   const data = _interopRequireDefault(require("path"));
-
   _path = function () {
     return data;
   };
-
   return data;
 }
-
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (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 _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 }; }
-
-var _default = new (_plugin().Optimizer)({
+var _default = exports.default = new (_plugin().Optimizer)({
+  async loadConfig({
+    config,
+    options
+  }) {
+    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;
+  },
   async optimize({
     contents,
     map,
     bundle,
+    config: userConfig,
     options,
     getSourceMapReference
   }) {
@@ -95,11 +78,10 @@ var _default = new (_plugin().Optimizer)({
         map
       };
     }
-
     let code = await (0, _utils().blobToString)(contents);
-    let userConfig = await (0, _utils().loadConfig)(options.inputFS, _path().default.join(options.entryRoot, 'index'), ['.terserrc', '.uglifyrc', '.uglifyrc.js', '.terserrc.js'], options.projectRoot);
     let originalMap = map ? await map.stringify({}) : null;
-    let config = { ...(userConfig === null || userConfig === void 0 ? void 0 : userConfig.config),
+    let config = {
+      ...userConfig,
       sourceMap: bundle.env.sourceMap ? {
         filename: _path().default.relative(options.projectRoot, _path().default.join(bundle.target.distDir, bundle.name)),
         asObject: true,
@@ -109,7 +91,6 @@ var _default = new (_plugin().Optimizer)({
       module: bundle.env.outputFormat === 'esmodule'
     };
     let result;
-
     try {
       result = await (0, _terser().minify)(code, config);
     } catch (error) {
@@ -119,37 +100,32 @@ var _default = new (_plugin().Optimizer)({
         line,
         col
       } = error;
-
       if (line != null && col != null) {
         message = (0, _diagnostic().escapeMarkdown)(message);
         let diagnostics = [];
         let mapping = map === null || map === void 0 ? void 0 : map.findClosestMapping(line, col);
-
         if (mapping && mapping.original && mapping.source) {
           let {
             source,
             original
           } = mapping;
-
           let filePath = _path().default.resolve(options.projectRoot, source);
-
           diagnostics.push({
             message,
             origin: '@parcel/optimizer-terser',
-            language: 'js',
-            filePath,
-            codeFrame: {
+            codeFrames: [{
+              language: 'js',
+              filePath,
               code: await options.inputFS.readFile(filePath, 'utf8'),
               codeHighlights: [{
                 message,
                 start: original,
                 end: original
               }]
-            },
+            }],
             hints: ["It's likely that Terser doesn't support this syntax yet."]
           });
         }
-
         if (diagnostics.length === 0 || options.logLevel === 'verbose') {
           let loc = {
             line: line,
@@ -158,20 +134,19 @@ var _default = new (_plugin().Optimizer)({
           diagnostics.push({
             message,
             origin: '@parcel/optimizer-terser',
-            language: 'js',
-            filePath: undefined,
-            codeFrame: {
+            codeFrames: [{
+              language: 'js',
+              filePath: undefined,
               code,
               codeHighlights: [{
                 message,
                 start: loc,
                 end: loc
               }]
-            },
+            }],
             hints: ["It's likely that Terser doesn't support this syntax yet."]
           });
         }
-
         throw new (_diagnostic().default)({
           diagnostic: diagnostics
         });
@@ -179,27 +154,20 @@ var _default = new (_plugin().Optimizer)({
         throw error;
       }
     }
-
     let sourceMap = null;
     let minifiedContents = (0, _nullthrows().default)(result.code);
     let resultMap = result.map;
-
     if (resultMap && typeof resultMap !== 'string') {
       sourceMap = new (_sourceMap().default)(options.projectRoot);
       sourceMap.addVLQMap(resultMap);
       let sourcemapReference = await getSourceMapReference(sourceMap);
-
       if (sourcemapReference) {
         minifiedContents += `\n//# sourceMappingURL=${sourcemapReference}\n`;
       }
     }
-
     return {
       contents: minifiedContents,
       map: sourceMap
     };
   }
-
-});
-
-exports.default = _default;
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/optimizer-terser",
-  "version": "2.0.0-beta.3.1",
+  "version": "2.0.0-dev.1515+9d5643b9b",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,15 +17,15 @@
   "source": "src/TerserOptimizer.js",
   "engines": {
     "node": ">= 12.0.0",
-    "parcel": "^2.0.0-beta.1"
+    "parcel": "^2.0.0-dev.1513+9d5643b9b"
   },
   "dependencies": {
-    "@parcel/diagnostic": "2.0.0-beta.3.1",
-    "@parcel/plugin": "2.0.0-beta.3.1",
-    "@parcel/source-map": "2.0.0-rc.1.0",
-    "@parcel/utils": "2.0.0-beta.3.1",
+    "@parcel/diagnostic": "2.0.0-dev.1515+9d5643b9b",
+    "@parcel/plugin": "2.0.0-dev.1515+9d5643b9b",
+    "@parcel/source-map": "^2.1.1",
+    "@parcel/utils": "2.0.0-dev.1515+9d5643b9b",
     "nullthrows": "^1.1.1",
     "terser": "^5.2.0"
   },
-  "gitHead": "daece49d003ba804bbdaa3a7ed3d6aaf446f166d"
+  "gitHead": "9d5643b9b5ba1a6ff638b4ae32024222e46b8133"
 }

package/src/TerserOptimizer.js

@@ -3,30 +3,38 @@
 import nullthrows from 'nullthrows';
 import {minify} from 'terser';
 import {Optimizer} from '@parcel/plugin';
-import {blobToString, loadConfig} from '@parcel/utils';
+import {blobToString} from '@parcel/utils';
 import SourceMap from '@parcel/source-map';
 import ThrowableDiagnostic, {escapeMarkdown} from '@parcel/diagnostic';
 
 import path from 'path';
 
 export default (new Optimizer({
-  async optimize({contents, map, bundle, options, getSourceMapReference}) {
+  async loadConfig({config, options}) {
+    let userConfig = await config.getConfigFrom(
+      path.join(options.projectRoot, 'index'),
+      ['.terserrc', '.terserrc.js', '.terserrc.cjs', '.terserrc.mjs'],
+    );
+
+    return userConfig?.contents;
+  },
+  async optimize({
+    contents,
+    map,
+    bundle,
+    config: userConfig,
+    options,
+    getSourceMapReference,
+  }) {
     if (!bundle.env.shouldOptimize) {
       return {contents, map};
     }
 
     let code = await blobToString(contents);
 
-    let userConfig = await loadConfig(
-      options.inputFS,
-      path.join(options.entryRoot, 'index'),
-      ['.terserrc', '.uglifyrc', '.uglifyrc.js', '.terserrc.js'],
-      options.projectRoot,
-    );
-
     let originalMap = map ? await map.stringify({}) : null;
     let config = {
-      ...userConfig?.config,
+      ...userConfig,
       sourceMap: bundle.env.sourceMap
         ? {
             filename: path.relative(
@@ -59,12 +67,14 @@ export default (new Optimizer({
           diagnostics.push({
             message,
             origin: '@parcel/optimizer-terser',
-            language: 'js',
-            filePath,
-            codeFrame: {
-              code: await options.inputFS.readFile(filePath, 'utf8'),
-              codeHighlights: [{message, start: original, end: original}],
-            },
+            codeFrames: [
+              {
+                language: 'js',
+                filePath,
+                code: await options.inputFS.readFile(filePath, 'utf8'),
+                codeHighlights: [{message, start: original, end: original}],
+              },
+            ],
             hints: ["It's likely that Terser doesn't support this syntax yet."],
           });
         }
@@ -77,12 +87,14 @@ export default (new Optimizer({
           diagnostics.push({
             message,
             origin: '@parcel/optimizer-terser',
-            language: 'js',
-            filePath: undefined,
-            codeFrame: {
-              code,
-              codeHighlights: [{message, start: loc, end: loc}],
-            },
+            codeFrames: [
+              {
+                language: 'js',
+                filePath: undefined,
+                code,
+                codeHighlights: [{message, start: loc, end: loc}],
+              },
+            ],
             hints: ["It's likely that Terser doesn't support this syntax yet."],
           });
         }