@umijs/bundler-webpack 4.0.0-beta.5 → 4.0.0-beta.6

package/dist/build.d.ts

@@ -6,6 +6,7 @@ interface IOpts {
     onBuildComplete?: Function;
     babelPreset?: any;
     chainWebpack?: Function;
+    modifyWebpackConfig?: Function;
     beforeBabelPlugins?: any[];
     beforeBabelPresets?: any[];
     extraBabelPlugins?: any[];

package/dist/build.js

@@ -35,6 +35,7 @@ function build(opts) {
                 ...(opts.extraBabelPresets || []),
             ],
             chainWebpack: opts.chainWebpack,
+            modifyWebpackConfig: opts.modifyWebpackConfig,
         });
         let isFirstCompile = true;
         return new Promise((resolve, reject) => {

package/dist/cli.js

@@ -1,23 +1,4 @@
 "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) {
@@ -36,7 +17,6 @@ const utils_1 = require("@umijs/utils");
 const assert_1 = __importDefault(require("assert"));
 const fs_1 = require("fs");
 const path_1 = require("path");
-const process = __importStar(require("process"));
 const build_1 = require("./build");
 const dev_1 = require("./dev");
 const args = (0, utils_1.yParser)(process.argv.slice(2), {});

package/dist/config/config.d.ts

@@ -8,6 +8,7 @@ interface IOpts {
     extraBabelPlugins?: any[];
     babelPreset?: any;
     chainWebpack?: Function;
+    modifyWebpackConfig?: Function;
     hash?: boolean;
     hmr?: boolean;
     staticPathPrefix?: string;

package/dist/config/config.js

@@ -111,6 +111,7 @@ function getConfig(opts) {
         // experiments
         config.experiments({
             topLevelAwait: true,
+            outputModule: !!userConfig.esm,
         });
         // node polyfill
         yield (0, nodePolyfill_1.addNodePolyfill)(applyOpts);
@@ -165,6 +166,12 @@ function getConfig(opts) {
         webpackConfig = yield (0, speedMeasureWebpackPlugin_1.addSpeedMeasureWebpackPlugin)({
             webpackConfig,
         });
+        if (opts.modifyWebpackConfig) {
+            webpackConfig = yield opts.modifyWebpackConfig(webpackConfig, {
+                env: opts.env,
+                webpack: webpack_1.default,
+            });
+        }
         return webpackConfig;
     });
 }

package/dist/config/javaScriptRules.js

@@ -8,10 +8,14 @@ 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 utils_1 = require("@umijs/utils");
 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) {
@@ -130,6 +134,7 @@ function addJavaScriptRules(opts) {
                             },
                         },
                     },
+                    plugin: (m) => new autoCSSModules_1.default().visitProgram(m),
                 });
             }
             else {

package/dist/dev.d.ts

@@ -6,6 +6,7 @@ interface IOpts {
     port?: number;
     host?: string;
     chainWebpack?: Function;
+    modifyWebpackConfig?: Function;
     beforeBabelPlugins?: any[];
     beforeBabelPresets?: any[];
     extraBabelPlugins?: any[];

package/dist/dev.js

@@ -21,9 +21,11 @@ const server_1 = require("./server/server");
 const types_1 = require("./types");
 function dev(opts) {
     var _a;
+    var _b;
     return __awaiter(this, void 0, void 0, function* () {
         const mfsu = new mfsu_1.MFSU({
             implementor: webpack_1.default,
+            buildDepWithESBuild: (_a = opts.config.mfsu) === null || _a === void 0 ? void 0 : _a.esbuild,
         });
         const webpackConfig = yield (0, config_1.getConfig)({
             cwd: opts.cwd,
@@ -40,6 +42,7 @@ function dev(opts) {
                 ...(opts.extraBabelPresets || []),
             ],
             chainWebpack: opts.chainWebpack,
+            modifyWebpackConfig: opts.modifyWebpackConfig,
             hmr: true,
             analyze: process.env.ANALYZE,
         });
@@ -52,7 +55,7 @@ function dev(opts) {
             staticPathPrefix: mfsu_1.MF_DEP_PREFIX,
             name: constants_1.MFSU_NAME,
         });
-        (_a = webpackConfig.resolve).alias || (_a.alias = {});
+        (_b = webpackConfig.resolve).alias || (_b.alias = {});
         // TODO: REMOVE ME
         ['@umijs/utils/compiled/strip-ansi', 'react-error-overlay'].forEach((dep) => {
             // @ts-ignore

package/dist/schema.js

@@ -50,7 +50,9 @@ function getSchemas() {
         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),
         jsMinifierOptions: (Joi) => Joi.object(),
         lessLoader: (Joi) => Joi.object(),
-        mfsu: (Joi) => Joi.alternatives(Joi.object(), Joi.boolean()),
+        mfsu: (Joi) => Joi.alternatives(Joi.object({
+            esbuild: Joi.boolean(),
+        }), Joi.boolean()),
         outputPath: (Joi) => Joi.string(),
         postcssLoader: (Joi) => Joi.object(),
         proxy: (Joi) => Joi.object(),
@@ -63,6 +65,8 @@ function getSchemas() {
         svgo: (Joi) => Joi.alternatives().try(Joi.object(), Joi.boolean()),
         targets: (Joi) => Joi.object(),
         writeToDisk: (Joi) => Joi.boolean(),
+        esm: (Joi) => Joi.object(),
+        theme: (Joi) => Joi.object(),
     };
 }
 exports.getSchemas = getSchemas;

package/dist/server/server.js

@@ -32,6 +32,16 @@ function createServer(opts) {
         // TODO: headers
         // before middlewares
         (opts.beforeMiddlewares || []).forEach((m) => app.use(m));
+        // TODO: add to before middleware
+        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'));
+            }
+            else {
+                next();
+            }
+        });
         // webpack dev middleware
         const compiler = (0, webpack_1.default)(Array.isArray(webpackConfig) ? webpackConfig : [webpackConfig]);
         const webpackDevMiddleware = require('@umijs/bundler-webpack/compiled/webpack-dev-middleware');
@@ -117,15 +127,6 @@ function createServer(opts) {
         app.use('/__umi_ping', (_, res) => {
             res.end('pong');
         });
-        // TODO: remove me
-        app.use((req, res, next) => {
-            if (req.path === '/umi.js' && (0, fs_1.existsSync)((0, path_1.join)(opts.cwd, 'umi.js'))) {
-                res.send((0, fs_1.readFileSync)((0, path_1.join)(opts.cwd, 'umi.js'), 'utf-8'));
-            }
-            else {
-                next();
-            }
-        });
         // index.html
         // TODO: remove me
         app.get('/', (_req, res, next) => {

package/dist/swcPlugins/autoCSSModules.d.ts

@@ -0,0 +1,8 @@
+import { ImportDeclaration, TsType, VariableDeclaration } from '@swc/core';
+import Visitor from '@swc/core/Visitor';
+declare class AutoCSSModule extends Visitor {
+    visitTsType(expression: TsType): TsType;
+    visitImportDeclaration(expression: ImportDeclaration): ImportDeclaration;
+    visitVariableDeclaration(expression: VariableDeclaration): VariableDeclaration;
+}
+export default AutoCSSModule;

package/dist/swcPlugins/autoCSSModules.js

@@ -0,0 +1,35 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const Visitor_1 = __importDefault(require("@swc/core/Visitor"));
+const path_1 = require("path");
+const CSS_EXT_NAMES = ['.css', '.less', '.sass', '.scss', '.stylus', '.styl'];
+class AutoCSSModule extends Visitor_1.default {
+    visitTsType(expression) {
+        return expression;
+    }
+    visitImportDeclaration(expression) {
+        const { specifiers, source } = expression;
+        const { value } = source;
+        if (specifiers.length && CSS_EXT_NAMES.includes((0, path_1.extname)(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[0].expression.type ===
+                'StringLiteral' &&
+            CSS_EXT_NAMES.includes((0, path_1.extname)(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

@@ -52,6 +52,9 @@ export interface IConfig {
     depTranspiler?: Transpiler;
     devtool?: Config.DevTool;
     externals?: WebpackConfig['externals'];
+    esm?: {
+        [key: string]: any;
+    };
     extraBabelPlugins?: IBabelPlugin[];
     extraBabelPresets?: IBabelPlugin[];
     extraPostCSSPlugins?: any[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.0.0-beta.5",
+  "version": "4.0.0-beta.6",
   "description": "@umijs/bundler-webpack",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -37,9 +37,9 @@
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.1",
     "@swc/core": "1.2.105",
     "@types/hapi__joi": "17.1.7",
-    "@umijs/babel-preset-umi": "4.0.0-beta.5",
-    "@umijs/mfsu": "4.0.0-beta.5",
-    "@umijs/utils": "4.0.0-beta.5",
+    "@umijs/babel-preset-umi": "4.0.0-beta.6",
+    "@umijs/mfsu": "4.0.0-beta.6",
+    "@umijs/utils": "4.0.0-beta.6",
     "css-loader": "6.5.0",
     "es5-imcompatible-versions": "^0.1.73",
     "jest-worker": "27.3.1",