Fixes #427, #556 adds options to set sourceType

webpack-contrib · Jan 8, 2025 · 70a2f00 · 70a2f00
1 parent f8d4711
commit 70a2f00
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 13 deletions.
diff --git a/src/BundleAnalyzerPlugin.js b/src/BundleAnalyzerPlugin.js
@@ -24,6 +24,7 @@ class BundleAnalyzerPlugin {
       // deprecated
       startAnalyzer: true,
       analyzerUrl: utils.defaultAnalyzerUrl,
+      parserOptions: { sourceType: 'script' },
       ...opts,
       analyzerPort: 'analyzerPort' in opts ? (opts.analyzerPort === 'auto' ? 0 : opts.analyzerPort) : 8888
     };
@@ -109,7 +110,8 @@ class BundleAnalyzerPlugin {
         logger: this.logger,
         defaultSizes: this.opts.defaultSizes,
         excludeAssets: this.opts.excludeAssets,
-        analyzerUrl: this.opts.analyzerUrl
+        analyzerUrl: this.opts.analyzerUrl,
+        parserOptions: this.opts.parserOptions
       });
     }
   }
@@ -119,7 +121,8 @@ class BundleAnalyzerPlugin {
       reportFilename: path.resolve(this.compiler.outputPath, this.opts.reportFilename || 'report.json'),
       bundleDir: this.getBundleDirFromCompiler(),
       logger: this.logger,
-      excludeAssets: this.opts.excludeAssets
+      excludeAssets: this.opts.excludeAssets,
+      parserOptions: this.opts.parserOptions
     });
   }
 
@@ -131,7 +134,8 @@ class BundleAnalyzerPlugin {
       bundleDir: this.getBundleDirFromCompiler(),
       logger: this.logger,
       defaultSizes: this.opts.defaultSizes,
-      excludeAssets: this.opts.excludeAssets
+      excludeAssets: this.opts.excludeAssets,
+      parserOptions: this.opts.parserOptions
     });
   }
 

diff --git a/src/analyzer.js b/src/analyzer.js
@@ -20,7 +20,8 @@ module.exports = {
 function getViewerData(bundleStats, bundleDir, opts) {
   const {
     logger = new Logger(),
-    excludeAssets = null
+    excludeAssets = null,
+    parserOptions = { sourceType: 'script' }
   } = opts || {};
 
   const isAssetIncluded = createAssetsFilter(excludeAssets);
@@ -77,7 +78,7 @@ function getViewerData(bundleStats, bundleDir, opts) {
       let bundleInfo;
 
       try {
-        bundleInfo = parseBundle(assetFile);
+        bundleInfo = parseBundle(assetFile, parserOptions);
       } catch (err) {
         const msg = (err.code === 'ENOENT') ? 'no such file' : err.message;
         logger.warn(`Error parsing bundle asset "${assetFile}": ${msg}`);

diff --git a/src/parseUtils.js b/src/parseUtils.js
@@ -6,10 +6,14 @@ module.exports = {
   parseBundle
 };
 
-function parseBundle(bundlePath) {
+function parseBundle(bundlePath, opts) {
+  const {
+    sourceType = "script"
+  } = opts || {};
+
   const content = fs.readFileSync(bundlePath, 'utf8');
   const ast = acorn.parse(content, {
-    sourceType: 'script',
+    sourceType: sourceType,
     // I believe in a bright future of ECMAScript!
     // Actually, it's set to `2050` to support the latest ECMAScript version that currently exists.
     // Seems like `acorn` supports such weird option value.

diff --git a/src/viewer.js b/src/viewer.js
@@ -40,10 +40,11 @@ async function startServer(bundleStats, opts) {
     defaultSizes = 'parsed',
     excludeAssets = null,
     reportTitle,
-    analyzerUrl
+    analyzerUrl,
+    parserOptions = { sourceType: 'script' }
   } = opts || {};
 
-  const analyzerOpts = {logger, excludeAssets};
+  const analyzerOpts = {logger, excludeAssets, parserOptions};
 
   let chartData = getChartData(analyzerOpts, bundleStats, bundleDir);
   const entrypoints = getEntrypoints(bundleStats);
@@ -136,10 +137,11 @@ async function generateReport(bundleStats, opts) {
     bundleDir = null,
     logger = new Logger(),
     defaultSizes = 'parsed',
-    excludeAssets = null
+    excludeAssets = null,
+    parserOptions = { sourceType: 'script' }
   } = opts || {};
 
-  const chartData = getChartData({logger, excludeAssets}, bundleStats, bundleDir);
+  const chartData = getChartData({logger, excludeAssets, parserOptions}, bundleStats, bundleDir);
   const entrypoints = getEntrypoints(bundleStats);
 
   if (!chartData) return;
@@ -165,9 +167,9 @@ async function generateReport(bundleStats, opts) {
 }
 
 async function generateJSONReport(bundleStats, opts) {
-  const {reportFilename, bundleDir = null, logger = new Logger(), excludeAssets = null} = opts || {};
+  const {reportFilename, bundleDir = null, logger = new Logger(), excludeAssets = null, parserOptions = { sourceType: 'script' }} = opts || {};
 
-  const chartData = getChartData({logger, excludeAssets}, bundleStats, bundleDir);
+  const chartData = getChartData({logger, excludeAssets, parserOptions}, bundleStats, bundleDir);
 
   if (!chartData) return;