@umijs/plugins 4.0.47 → 4.0.48

package/dist/access.js

@@ -51,7 +51,7 @@ var access_default = (api) => {
       path: "runtime.tsx",
       content: `
 import React from 'react';${hasAccessFile ? `
-import accessFactory from '@/access'
+import accessFactory from '@/access';
 import { useModel } from '@@/plugin-model';
 ` : ""}
 import { AccessContext } from './context';
@@ -166,10 +166,23 @@ export const useAccessMarkedRoutes = (routes: IRoute[]) => {
     api.writeTmpFile({
       path: "context.ts",
       content: `
-import React from 'react';
+import React from 'react';${hasAccessFile ? `
+import { AccessInstance } from './types.d';
+
+export const AccessContext = React.createContext<AccessInstance>(null);
+` : `
 export const AccessContext = React.createContext<any>(null);
+`}
       `
     });
+    api.writeTmpFile({
+      path: "types.d.ts",
+      content: hasAccessFile ? `
+import accessFactory from '@/access';
+
+export type AccessInstance = ReturnType<typeof accessFactory>;
+` : "export {}"
+    });
   });
   api.addRuntimePlugin(() => {
     return [(0, import_withTmpPath.withTmpPath)({ api, path: "runtime.tsx" })];

package/dist/mf.js

@@ -76,10 +76,11 @@ function mf(api) {
         (0, import_path.join)(api.paths.absTmpPath, "plugin-mf", mfSetupPathFileName)
       );
     }
+    const useHash = api.config.hash && api.env !== "development";
     const mfConfig = {
       name,
       remotes,
-      filename: api.config.hash ? "remote.[contenthash:8].js" : "remote.js",
+      filename: useHash ? "remote.[contenthash:8].js" : "remote.js",
       exposes,
       shared,
       library: api.config.mf.library
@@ -93,6 +94,19 @@ function mf(api) {
     );
     return config;
   });
+  api.modifyDefaultConfig(async (memo) => {
+    if (memo.mfsu) {
+      const exposes = await constructExposes();
+      if (!isEmpty(exposes)) {
+        memo.mfsu.remoteName = mfName();
+        memo.mfsu.mfName = `mf_${memo.mfsu.remoteName}`;
+      }
+      const remotes = formatRemotes();
+      memo.mfsu.remoteAliases = Object.keys(remotes);
+      memo.mfsu.shared = getShared();
+    }
+    return memo;
+  });
   api.onGenerateFiles(() => {
     api.writeTmpFile({
       content: `/* infer remote public */;
@@ -116,7 +130,7 @@ function mf(api) {
     });
   });
   function formatRemotes() {
-    const { remotes = [] } = api.config.mf;
+    const { remotes = [] } = api.userConfig.mf;
     const memo = {};
     remotes.forEach((remote) => {
       const aliasName = remote.aliasName || remote.name;
@@ -188,7 +202,7 @@ function mf(api) {
     return exposes;
   }
   function mfName() {
-    const name = api.config.mf.name;
+    const name = api.userConfig.mf.name;
     if (!name) {
       api.logger.warn(
         `module federation name is not defined , "unNamedMF" will be used`
@@ -197,7 +211,7 @@ function mf(api) {
     return name || "unNamedMF";
   }
   function getShared() {
-    const { shared = {} } = api.config.mf;
+    const { shared = {} } = api.userConfig.mf;
     return shared;
   }
   function changeUmiEntry(config) {

package/dist/react-query.js

@@ -28,6 +28,7 @@ __export(react_query_exports, {
   default: () => react_query_default
 });
 module.exports = __toCommonJS(react_query_exports);
+var import_utils = require("@umijs/utils");
 var import_path = require("path");
 var import_resolveProjectDep = require("./utils/resolveProjectDep");
 var import_withTmpPath = require("./utils/withTmpPath");
@@ -45,18 +46,19 @@ var react_query_default = (api) => {
     enableBy: api.EnableBy.config
   });
   let pkgPath;
-  const defaultPkgPath = (0, import_path.dirname)(
-    require.resolve("@tanstack/react-query/package.json")
+  const defaultPkgPath = (0, import_utils.winPath)(
+    (0, import_path.dirname)(require.resolve("@tanstack/react-query/package.json"))
   );
-  const devtoolPkgPath = (0, import_path.dirname)(
-    require.resolve("@tanstack/react-query-devtools/package.json")
+  const devtoolPkgPath = (0, import_utils.winPath)(
+    (0, import_path.dirname)(require.resolve("@tanstack/react-query-devtools/package.json"))
   );
   try {
-    pkgPath = (0, import_resolveProjectDep.resolveProjectDep)({
+    const localQueryPath = (0, import_resolveProjectDep.resolveProjectDep)({
       pkg: api.pkg,
       cwd: api.cwd,
       dep: "@tanstack/react-query"
-    }) || defaultPkgPath;
+    });
+    pkgPath = localQueryPath ? (0, import_utils.winPath)(localQueryPath) : defaultPkgPath;
   } catch (e) {
     throw new Error(`[reactQuery] package resolve failed, ${e.message}`);
   }

package/dist/styled-components.js

@@ -28,6 +28,7 @@ __export(styled_components_exports, {
   default: () => styled_components_default
 });
 module.exports = __toCommonJS(styled_components_exports);
+var import_utils = require("@umijs/utils");
 var import_path = require("path");
 var import_withTmpPath = require("./utils/withTmpPath");
 var styled_components_default = (api) => {
@@ -62,7 +63,9 @@ var styled_components_default = (api) => {
     api.writeTmpFile({
       path: "index.tsx",
       content: `
-import styled, { ThemeProvider, createGlobalStyle, css, keyframes, StyleSheetManager, useTheme } from '${libPath}';
+import styled, { ThemeProvider, createGlobalStyle, css, keyframes, StyleSheetManager, useTheme } from '${(0, import_utils.winPath)(
+        libPath
+      )}';
 export { styled, ThemeProvider, createGlobalStyle, css, keyframes, StyleSheetManager, useTheme };
       `
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.47",
+  "version": "4.0.48",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -29,8 +29,8 @@
     "@ant-design/pro-components": "^2.0.1",
     "@tanstack/react-query": "^4.22.0",
     "@tanstack/react-query-devtools": "^4.22.0",
-    "@umijs/bundler-utils": "4.0.47",
-    "@umijs/valtio": "^1.0.2",
+    "@umijs/bundler-utils": "4.0.48",
+    "@umijs/valtio": "^1.0.3",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.27.2",
     "babel-plugin-import": "^1.13.6",
@@ -53,7 +53,7 @@
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.0.47"
+    "umi": "4.0.48"
   },
   "publishConfig": {
     "access": "public"