Remove analyzer, update logger output

Author: maier49

package-lock.json

@@ -17,15 +17,14 @@
     "url": "https://github.com/dojo/cli-build-app.git"
   },
   "scripts": {
-    "webpack-bundle-analyzer": "cd src/webpack-bundle-analyzer/client && npm run build:dist && shx mv output/dist ../../../dist/release/webpack-bundle-analyzer/reporter && cd ../../../",
     "artifact:build:pwa": "cd test-app && npm run build:dist:pwa:evergreen && shx mv output/dist output/dist-pwa-evergreen && npm run build:dev:pwa:evergreen && shx mv output/dev output/dev-pwa-evergreen && npm run build:dist:pwa && shx mv output/dist output/dist-pwa && npm run build:dev:pwa && shx mv output/dev output/dev-pwa",
     "artifact:build:app": "cd test-app && npm run build:dist:evergreen && shx mv output/dist output/dist-app-evergreen && npm run build:dev:evergreen && shx mv output/dev output/dev-app-evergreen && npm run build:dist && shx mv output/dist output/dist-app && npm run build:dev && shx mv output/dev output/dev-app",
     "artifact:install": "cd test-app && shx rm -rf node_modules && npm i && npm run install-build-app",
     "artifact:package": "cd dist && npm pack -q ./release && shx mv dojo-cli-build-app-* dojo-cli-build-app.tgz && cd ..",
-    "build:static:dev": "cpx \"{src,tests}/**/*.{d.ts,html,md,json,js,css}\" dist/dev && rimraf dist/dev/src/webpack-bundle-analyzer/client",
-    "build:static:release": "cpx \"src/**/*.{d.ts,json}\" dist/release && rimraf dist/release/webpack-bundle-analyzer/client",
+    "build:static:dev": "cpx \"{src,tests}/**/*.{d.ts,html,md,json,js,css}\" dist/dev",
+    "build:static:release": "cpx \"src/**/*.{d.ts,json}\" dist/release",
     "build:cjs": "tsc",
-    "build": "npm-run-all -p build:** -s webpack-bundle-analyzer -s dojo-package && rimraf src/webpack-bundle-analyzer/client/node_modules",
+    "build": "npm-run-all -p build:** -s dojo-package",
     "clean": "rimraf dist coverage output test-app/output test-app/node_modules",
     "dojo-package": "dojo-package",
     "dojo-release": "dojo-release",
@@ -69,7 +68,6 @@
     "@types/execa": "0.8.0",
     "@types/express": "4.11.0",
     "@types/express-serve-static-core": "4.16.4",
-    "@types/fs-extra": "^8.1.0",
     "@types/globby": "6.1.0",
     "@types/gzip-size": "4.0.0",
     "@types/html-webpack-plugin": "3.2.0",
@@ -81,7 +79,6 @@
     "@types/log-update": "2.0.0",
     "@types/mini-css-extract-plugin": "0.2.0",
     "@types/minimatch": "3.0.3",
-    "@types/mkdirp": "0.5.2",
     "@types/mockery": "1.4.29",
     "@types/node": "~9.6.5",
     "@types/ora": "1.3.1",
@@ -107,7 +104,7 @@
     "sinon": "~4.5.0"
   },
   "dependencies": {
-    "@dojo/webpack-contrib": "7.0.0-beta.2",
+    "@dojo/webpack-contrib": "file:~/Projects/opensource/webpack-contrib/dist/release/dojo-webpack-contrib-7.0.0-beta.2.tgz",
     "brotli-webpack-plugin": "1.0.0",
     "caniuse-lite": "1.0.30000973",
     "chalk": "2.4.1",
@@ -124,7 +121,6 @@
     "extra-watch-webpack-plugin": "1.0.3",
     "file-loader": "2.0.0",
     "globby": "7.1.1",
-    "mkdirp": "0.5.1",
     "gzip-size": "4.1.0",
     "html-loader": "0.5.5",
     "html-webpack-plugin": "3.2.0",

package.json

@@ -3,9 +3,9 @@ import * as logUpdate from 'log-update';
 import * as logSymbols from 'log-symbols';
 import * as typescript from 'typescript';
 import * as jsonFile from 'jsonfile';
-import BundleAnalyzer from './webpack-bundle-analyzer/BundleAnalyzer';
+import analyzeBundles from '@dojo/webpack-contrib/webpack-bundle-analyzer/AnalyzeBundles';
+import { findLargestPackage } from '@dojo/webpack-contrib/webpack-bundle-analyzer/parseUtils';
 import chalk from 'chalk';
-import { findLargestGroup } from './webpack-bundle-analyzer/parseUtils';
 
 const pkgDir = require('pkg-dir');
 const columns = require('cli-columns');
@@ -20,13 +20,14 @@ export default function logger(stats: any, config: any, runningMessage: string =
 
 	let chunkMap: { [chunk: string]: any };
 	if (args.mode === 'dist') {
-		chunkMap = new BundleAnalyzer({
+		chunkMap = analyzeBundles(stats, config, {
 			analyzerMode: 'static',
 			openAnalyzer: false,
 			generateStatsFile: true,
 			reportFilename: '../info/report.html',
-			statsFilename: '../info/stats.json'
-		}).analyze(stats, config);
+			statsFilename: '../info/stats.json',
+			excludeBundles: '(^bootstrap.)|(^runtime/)'
+		});
 	}
 	chunks = (Array.isArray(config)
 		? loggerStats.children.reduce((chunks: any[], current: any) => [...chunks, ...current.chunks], [])
@@ -37,17 +38,19 @@ export default function logger(stats: any, config: any, runningMessage: string =
 			return chunkName;
 		} else {
 			const chunkStats = chunkMap[chunkName];
-			const size = chunkStats && (chunkStats.parsedSize || chunkStats.statSize);
-			const gzipSize = chunkStats && chunkStats.gzipSize;
+			const size = ((chunkStats && (chunkStats.parsedSize || chunkStats.statSize)) || 0) / 1000;
+			const gzipSize = ((chunkStats && chunkStats.gzipSize) || 0) / 1000;
 
-			const chunkInfo = `${chunkName} ${chalk.yellow(`(${size}kb)`)}${
-				gzipSize ? `/ ${chalk.blue(`(${gzipSize}kb gz)`)}` : ''
+			const chunkInfo = `${chunkName} ${chalk.yellow(`(${size}kB)`)}${
+				gzipSize ? `/ ${chalk.blue(`(${gzipSize}kB gz)`)}` : ''
 			}`;
 
-			if (size > 1000) {
-				const largestGroup = findLargestGroup(chunkStats, 'node_modules');
-				if (largestGroup) {
-					return `${chunkInfo}\nDependency: ${largestGroup.label} is ${largestGroup.statSize}kb`;
+			if (size > 250) {
+				const largestPackage = findLargestPackage(chunkStats);
+				if (largestPackage) {
+					return `${chunkInfo}\nLargest dependency is ${largestPackage.name} (${chalk.yellow(
+						`${largestPackage.size / 1000}kB`
+					)})`;
 				}
 			}
 			return chunkInfo;