@umijs/plugins 4.6.56 → 4.6.58

package/dist/access.js

@@ -53,7 +53,10 @@ var access_default = (api) => {
       content: `
 import React from 'react';${hasAccessFile ? `
 import accessFactory from '@/access';
-import { useModel } from '@@/plugin-model';
+import { useModel } from '${(0, import_withTmpPath.getPluginModelImport)({
+        api,
+        from: "runtime.tsx"
+      })}';
 ` : ""}
 import { AccessContext } from './context';
 

package/dist/initial-state.js

@@ -55,7 +55,10 @@ var initial_state_default = (api) => {
       path: "Provider.tsx",
       content: `
 import React from 'react';
-import { useModel } from '@@/plugin-model';
+import { useModel } from '${(0, import_withTmpPath.getPluginModelImport)({
+        api,
+        from: "Provider.tsx"
+      })}';
 ${loading ? `import Loading from '${loading}'` : `function Loading() { return <div />; }`}
 export default function InitialStateProvider(props: any) {
   const appLoaded = React.useRef(false);

package/dist/layout.js

@@ -146,7 +146,10 @@ import './${layoutFile}';
 import Logo from './Logo';
 import Exception from './Exception';
 import { getRightRenderContent } from './rightRender';
-${hasInitialStatePlugin ? `import { useModel } from '@@/plugin-model';` : "const useModel = null;"}
+${hasInitialStatePlugin ? `import { useModel } from '${(0, import_withTmpPath.getPluginModelImport)({
+        api,
+        from: "Layout.tsx"
+      })}';` : "const useModel = null;"}
 ${api.config.access ? `
 import { useAccessMarkedRoutes } from '@@/plugin-access';
    `.trim() : "const useAccessMarkedRoutes = (r) => r;"}

package/dist/qiankun/master.js

@@ -203,7 +203,10 @@ export const setMasterOptions = (newOpts) => options = ({ ...options, ...newOpts
           path: file.replace(/\.tpl$/, ""),
           content: content.replace(
             "__USE_MODEL__",
-            api.isPluginEnable("model") ? `import { useModel } from '@@/plugin-model'` : `console.warn(\`[plugins/qiankun]: Seems like you're not using @umijs/plugin-model, you need to install it or some features may not work!\`);
+            api.isPluginEnable("model") ? `import { useModel } from '${(0, import_withTmpPath.getPluginModelImport)({
+              api,
+              from: "masterRuntimePlugin.tsx"
+            })}'` : `console.warn(\`[plugins/qiankun]: Seems like you're not using @umijs/plugin-model, you need to install it or some features may not work!\`);
 const useModel = null`
           ).replace(
             /from 'lodash\//g,

package/dist/qiankun/slave.js

@@ -250,7 +250,10 @@ if (!isServer && !window.__POWERED_BY_QIANKUN__) {
           path: file.replace(/\.tpl$/, ""),
           content: getFileContent(file).replace(
             "__USE_MODEL__",
-            api.isPluginEnable("model") ? `import { useModel } from '@@/plugin-model'` : `console.warn(\`[plugins/qiankun]: Seems like you're not using @umijs/plugin-model, you need to install it or some features may not work!\`);
+            api.isPluginEnable("model") ? `import { useModel } from '${(0, import_withTmpPath.getPluginModelImport)({
+              api,
+              from: "slaveRuntimePlugin.ts"
+            })}'` : `console.warn(\`[plugins/qiankun]: Seems like you're not using @umijs/plugin-model, you need to install it or some features may not work!\`);
 const useModel = null`
           ).replace(
             /from 'qiankun'/g,

package/dist/utils/withTmpPath.d.ts

@@ -4,3 +4,8 @@ export declare function withTmpPath(opts: {
     path: string;
     noPluginDir?: boolean;
 }): string;
+export declare function isUtooWin(api: IApi): boolean;
+export declare function getPluginModelImport(opts: {
+    api: IApi;
+    from: string;
+}): string;

package/dist/utils/withTmpPath.js

@@ -19,6 +19,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/utils/withTmpPath.ts
 var withTmpPath_exports = {};
 __export(withTmpPath_exports, {
+  getPluginModelImport: () => getPluginModelImport,
+  isUtooWin: () => isUtooWin,
   withTmpPath: () => withTmpPath
 });
 module.exports = __toCommonJS(withTmpPath_exports);
@@ -33,7 +35,24 @@ function withTmpPath(opts) {
     )
   );
 }
+function withTmpPluginPath(opts) {
+  return (0, import_plugin_utils.winPath)((0, import_path.join)(opts.api.paths.absTmpPath, `plugin-${opts.pluginKey}`));
+}
+function isUtooWin(api) {
+  return process.platform === "win32" && api.appData.bundler === "utoopack";
+}
+function getPluginModelImport(opts) {
+  if (!isUtooWin(opts.api)) {
+    return "@@/plugin-model";
+  }
+  const from = withTmpPath({ api: opts.api, path: opts.from });
+  const to = withTmpPluginPath({ api: opts.api, pluginKey: "model" });
+  const relPath = (0, import_plugin_utils.winPath)((0, import_path.relative)((0, import_path.dirname)(from), to));
+  return relPath.startsWith(".") ? relPath : `./${relPath}`;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getPluginModelImport,
+  isUtooWin,
   withTmpPath
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.6.56",
+  "version": "4.6.58",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -45,12 +45,12 @@
     "styled-components": "6.1.1",
     "tslib": "^2",
     "warning": "^4.0.3",
-    "@umijs/bundler-utils": "4.6.56",
+    "@umijs/bundler-utils": "4.6.58",
     "@umijs/valtio": "1.0.4"
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.6.56"
+    "umi": "4.6.58"
   },
   "publishConfig": {
     "access": "public"