@umijs/plugins 4.0.14 → 4.0.17

package/dist/qiankun/slave.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -42,6 +25,8 @@ __export(slave_exports, {
   default: () => slave_default
 });
 module.exports = __toCommonJS(slave_exports);
+var import_http_proxy_middleware = require("@umijs/bundler-webpack/compiled/http-proxy-middleware");
+var import_utils = require("@umijs/utils");
 var import_assert = __toESM(require("assert"));
 var import_fs = require("fs");
 var import_path = require("path");
@@ -49,6 +34,42 @@ var import_umi = require("umi");
 var import_plugin_utils = require("umi/plugin-utils");
 var import_withTmpPath = require("../utils/withTmpPath");
 var import_constants = require("./constants");
+function getCurrentLocalDevServerEntry(api, req) {
+  const port = api.appData.port;
+  const hostname = req.hostname;
+  const protocol = req.protocol;
+  return `${protocol}://${hostname}${port ? ":" : ""}${port}/local-dev-server`;
+}
+function handleOriginalHtml(api, microAppEntry, originalHtml) {
+  const appName = api.pkg.name;
+  (0, import_assert.default)(appName, "[@umijs/plugin-qiankun]: You should have name in package.json");
+  const $ = import_utils.cheerio.load(originalHtml);
+  $("head").prepend(`<script type="extra-qiankun-config">${JSON.stringify({
+    master: {
+      apps: [
+        {
+          name: appName,
+          entry: microAppEntry,
+          extraSource: microAppEntry
+        }
+      ],
+      routes: [
+        {
+          microApp: appName,
+          name: appName,
+          path: "/" + appName,
+          extraSource: microAppEntry
+        }
+      ],
+      prefetch: false
+    }
+  })}<\/script>`);
+  return api.applyPlugins({
+    key: "modifyMasterHTML",
+    type: api.ApplyPluginsType.modify,
+    initialValue: $.html()
+  });
+}
 function isSlaveEnable(opts) {
   var _a, _b;
   const slaveCfg = (_b = (_a = opts.userConfig) == null ? void 0 : _a.qiankun) == null ? void 0 : _b.slave;
@@ -102,15 +123,19 @@ export interface IRuntimeConfig {
   });
   api.modifyDefaultConfig((memo) => {
     var _a, _b, _c;
-    const initialSlaveOptions = __spreadValues(__spreadValues({
-      devSourceMap: true
-    }, JSON.parse(process.env.INITIAL_QIANKUN_SLAVE_OPTIONS || "{}")), (memo.qiankun || {}).slave);
-    const modifiedDefaultConfig = __spreadProps(__spreadValues({}, memo), {
+    const initialSlaveOptions = {
+      devSourceMap: true,
+      ...JSON.parse(process.env.INITIAL_QIANKUN_SLAVE_OPTIONS || "{}"),
+      ...(memo.qiankun || {}).slave
+    };
+    const modifiedDefaultConfig = {
+      ...memo,
       runtimePublicPath: true,
-      qiankun: __spreadProps(__spreadValues({}, memo.qiankun), {
+      qiankun: {
+        ...memo.qiankun,
         slave: initialSlaveOptions
-      })
-    });
+      }
+    };
     const shouldNotModifyDefaultBase = ((_b = (_a = api.userConfig.qiankun) == null ? void 0 : _a.slave) == null ? void 0 : _b.shouldNotModifyDefaultBase) ?? initialSlaveOptions.shouldNotModifyDefaultBase;
     const historyType = ((_c = api.userConfig.history) == null ? void 0 : _c.type) || "browser";
     if (!shouldNotModifyDefaultBase && historyType !== "hash") {
@@ -121,9 +146,10 @@ export interface IRuntimeConfig {
   api.modifyConfig((config) => {
     var _a, _b;
     if (config.mfsu !== false) {
-      config.mfsu = __spreadProps(__spreadValues({}, config.mfsu), {
+      config.mfsu = {
+        ...config.mfsu,
         mfName: ((_a = config.mfsu) == null ? void 0 : _a.mfName) || `mf_${(_b = api.pkg.name) == null ? void 0 : _b.replace(/^@/, "").replace(/\W/g, "_")}`
-      });
+      };
     }
     return config;
   });
@@ -194,6 +220,56 @@ export { connectMaster } from './connectMaster';
     },
     before: "model"
   });
+  api.addMiddlewares(async () => {
+    return async (req, res, next) => {
+      var _a, _b;
+      const qiankunConfig = api.config.qiankun || {};
+      const masterEntry = (_a = qiankunConfig.slave) == null ? void 0 : _a.masterEntry;
+      const isMasterApp = (_b = qiankunConfig.master) == null ? void 0 : _b.enable;
+      const { proxyToMasterEnabled } = await api.applyPlugins({
+        key: "shouldProxyToMaster",
+        type: api.ApplyPluginsType.modify,
+        initialValue: { proxyToMasterEnabled: true, req }
+      }) ?? {};
+      if (masterEntry && proxyToMasterEnabled) {
+        if (isMasterApp) {
+          api.logger.warn("You should not set masterEntry in master app ");
+          return next();
+        }
+        return (0, import_http_proxy_middleware.createProxyMiddleware)((pathname) => pathname !== "/local-dev-server", {
+          target: masterEntry,
+          secure: false,
+          ignorePath: false,
+          followRedirects: false,
+          changeOrigin: true,
+          selfHandleResponse: true,
+          onProxyRes: (0, import_http_proxy_middleware.responseInterceptor)(async (responseBuffer, proxyRes, req2, res2) => {
+            if (proxyRes.statusCode === 302) {
+              const hostname = req2.hostname;
+              const port = process.env.PORT;
+              const goto = `${hostname}:${port}`;
+              const redirectUrl = proxyRes.headers.location.replace(encodeURIComponent(new URL(masterEntry).hostname), encodeURIComponent(goto)) || masterEntry;
+              const redirectMessage = `[@umijs/plugin-qiankun]: redirect to ${redirectUrl}`;
+              api.logger.info(redirectMessage);
+              res2.statusCode = 302;
+              res2.setHeader("location", redirectUrl);
+              return redirectMessage;
+            }
+            const microAppEntry = getCurrentLocalDevServerEntry(api, req2);
+            const originalHtml = responseBuffer.toString("utf8");
+            const html = handleOriginalHtml(api, microAppEntry, originalHtml);
+            return html;
+          }),
+          onError(err, _, res2) {
+            api.logger.error(err);
+            res2.set("content-type", "text/plain; charset=UTF-8");
+            res2.end(`[@umijs/plugin-qiankun] \u4EE3\u7406\u5230 ${masterEntry} \u65F6\u51FA\u9519\u4E86\uFF0C\u8BF7\u5C1D\u8BD5 ${masterEntry} \u662F\u5426\u662F\u53EF\u4EE5\u6B63\u5E38\u8BBF\u95EE\u7684\uFF0C\u7136\u540E\u91CD\u65B0\u542F\u52A8\u9879\u76EE\u8BD5\u8BD5\u3002(\u6CE8\u610F\u5982\u679C\u51FA\u73B0\u8DE8\u57DF\u95EE\u9898\uFF0C\u8BF7\u4FEE\u6539\u672C\u5730 host \uFF0C\u901A\u8FC7\u4E00\u4E2A\u548C\u4E3B\u5E94\u7528\u76F8\u540C\u7684\u4E00\u7EA7\u57DF\u540D\u7684\u57DF\u540D\u6765\u8BBF\u95EE 127.0.0.1)`);
+          }
+        })(req, res, next);
+      }
+      return next();
+    };
+  });
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.14",
+  "version": "4.0.17",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -27,7 +27,7 @@
     "@ant-design/antd-theme-variable": "^1.0.0",
     "@ant-design/icons": "^4.7.0",
     "@ant-design/pro-layout": "^7.0.1-beta.28",
-    "@umijs/bundler-utils": "4.0.14",
+    "@umijs/bundler-utils": "4.0.17",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.27.2",
     "babel-plugin-import": "^1.13.5",
@@ -46,7 +46,7 @@
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.14"
+    "umi": "4.0.17"
   },
   "publishConfig": {
     "access": "public"