@umijs/bundler-webpack 4.0.0-canary.20220517.1 → 4.0.0-canary.20220525.2

package/dist/config/compressPlugin.js

@@ -7,8 +7,6 @@ exports.addCompressPlugin = void 0;
 // @ts-ignore
 const css_minimizer_webpack_plugin_1 = __importDefault(require("@umijs/bundler-webpack/compiled/css-minimizer-webpack-plugin"));
 const terser_webpack_plugin_1 = __importDefault(require("../../compiled/terser-webpack-plugin"));
-const ESBuildCSSMinifyPlugin_1 = __importDefault(require("../plugins/ESBuildCSSMinifyPlugin"));
-const ParcelCSSMinifyPlugin_1 = require("../plugins/ParcelCSSMinifyPlugin");
 const types_1 = require("../types");
 const getEsBuildTarget_1 = require("../utils/getEsBuildTarget");
 async function addCompressPlugin(opts) {
@@ -22,24 +20,38 @@ async function addCompressPlugin(opts) {
         return;
     }
     config.optimization.minimize(true);
+    // esbuild transform only allow `string[]` as target
+    const esbuildTarget = (0, getEsBuildTarget_1.getEsBuildTarget)({
+        targets: userConfig.targets || {},
+    });
     let minify;
     let terserOptions;
     if (jsMinifier === types_1.JSMinifier.esbuild) {
         minify = terser_webpack_plugin_1.default.esbuildMinify;
         terserOptions = {
-            target: (0, getEsBuildTarget_1.getEsBuildTarget)({
-                targets: userConfig.targets || {},
-            }),
+            target: esbuildTarget,
+            // remove all comments
+            legalComments: 'none',
         };
     }
     else if (jsMinifier === types_1.JSMinifier.terser) {
         minify = terser_webpack_plugin_1.default.terserMinify;
+        terserOptions = {
+            format: {
+                comments: false,
+            },
+        };
     }
     else if (jsMinifier === types_1.JSMinifier.swc) {
         minify = terser_webpack_plugin_1.default.swcMinify;
     }
     else if (jsMinifier === types_1.JSMinifier.uglifyJs) {
         minify = terser_webpack_plugin_1.default.uglifyJsMinify;
+        terserOptions = {
+            output: {
+                comments: false,
+            },
+        };
     }
     else if (jsMinifier !== types_1.JSMinifier.none) {
         throw new Error(`Unsupported jsMinifier ${userConfig.jsMinifier}.`);
@@ -51,33 +63,40 @@ async function addCompressPlugin(opts) {
     if (jsMinifier !== types_1.JSMinifier.none) {
         config.optimization.minimizer(`js-${jsMinifier}`).use(terser_webpack_plugin_1.default, [
             {
+                extractComments: false,
                 minify,
                 terserOptions,
             },
         ]);
     }
+    let cssMinify;
+    let minimizerOptions;
     if (cssMinifier === types_1.CSSMinifier.esbuild) {
-        config.optimization
-            .minimizer(`css-${cssMinifier}`)
-            .use(ESBuildCSSMinifyPlugin_1.default, [userConfig.cssMinifierOptions]);
+        cssMinify = css_minimizer_webpack_plugin_1.default.esbuildMinify;
+        minimizerOptions = {
+            target: esbuildTarget,
+        };
     }
     else if (cssMinifier === types_1.CSSMinifier.cssnano) {
-        config.optimization
-            .minimizer(`css-${cssMinifier}`)
-            .use(css_minimizer_webpack_plugin_1.default, [
-            {
-                minimizerOptions: userConfig.cssMinifierOptions,
-                parallel: true,
-            },
-        ]);
+        cssMinify = css_minimizer_webpack_plugin_1.default.cssnanoMinify;
     }
     else if (cssMinifier === types_1.CSSMinifier.parcelCSS) {
-        config.optimization
-            .minimizer(`css-${cssMinifier}`)
-            .use(ParcelCSSMinifyPlugin_1.ParcelCSSMinifyPlugin);
+        cssMinify = css_minimizer_webpack_plugin_1.default.parcelCssMinify;
     }
     else if (cssMinifier !== types_1.CSSMinifier.none) {
         throw new Error(`Unsupported cssMinifier ${userConfig.cssMinifier}.`);
     }
+    minimizerOptions = {
+        ...minimizerOptions,
+        ...userConfig.cssMinifierOptions,
+    };
+    config.optimization
+        .minimizer(`css-${cssMinifier}`)
+        .use(css_minimizer_webpack_plugin_1.default, [
+        {
+            minify: cssMinify,
+            minimizerOptions,
+        },
+    ]);
 }
 exports.addCompressPlugin = addCompressPlugin;

package/dist/server/server.js

@@ -9,6 +9,7 @@ const express_1 = __importDefault(require("@umijs/bundler-utils/compiled/express
 const http_proxy_middleware_1 = require("@umijs/bundler-webpack/compiled/http-proxy-middleware");
 const webpack_1 = __importDefault(require("@umijs/bundler-webpack/compiled/webpack"));
 const utils_1 = require("@umijs/utils");
+const cors_1 = __importDefault(require("cors"));
 const fs_1 = require("fs");
 const http_1 = __importDefault(require("http"));
 const path_1 = require("path");
@@ -19,12 +20,11 @@ async function createServer(opts) {
     const { proxy } = userConfig;
     const app = (0, express_1.default)();
     // cros
-    app.use((_req, res, next) => {
-        res.header('Access-Control-Allow-Origin', '*');
-        res.header('Access-Control-Allow-Headers', 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With');
-        res.header('Access-Control-Allow-Methods', 'GET, HEAD, PUT, POST, PATCH, DELETE, OPTIONS');
-        next();
-    });
+    app.use((0, cors_1.default)({
+        origin: true,
+        methods: ['GET', 'HEAD', 'PUT', 'POST', 'PATCH', 'DELETE', 'OPTIONS'],
+        credentials: true,
+    }));
     // compression
     app.use(require('@umijs/bundler-webpack/compiled/compression')());
     // TODO: headers

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.0.0-canary.20220517.1",
+  "version": "4.0.0-canary.20220525.2",
   "description": "@umijs/bundler-webpack",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/bundler-webpack#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -35,10 +35,11 @@
     "@svgr/plugin-jsx": "^6.2.1",
     "@svgr/plugin-svgo": "^6.2.0",
     "@types/hapi__joi": "17.1.8",
-    "@umijs/babel-preset-umi": "4.0.0-canary.20220517.1",
-    "@umijs/bundler-utils": "4.0.0-canary.20220517.1",
-    "@umijs/mfsu": "4.0.0-canary.20220517.1",
-    "@umijs/utils": "4.0.0-canary.20220517.1",
+    "@umijs/babel-preset-umi": "4.0.0-canary.20220525.2",
+    "@umijs/bundler-utils": "4.0.0-canary.20220525.2",
+    "@umijs/mfsu": "4.0.0-canary.20220525.2",
+    "@umijs/utils": "4.0.0-canary.20220525.2",
+    "cors": "^2.8.5",
     "css-loader": "6.7.1",
     "es5-imcompatible-versions": "^0.1.73",
     "jest-worker": "27.5.1",
@@ -49,6 +50,7 @@
   },
   "devDependencies": {
     "@swc/core": "1.2.165",
+    "@types/cors": "^2.8.12",
     "@types/webpack-sources": "3.2.0",
     "@types/ws": "8.5.3",
     "autoprefixer": "10.4.4",
@@ -56,7 +58,7 @@
     "compression": "1.7.4",
     "connect-history-api-fallback": "1.6.0",
     "copy-webpack-plugin": "10.2.4",
-    "css-minimizer-webpack-plugin": "3.4.1",
+    "css-minimizer-webpack-plugin": "4.0.0",
     "cssnano": "5.1.7",
     "fork-ts-checker-webpack-plugin": "7.2.4",
     "http-proxy-middleware": "2.0.4",

package/dist/plugins/ESBuildCSSMinifyPlugin.d.ts

@@ -1,11 +0,0 @@
-import { Compilation, Compiler } from '@umijs/bundler-webpack/compiled/webpack';
-interface IOpts {
-    sourcemap?: any;
-}
-declare class ESBuildCSSMinifyPlugin {
-    options: IOpts;
-    constructor(options?: IOpts);
-    apply(compiler: Compiler): void;
-    transformAssets(compilation: Compilation): Promise<void>;
-}
-export default ESBuildCSSMinifyPlugin;

package/dist/plugins/ESBuildCSSMinifyPlugin.js

@@ -1,52 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const esbuild_1 = require("@umijs/bundler-utils/compiled/esbuild");
-const webpack_sources_1 = require("@umijs/bundler-webpack/compiled/webpack-sources");
-const version = require('../../package.json');
-const PLUGIN_NAME = 'ESBuildCSSMinifyPlugin';
-const RE_CSS_FILE = /\.css(\?.*)?$/i;
-class ESBuildCSSMinifyPlugin {
-    constructor(options = {}) {
-        this.options = options;
-    }
-    apply(compiler) {
-        compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
-            compilation.hooks.chunkHash.tap(PLUGIN_NAME, (_, hash) => {
-                hash.update(JSON.stringify({
-                    version,
-                    options: this.options,
-                }));
-            });
-            compilation.hooks.processAssets.tapPromise({
-                name: PLUGIN_NAME,
-                stage: 400,
-                additionalAssets: true,
-            }, async () => {
-                await this.transformAssets(compilation);
-            });
-        });
-    }
-    async transformAssets(compilation) {
-        const { options: { devtool }, } = compilation.compiler;
-        const sourcemap = this.options.sourcemap === undefined ? !!devtool : this.options.sourcemap;
-        const assets = compilation.getAssets().filter((asset) => {
-            return !asset.info.minimized && RE_CSS_FILE.test(asset.name);
-        });
-        await Promise.all(assets.map(async (asset) => {
-            const { source, map } = asset.source.sourceAndMap();
-            const sourceAsString = source.toString();
-            const result = await (0, esbuild_1.transform)(sourceAsString, {
-                loader: 'css',
-                sourcemap,
-                sourcefile: asset.name,
-                minify: true,
-            });
-            compilation.updateAsset(asset.name, 
-            // @ts-ignore
-            sourcemap
-                ? new webpack_sources_1.SourceMapSource(result.code, asset.name, result.map, sourceAsString, map, true)
-                : new webpack_sources_1.RawSource(result.code), { ...asset.info, minimized: true });
-        }));
-    }
-}
-exports.default = ESBuildCSSMinifyPlugin;

package/dist/plugins/ParcelCSSMinifyPlugin.d.ts

@@ -1,10 +0,0 @@
-import type { TransformOptions } from '@parcel/css';
-import type { Compiler } from '../../compiled/webpack/types';
-declare type MinifyPluginOpts = Omit<TransformOptions, 'filename' | 'code' | 'minify'>;
-export declare class ParcelCSSMinifyPlugin {
-    private readonly options;
-    constructor(opts?: MinifyPluginOpts);
-    apply(compiler: Compiler): void;
-    private transformAssets;
-}
-export {};

package/dist/plugins/ParcelCSSMinifyPlugin.js

@@ -1,73 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ParcelCSSMinifyPlugin = void 0;
-const utils_1 = require("@umijs/utils");
-const buffer_1 = require("buffer");
-const path_1 = require("path");
-const webpack_sources_1 = require("../../compiled/webpack-sources");
-const pkgPath = (0, path_1.join)(__dirname, '../../package.json');
-const pkg = require(pkgPath);
-const PLUGIN_NAME = 'parcel-css-minify-plugin';
-const CSS_FILE_REG = /\.css(?:\?.*)?$/i;
-class ParcelCSSMinifyPlugin {
-    constructor(opts = {}) {
-        this.options = opts;
-    }
-    apply(compiler) {
-        const meta = JSON.stringify({
-            name: pkg.name,
-            version: pkg.version,
-            options: this.options,
-        });
-        compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
-            compilation.hooks.chunkHash.tap(PLUGIN_NAME, (_, hash) => hash.update(meta));
-            compilation.hooks.processAssets.tapPromise({
-                name: PLUGIN_NAME,
-                // @ts-ignore
-                stage: compilation.constructor.PROCESS_ASSETS_STAGE_OPTIMIZE_SIZE,
-                additionalAssets: true,
-            }, async () => await this.transformAssets(compilation));
-            compilation.hooks.statsPrinter.tap(PLUGIN_NAME, (statsPrinter) => {
-                statsPrinter.hooks.print
-                    .for('asset.info.minimized')
-                    // @ts-ignore
-                    .tap(PLUGIN_NAME, (minimized, { green, formatFlag }) => {
-                    // @ts-ignore
-                    return minimized ? green(formatFlag('minimized')) : undefined;
-                });
-            });
-        });
-    }
-    async transformAssets(compilation) {
-        const { options: { devtool }, } = compilation.compiler;
-        const sourcemap = this.options.sourceMap === undefined
-            ? (devtool && devtool.includes('source-map'))
-            : this.options.sourceMap;
-        const assets = compilation.getAssets().filter((asset) => {
-            return !asset.info.minimized && CSS_FILE_REG.test(asset.name);
-        });
-        await Promise.all(assets.map(async (asset) => {
-            const { source, map } = asset.source.sourceAndMap();
-            const sourceAsString = source.toString();
-            const code = typeof source === 'string' ? buffer_1.Buffer.from(source) : source;
-            const { transform } = (0, utils_1.importLazy)('@parcel/css');
-            const result = await transform({
-                filename: asset.name,
-                code,
-                minify: true,
-                sourceMap: sourcemap,
-                ...this.options,
-            });
-            const codeString = result.code.toString();
-            compilation.updateAsset(asset.name, 
-            // @ts-ignore
-            sourcemap
-                ? new webpack_sources_1.SourceMapSource(codeString, asset.name, JSON.parse(result.map.toString()), sourceAsString, map, true)
-                : new webpack_sources_1.RawSource(codeString), {
-                ...asset.info,
-                minimized: true,
-            });
-        }));
-    }
-}
-exports.ParcelCSSMinifyPlugin = ParcelCSSMinifyPlugin;