@umijs/plugins 4.0.0-canary.20230330.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

@@ -48,7 +48,8 @@ function getCurrentLocalDevServerEntry(api, req) {
   return `${protocol}://${hostname}${port ? ":" : ""}${port}/local-dev-server`;
 }
 function handleOriginalHtml(api, microAppEntry, originalHtml) {
-  const appName = api.pkg.name;
+  var _a, _b;
+  const appName = ((_b = (_a = api.config.qiankun) == null ? void 0 : _a.slave) == null ? void 0 : _b.appName) || api.pkg.name;
   (0, import_assert.default)(
     appName,
     "[@umijs/plugin-qiankun]: You should have name in package.json"
@@ -262,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",
@@ -283,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/dist/utils/modelUtils.js

@@ -34,6 +34,7 @@ __export(modelUtils_exports, {
   getNamespace: () => getNamespace
 });
 module.exports = __toCommonJS(modelUtils_exports);
+var import_bundler_utils = require("@umijs/bundler-utils");
 var parser = __toESM(require("@umijs/bundler-utils/compiled/babel/parser"));
 var import_traverse = __toESM(require("@umijs/bundler-utils/compiled/babel/traverse"));
 var t = __toESM(require("@umijs/bundler-utils/compiled/babel/types"));
@@ -157,16 +158,28 @@ var _ModelUtils = class {
     });
   }
   isModelValid(opts) {
+    var _a;
     const { file, content } = opts;
     if (this.opts.contentTest && this.opts.contentTest(content)) {
       return true;
     }
-    const loader = (0, import_path.extname)(file).slice(1);
-    const result = (0, import_esbuild.transformSync)(content, {
-      loader,
-      sourcemap: false,
-      minify: false
-    });
+    let result = null;
+    try {
+      const ext = (0, import_path.extname)(file).slice(1);
+      const loader = ext === "js" ? "jsx" : ext;
+      result = (0, import_esbuild.transformSync)(content, {
+        loader,
+        sourcemap: false,
+        minify: false,
+        sourcefile: file
+      });
+    } catch (e) {
+      if ((_a = e.errors) == null ? void 0 : _a.length) {
+        (0, import_bundler_utils.prettyPrintEsBuildErrors)(e.errors, { path: file, content });
+        delete e.errors;
+      }
+      throw e;
+    }
     let ret = false;
     const ast = parser.parse(result.code, {
       sourceType: "module",

package/libs/qiankun/master/MicroApp.tsx

@@ -3,6 +3,7 @@
 __USE_MODEL__;
 import concat from 'lodash/concat';
 import mergeWith from 'lodash/mergeWith';
+import isEqual from 'lodash/isEqual';
 import noop from 'lodash/noop';
 import {
   FrameworkConfiguration,
@@ -64,6 +65,15 @@ function unmountMicroApp(microApp?: MicroAppType) {
   }
 }
 
+function useDeepCompare<T>(value: T): T {
+  const ref = useRef<T>(value);
+  if (!isEqual(value, ref.current)) {
+    ref.current = value;
+  }
+
+  return ref.current;
+}
+
 let noneMounted = true;
 
 export const MicroApp = forwardRef(
@@ -213,7 +223,7 @@ export const MicroApp = forwardRef(
         },
       );
 
-      return () => unmountMicroApp(microAppRef.current);
+      return () => unmountMicroApp(microAppRef.current, updatingPromise.current);
     }, [name]);
 
     useEffect(() => {
@@ -266,7 +276,7 @@ export const MicroApp = forwardRef(
       }
 
       return noop;
-    }, Object.values({ ...stateForSlave, ...propsFromParams }));
+    }, [useDeepCompare({ ...stateForSlave, ...propsFromParams })]);
 
     // 未配置自定义 loader 且开启了 autoSetLoading 场景下，使用插件默认的 loader，否则使用自定义 loader
     const microAppLoader =

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-canary.20230330.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.20230330.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.20230330.1"
+    "umi": "4.0.0-canary.20230420.1"
   },
   "publishConfig": {
     "access": "public"