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

package/dist/plugins/ParcelCSSMinifyPlugin.js

@@ -0,0 +1,75 @@
+"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 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,
+            }, () => __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 { transform } = (0, utils_1.importLazy)('@parcel/css');
+                const result = yield 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/plugins/RuntimePublicPathPlugin.js

@@ -11,7 +11,7 @@ class RuntimePublicPathPlugin {
                 // https://github.com/webpack/webpack/blob/master/lib/runtime/PublicPathRuntimeModule.js
                 if (module.constructor.name === 'PublicPathRuntimeModule') {
                     // @ts-ignore
-                    module._cachedGeneratedCode = `__webpack_require__.p = window.publicPath;`;
+                    module._cachedGeneratedCode = `__webpack_require__.p = (globalThis || window).publicPath;`;
                 }
             });
         });

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

@@ -32,18 +32,21 @@ 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(),
+        deadCode: (Joi) => Joi.object(),
         define: (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()),
+        esm: (Joi) => Joi.object(),
         externals: (Joi) => Joi.alternatives().try(Joi.object(), Joi.string(), Joi.func()),
-        extraBabelPlugins: (Joi) => Joi.alternatives().try(Joi.string(), Joi.array().items(Joi.alternatives().try(Joi.string(), Joi.object()))),
-        extraBabelPresets: (Joi) => Joi.alternatives().try(Joi.string(), Joi.array().items(Joi.alternatives().try(Joi.string(), Joi.object()))),
+        extraBabelPlugins: (Joi) => Joi.array().items(Joi.alternatives().try(Joi.string(), Joi.array())),
+        extraBabelPresets: (Joi) => Joi.array().items(Joi.alternatives().try(Joi.string(), Joi.array())),
         extraPostCSSPlugins: (Joi) => Joi.array(),
         fastRefresh: (Joi) => Joi.boolean(),
         forkTSChecker: (Joi) => Joi.object(),
         hash: (Joi) => Joi.boolean(),
+        https: (Joi) => Joi.object(),
         ignoreMomentLocale: (Joi) => Joi.boolean(),
         inlineLimit: (Joi) => Joi.number(),
         jsMinifier: (Joi) => Joi.string().valid(types_1.JSMinifier.esbuild, types_1.JSMinifier.swc, types_1.JSMinifier.terser, types_1.JSMinifier.uglifyJs, types_1.JSMinifier.none),
@@ -55,6 +58,8 @@ function getSchemas() {
             loaderOptions: Joi.object(),
         }),
         mfsu: (Joi) => Joi.alternatives(Joi.object({
+            cacheDirectory: Joi.string(),
+            chainWebpack: Joi.function(),
             esbuild: Joi.boolean(),
             mfName: Joi.string(),
         }), Joi.boolean()),
@@ -67,12 +72,11 @@ function getSchemas() {
         sassLoader: (Joi) => Joi.object(),
         srcTranspiler: (Joi) => Joi.string().valid(types_1.Transpiler.babel, types_1.Transpiler.esbuild, types_1.Transpiler.swc, types_1.Transpiler.none),
         styleLoader: (Joi) => Joi.object(),
-        svgr: (Joi) => Joi.object(),
         svgo: (Joi) => Joi.alternatives().try(Joi.object(), Joi.boolean()),
+        svgr: (Joi) => Joi.object(),
         targets: (Joi) => Joi.object(),
-        writeToDisk: (Joi) => Joi.boolean(),
-        esm: (Joi) => Joi.object(),
         theme: (Joi) => Joi.object(),
+        writeToDisk: (Joi) => Joi.boolean(),
     };
 }
 exports.getSchemas = getSchemas;

package/dist/server/https.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="node" />
+import { RequestListener } from 'http';
+import https from 'https';
+import { HttpsParams } from '../types';
+export declare function createHttpsServer(app: RequestListener, httpsConfig: HttpsParams): Promise<https.Server>;

package/dist/server/https.js

@@ -0,0 +1,73 @@
+"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());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createHttpsServer = void 0;
+const utils_1 = require("@umijs/utils");
+const fs_1 = require("fs");
+const https_1 = __importDefault(require("https"));
+const path_1 = require("path");
+const defaultHttpsHosts = ['localhost', '127.0.0.1'];
+function createHttpsServer(app, httpsConfig) {
+    return __awaiter(this, void 0, void 0, function* () {
+        utils_1.logger.wait('[HTTPS] Starting service in https mode...');
+        // Check if mkcert is installed
+        try {
+            yield utils_1.execa.execa('mkcert', ['--version']);
+        }
+        catch (e) {
+            utils_1.logger.error('[HTTPS] The mkcert has not been installed.');
+            utils_1.logger.info('[HTTPS] Please follow the guide to install manually.');
+            switch (process.platform) {
+                case 'darwin':
+                    console.log(utils_1.chalk.green('$ brew install mkcert'));
+                    console.log(utils_1.chalk.gray('# If you use firefox, please install nss.'));
+                    console.log(utils_1.chalk.green('$ brew install nss'));
+                    console.log(utils_1.chalk.green('$ mkcert -install'));
+                    break;
+                case 'win32':
+                    console.log(utils_1.chalk.green('Checkout https://github.com/FiloSottile/mkcert#windows'));
+                    break;
+                case 'linux':
+                    console.log(utils_1.chalk.green('Checkout https://github.com/FiloSottile/mkcert#linux'));
+                    break;
+                default:
+                    break;
+            }
+            throw new Error(`[HTTPS] mkcert not found.`);
+        }
+        let { key, cert, hosts } = httpsConfig;
+        hosts = hosts || defaultHttpsHosts;
+        if (!key || !cert) {
+            key = (0, path_1.join)(__dirname, 'umi.key.pem');
+            cert = (0, path_1.join)(__dirname, 'umi.pem');
+        }
+        // Generate cert and key files if they are not exist.
+        if (!(0, fs_1.existsSync)(key) || !(0, fs_1.existsSync)(cert)) {
+            utils_1.logger.wait('[HTTPS] Generating cert and key files...');
+            yield utils_1.execa.execa('mkcert', [
+                '-cert-file',
+                cert,
+                '-key-file',
+                key,
+                ...hosts,
+            ]);
+        }
+        // Create server
+        return https_1.default.createServer({
+            key: (0, fs_1.readFileSync)(key, 'utf-8'),
+            cert: (0, fs_1.readFileSync)(cert, 'utf-8'),
+        }, app);
+    });
+}
+exports.createHttpsServer = createHttpsServer;

package/dist/server/server.d.ts

@@ -11,6 +11,7 @@ interface IOpts {
     beforeMiddlewares?: any[];
     afterMiddlewares?: any[];
     onDevCompileDone?: Function;
+    onProgress?: Function;
 }
-export declare function createServer(opts: IOpts): Promise<http.Server>;
+export declare function createServer(opts: IOpts): Promise<import("https").Server | http.Server | null>;
 export {};

package/dist/server/server.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createServer = void 0;
-const express_1 = __importDefault(require("@umijs/bundler-webpack/compiled/express"));
+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");
@@ -21,6 +21,7 @@ const fs_1 = require("fs");
 const http_1 = __importDefault(require("http"));
 const path_1 = require("path");
 const constants_1 = require("../constants");
+const https_1 = require("./https");
 const ws_1 = require("./ws");
 function createServer(opts) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -42,7 +43,7 @@ function createServer(opts) {
         // 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 , yourHeaderFeild');
+            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();
         });
@@ -55,17 +56,35 @@ function createServer(opts) {
         app.use((req, res, next) => {
             if (req.path === '/umi.js' && (0, fs_1.existsSync)((0, path_1.join)(opts.cwd, 'umi.js'))) {
                 res.setHeader('Content-Type', 'application/javascript');
-                res.send((0, fs_1.readFileSync)((0, path_1.join)(opts.cwd, 'umi.js'), 'utf-8'));
+                (0, fs_1.createReadStream)((0, path_1.join)(opts.cwd, 'umi.js')).on('error', next).pipe(res);
             }
             else {
                 next();
             }
         });
         // webpack dev middleware
-        const compiler = (0, webpack_1.default)(Array.isArray(webpackConfig) ? webpackConfig : [webpackConfig]);
+        const configs = Array.isArray(webpackConfig)
+            ? webpackConfig
+            : [webpackConfig];
+        const progresses = [];
+        if (opts.onProgress) {
+            configs.forEach((config) => {
+                const progress = {
+                    percent: 0,
+                    status: 'waiting',
+                };
+                progresses.push(progress);
+                config.plugins.push(new webpack_1.default.ProgressPlugin((percent, msg) => {
+                    progress.percent = percent;
+                    progress.status = msg;
+                    opts.onProgress({ progresses });
+                }));
+            });
+        }
+        const compiler = (0, webpack_1.default)(configs);
         const webpackDevMiddleware = require('@umijs/bundler-webpack/compiled/webpack-dev-middleware');
         const compilerMiddleware = webpackDevMiddleware(compiler, {
-            publicPath: '/',
+            publicPath: userConfig.publicPath || '/',
             writeToDisk: userConfig.writeToDisk,
             stats: 'none',
             // watchOptions: { ignored }
@@ -133,11 +152,24 @@ function createServer(opts) {
         // proxy
         if (proxy) {
             Object.keys(proxy).forEach((key) => {
-                app.use(key, (0, http_proxy_middleware_1.createProxyMiddleware)(proxy[key]));
+                const proxyConfig = proxy[key];
+                const target = proxyConfig.target;
+                if (target) {
+                    app.use(key, (0, http_proxy_middleware_1.createProxyMiddleware)(key, Object.assign(Object.assign({}, proxy[key]), { 
+                        // Add x-real-url in response header
+                        onProxyRes(proxyRes, req) {
+                            var _a;
+                            proxyRes.headers['x-real-url'] =
+                                ((_a = new URL(req.url || '', target)) === null || _a === void 0 ? void 0 : _a.href) || '';
+                        } })));
+                }
             });
         }
         // after middlewares
-        (opts.afterMiddlewares || []).forEach((m) => app.use(m));
+        (opts.afterMiddlewares || []).forEach((m) => {
+            // TODO: FIXME
+            app.use(m.toString().includes(`{ compiler }`) ? m({ compiler }) : m);
+        });
         // history fallback
         app.use(require('@umijs/bundler-webpack/compiled/connect-history-api-fallback')({
             index: '/',
@@ -152,24 +184,29 @@ function createServer(opts) {
             res.set('Content-Type', 'text/html');
             const htmlPath = (0, path_1.join)(opts.cwd, 'index.html');
             if ((0, fs_1.existsSync)(htmlPath)) {
-                const html = (0, fs_1.readFileSync)(htmlPath, 'utf-8');
-                res.send(html);
+                (0, fs_1.createReadStream)(htmlPath).on('error', next).pipe(res);
             }
             else {
                 next();
             }
         });
-        const server = http_1.default.createServer(app);
+        const server = userConfig.https
+            ? yield (0, https_1.createHttpsServer)(app, userConfig.https)
+            : http_1.default.createServer(app);
+        if (!server) {
+            return null;
+        }
         const ws = (0, ws_1.createWebSocketServer)(server);
         ws.wss.on('connection', (socket) => {
             if (stats) {
                 sendStats(getStats(stats), false, socket);
             }
         });
+        const protocol = userConfig.https ? 'https:' : 'http:';
         const port = opts.port || 8000;
         server.listen(port, () => {
             const host = opts.host && opts.host !== '0.0.0.0' ? opts.host : '127.0.0.1';
-            utils_1.logger.ready(`App listening at ${utils_1.chalk.green(`http://${host}:${port}`)}`);
+            utils_1.logger.ready(`App listening at ${utils_1.chalk.green(`${protocol}//${host}:${port}`)}`);
         });
         return server;
     });

package/dist/server/ws.d.ts

@@ -1,7 +1,8 @@
 /// <reference types="node" />
-import { Server } from 'http';
+import { Server as HttpServer } from 'http';
+import { Server as HttpsServer } from 'https';
 import WebSocket from '../../compiled/ws';
-export declare function createWebSocketServer(server: Server): {
+export declare function createWebSocketServer(server: HttpServer | HttpsServer): {
     send(message: string): void;
     wss: WebSocket.Server;
     close(): void;

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

@@ -5,31 +5,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const Visitor_1 = __importDefault(require("@swc/core/Visitor"));
 const utils_1 = require("@umijs/utils");
+const changeImportFromString_1 = require("./changeImportFromString");
 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;
         if (specifiers.length && (0, utils_1.isStyleFile)({ filename: value })) {
-            return Object.assign(Object.assign({}, expression), { source: Object.assign(Object.assign({}, source), { value: `${value}?modules` }) });
-        }
-        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`;
+            const newImportFrom = `${value}?modules`;
+            (0, changeImportFromString_1.changeImportFromString)(expression, newImportFrom);
         }
         return expression;
     }

package/dist/swcPlugins/changeImportFromString.d.ts

@@ -0,0 +1,2 @@
+import type { ImportDeclaration } from '@swc/core';
+export declare const changeImportFromString: (e: ImportDeclaration, v: string) => void;

package/dist/swcPlugins/changeImportFromString.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.changeImportFromString = void 0;
+const changeImportFromString = (e, v) => {
+    e.source.value = v;
+    // sync change to `raw`
+    // https://github.com/swc-project/swc/issues/4128
+    e.source.raw = `'${v}'`;
+};
+exports.changeImportFromString = changeImportFromString;

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/swcPlugins/lockCoreJS.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Visitor_1 = __importDefault(require("@swc/core/Visitor"));
 const utils_1 = require("@umijs/utils");
 const path_1 = require("path");
+const changeImportFromString_1 = require("./changeImportFromString");
 function addLastSlash(path) {
     return path.endsWith('/') ? path : `${path}/`;
 }
@@ -14,8 +15,8 @@ class LockCoreJS extends Visitor_1.default {
         const { source } = expression;
         let { value, type } = source;
         if (type === 'StringLiteral' && value.startsWith('core-js/')) {
-            value = value.replace(/^core-js\//, addLastSlash((0, utils_1.winPath)((0, path_1.dirname)(require.resolve('core-js/package.json')))));
-            return Object.assign(Object.assign({}, expression), { source: Object.assign(Object.assign({}, source), { value }) });
+            const newValue = value.replace(/^core-js\//, addLastSlash((0, utils_1.winPath)((0, path_1.dirname)(require.resolve('core-js/package.json')))));
+            (0, changeImportFromString_1.changeImportFromString)(expression, newValue);
         }
         return expression;
     }

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';
@@ -24,6 +22,7 @@ export declare enum JSMinifier {
 export declare enum CSSMinifier {
     esbuild = "esbuild",
     cssnano = "cssnano",
+    parcelCSS = "parcelCSS",
     none = "none"
 }
 export interface ICopy {
@@ -34,6 +33,19 @@ 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 HttpsParams {
+    key?: string;
+    cert?: string;
+    hosts?: string[];
+}
 export interface IConfig {
     alias?: Record<string, string>;
     autoCSSModules?: boolean;
@@ -55,6 +67,8 @@ export interface IConfig {
     };
     depTranspiler?: Transpiler;
     devtool?: Config.DevTool;
+    deadCode?: DeadCodeParams;
+    https?: HttpsParams;
     externals?: WebpackConfig['externals'];
     esm?: {
         [key: string]: any;
@@ -104,15 +118,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/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/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/dist/utils/getEsBuildTarget.d.ts

@@ -0,0 +1,5 @@
+interface IOpts {
+    targets: Record<string, any>;
+}
+export declare function getEsBuildTarget({ targets }: IOpts): string[];
+export {};

package/dist/utils/getEsBuildTarget.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEsBuildTarget = void 0;
+const constants_1 = require("../constants");
+function getEsBuildTarget({ targets }) {
+    return Object.keys(targets)
+        .filter((key) => constants_1.DEFAULT_ESBUILD_TARGET_KEYS.includes(key))
+        .map((key) => {
+        return `${key}${targets[key] === true ? '0' : targets[key]}`;
+    });
+}
+exports.getEsBuildTarget = getEsBuildTarget;