@umijs/bundler-webpack 4.0.0-rc.2 → 4.0.0-rc.5

package/dist/client/client.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/config/compressPlugin.js

@@ -17,6 +17,7 @@ exports.addCompressPlugin = void 0;
 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");
 function addCompressPlugin(opts) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -69,6 +70,11 @@ function addCompressPlugin(opts) {
                 },
             ]);
         }
+        else if (cssMinifier === types_1.CSSMinifier.parcelCSS) {
+            config.optimization
+                .minimizer(`css-${cssMinifier}`)
+                .use(ParcelCSSMinifyPlugin_1.ParcelCSSMinifyPlugin);
+        }
         else if (cssMinifier !== types_1.CSSMinifier.none) {
             throw new Error(`Unsupported cssMinifier ${userConfig.cssMinifier}.`);
         }

package/dist/config/detectDeadCode.js

@@ -114,7 +114,7 @@ const logUnusedFiles = (unusedFiles) => {
     if (!(unusedFiles === null || unusedFiles === void 0 ? void 0 : unusedFiles.length)) {
         return;
     }
-    console.log(utils_1.chalk.yellow.bold('\nWarning:'), utils_1.chalk.yellow(`There are ${unusedFiles.length} unused files:\n`), ...unusedFiles.map((file, index) => `${index + 1}. ${utils_1.chalk.yellow(file)}\n`), utils_1.chalk.red.bold('Please be careful if you want to remove them (¬º-°)¬.\n'));
+    console.log(utils_1.chalk.yellow.bold('\nWarning:'), utils_1.chalk.yellow(`There are ${unusedFiles.length} unused files:`), ...unusedFiles.map((file, index) => `\n${index + 1}. ${utils_1.chalk.yellow(file)}`), utils_1.chalk.red.bold('\nPlease be careful if you want to remove them (¬º-°)¬.\n'));
 };
 const convertToUnixPath = (path) => path.replace(/\\+/g, '/');
 exports.default = detectDeadCode;

package/dist/config/detectDeadCodePlugin.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/config/javaScriptRules.js

@@ -8,16 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addJavaScriptRules = void 0;
 const mfsu_1 = require("@umijs/mfsu");
 const utils_1 = require("@umijs/utils");
 const webpack_1 = require("../../compiled/webpack");
 const constants_1 = require("../constants");
-const autoCSSModules_1 = __importDefault(require("../swcPlugins/autoCSSModules"));
 const types_1 = require("../types");
 const depMatch_1 = require("../utils/depMatch");
 function addJavaScriptRules(opts) {
@@ -118,11 +114,12 @@ function addJavaScriptRules(opts) {
                 });
             }
             else if (srcTranspiler === types_1.Transpiler.swc) {
+                const AutoCSSModule = require('../swcPlugins/autoCSSModules').default;
                 rule
                     .use('swc-loader')
                     .loader(require.resolve('../loader/swc'))
                     .options({
-                    plugin: (m) => new autoCSSModules_1.default().visitProgram(m),
+                    plugin: (m) => new AutoCSSModule().visitProgram(m),
                 });
             }
             else if (srcTranspiler === types_1.Transpiler.esbuild) {

package/dist/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/plugins/ParcelCSSMinifyPlugin.d.ts

@@ -0,0 +1,10 @@
+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

@@ -0,0 +1,74 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ParcelCSSMinifyPlugin = void 0;
+const css_1 = require("@parcel/css");
+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,
+            }, () => __awaiter(this, void 0, void 0, function* () { return yield 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;
+                });
+            });
+        });
+    }
+    transformAssets(compilation) {
+        return __awaiter(this, void 0, void 0, function* () {
+            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);
+            });
+            yield Promise.all(assets.map((asset) => __awaiter(this, void 0, void 0, function* () {
+                const { source, map } = asset.source.sourceAndMap();
+                const sourceAsString = source.toString();
+                const code = typeof source === 'string' ? buffer_1.Buffer.from(source) : source;
+                const result = yield (0, css_1.transform)(Object.assign({ 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), Object.assign(Object.assign({}, asset.info), { minimized: true }));
+            })));
+        });
+    }
+}
+exports.ParcelCSSMinifyPlugin = ParcelCSSMinifyPlugin;

package/dist/plugins/ProgressPlugin.js

@@ -13,7 +13,7 @@ class UmiProgressPlugin extends webpack_1.ProgressPlugin {
     }
     apply(compiler) {
         compiler.hooks.invalid.tap(PLUGIN_NAME, () => {
-            utils_1.logger.wait('compiling...');
+            utils_1.logger.wait('Compiling...');
         });
         compiler.hooks.done.tap(PLUGIN_NAME, (stats) => {
             const { errors, warnings } = stats.toJson({
@@ -33,7 +33,7 @@ class UmiProgressPlugin extends webpack_1.ProgressPlugin {
             }
             else {
                 const prefix = this.options.name ? `${this.options.name} ` : '';
-                utils_1.logger.event(`${prefix}compiled successfully in ${stats.endTime - stats.startTime} ms (${stats.compilation.modules.size} modules)`);
+                utils_1.logger.event(`${prefix}Compiled successfully in ${stats.endTime - stats.startTime} ms (${stats.compilation.modules.size} modules)`);
             }
         });
     }

package/dist/schema.js

@@ -32,7 +32,7 @@ function getSchemas() {
         }), Joi.string())),
         cssLoader: (Joi) => Joi.object(),
         cssLoaderModules: (Joi) => Joi.object(),
-        cssMinifier: (Joi) => Joi.string().valid(types_1.CSSMinifier.cssnano, types_1.CSSMinifier.esbuild, types_1.CSSMinifier.none),
+        cssMinifier: (Joi) => Joi.string().valid(types_1.CSSMinifier.cssnano, types_1.CSSMinifier.esbuild, types_1.CSSMinifier.parcelCSS, types_1.CSSMinifier.none),
         cssMinifierOptions: (Joi) => Joi.object(),
         define: (Joi) => Joi.object(),
         deadCode: (Joi) => Joi.object(),

package/dist/swcPlugins/lockCoreJS.d.ts

@@ -1,4 +1,4 @@
-import { ImportDeclaration } from '@swc/core';
+import type { ImportDeclaration } from '@swc/core';
 import Visitor from '@swc/core/Visitor';
 declare class LockCoreJS extends Visitor {
     visitImportDeclaration(expression: ImportDeclaration): ImportDeclaration;

package/dist/types.d.ts

@@ -22,6 +22,7 @@ export declare enum JSMinifier {
 export declare enum CSSMinifier {
     esbuild = "esbuild",
     cssnano = "cssnano",
+    parcelCSS = "parcelCSS",
     none = "none"
 }
 export interface ICopy {

package/dist/types.js

@@ -25,5 +25,6 @@ var CSSMinifier;
 (function (CSSMinifier) {
     CSSMinifier["esbuild"] = "esbuild";
     CSSMinifier["cssnano"] = "cssnano";
+    CSSMinifier["parcelCSS"] = "parcelCSS";
     CSSMinifier["none"] = "none";
 })(CSSMinifier = exports.CSSMinifier || (exports.CSSMinifier = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.0.0-rc.2",
+  "version": "4.0.0-rc.5",
   "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",
@@ -28,34 +28,35 @@
     "generate:webpackPackages": "zx ./scripts/generateWebpackPackages.mjs"
   },
   "dependencies": {
+    "@parcel/css": "1.5.0",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.4",
     "@svgr/core": "6.2.1",
     "@svgr/plugin-jsx": "^6.2.1",
     "@svgr/plugin-svgo": "^6.2.0",
-    "@swc/core": "1.2.141",
     "@types/hapi__joi": "17.1.8",
-    "@umijs/babel-preset-umi": "4.0.0-rc.2",
-    "@umijs/mfsu": "4.0.0-rc.2",
-    "@umijs/utils": "4.0.0-rc.2",
+    "@umijs/babel-preset-umi": "4.0.0-rc.5",
+    "@umijs/mfsu": "4.0.0-rc.5",
+    "@umijs/utils": "4.0.0-rc.5",
     "css-loader": "6.6.0",
     "es5-imcompatible-versions": "^0.1.73",
     "jest-worker": "27.5.1",
     "node-libs-browser": "2.2.1",
-    "postcss": "^8.4.6",
-    "postcss-preset-env": "7.4.1",
+    "postcss": "^8.4.7",
+    "postcss-preset-env": "7.4.2",
     "react-error-overlay": "6.0.9"
   },
   "devDependencies": {
+    "@swc/core": "1.2.147",
     "@types/express": "4.17.13",
     "@types/webpack-sources": "3.2.0",
-    "@types/ws": "8.2.2",
+    "@types/ws": "8.5.2",
     "autoprefixer": "10.4.2",
     "babel-loader": "8.2.3",
     "compression": "1.7.4",
     "connect-history-api-fallback": "1.6.0",
     "copy-webpack-plugin": "10.2.4",
     "css-minimizer-webpack-plugin": "3.4.1",
-    "cssnano": "5.0.17",
+    "cssnano": "5.1.0",
     "express": "4.17.3",
     "fork-ts-checker-webpack-plugin": "7.2.1",
     "http-proxy-middleware": "2.0.3",
@@ -72,7 +73,7 @@
     "style-loader": "3.3.1",
     "svgo-loader": "3.0.0",
     "tapable": "2.2.1",
-    "terser": "5.10.0",
+    "terser": "5.12.0",
     "terser-webpack-plugin": "5.3.1",
     "url-loader": "4.1.1",
     "webpack": "5.69.1",