@shuvi/toolpack 1.0.20 → 1.0.22

package/lib/webpack/config/base.d.ts

@@ -21,6 +21,7 @@ export interface BaseOptions {
     };
     lightningCss?: boolean;
     compiler?: CompilerOptions;
+    analyze?: boolean;
 }
 export { WebpackChain };
 export declare function getDefineEnv(env: {
@@ -28,4 +29,4 @@ export declare function getDefineEnv(env: {
 }): {
     [x: string]: string;
 };
-export declare function baseWebpackChain({ dev, outputDir, lightningCss, compiler, projectRoot, include, jsConfig, name, publicPath, env, cacheDir }: BaseOptions): WebpackChain;
+export declare function baseWebpackChain({ dev, outputDir, lightningCss, compiler, projectRoot, include, jsConfig, name, publicPath, env, cacheDir, analyze }: BaseOptions): WebpackChain;

package/lib/webpack/config/base.js

@@ -29,6 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.baseWebpackChain = exports.getDefineEnv = exports.WebpackChain = void 0;
 const webpack_chain_1 = __importDefault(require("webpack-chain"));
 exports.WebpackChain = webpack_chain_1.default;
+const webpack_bundle_analyzer_1 = require("webpack-bundle-analyzer");
 const terser_webpack_plugin_1 = __importDefault(require("terser-webpack-plugin"));
 const css_minimizer_webpack_plugin_1 = __importDefault(require("css-minimizer-webpack-plugin"));
 const webpack_1 = __importDefault(require("webpack"));
@@ -71,7 +72,9 @@ function getDefineEnv(env) {
     }, {}));
 }
 exports.getDefineEnv = getDefineEnv;
-function baseWebpackChain({ dev, outputDir, lightningCss, compiler, projectRoot, include, jsConfig, name, publicPath = '/', env = {}, cacheDir }) {
+/** remove 'shuvi/' of the target name */
+const getSimplifiedTargetName = (targetName) => targetName.replace(/^shuvi\//, '');
+function baseWebpackChain({ dev, outputDir, lightningCss, compiler, projectRoot, include, jsConfig, name, publicPath = '/', env = {}, cacheDir, analyze }) {
     const config = new webpack_chain_1.default();
     config.mode(dev ? 'development' : 'production');
     config.bail(!dev);
@@ -120,6 +123,21 @@ function baseWebpackChain({ dev, outputDir, lightningCss, compiler, projectRoot,
                     : css_minimizer_webpack_plugin_1.default.cssnanoMinify
             }
         ]);
+        if (analyze) {
+            const targetName = getSimplifiedTargetName(name);
+            config
+                .plugin('private/bundle-analyzer-plugin')
+                .use(webpack_bundle_analyzer_1.BundleAnalyzerPlugin, [
+                {
+                    logLevel: 'warn',
+                    openAnalyzer: false,
+                    analyzerMode: 'static',
+                    reportFilename: `../analyze/${targetName}.html`,
+                    generateStatsFile: true,
+                    statsFilename: `../analyze/${targetName}-stats.json`
+                }
+            ]);
+        }
     }
     // Support for NODE_PATH
     const nodePathList = (process.env.NODE_PATH || '')

package/lib/webpack/config/browser.d.ts

@@ -1,5 +1,2 @@
 import { WebpackChain, BaseOptions } from './base';
-export interface BrowserOptions extends BaseOptions {
-    analyze?: boolean;
-}
-export declare function createBrowserWebpackChain(options: BrowserOptions): WebpackChain;
+export declare function createBrowserWebpackChain(options: BaseOptions): WebpackChain;

package/lib/webpack/config/browser.js

@@ -30,7 +30,6 @@ exports.createBrowserWebpackChain = void 0;
 const crypto = __importStar(require("crypto"));
 const webpack_1 = __importDefault(require("webpack"));
 const path = __importStar(require("path"));
-const webpack_bundle_analyzer_1 = require("webpack-bundle-analyzer");
 const resolve_1 = require("@shuvi/utils/resolve");
 const base_1 = require("./base");
 const style_1 = require("./parts/style");
@@ -50,7 +49,7 @@ const FRAMEWORK_REACT_MODULES = [
     }
 ];
 function createBrowserWebpackChain(options) {
-    const { projectRoot, cacheDir, jsConfig, dev, publicPath, analyze } = options;
+    const { projectRoot, cacheDir, jsConfig, dev, publicPath } = options;
     const chain = (0, base_1.baseWebpackChain)(options);
     const useTypeScript = !!(jsConfig === null || jsConfig === void 0 ? void 0 : jsConfig.useTypeScript);
     chain.target('web');
@@ -169,16 +168,6 @@ function createBrowserWebpackChain(options) {
             maxInitialRequests: 25,
             minSize: 20000
         });
-        if (analyze) {
-            chain.plugin('private/bundle-analyzer-plugin').use(webpack_bundle_analyzer_1.BundleAnalyzerPlugin, [
-                {
-                    logLevel: 'warn',
-                    openAnalyzer: false,
-                    analyzerMode: 'static',
-                    reportFilename: '../analyze/client.html'
-                }
-            ]);
-        }
     }
     // node polyfills
     chain.resolve.set('fallback', {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/toolpack",
-  "version": "1.0.20",
+  "version": "1.0.22",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -20,7 +20,7 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@shuvi/compiler": "1.0.20",
+    "@shuvi/compiler": "1.0.22",
     "@babel/core": "7.12.10",
     "@babel/plugin-proposal-class-properties": "7.12.1",
     "@babel/plugin-proposal-nullish-coalescing-operator": "7.10.1",
@@ -35,8 +35,8 @@
     "@babel/preset-typescript": "7.12.7",
     "@babel/runtime": "7.12.5",
     "lightningcss": "1.19.0",
-    "@shuvi/shared": "1.0.20",
-    "@shuvi/utils": "1.0.20",
+    "@shuvi/shared": "1.0.22",
+    "@shuvi/utils": "1.0.22",
     "babel-loader": "8.2.2",
     "babel-plugin-syntax-jsx": "6.18.0",
     "babel-plugin-transform-define": "2.0.0",