@umijs/bundler-webpack 4.0.0-beta.13 → 4.0.0-beta.14

package/dist/config/config.js

@@ -17,6 +17,7 @@ const path_1 = require("path");
 const webpack_1 = __importDefault(require("../../compiled/webpack"));
 const webpack_5_chain_1 = __importDefault(require("../../compiled/webpack-5-chain"));
 const constants_1 = require("../constants");
+const RuntimePublicPathPlugin_1 = require("../plugins/RuntimePublicPathPlugin");
 const types_1 = require("../types");
 const browsersList_1 = require("../utils/browsersList");
 const assetRules_1 = require("./assetRules");
@@ -26,6 +27,7 @@ const copyPlugin_1 = require("./copyPlugin");
 const cssRules_1 = require("./cssRules");
 const definePlugin_1 = require("./definePlugin");
 const fastRefreshPlugin_1 = require("./fastRefreshPlugin");
+const harmonyLinkingErrorPlugin_1 = require("./harmonyLinkingErrorPlugin");
 const ignorePlugin_1 = require("./ignorePlugin");
 const javaScriptRules_1 = require("./javaScriptRules");
 const miniCSSExtractPlugin_1 = require("./miniCSSExtractPlugin");
@@ -61,7 +63,6 @@ function getConfig(opts) {
         // entry
         Object.keys(opts.entry).forEach((key) => {
             const entry = config.entry(key);
-            // TODO: runtimePublicPath
             if (isDev && opts.hmr) {
                 entry.add(require.resolve('../../client/client/client'));
             }
@@ -143,6 +144,12 @@ function getConfig(opts) {
         yield (0, compressPlugin_1.addCompressPlugin)(applyOpts);
         // purgecss
         // await applyPurgeCSSWebpackPlugin(applyOpts);
+        // handle HarmonyLinkingError
+        yield (0, harmonyLinkingErrorPlugin_1.addHarmonyLinkingErrorPlugin)(applyOpts);
+        // runtimePublicPath
+        if (userConfig.runtimePublicPath) {
+            config.plugin('runtimePublicPath').use(RuntimePublicPathPlugin_1.RuntimePublicPathPlugin);
+        }
         // analyzer
         if (opts.analyze) {
             yield (0, bundleAnalyzerPlugin_1.addBundleAnalyzerPlugin)(applyOpts);

package/dist/config/harmonyLinkingErrorPlugin.d.ts

@@ -0,0 +1,6 @@
+import Config from '@umijs/bundler-webpack/compiled/webpack-5-chain';
+interface IOpts {
+    config: Config;
+}
+export declare function addHarmonyLinkingErrorPlugin(opts: IOpts): Promise<void>;
+export {};

package/dist/config/harmonyLinkingErrorPlugin.js

@@ -0,0 +1,39 @@
+"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.addHarmonyLinkingErrorPlugin = void 0;
+// ref: https://github.com/webpack/webpack/blob/ccecc17c01af96edddb931a76e7a3b21ef2969d8/lib/dependencies/HarmonyImportDependency.js#L164
+const LINKING_ERROR_TAG = 'was not found in';
+class HarmonyLinkingErrorPlugin {
+    apply(compiler) {
+        compiler.hooks.afterCompile.tap('HarmonyLinkingErrorPlugin', (compilation) => {
+            if (!compilation.warnings.length) {
+                return;
+            }
+            const harmonyLinkingErrors = compilation.warnings.filter((w) => {
+                return (w.name === 'ModuleDependencyWarning' &&
+                    !w.module.resource.includes('node_modules') &&
+                    w.message.includes(LINKING_ERROR_TAG));
+            });
+            if (!harmonyLinkingErrors.length) {
+                return;
+            }
+            compilation.errors.push(...harmonyLinkingErrors);
+        });
+    }
+}
+function addHarmonyLinkingErrorPlugin(opts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { config } = opts;
+        config.plugin('harmony-linking-error-plugin').use(HarmonyLinkingErrorPlugin);
+    });
+}
+exports.addHarmonyLinkingErrorPlugin = addHarmonyLinkingErrorPlugin;

package/dist/dev.js

@@ -20,8 +20,8 @@ const constants_1 = require("./constants");
 const server_1 = require("./server/server");
 const types_1 = require("./types");
 function dev(opts) {
-    var _a;
-    var _b;
+    var _a, _b, _c;
+    var _d;
     return __awaiter(this, void 0, void 0, function* () {
         const enableMFSU = opts.config.mfsu !== false;
         let mfsu = null;
@@ -29,6 +29,11 @@ function dev(opts) {
             mfsu = new mfsu_1.MFSU({
                 implementor: webpack_1.default,
                 buildDepWithESBuild: (_a = opts.config.mfsu) === null || _a === void 0 ? void 0 : _a.esbuild,
+                depBuildConfig: {
+                    extraPostCSSPlugins: ((_b = opts.config) === null || _b === void 0 ? void 0 : _b.extraPostCSSPlugins) || [],
+                },
+                mfName: (_c = opts.config.mfsu) === null || _c === void 0 ? void 0 : _c.mfName,
+                runtimePublicPath: opts.config.runtimePublicPath,
             });
         }
         const webpackConfig = yield (0, config_1.getConfig)({
@@ -59,16 +64,16 @@ function dev(opts) {
             staticPathPrefix: mfsu_1.MF_DEP_PREFIX,
             name: constants_1.MFSU_NAME,
         });
-        (_b = webpackConfig.resolve).alias || (_b.alias = {});
+        (_d = webpackConfig.resolve).alias || (_d.alias = {});
         // TODO: REMOVE ME
         ['@umijs/utils/compiled/strip-ansi', 'react-error-overlay'].forEach((dep) => {
             // @ts-ignore
             webpackConfig.resolve.alias[dep] = require.resolve(dep);
         });
-        mfsu === null || mfsu === void 0 ? void 0 : mfsu.setWebpackConfig({
+        yield (mfsu === null || mfsu === void 0 ? void 0 : mfsu.setWebpackConfig({
             config: webpackConfig,
             depConfig: depConfig,
-        });
+        }));
         yield (0, server_1.createServer)({
             webpackConfig,
             userConfig: opts.config,

package/dist/plugins/RuntimePublicPathPlugin.d.ts

@@ -0,0 +1,4 @@
+import type { Compiler } from '@umijs/bundler-webpack/compiled/webpack';
+export declare class RuntimePublicPathPlugin {
+    apply(compiler: Compiler): void;
+}

package/dist/plugins/RuntimePublicPathPlugin.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RuntimePublicPathPlugin = void 0;
+const PLUGIN_NAME = 'RuntimePublicPath';
+class RuntimePublicPathPlugin {
+    apply(compiler) {
+        compiler.hooks.make.tap(PLUGIN_NAME, (compilation) => {
+            compilation.hooks.runtimeModule.tap(PLUGIN_NAME, (module) => {
+                // The hook to get the public path ('__webpack_require__.p')
+                // 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;`;
+                }
+            });
+        });
+    }
+}
+exports.RuntimePublicPathPlugin = RuntimePublicPathPlugin;

package/dist/schema.js

@@ -52,12 +52,14 @@ function getSchemas() {
         lessLoader: (Joi) => Joi.object(),
         mfsu: (Joi) => Joi.alternatives(Joi.object({
             esbuild: Joi.boolean(),
+            mfName: Joi.string(),
         }), Joi.boolean()),
         outputPath: (Joi) => Joi.string(),
         postcssLoader: (Joi) => Joi.object(),
         proxy: (Joi) => Joi.object(),
         publicPath: (Joi) => Joi.string(),
         purgeCSS: (Joi) => Joi.object(),
+        runtimePublicPath: (Joi) => Joi.object(),
         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(),

package/dist/server/server.js

@@ -27,6 +27,23 @@ function createServer(opts) {
         const { webpackConfig, userConfig } = opts;
         const { proxy } = userConfig;
         const app = (0, express_1.default)();
+        // basename middleware
+        app.use((req, _res, next) => {
+            const { url, path } = req;
+            const { basename } = userConfig;
+            if (basename !== '/' && url.startsWith(basename)) {
+                req.url = url.slice(basename.length);
+                req.path = path.slice(basename.length);
+            }
+            next();
+        });
+        // 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-Methods', 'GET, HEAD, PUT, POST, PATCH, DELETE, OPTIONS');
+            next();
+        });
         // compression
         app.use(require('@umijs/bundler-webpack/compiled/compression')());
         // TODO: headers

package/dist/types.d.ts

@@ -34,6 +34,7 @@ declare type IBabelPlugin = Function | string | [string, {
 export interface IConfig {
     alias?: Record<string, string>;
     autoCSSModules?: boolean;
+    base?: string;
     chainWebpack?: Function;
     copy?: ICopy[] | string[];
     cssLoader?: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.0.0-beta.13",
+  "version": "4.0.0-beta.14",
   "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",
@@ -34,9 +34,9 @@
     "@svgr/plugin-svgo": "^6.1.0",
     "@swc/core": "1.2.117",
     "@types/hapi__joi": "17.1.7",
-    "@umijs/babel-preset-umi": "4.0.0-beta.13",
-    "@umijs/mfsu": "4.0.0-beta.13",
-    "@umijs/utils": "4.0.0-beta.13",
+    "@umijs/babel-preset-umi": "4.0.0-beta.14",
+    "@umijs/mfsu": "4.0.0-beta.14",
+    "@umijs/utils": "4.0.0-beta.14",
     "css-loader": "6.5.1",
     "es5-imcompatible-versions": "^0.1.73",
     "jest-worker": "27.4.2",