@umijs/plugins 4.0.0-canary.20230417.1 → 4.0.0-canary.20230420.1

package/dist/antd.js

@@ -223,13 +223,17 @@ export type IRuntimeConfig = {
     return [];
   });
   api.addEntryImportsAhead(() => {
+    const isAntd5 = antdVersion.startsWith("5");
     const style = api.config.antd.style || "less";
-    const doNotImportLess = api.config.antd.import && !api.appData.vite || antdVersion.startsWith("5");
-    return doNotImportLess ? [] : [
-      {
+    const imports = [];
+    if (isAntd5) {
+      imports.push({ source: "antd/dist/reset.css" });
+    } else if (!api.config.antd.import || api.appData.vite) {
+      imports.push({
         source: style === "less" ? "antd/dist/antd.less" : "antd/dist/antd.css"
-      }
-    ];
+      });
+    }
+    return imports;
   });
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/qiankun/slave.js

@@ -263,15 +263,24 @@ export { MicroAppLink } from './MicroAppLink';
           key: "onLocalProxyStart",
           type: api.ApplyPluginsType.event
         });
+        const modifyLocalProxyOpts = await api.applyPlugins({
+          key: "modifyLocalProxyOpts",
+          type: api.ApplyPluginsType.modify,
+          initialValue: {}
+        }) ?? {};
+        const localProxyOpts = {
+          target: masterEntry,
+          secure: false,
+          ignorePath: false,
+          followRedirects: false,
+          changeOrigin: true,
+          selfHandleResponse: true,
+          ...modifyLocalProxyOpts
+        };
         return (0, import_http_proxy_middleware.createProxyMiddleware)(
           (pathname) => pathname !== "/local-dev-server",
           {
-            target: masterEntry,
-            secure: false,
-            ignorePath: false,
-            followRedirects: false,
-            changeOrigin: true,
-            selfHandleResponse: true,
+            ...localProxyOpts,
             onProxyReq(proxyReq) {
               api.applyPlugins({
                 key: "onLocalProxyReq",
@@ -284,13 +293,18 @@ export { MicroAppLink } from './MicroAppLink';
               async (responseBuffer, proxyRes, req2, res2) => {
                 var _a2;
                 if (proxyRes.statusCode === 302) {
-                  const hostname = req2.hostname;
+                  const { ignorePath = false } = localProxyOpts;
+                  const { hostname, url, protocol } = req2;
                   const port = process.env.PORT || ((_a2 = api.appData) == null ? void 0 : _a2.port);
-                  const goto = `${hostname}:${port}`;
-                  const redirectUrl = proxyRes.headers.location.replace(
-                    encodeURIComponent(new URL(masterEntry).hostname),
-                    encodeURIComponent(goto)
-                  ) || masterEntry;
+                  const gotoBasePart = `${protocol}://${hostname}:${port}${ignorePath && url ? url : "/"}`;
+                  const fromBasePart = masterEntry;
+                  const locationUrl = proxyRes.headers.location || "";
+                  const [originAndPath, searchParams] = locationUrl.split("?");
+                  const searchHandled = searchParams ? `?${searchParams.replace(
+                    encodeURIComponent(fromBasePart),
+                    encodeURIComponent(gotoBasePart)
+                  )}` : "";
+                  const redirectUrl = `${originAndPath}${searchHandled}`;
                   const redirectMessage = `[@umijs/plugin-qiankun]: redirect to ${redirectUrl}`;
                   api.logger.info(redirectMessage);
                   res2.statusCode = 302;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-canary.20230417.1",
+  "version": "4.0.0-canary.20230420.1",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -42,12 +42,12 @@
     "styled-components": "6.0.0-beta.9",
     "tslib": "^2",
     "warning": "^4.0.3",
-    "@umijs/bundler-utils": "4.0.0-canary.20230417.1",
+    "@umijs/bundler-utils": "4.0.0-canary.20230420.1",
     "@umijs/valtio": "1.0.3"
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.0.0-canary.20230417.1"
+    "umi": "4.0.0-canary.20230420.1"
   },
   "publishConfig": {
     "access": "public"