@umijs/plugins 4.0.0-canary.20220507.2 → 4.0.0-canary.20220512.1

package/dist/antd.js

@@ -30,7 +30,12 @@ exports.default = (api) => {
                 });
             },
         },
-        enableBy: api.EnableBy.config,
+        enableBy({ userConfig }) {
+            // 由于本插件有 api.modifyConfig 的调用，以及 Umi 框架的限制
+            // 在其他插件中通过 api.modifyDefaultConfig 设置 antd 并不能让 api.modifyConfig 生效
+            // 所以这里通过环境变量来判断是否启用
+            return process.env.UMI_PLUGIN_ANTD_ENABLE || userConfig.antd;
+        },
     });
     function checkPkgPath() {
         if (!pkgPath) {
@@ -48,23 +53,27 @@ exports.default = (api) => {
     });
     api.modifyConfig((memo) => {
         checkPkgPath();
+        const antd = memo.antd || {};
+        // defaultConfig 的取值在 config 之后，所以改用环境变量传默认值
+        if (process.env.UMI_PLUGIN_ANTD_ENABLE) {
+            const { defaultConfig } = JSON.parse(process.env.UMI_PLUGIN_ANTD_ENABLE);
+            Object.assign(antd, defaultConfig);
+        }
         // antd import
         memo.alias.antd = pkgPath;
         // moment > dayjs
-        if (memo.antd.dayjs) {
+        if (antd.dayjs) {
             memo.alias.moment = (0, path_1.dirname)(require.resolve('dayjs/package.json'));
         }
         // dark mode & compact mode
-        if (memo.antd.dark || memo.antd.compact) {
+        if (antd.dark || antd.compact) {
             const { getThemeVariables } = require('antd/dist/theme');
             memo.theme = {
-                ...getThemeVariables(memo.antd),
+                ...getThemeVariables(antd),
                 ...memo.theme,
             };
         }
-        return memo;
-    });
-    api.modifyConfig((memo) => {
+        // antd theme
         memo.theme = {
             'root-entry-name': 'default',
             ...memo.theme,

package/dist/request.js

@@ -160,12 +160,12 @@ const getRequestInstance = (): AxiosInstance => {
   const config = getConfig();
   requestInstance = axios.create(config);
 
-  config?.requestInterceptors?.forEach((interceptor) => { 
+  config?.requestInterceptors?.forEach((interceptor) => {
     if(interceptor instanceof Array){
       requestInstance.interceptors.request.use((config) => {
         const { url } = config;
         if(interceptor[0].length === 2){
-          const { url: newUrl, options } = interceptor[0](url, config);  
+          const { url: newUrl, options } = interceptor[0](url, config);
           return { ...options, url: newUrl };
         }
         return interceptor[0](config);
@@ -182,16 +182,16 @@ const getRequestInstance = (): AxiosInstance => {
     }
   });
 
-  config?.responseInterceptors?.forEach((interceptor) => { 
-    interceptor instanceof Array ? 
+  config?.responseInterceptors?.forEach((interceptor) => {
+    interceptor instanceof Array ?
       requestInstance.interceptors.response.use(interceptor[0], interceptor[1]):
        requestInstance.interceptors.response.use(interceptor);
   });
 
   // 当响应的数据 success 是 false 的时候，抛出 error 以供 errorHandler 处理。
-  requestInstance.interceptors.response.use((response)=>{
+  requestInstance.interceptors.response.use((response) => {
     const { data } = response;
-    if(config?.errorConfig?.errorThrower){
+    if(data?.success === false && config?.errorConfig?.errorThrower){
       config.errorConfig.errorThrower(data);
     }
     return response;
@@ -199,16 +199,16 @@ const getRequestInstance = (): AxiosInstance => {
   return requestInstance;
 };
 
-const request: IRequest = (url: string, opts: any = { method: 'GET' }) => {   
+const request: IRequest = (url: string, opts: any = { method: 'GET' }) => {
   const requestInstance = getRequestInstance();
   const config = getConfig();
   const { getResponse = false, requestInterceptors, responseInterceptors } = opts;
-  const requestInterceptorsToEject = requestInterceptors?.map((interceptor) => { 
+  const requestInterceptorsToEject = requestInterceptors?.map((interceptor) => {
     if(interceptor instanceof Array){
       return requestInstance.interceptors.request.use((config) => {
         const { url } = config;
         if(interceptor[0].length === 2){
-          const { url: newUrl, options } = interceptor[0](url, config);  
+          const { url: newUrl, options } = interceptor[0](url, config);
           return { ...options, url: newUrl };
         }
         return interceptor[0](config);
@@ -224,8 +224,8 @@ const request: IRequest = (url: string, opts: any = { method: 'GET' }) => {
       })
     }
     });
-  const responseInterceptorsToEject = responseInterceptors?.map((interceptor) => { 
-    return interceptor instanceof Array ? 
+  const responseInterceptorsToEject = responseInterceptors?.map((interceptor) => {
+    return interceptor instanceof Array ?
       requestInstance.interceptors.response.use(interceptor[0], interceptor[1]):
        requestInstance.interceptors.response.use(interceptor);
     });

package/libs/qiankun/slave/lifecycles.ts

@@ -119,6 +119,14 @@ export function genMount(mountElementId: string) {
       defer.resolve();
     }
 
+    // 如果需要手动控制 loading，通过主应用配置 props.autoSetLoading false 可以关闭
+    // 考虑到 react 18 之后 callback 不再准
+    // 所以在这里直接返回，而不使用 ReactDOM.render 的第三个参数
+    if (typeof props !== 'undefined') {
+      if (props.autoSetLoading && typeof props.setLoading === 'function') {
+        props.setLoading(false);
+      }
+    }
     hasMountedAtLeastOnce = true;
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-canary.20220507.2",
+  "version": "4.0.0-canary.20220512.1",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -25,7 +25,7 @@
     "@ahooksjs/use-request": "^2.0.0",
     "@ant-design/icons": "^4.7.0",
     "@ant-design/pro-layout": "^6.38.0",
-    "@umijs/bundler-utils": "4.0.0-canary.20220507.2",
+    "@umijs/bundler-utils": "4.0.0-canary.20220512.1",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.27.2",
     "babel-plugin-import": "^1.13.3",
@@ -44,7 +44,7 @@
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.0-canary.20220507.2"
+    "umi": "4.0.0-canary.20220512.1"
   },
   "publishConfig": {
     "access": "public"