@parcel/optimizer-terser 2.0.0-beta.2 → 2.0.0-nightly.1004

package/lib/TerserOptimizer.js

@@ -75,17 +75,35 @@ function _path() {
   return data;
 }
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+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) { 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 _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)({
+  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
   }) {
@@ -97,11 +115,10 @@ var _default = new (_plugin().Optimizer)({
     }
 
     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']);
     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, bundle.filePath),
+        filename: _path().default.relative(options.projectRoot, _path().default.join(bundle.target.distDir, bundle.name)),
         asObject: true,
         content: originalMap
       } : false,
@@ -136,16 +153,16 @@ var _default = new (_plugin().Optimizer)({
           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."]
           });
         }
@@ -158,16 +175,16 @@ 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."]
           });
         }
@@ -186,7 +203,7 @@ var _default = new (_plugin().Optimizer)({
 
     if (resultMap && typeof resultMap !== 'string') {
       sourceMap = new (_sourceMap().default)(options.projectRoot);
-      sourceMap.addRawMappings(resultMap);
+      sourceMap.addVLQMap(resultMap);
       let sourcemapReference = await getSourceMapReference(sourceMap);
 
       if (sourcemapReference) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/optimizer-terser",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-nightly.1004+47379bf8",
   "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-nightly.1002+47379bf8"
   },
   "dependencies": {
-    "@parcel/diagnostic": "2.0.0-beta.2",
-    "@parcel/plugin": "2.0.0-beta.2",
-    "@parcel/source-map": "2.0.0-alpha.4.21",
-    "@parcel/utils": "2.0.0-beta.2",
+    "@parcel/diagnostic": "2.0.0-nightly.1004+47379bf8",
+    "@parcel/plugin": "2.0.0-nightly.1004+47379bf8",
+    "@parcel/source-map": "^2.0.0",
+    "@parcel/utils": "2.0.0-nightly.1004+47379bf8",
     "nullthrows": "^1.1.1",
     "terser": "^5.2.0"
   },
-  "gitHead": "a3aa86815e098c90fda72a08d29646ff059ab74d"
+  "gitHead": "47379bf8fabeb2cfe03ade8802d942388b153e5b"
 }

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, {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'],
+    );
+
+    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.entryRoot, 'index'),
-      ['.terserrc', '.uglifyrc', '.uglifyrc.js', '.terserrc.js'],
-    );
-
     let originalMap = map ? await map.stringify({}) : null;
     let config = {
-      ...userConfig?.config,
+      ...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,
           }
@@ -55,12 +74,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."],
           });
         }
@@ -73,12 +94,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."],
           });
         }
@@ -93,7 +116,7 @@ export default (new Optimizer({
     let resultMap = result.map;
     if (resultMap && typeof resultMap !== 'string') {
       sourceMap = new SourceMap(options.projectRoot);
-      sourceMap.addRawMappings(resultMap);
+      sourceMap.addVLQMap(resultMap);
       let sourcemapReference = await getSourceMapReference(sourceMap);
       if (sourcemapReference) {
         minifiedContents += `\n//# sourceMappingURL=${sourcemapReference}\n`;