@parcel/optimizer-terser 2.0.0-beta.1 → 2.0.0-nightly.1002

package/lib/TerserOptimizer.js

@@ -5,61 +5,141 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _nullthrows = _interopRequireDefault(require("nullthrows"));
+function _nullthrows() {
+  const data = _interopRequireDefault(require("nullthrows"));
 
-var _terser = require("terser");
+  _nullthrows = function () {
+    return data;
+  };
 
-var _plugin = require("@parcel/plugin");
+  return data;
+}
 
-var _utils = require("@parcel/utils");
+function _terser() {
+  const data = require("terser");
 
-var _sourceMap = _interopRequireDefault(require("@parcel/source-map"));
+  _terser = function () {
+    return data;
+  };
 
-var _diagnostic = _interopRequireDefault(require("@parcel/diagnostic"));
+  return data;
+}
 
-var _path = _interopRequireDefault(require("path"));
+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(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({
+var _default = new (_plugin().Optimizer)({
+  async loadConfig({
+    config,
+    options
+  }) {
+    let userConfig = await config.getConfigFrom(_path().default.join(options.projectRoot, 'index'), ['.terserrc', '.terserrc.js']);
+
+    if (userConfig) {
+      let isJavascript = _path().default.extname(userConfig.filePath) === '.js';
+
+      if (isJavascript) {
+        config.invalidateOnStartup();
+      }
+    }
+
+    return userConfig === null || userConfig === void 0 ? void 0 : userConfig.contents;
+  },
+
   async optimize({
     contents,
     map,
     bundle,
+    config: userConfig,
     options,
     getSourceMapReference
   }) {
-    if (!bundle.env.minify) {
+    if (!bundle.env.shouldOptimize) {
       return {
         contents,
         map
       };
     }
 
-    let code = await (0, _utils.blobToString)(contents);
-    let userConfig = await (0, _utils.loadConfig)(options.inputFS, _path.default.join(options.projectRoot, 'index'), ['.terserrc', '.uglifyrc', '.uglifyrc.js', '.terserrc.js']);
+    let code = await (0, _utils().blobToString)(contents);
     let originalMap = map ? await map.stringify({}) : null;
-    let config = { ...(userConfig === null || userConfig === void 0 ? void 0 : userConfig.config),
-      sourceMap: options.sourceMaps ? {
-        filename: _path.default.relative(options.projectRoot, bundle.filePath),
+    let config = { ...userConfig,
+      sourceMap: bundle.env.sourceMap ? {
+        filename: _path().default.relative(options.projectRoot, _path().default.join(bundle.target.distDir, bundle.name)),
         asObject: true,
         content: originalMap
       } : false,
       toplevel: bundle.env.outputFormat === 'esmodule' || bundle.env.outputFormat === 'commonjs',
       module: bundle.env.outputFormat === 'esmodule'
     };
-    let result = (0, _terser.minify)(code, config);
+    let result;
 
-    if (result.error) {
+    try {
+      result = await (0, _terser().minify)(code, config);
+    } catch (error) {
       // $FlowFixMe
       let {
         message,
         line,
         col
-      } = result.error;
+      } = error;
 
       if (line != null && col != null) {
-        let diagnostic = [];
+        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) {
@@ -68,61 +148,62 @@ var _default = new _plugin.Optimizer({
             original
           } = mapping;
 
-          let filePath = _path.default.resolve(options.projectRoot, source);
+          let filePath = _path().default.resolve(options.projectRoot, source);
 
-          diagnostic.push({
+          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 (diagnostic.length === 0 || options.logLevel === 'verbose') {
+        if (diagnostics.length === 0 || options.logLevel === 'verbose') {
           let loc = {
             line: line,
             column: col
           };
-          diagnostic.push({
+          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
+        throw new (_diagnostic().default)({
+          diagnostic: diagnostics
         });
       } else {
-        throw result.error;
+        throw error;
       }
     }
 
     let sourceMap = null;
-    let minifiedContents = (0, _nullthrows.default)(result.code);
+    let minifiedContents = (0, _nullthrows().default)(result.code);
+    let resultMap = result.map;
 
-    if (result.map && typeof result.map !== 'string') {
-      sourceMap = new _sourceMap.default();
-      sourceMap.addRawMappings(result.map);
+    if (resultMap && typeof resultMap !== 'string') {
+      sourceMap = new (_sourceMap().default)(options.projectRoot);
+      sourceMap.addVLQMap(resultMap);
       let sourcemapReference = await getSourceMapReference(sourceMap);
 
       if (sourcemapReference) {

package/package.json

@@ -1,10 +1,14 @@
 {
   "name": "@parcel/optimizer-terser",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-nightly.1002+5530a6ef",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
   },
+  "funding": {
+    "type": "opencollective",
+    "url": "https://opencollective.com/parcel"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/parcel-bundler/parcel.git"
@@ -12,19 +16,16 @@
   "main": "lib/TerserOptimizer.js",
   "source": "src/TerserOptimizer.js",
   "engines": {
-    "node": ">= 10.0.0",
-    "parcel": "^2.0.0-alpha.1.1"
+    "node": ">= 12.0.0",
+    "parcel": "2.0.0-nightly.1000+5530a6ef"
   },
   "dependencies": {
-    "@parcel/diagnostic": "2.0.0-beta.1",
-    "@parcel/plugin": "2.0.0-beta.1",
-    "@parcel/source-map": "2.0.0-alpha.4.13",
-    "@parcel/utils": "2.0.0-beta.1",
+    "@parcel/diagnostic": "2.0.0-nightly.1002+5530a6ef",
+    "@parcel/plugin": "2.0.0-nightly.1002+5530a6ef",
+    "@parcel/source-map": "^2.0.0",
+    "@parcel/utils": "2.0.0-nightly.1002+5530a6ef",
     "nullthrows": "^1.1.1",
-    "terser": "^4.3.0"
-  },
-  "peerDependencies": {
-    "@parcel/core": "^2.0.0-alpha.3.1"
+    "terser": "^5.2.0"
   },
-  "gitHead": "74335525be92e23bac4ed1bf30595443cfb238e3"
+  "gitHead": "5530a6eff8b619873353baeb0457ae4ec591e9fa"
 }

package/src/TerserOptimizer.js

@@ -3,32 +3,51 @@
 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 from '@parcel/diagnostic';
+import ThrowableDiagnostic, {escapeMarkdown} from '@parcel/diagnostic';
 
 import path from 'path';
 
-export default new Optimizer({
-  async optimize({contents, map, bundle, options, getSourceMapReference}) {
-    if (!bundle.env.minify) {
+export default (new Optimizer({
+  async loadConfig({config, options}) {
+    let userConfig = await config.getConfigFrom(
+      path.join(options.projectRoot, 'index'),
+      ['.terserrc', '.terserrc.js'],
+    );
+
+    if (userConfig) {
+      let isJavascript = path.extname(userConfig.filePath) === '.js';
+      if (isJavascript) {
+        config.invalidateOnStartup();
+      }
+    }
+
+    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.projectRoot, 'index'),
-      ['.terserrc', '.uglifyrc', '.uglifyrc.js', '.terserrc.js'],
-    );
-
     let originalMap = map ? await map.stringify({}) : null;
     let config = {
-      ...userConfig?.config,
-      sourceMap: options.sourceMaps
+      ...userConfig,
+      sourceMap: bundle.env.sourceMap
         ? {
-            filename: path.relative(options.projectRoot, bundle.filePath),
+            filename: path.relative(
+              options.projectRoot,
+              path.join(bundle.target.distDir, bundle.name),
+            ),
             asObject: true,
             content: originalMap,
           }
@@ -39,58 +58,65 @@ export default new Optimizer({
       module: bundle.env.outputFormat === 'esmodule',
     };
 
-    let result = minify(code, config);
-
-    if (result.error) {
+    let result;
+    try {
+      result = await minify(code, config);
+    } catch (error) {
       // $FlowFixMe
-      let {message, line, col} = result.error;
+      let {message, line, col} = error;
       if (line != null && col != null) {
-        let diagnostic = [];
+        message = escapeMarkdown(message);
+        let diagnostics = [];
         let mapping = map?.findClosestMapping(line, col);
         if (mapping && mapping.original && mapping.source) {
           let {source, original} = mapping;
           let filePath = path.resolve(options.projectRoot, source);
-          diagnostic.push({
+          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."],
           });
         }
 
-        if (diagnostic.length === 0 || options.logLevel === 'verbose') {
+        if (diagnostics.length === 0 || options.logLevel === 'verbose') {
           let loc = {
             line: line,
             column: col,
           };
-          diagnostic.push({
+          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."],
           });
         }
-        throw new ThrowableDiagnostic({diagnostic});
+        throw new ThrowableDiagnostic({diagnostic: diagnostics});
       } else {
-        throw result.error;
+        throw error;
       }
     }
 
     let sourceMap = null;
     let minifiedContents: string = nullthrows(result.code);
-    if (result.map && typeof result.map !== 'string') {
-      sourceMap = new SourceMap();
-      sourceMap.addRawMappings(result.map);
+    let resultMap = result.map;
+    if (resultMap && typeof resultMap !== 'string') {
+      sourceMap = new SourceMap(options.projectRoot);
+      sourceMap.addVLQMap(resultMap);
       let sourcemapReference = await getSourceMapReference(sourceMap);
       if (sourcemapReference) {
         minifiedContents += `\n//# sourceMappingURL=${sourcemapReference}\n`;
@@ -99,4 +125,4 @@ export default new Optimizer({
 
     return {contents: minifiedContents, map: sourceMap};
   },
-});
+}): Optimizer);