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

package/dist/config/detectDeadCode.js

@@ -0,0 +1,120 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.disabledFolders = void 0;
+const webpack_1 = require("@umijs/bundler-webpack/compiled/webpack");
+const utils_1 = require("@umijs/utils");
+const path_1 = __importDefault(require("path"));
+exports.disabledFolders = [
+    'node_modules',
+    '.umi',
+    '.umi-production',
+    'dist',
+];
+const detectDeadCode = (compilation, options) => {
+    const assets = getWebpackAssets(compilation);
+    const compiledFilesDictionary = convertFilesToDict(assets);
+    const includedFiles = getPattern(options)
+        .map((pattern) => utils_1.glob.sync(pattern))
+        .flat();
+    const unusedFiles = options.detectUnusedFiles
+        ? includedFiles.filter((file) => !compiledFilesDictionary[file])
+        : [];
+    const unusedExportMap = options.detectUnusedExport
+        ? getUnusedExportMap(convertFilesToDict(includedFiles), compilation)
+        : {};
+    logUnusedFiles(unusedFiles);
+    logUnusedExportMap(unusedExportMap);
+    const hasUnusedThings = unusedFiles.length || Object.keys(unusedExportMap).length;
+    if (hasUnusedThings && options.failOnHint) {
+        process.exit(2);
+    }
+};
+const getPattern = (options) => {
+    return options.patterns
+        .map((pattern) => path_1.default.resolve(options.context || '', pattern))
+        .concat(options.exclude.map((pattern) => path_1.default.resolve(options.context || '', `!${pattern}`)))
+        .map(convertToUnixPath);
+};
+const getUnusedExportMap = (includedFileMap, compilation) => {
+    const unusedExportMap = {};
+    compilation.chunks.forEach((chunk) => {
+        compilation.chunkGraph.getChunkModules(chunk).forEach((module) => {
+            outputUnusedExportMap(compilation, chunk, module, includedFileMap, unusedExportMap);
+        });
+    });
+    return unusedExportMap;
+};
+const outputUnusedExportMap = (compilation, chunk, module, includedFileMap, unusedExportMap) => {
+    if (!(module instanceof webpack_1.NormalModule) || !module.resource) {
+        return;
+    }
+    const path = convertToUnixPath(module.resource);
+    if (!/^((?!(node_modules)).)*$/.test(path))
+        return;
+    const providedExports = compilation.chunkGraph.moduleGraph.getProvidedExports(module);
+    const usedExports = compilation.chunkGraph.moduleGraph.getUsedExports(module, chunk.runtime);
+    if (usedExports !== true &&
+        providedExports !== true &&
+        includedFileMap[path]) {
+        if (usedExports === false) {
+            if (providedExports === null || providedExports === void 0 ? void 0 : providedExports.length) {
+                unusedExportMap[path] = providedExports;
+            }
+        }
+        else if (providedExports instanceof Array) {
+            const unusedExports = providedExports.filter((item) => usedExports && !usedExports.has(item));
+            if (unusedExports.length) {
+                unusedExportMap[path] = unusedExports;
+            }
+        }
+    }
+};
+const logUnusedExportMap = (unusedExportMap) => {
+    if (!Object.keys(unusedExportMap).length) {
+        return;
+    }
+    let numberOfUnusedExport = 0;
+    let logStr = '';
+    Object.keys(unusedExportMap).forEach((filePath, fileIndex) => {
+        const unusedExports = unusedExportMap[filePath];
+        logStr += [
+            `\n${fileIndex + 1}. `,
+            utils_1.chalk.yellow(`${filePath}\n`),
+            '    >>>  ',
+            utils_1.chalk.yellow(`${unusedExports.join(',  ')}`),
+        ].join('');
+        numberOfUnusedExport += unusedExports.length;
+    });
+    console.log(utils_1.chalk.yellow.bold('\nWarning:'), utils_1.chalk.yellow(`There are ${numberOfUnusedExport} unused exports in ${Object.keys(unusedExportMap).length} files:`), logStr, utils_1.chalk.red.bold('\nPlease be careful if you want to remove them (¬º-°)¬.\n'));
+};
+const getWebpackAssets = (compilation) => {
+    const outputPath = compilation.getPath(compilation.compiler.outputPath);
+    const assets = [
+        ...Array.from(compilation.fileDependencies),
+        ...compilation
+            .getAssets()
+            .map((asset) => path_1.default.join(outputPath, asset.name)),
+    ];
+    return assets;
+};
+const convertFilesToDict = (assets) => {
+    return assets
+        .filter((file) => Boolean(file) &&
+        exports.disabledFolders.every((disabledPath) => !file.includes(disabledPath)))
+        .reduce((fileDictionary, file) => {
+        const unixFile = convertToUnixPath(file);
+        fileDictionary[unixFile] = true;
+        return fileDictionary;
+    }, {});
+};
+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'));
+};
+const convertToUnixPath = (path) => path.replace(/\\+/g, '/');
+exports.default = detectDeadCode;

package/dist/config/detectDeadCodePlugin.d.ts

@@ -0,0 +1,9 @@
+import Config from '@umijs/bundler-webpack/compiled/webpack-5-chain';
+import { Env, IConfig } from '../types';
+interface IOpts {
+    userConfig: IConfig;
+    config: Config;
+    env: Env;
+}
+export declare function addDetectDeadCodePlugin(opts: IOpts): Promise<void>;
+export {};

package/dist/config/detectDeadCodePlugin.js

@@ -0,0 +1,71 @@
+"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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+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.addDetectDeadCodePlugin = void 0;
+const types_1 = require("../types");
+const detectDeadCode_1 = __importStar(require("./detectDeadCode"));
+const defaultOptions = {
+    patterns: [`!(${detectDeadCode_1.disabledFolders.join('|')})/**/*.*`],
+    exclude: [],
+    failOnHint: false,
+    detectUnusedFiles: true,
+    detectUnusedExport: true,
+};
+class DetectDeadCodePlugin {
+    constructor(options) {
+        this.options = defaultOptions;
+        this.handleAfterEmit = (compilation, callback) => {
+            (0, detectDeadCode_1.default)(compilation, this.options);
+            callback();
+        };
+        if (!options) {
+            return;
+        }
+        this.options = Object.assign(Object.assign({}, this.options), options);
+    }
+    apply(compiler) {
+        if (!this.options.context) {
+            this.options = Object.assign(Object.assign({}, this.options), { context: compiler.context });
+        }
+        compiler.hooks.afterEmit.tapAsync('DetectDeadCodePlugin', this.handleAfterEmit);
+    }
+}
+function addDetectDeadCodePlugin(opts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { config, userConfig } = opts;
+        const isDev = opts.env === types_1.Env.development;
+        if (userConfig.deadCode && !isDev) {
+            config
+                .plugin('detect-dead-code-plugin')
+                .use(DetectDeadCodePlugin, [userConfig.deadCode]);
+        }
+    });
+}
+exports.addDetectDeadCodePlugin = addDetectDeadCodePlugin;

package/dist/config/javaScriptRules.js

@@ -13,11 +13,10 @@ var __importDefault = (this && this.__importDefault) || function (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("../esbuildHandler/autoCssModules"));
-const esbuild_1 = require("../loader/esbuild");
 const autoCSSModules_1 = __importDefault(require("../swcPlugins/autoCSSModules"));
 const types_1 = require("../types");
 const depMatch_1 = require("../utils/depMatch");
@@ -119,22 +118,20 @@ function addJavaScriptRules(opts) {
                 });
             }
             else if (srcTranspiler === types_1.Transpiler.swc) {
-                // TODO: support javascript
                 rule
                     .use('swc-loader')
                     .loader(require.resolve('../loader/swc'))
                     .options({
                     plugin: (m) => new autoCSSModules_1.default().visitProgram(m),
-                    targets: userConfig.targets,
                 });
             }
             else if (srcTranspiler === types_1.Transpiler.esbuild) {
                 rule
                     .use('esbuild-loader')
-                    .loader(esbuild_1.esbuildLoaderPath)
+                    .loader(mfsu_1.esbuildLoader)
                     .options({
                     target: isDev ? 'esnext' : 'es2015',
-                    handler: [autoCssModules_1.default, ...opts.extraEsbuildLoaderHandler],
+                    handler: [mfsu_1.autoCssModulesHandler, ...opts.extraEsbuildLoaderHandler],
                 });
                 // esbuild loader can not auto import `React`
                 config.plugin('react-provide-plugin').use(webpack_1.ProvidePlugin, [

package/dist/constants.d.ts

@@ -9,3 +9,6 @@ export declare enum MESSAGE_TYPE {
     stillOk = "still-ok",
     invalid = "invalid"
 }
+export declare const DEFAULT_BROWSER_TARGETS: {
+    chrome: number;
+};

package/dist/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MESSAGE_TYPE = exports.MFSU_NAME = exports.DEFAULT_OUTPUT_PATH = exports.DEFAULT_DEVTOOL = void 0;
+exports.DEFAULT_BROWSER_TARGETS = exports.MESSAGE_TYPE = exports.MFSU_NAME = exports.DEFAULT_OUTPUT_PATH = exports.DEFAULT_DEVTOOL = void 0;
 exports.DEFAULT_DEVTOOL = 'cheap-module-source-map';
 exports.DEFAULT_OUTPUT_PATH = 'dist';
 exports.MFSU_NAME = 'MFSU';
@@ -13,3 +13,6 @@ var MESSAGE_TYPE;
     MESSAGE_TYPE["stillOk"] = "still-ok";
     MESSAGE_TYPE["invalid"] = "invalid";
 })(MESSAGE_TYPE = exports.MESSAGE_TYPE || (exports.MESSAGE_TYPE = {}));
+exports.DEFAULT_BROWSER_TARGETS = {
+    chrome: 80,
+};

package/dist/dev.d.ts

@@ -6,6 +6,7 @@ declare type IOpts = {
     onDevCompileDone?: Function;
     port?: number;
     host?: string;
+    babelPreset?: any;
     chainWebpack?: Function;
     modifyWebpackConfig?: Function;
     beforeBabelPlugins?: any[];

package/dist/dev.js

@@ -22,8 +22,8 @@ const constants_1 = require("./constants");
 const server_1 = require("./server/server");
 const types_1 = require("./types");
 function dev(opts) {
-    var _a, _b, _c, _d;
-    var _e;
+    var _a, _b, _c, _d, _e;
+    var _f;
     return __awaiter(this, void 0, void 0, function* () {
         const enableMFSU = opts.config.mfsu !== false;
         let mfsu = null;
@@ -39,7 +39,8 @@ function dev(opts) {
                 },
                 mfName: (_c = opts.config.mfsu) === null || _c === void 0 ? void 0 : _c.mfName,
                 runtimePublicPath: opts.config.runtimePublicPath,
-                tmpBase: (0, path_1.join)(opts.cwd, 'node_modules/.cache/mfsu'),
+                tmpBase: ((_d = opts.config.mfsu) === null || _d === void 0 ? void 0 : _d.cacheDirectory) ||
+                    (0, path_1.join)(opts.cwd, 'node_modules/.cache/mfsu'),
                 getCacheDependency() {
                     var _a;
                     return {
@@ -54,6 +55,7 @@ function dev(opts) {
             env: types_1.Env.development,
             entry: opts.entry,
             userConfig: opts.config,
+            babelPreset: opts.babelPreset,
             extraBabelPlugins: [
                 ...(opts.beforeBabelPlugins || []),
                 ...((mfsu === null || mfsu === void 0 ? void 0 : mfsu.getBabelPlugins()) || []),
@@ -79,11 +81,11 @@ function dev(opts) {
             staticPathPrefix: mfsu_1.MF_DEP_PREFIX,
             name: constants_1.MFSU_NAME,
             cache: {
-                buildDependencies: (_d = opts.cache) === null || _d === void 0 ? void 0 : _d.buildDependencies,
+                buildDependencies: (_e = opts.cache) === null || _e === void 0 ? void 0 : _e.buildDependencies,
                 cacheDirectory: (0, path_1.join)(opts.cwd, 'node_modules', '.cache', 'mfsu-deps'),
             },
         });
-        (_e = webpackConfig.resolve).alias || (_e.alias = {});
+        (_f = webpackConfig.resolve).alias || (_f.alias = {});
         // TODO: REMOVE ME
         ['@umijs/utils/compiled/strip-ansi', 'react-error-overlay'].forEach((dep) => {
             // @ts-ignore

package/dist/loader/swc.js

@@ -13,27 +13,23 @@ var __rest = (this && this.__rest) || function (s, e) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@swc/core");
 const types_1 = require("../types");
-function getBaseOpts({ filename, targets = { chrome: '61' }, }) {
+function getBaseOpts({ filename }) {
     const isTSFile = filename.endsWith('.ts');
     const isTypeScript = isTSFile || filename.endsWith('.tsx');
     const isDev = process.env.NODE_ENV === types_1.Env.development;
-    const polyfillOpts = isDev
-        ? {}
-        : {
-            env: {
-                /**
-                 * need `@umijs/preset-umi/src/features/polyfill/swcPolyfill` config alias and provide polyfill
-                 */
-                mode: 'usage',
-                coreJs: 3,
-                targets,
-            },
-        };
-    const swcOpts = Object.assign(Object.assign({ module: {
+    /**
+     * Not use swc auto polyfill , depend on `preset-umi/features/polyfill/polyfill` imported polyfill file
+     *
+     * @issue https://github.com/swc-project/swc/issues/2607
+     *        https://github.com/swc-project/swc/issues/1604
+     */
+    const swcOpts = {
+        module: {
             // @ts-ignore
             type: 'es6',
             ignoreDynamic: true,
-        } }, polyfillOpts), { jsc: {
+        },
+        jsc: {
             parser: {
                 syntax: isTypeScript ? 'typescript' : 'ecmascript',
                 [isTypeScript ? 'tsx' : 'jsx']: !isTSFile,
@@ -50,18 +46,18 @@ function getBaseOpts({ filename, targets = { chrome: '61' }, }) {
                     useBuiltins: true,
                 },
             },
-        } });
+        },
+    };
     return swcOpts;
 }
 function swcLoader(contents) {
     // 启用异步模式
     const callback = this.async();
     const loaderOpts = this.getOptions();
-    const { sync = false, parseMap = false, targets } = loaderOpts, otherOpts = __rest(loaderOpts, ["sync", "parseMap", "targets"]);
+    const { sync = false, parseMap = false } = loaderOpts, otherOpts = __rest(loaderOpts, ["sync", "parseMap"]);
     const filename = this.resourcePath;
     const swcOpts = Object.assign(Object.assign(Object.assign({}, getBaseOpts({
         filename,
-        targets,
     })), { filename, sourceMaps: this.sourceMap, sourceFileName: filename }), otherOpts);
     try {
         if (sync) {

package/dist/requireHook.js

@@ -17,7 +17,7 @@ const hookPropertyMap = new Map([
     ['webpack/lib/webpack.js', '@umijs/bundler-webpack/compiled/webpack'],
 ]);
 deepImports_json_1.default.forEach((item) => {
-    const name = item.split('/').unshift();
+    const name = item.split('/').pop();
     hookPropertyMap.set(item, `@umijs/bundler-webpack/compiled/webpack/${name}`);
     hookPropertyMap.set(`${item}.js`, `@umijs/bundler-webpack/compiled/webpack/${name}`);
 });

package/dist/schema.js

@@ -35,6 +35,7 @@ function getSchemas() {
         cssMinifier: (Joi) => Joi.string().valid(types_1.CSSMinifier.cssnano, types_1.CSSMinifier.esbuild, types_1.CSSMinifier.none),
         cssMinifierOptions: (Joi) => Joi.object(),
         define: (Joi) => Joi.object(),
+        deadCode: (Joi) => Joi.object(),
         depTranspiler: (Joi) => Joi.string().valid(types_1.Transpiler.babel, types_1.Transpiler.esbuild, types_1.Transpiler.swc, types_1.Transpiler.none),
         devtool: (Joi) => Joi.alternatives().try(Joi.string().regex(DEVTOOL_REGEX), Joi.boolean()),
         externals: (Joi) => Joi.alternatives().try(Joi.object(), Joi.string(), Joi.func()),
@@ -55,6 +56,7 @@ function getSchemas() {
             loaderOptions: Joi.object(),
         }),
         mfsu: (Joi) => Joi.alternatives(Joi.object({
+            cacheDirectory: Joi.string(),
             esbuild: Joi.boolean(),
             mfName: Joi.string(),
         }), Joi.boolean()),

package/dist/swcPlugins/autoCSSModules.d.ts

@@ -1,8 +1,13 @@
-import { ImportDeclaration, TsType, VariableDeclaration } from '@swc/core';
+import type { ImportDeclaration, ModuleItem, TsType } from '@swc/core';
 import Visitor from '@swc/core/Visitor';
 declare class AutoCSSModule extends Visitor {
     visitTsType(expression: TsType): TsType;
+    /**
+     * call path:
+     *   visitProgram -> visitModule -> visitModuleItems -> visitModuleItem -> visitImportDeclaration
+     * @see https://github.com/swc-project/swc/blob/main/node-swc/src/Visitor.ts#L189
+     */
+    visitModuleItem(n: ModuleItem): ImportDeclaration | import("@swc/core").ExportDeclaration | import("@swc/core").ExportNamedDeclaration | import("@swc/core").ExportDefaultDeclaration | import("@swc/core").ExportDefaultExpression | import("@swc/core").ExportAllDeclaration | import("@swc/core").TsImportEqualsDeclaration | import("@swc/core").TsExportAssignment | import("@swc/core").TsNamespaceExportDeclaration | import("@swc/core").ExpressionStatement | import("@swc/core").BlockStatement | import("@swc/core").EmptyStatement | import("@swc/core").DebuggerStatement | import("@swc/core").WithStatement | import("@swc/core").ReturnStatement | import("@swc/core").LabeledStatement | import("@swc/core").BreakStatement | import("@swc/core").ContinueStatement | import("@swc/core").IfStatement | import("@swc/core").SwitchStatement | import("@swc/core").ThrowStatement | import("@swc/core").TryStatement | import("@swc/core").WhileStatement | import("@swc/core").DoWhileStatement | import("@swc/core").ForStatement | import("@swc/core").ForInStatement | import("@swc/core").ForOfStatement | import("@swc/core").ClassDeclaration | import("@swc/core").FunctionDeclaration | import("@swc/core").VariableDeclaration | import("@swc/core").TsInterfaceDeclaration | import("@swc/core").TsTypeAliasDeclaration | import("@swc/core").TsEnumDeclaration | import("@swc/core").TsModuleDeclaration;
     visitImportDeclaration(expression: ImportDeclaration): ImportDeclaration;
-    visitVariableDeclaration(expression: VariableDeclaration): VariableDeclaration;
 }
 export default AutoCSSModule;

package/dist/swcPlugins/autoCSSModules.js

@@ -9,6 +9,17 @@ class AutoCSSModule extends Visitor_1.default {
     visitTsType(expression) {
         return expression;
     }
+    /**
+     * call path:
+     *   visitProgram -> visitModule -> visitModuleItems -> visitModuleItem -> visitImportDeclaration
+     * @see https://github.com/swc-project/swc/blob/main/node-swc/src/Visitor.ts#L189
+     */
+    visitModuleItem(n) {
+        if (n.type === 'ImportDeclaration') {
+            return this.visitImportDeclaration(n);
+        }
+        return n;
+    }
     visitImportDeclaration(expression) {
         const { specifiers, source } = expression;
         const { value } = source;
@@ -17,21 +28,5 @@ class AutoCSSModule extends Visitor_1.default {
         }
         return expression;
     }
-    visitVariableDeclaration(expression) {
-        const { declarations } = expression;
-        if (declarations.length &&
-            declarations[0].init &&
-            declarations[0].init.type === 'AwaitExpression' &&
-            declarations[0].init.argument.type === 'CallExpression' &&
-            declarations[0].init.argument.arguments.length &&
-            declarations[0].init.argument.arguments[0].expression.type ===
-                'StringLiteral' &&
-            (0, utils_1.isStyleFile)({
-                filename: declarations[0].init.argument.arguments[0].expression.value,
-            })) {
-            declarations[0].init.argument.arguments[0].expression.value = `${declarations[0].init.argument.arguments[0].expression.value}?modules`;
-        }
-        return expression;
-    }
 }
 exports.default = AutoCSSModule;

package/dist/types.d.ts

@@ -1,6 +1,4 @@
 import type { Config as SwcConfig } from '@swc/core';
-import type { ImportSpecifier } from '@umijs/bundler-utils/compiled/es-module-lexer';
-import type { TransformOptions } from '@umijs/bundler-utils/compiled/esbuild';
 import type { Options as ProxyOptions } from '../compiled/http-proxy-middleware';
 import { Configuration } from '../compiled/webpack';
 import Config from '../compiled/webpack-5-chain';
@@ -34,6 +32,14 @@ declare type WebpackConfig = Required<Configuration>;
 declare type IBabelPlugin = Function | string | [string, {
     [key: string]: any;
 }];
+export interface DeadCodeParams {
+    patterns?: string[];
+    exclude?: string[];
+    failOnHint?: boolean;
+    detectUnusedFiles?: boolean;
+    detectUnusedExport?: boolean;
+    context?: string;
+}
 export interface IConfig {
     alias?: Record<string, string>;
     autoCSSModules?: boolean;
@@ -55,6 +61,7 @@ export interface IConfig {
     };
     depTranspiler?: Transpiler;
     devtool?: Config.DevTool;
+    deadCode?: DeadCodeParams;
     externals?: WebpackConfig['externals'];
     esm?: {
         [key: string]: any;
@@ -104,15 +111,5 @@ export interface IConfig {
 export interface SwcOptions extends SwcConfig {
     sync?: boolean;
     parseMap?: boolean;
-    targets?: Record<string, any>;
-}
-export interface IEsbuildLoaderHandlerParams {
-    code: string;
-    filePath: string;
-    imports: readonly ImportSpecifier[];
-    exports: readonly string[];
-}
-export interface IEsbuildLoaderOpts extends Partial<TransformOptions> {
-    handler?: Array<(opts: IEsbuildLoaderHandlerParams) => string>;
 }
 export {};

package/dist/utils/depMatch.js

@@ -15,7 +15,7 @@ function isMatch(opts) {
         return !!cache.get(dir);
     }
     else {
-        const pkgPath = utils_1.pkgUp.sync({ cwd: opts.path });
+        const pkgPath = utils_1.pkgUp.pkgUpSync({ cwd: opts.path });
         let ret;
         if (!pkgPath) {
             ret = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.0.0-rc.1",
+  "version": "4.0.0-rc.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",
@@ -28,60 +28,60 @@
     "generate:webpackPackages": "zx ./scripts/generateWebpackPackages.mjs"
   },
   "dependencies": {
-    "@pmmmwh/react-refresh-webpack-plugin": "0.5.3",
-    "@svgr/core": "6.0.0",
-    "@svgr/plugin-jsx": "^6.1.0",
-    "@svgr/plugin-svgo": "^6.1.0",
-    "@swc/core": "1.2.117",
-    "@types/hapi__joi": "17.1.7",
-    "@umijs/babel-preset-umi": "4.0.0-rc.1",
-    "@umijs/mfsu": "4.0.0-rc.1",
-    "@umijs/utils": "4.0.0-rc.1",
-    "css-loader": "6.5.1",
+    "@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",
+    "css-loader": "6.6.0",
     "es5-imcompatible-versions": "^0.1.73",
-    "jest-worker": "27.4.2",
+    "jest-worker": "27.5.1",
     "node-libs-browser": "2.2.1",
-    "postcss": "^8.4.4",
-    "postcss-preset-env": "7.0.1",
+    "postcss": "^8.4.6",
+    "postcss-preset-env": "7.4.1",
     "react-error-overlay": "6.0.9"
   },
   "devDependencies": {
     "@types/express": "4.17.13",
     "@types/webpack-sources": "3.2.0",
-    "@types/ws": "8.2.1",
-    "autoprefixer": "10.4.0",
+    "@types/ws": "8.2.2",
+    "autoprefixer": "10.4.2",
     "babel-loader": "8.2.3",
     "compression": "1.7.4",
     "connect-history-api-fallback": "1.6.0",
-    "copy-webpack-plugin": "9.0.1",
-    "css-minimizer-webpack-plugin": "3.1.1",
-    "cssnano": "5.0.8",
-    "express": "4.17.1",
-    "fork-ts-checker-webpack-plugin": "6.5.0",
-    "http-proxy-middleware": "2.0.1",
+    "copy-webpack-plugin": "10.2.4",
+    "css-minimizer-webpack-plugin": "3.4.1",
+    "cssnano": "5.0.17",
+    "express": "4.17.3",
+    "fork-ts-checker-webpack-plugin": "7.2.1",
+    "http-proxy-middleware": "2.0.3",
     "less": "4.1.2",
     "less-loader": "10.2.0",
-    "mini-css-extract-plugin": "2.4.5",
+    "mini-css-extract-plugin": "2.5.3",
     "postcss-flexbugs-fixes": "5.0.2",
     "postcss-loader": "6.2.1",
-    "purgecss-webpack-plugin": "4.0.3",
+    "purgecss-webpack-plugin": "4.1.3",
     "react-refresh": "0.11.0",
-    "sass-loader": "12.3.0",
+    "sass-loader": "12.6.0",
     "schema-utils": "4.0.0",
     "speed-measure-webpack-plugin": "1.5.0",
     "style-loader": "3.3.1",
     "svgo-loader": "3.0.0",
     "tapable": "2.2.1",
     "terser": "5.10.0",
-    "terser-webpack-plugin": "5.2.5",
+    "terser-webpack-plugin": "5.3.1",
     "url-loader": "4.1.1",
-    "webpack": "5.64.4",
+    "webpack": "5.69.1",
     "webpack-5-chain": "8.0.0",
     "webpack-bundle-analyzer": "4.5.0",
-    "webpack-dev-middleware": "5.2.2",
-    "webpack-manifest-plugin": "4.0.2",
-    "webpack-sources": "3.2.2",
-    "ws": "8.2.3"
+    "webpack-dev-middleware": "5.3.1",
+    "webpack-manifest-plugin": "4.1.1",
+    "webpack-sources": "3.2.3",
+    "ws": "8.5.0"
   },
   "publishConfig": {
     "access": "public"

package/dist/esbuildHandler/autoCssModules.d.ts

@@ -1,2 +0,0 @@
-import { IEsbuildLoaderHandlerParams } from '../types';
-export default function autoCssModulesHandler(opts: IEsbuildLoaderHandlerParams): string;

package/dist/esbuildHandler/autoCssModules.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("@umijs/utils");
-const CSS_MODULES_QUERY = '?modules';
-const QUERY_LENGTH = CSS_MODULES_QUERY.length;
-function autoCssModulesHandler(opts) {
-    let { code } = opts;
-    let offset = 0;
-    opts.imports.forEach((i) => {
-        if (i.d < 0 && (0, utils_1.isStyleFile)({ filename: i.n })) {
-            // import x from './index.less'
-            //   => import x from '
-            const importSegment = code.substring(i.ss + offset, i.s + offset);
-            // is css module
-            if (~importSegment.indexOf(' from')) {
-                code = `${code.substring(0, i.e + offset)}${CSS_MODULES_QUERY}${code.substring(i.e + offset)}`;
-                offset += QUERY_LENGTH;
-            }
-        }
-    });
-    return code;
-}
-exports.default = autoCssModulesHandler;

package/dist/loader/esbuild.d.ts

@@ -1,5 +0,0 @@
-import type { LoaderContext } from '../../compiled/webpack';
-import type { IEsbuildLoaderOpts } from '../types';
-declare function esbuildLoader(this: LoaderContext<IEsbuildLoaderOpts>, source: string): Promise<void>;
-export default esbuildLoader;
-export declare const esbuildLoaderPath: string;