webpack-bundle-analyzer 2.13.1 → 3.0.2

package/src/BundleAnalyzerPlugin.js

@@ -1,7 +1,7 @@
-const bfj = require('bfj-node4');
+const bfj = require('bfj');
 const path = require('path');
 const mkdir = require('mkdirp');
-const { bold } = require('chalk');
+const {bold} = require('chalk');
 
 const Logger = require('./Logger');
 const viewer = require('./viewer');

package/src/analyzer.js

@@ -6,8 +6,8 @@ const gzipSize = require('gzip-size');
 
 const Logger = require('./Logger');
 const Folder = require('./tree/Folder').default;
-const { parseBundle } = require('./parseUtils');
-const { createAssetsFilter } = require('./utils');
+const {parseBundle} = require('./parseUtils');
+const {createAssetsFilter} = require('./utils');
 
 const FILENAME_QUERY_REGEXP = /\?.*$/;
 
@@ -132,6 +132,7 @@ function createModulesTree(modules) {
   const root = new Folder('.');
 
   _.each(modules, module => root.addModule(module));
+  root.mergeNestedFolders();
 
   return root;
 }

package/src/bin/analyzer.js

@@ -1,10 +1,10 @@
 #! /usr/bin/env node
 
-const { resolve, dirname } = require('path');
+const {resolve, dirname} = require('path');
 
 const _ = require('lodash');
 const commander = require('commander');
-const { magenta } = require('chalk');
+const {magenta} = require('chalk');
 
 const analyzer = require('../analyzer');
 const viewer = require('../viewer');

package/src/index.js

@@ -1,4 +1,4 @@
-const { start } = require('./viewer');
+const {start} = require('./viewer');
 
 module.exports = {
   start,

package/src/tree/BaseFolder.js

@@ -30,7 +30,7 @@ export default class BaseFolder extends Node {
   }
 
   addChildModule(module) {
-    const { name } = module;
+    const {name} = module;
     const currentChild = this.children[name];
 
     // For some reason we already have this node in children and it's a folder.
@@ -80,6 +80,32 @@ export default class BaseFolder extends Node {
     }
   }
 
+  mergeNestedFolders() {
+    if (!this.isRoot) {
+      let childNames;
+
+      while ((childNames = Object.keys(this.children)).length === 1) {
+        const childName = childNames[0];
+        const onlyChild = this.children[childName];
+
+        if (onlyChild instanceof this.constructor) {
+          this.name += `/${onlyChild.name}`;
+          this.children = onlyChild.children;
+        } else {
+          break;
+        }
+      }
+    }
+
+    this.walk(child => {
+      child.parent = this;
+
+      if (child.mergeNestedFolders) {
+        child.mergeNestedFolders();
+      }
+    }, null, false);
+  }
+
   toChartData() {
     return {
       label: this.name,

package/src/tree/ConcatenatedModule.js

@@ -3,7 +3,7 @@ import _ from 'lodash';
 import Module from './Module';
 import ContentModule from './ContentModule';
 import ContentFolder from './ContentFolder';
-import { getModulePathParts } from './utils';
+import {getModulePathParts} from './utils';
 
 export default class ConcatenatedModule extends Module {
 
@@ -57,6 +57,10 @@ export default class ConcatenatedModule extends Module {
     return folder;
   }
 
+  mergeNestedFolders() {
+    _.invokeMap(this.children, 'mergeNestedFolders');
+  }
+
   toChartData() {
     return {
       ...super.toChartData(),

package/src/tree/Folder.js

@@ -4,7 +4,7 @@ import gzipSize from 'gzip-size';
 import Module from './Module';
 import BaseFolder from './BaseFolder';
 import ConcatenatedModule from './ConcatenatedModule';
-import { getModulePathParts } from './utils';
+import {getModulePathParts} from './utils';
 
 export default class Folder extends BaseFolder {
 

package/src/tree/Node.js

@@ -17,4 +17,8 @@ export default class Node {
     return path.reverse().join('/');
   }
 
+  get isRoot() {
+    return !this.parent;
+  }
+
 };

package/src/utils.js

@@ -1,4 +1,4 @@
-const { inspect } = require('util');
+const {inspect} = require('util');
 const _ = require('lodash');
 
 exports.createAssetsFilter = createAssetsFilter;
@@ -18,7 +18,7 @@ function createAssetsFilter(excludePatterns) {
 
       if (!_.isFunction(pattern)) {
         throw new TypeError(
-          `Pattern should be either string, RegExp or a function, but "${inspect(pattern, { depth: 0 })}" got.`
+          `Pattern should be either string, RegExp or a function, but "${inspect(pattern, {depth: 0})}" got.`
         );
       }
 

package/src/viewer.js

@@ -8,7 +8,7 @@ const express = require('express');
 const ejs = require('ejs');
 const opener = require('opener');
 const mkdir = require('mkdirp');
-const { bold } = require('chalk');
+const {bold} = require('chalk');
 
 const Logger = require('./Logger');
 const analyzer = require('./analyzer');
@@ -33,7 +33,7 @@ async function startServer(bundleStats, opts) {
     excludeAssets = null
   } = opts || {};
 
-  const analyzerOpts = { logger, excludeAssets };
+  const analyzerOpts = {logger, excludeAssets};
 
   let chartData = getChartData(analyzerOpts, bundleStats, bundleDir);
 
@@ -75,7 +75,7 @@ async function startServer(bundleStats, opts) {
     });
   });
 
-  const wss = new WebSocket.Server({ server });
+  const wss = new WebSocket.Server({server});
 
   wss.on('connection', ws => {
     ws.on('error', err => {
@@ -120,7 +120,7 @@ function generateReport(bundleStats, opts) {
     excludeAssets = null
   } = opts || {};
 
-  const chartData = getChartData({ logger, excludeAssets }, bundleStats, bundleDir);
+  const chartData = getChartData({logger, excludeAssets}, bundleStats, bundleDir);
 
   if (!chartData) return;
 
@@ -157,7 +157,7 @@ function getAssetContent(filename) {
 
 function getChartData(analyzerOpts, ...args) {
   let chartData;
-  const { logger } = analyzerOpts;
+  const {logger} = analyzerOpts;
 
   try {
     chartData = analyzer.getViewerData(...args, analyzerOpts);