@umijs/plugins 4.0.0-rc.19 → 4.0.0-rc.21

package/dist/analytics.js

@@ -20,7 +20,7 @@ exports.default = (api) => {
         return `
     (function() {
       var hm = document.createElement('script');
-      hm.src = 'https://hm.baidu.com/hm.js?${code}';
+      hm.src = '//hm.baidu.com/hm.js?${code}';
       var s = document.getElementsByTagName('script')[0];
       s.parentNode.insertBefore(hm, s);
     })();

package/dist/layout.js

@@ -24,9 +24,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const allIcons = __importStar(require("@ant-design/icons"));
+const fs_1 = require("fs");
 const path_1 = require("path");
 const plugin_utils_1 = require("umi/plugin-utils");
-const resolveProjectDep_1 = require("./utils/resolveProjectDep");
 const withTmpPath_1 = require("./utils/withTmpPath");
 exports.default = (api) => {
     api.describe({
@@ -39,11 +39,28 @@ exports.default = (api) => {
         },
         enableBy: api.EnableBy.config,
     });
-    const pkgPath = (0, resolveProjectDep_1.resolveProjectDep)({
-        pkg: api.pkg,
-        cwd: api.cwd,
-        dep: '@ant-design/pro-layout',
-    }) || (0, path_1.dirname)(require.resolve('@ant-design/pro-layout/package.json'));
+    /**
+     * 优先去找 '@alipay/tech-ui'，保证稳定性
+     */
+    const depList = ['@alipay/tech-ui', '@ant-design/pro-layout'];
+    const pkgHasDep = depList.find((dep) => {
+        var _a, _b;
+        const { pkg } = api;
+        if (((_a = pkg.dependencies) === null || _a === void 0 ? void 0 : _a[dep]) || ((_b = pkg.devDependencies) === null || _b === void 0 ? void 0 : _b[dep])) {
+            return true;
+        }
+        return false;
+    });
+    const getPkgPath = () => {
+        // 如果  layout 和 techui至少有一个在，找到他们的地址
+        if (pkgHasDep &&
+            (0, fs_1.existsSync)((0, path_1.join)(api.cwd, 'node_modules', pkgHasDep, 'package.json'))) {
+            return (0, path_1.join)(api.cwd, 'node_modules', pkgHasDep);
+        }
+        // 如果项目中没有去找插件以来的
+        return (0, path_1.dirname)(require.resolve('@ant-design/pro-layout/package.json'));
+    };
+    const pkgPath = getPkgPath();
     api.modifyAppData((memo) => {
         const version = require(`${pkgPath}/package.json`).version;
         memo.pluginLayout = {
@@ -53,8 +70,11 @@ exports.default = (api) => {
         return memo;
     });
     api.modifyConfig((memo) => {
-        // import from @ant-design/pro-layout
-        memo.alias['@ant-design/pro-layout'] = pkgPath;
+        // 只在没有自行依赖 @ant-design/pro-layout 或 @alipay/tech-ui 时
+        // 才使用插件中提供的 @ant-design/pro-layout
+        if (!pkgHasDep) {
+            memo.alias['@ant-design/pro-layout'] = pkgPath;
+        }
         return memo;
     });
     api.onGenerateFiles(() => {
@@ -65,9 +85,9 @@ exports.default = (api) => {
             content: `
 import { Link, useLocation, useNavigate, Outlet, useAppData, useRouteData, matchRoutes } from 'umi';
 import { useMemo } from 'react';
-import ProLayout, {
-  PageLoading,
-} from '@ant-design/pro-layout';
+import  {
+  ProLayout,
+} from "${pkgHasDep || '@ant-design/pro-layout'}";
 import './Layout.less';
 import Logo from './Logo';
 import Exception from './Exception';

package/dist/qiankun/master.js

@@ -34,16 +34,14 @@ exports.default = (api) => {
             },
         },
     }));
-    // TODO: modify routes
     api.modifyRoutes((memo) => {
         Object.keys(memo).forEach((id) => {
+            var _a;
             const route = memo[id];
             if (route.microApp) {
                 const appName = route.microApp;
-                // TODO: config base
-                const base = '/';
-                // TODO: config masterHistoryType
-                const masterHistoryType = 'browser';
+                const base = api.config.base || '/';
+                const masterHistoryType = ((_a = api.config.history) === null || _a === void 0 ? void 0 : _a.type) || 'browser';
                 const routeProps = route.microAppProps || {};
                 const normalizedRouteProps = JSON.stringify(routeProps).replace(/"/g, "'");
                 route.file = `(async () => {

package/dist/qiankun/slave.js

@@ -74,8 +74,8 @@ exports.default = (api) => {
         return config;
     });
     api.addHTMLHeadScripts(() => {
-        var _a;
-        const dontModify = (_a = api.config.qiankun) === null || _a === void 0 ? void 0 : _a.shouldNotModifyRuntimePublicPath;
+        var _a, _b;
+        const dontModify = (_b = (_a = api.config.qiankun) === null || _a === void 0 ? void 0 : _a.slave) === null || _b === void 0 ? void 0 : _b.shouldNotModifyRuntimePublicPath;
         return dontModify
             ? []
             : [

package/dist/request.js

@@ -250,7 +250,7 @@ const request: IRequest = (url: string, opts: any = { method: 'GET' }) => {
         });
         try {
           const handler =
-            config.errorConfig?.errorHandler;
+            config?.errorConfig?.errorHandler;
           if(handler)
             handler(error, opts, config);
         } catch (e) {

package/dist/utils/modelUtils.js

@@ -212,11 +212,15 @@ class ModelUtils {
         const imports = [];
         const modelProps = [];
         models.forEach((model) => {
+            const fileWithoutExt = (0, path_1.format)({
+                dir: (0, path_1.dirname)(model.file),
+                base: (0, path_1.basename)(model.file, (0, path_1.extname)(model.file)),
+            });
             if (model.exportName !== 'default') {
-                imports.push(`import { ${model.exportName} as ${model.id} } from '${model.file}';`);
+                imports.push(`import { ${model.exportName} as ${model.id} } from '${fileWithoutExt}';`);
             }
             else {
-                imports.push(`import ${model.id} from '${model.file}';`);
+                imports.push(`import ${model.id} from '${fileWithoutExt}';`);
             }
             modelProps.push(`${model.id}: { namespace: '${model.namespace}', model: ${model.id} },`);
         });
@@ -225,7 +229,7 @@ ${imports.join('\n')}
 
 export const models = {
 ${modelProps.join('\n')}
-}`;
+} as const`;
     }
 }
 exports.ModelUtils = ModelUtils;

package/libs/model.tsx

@@ -1,14 +1,25 @@
 // @ts-ignore
+import type { models as rawModels } from '@@/plugin-model/model';
 import isEqual from 'fast-deep-equal';
 import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
 
+type Models = typeof rawModels;
+
+type GetNamespaces<M> = {
+  [K in keyof M]: M[K] extends { namespace: string }
+    ? M[K]['namespace']
+    : never;
+}[keyof M];
+
+type Namespaces = GetNamespaces<Models>;
+
 // @ts-ignore
 const Context = React.createContext<{ dispatcher: Dispatcher }>(null);
 
 class Dispatcher {
-  callbacks: Record<string, Set<Function>> = {};
-  data: Record<string, unknown> = {};
-  update = (namespace: string) => {
+  callbacks: Record<Namespaces, Set<Function>> = {};
+  data: Record<Namespaces, unknown> = {};
+  update = (namespace: Namespaces) => {
     if (this.callbacks[namespace]) {
       this.callbacks[namespace].forEach((cb) => {
         try {
@@ -87,7 +98,34 @@ export function Provider(props: {
   );
 }
 
-export function useModel(namespace: string, selector?: any) {
+type GetModelByNamespace<M, N> = {
+  [K in keyof M]: M[K] extends { namespace: string; model: unknown }
+    ? M[K]['namespace'] extends N
+      ? M[K]['model'] extends (...args: any) => any
+        ? ReturnType<M[K]['model']>
+        : never
+      : never
+    : never;
+}[keyof M];
+
+type Model<N> = GetModelByNamespace<Models, N>;
+type Selector<N, S> = (model: Model<N>) => S;
+
+type SelectedModel<N, T> = T extends (...args: any) => any
+  ? ReturnType<NonNullable<T>>
+  : Model<N>;
+
+export function useModel<N extends Namespaces>(namespace: N): Model<N>;
+
+export function useModel<N extends Namespaces, S>(
+  namespace: N,
+  selector: Selector<N, S>,
+): SelectedModel<N, typeof selector>;
+
+export function useModel<N extends Namespaces, S>(
+  namespace: N,
+  selector?: Selector<N, S>,
+): SelectedModel<N, typeof selector> {
   const { dispatcher } = useContext<{ dispatcher: Dispatcher }>(Context);
   const selectorRef = useRef(selector);
   selectorRef.current = selector;
@@ -127,7 +165,7 @@ export function useModel(namespace: string, selector?: any) {
       }
     };
 
-    dispatcher.callbacks[namespace] ||= new Set();
+    dispatcher.callbacks[namespace] ||= new Set() as any; // rawModels 是 umi 动态生成的文件，导致前面 callback[namespace] 的类型无法推导出来，所以用 as any 来忽略掉
     dispatcher.callbacks[namespace].add(handler);
     dispatcher.update(namespace);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-rc.19",
+  "version": "4.0.0-rc.21",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -24,11 +24,11 @@
   "dependencies": {
     "@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-rc.19",
+    "@ant-design/pro-layout": "^7.0.1-beta.17",
+    "@umijs/bundler-utils": "4.0.0-rc.21",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.27.2",
-    "babel-plugin-import": "^1.13.3",
+    "babel-plugin-import": "^1.13.5",
     "dayjs": "^1.11.2",
     "dva-core": "^2.0.4",
     "dva-immer": "^1.0.0",
@@ -39,12 +39,12 @@
     "moment": "^2.29.3",
     "qiankun": "^2.7.0",
     "react-intl": "3.12.1",
-    "react-redux": "^8.0.1",
+    "react-redux": "^8.0.2",
     "redux": "^4.2.0",
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.0-rc.19"
+    "umi": "4.0.0-rc.21"
   },
   "publishConfig": {
     "access": "public"