@umijs/plugins 4.1.4 → 4.1.5

package/dist/layout.js

@@ -118,8 +118,13 @@ var layout_default = (api) => {
     return memo;
   });
   api.onGenerateFiles(() => {
+    var _a;
+    let realNpmClient = api.appData.npmClient;
+    if (api.appData.npmClient === import_plugin_utils.NpmClientEnum.tnpm && ((_a = api.pkg.tnpm) == null ? void 0 : _a.mode) && [import_plugin_utils.NpmClientEnum.npm, import_plugin_utils.NpmClientEnum.yarn].includes(api.pkg.tnpm.mode)) {
+      realNpmClient = api.pkg.tnpm.mode;
+    }
     const isFlattedDepsDir = [import_plugin_utils.NpmClientEnum.npm, import_plugin_utils.NpmClientEnum.yarn].includes(
-      api.appData.npmClient
+      realNpmClient
     );
     const PKG_TYPE_REFERENCE = `
 /// <reference types="${isFlattedDepsDir ? ANT_PRO_COMPONENT : resolvedPkgPath}" />

package/dist/react-query.js

@@ -1,8 +1,6 @@
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -16,14 +14,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/react-query.ts
@@ -50,25 +40,51 @@ var react_query_default = (api) => {
     enableBy: api.EnableBy.config
   });
   let pkgPath;
+  let devtoolsPkgPath;
+  const REACT_QUERY_DEP_NAME = "@tanstack/react-query";
+  const REACT_QUERY_DEVTOOLS_DEP_NAME = "@tanstack/react-query-devtools";
   const defaultPkgPath = (0, import_utils.winPath)(
-    (0, import_path.dirname)(require.resolve("@tanstack/react-query/package.json"))
+    (0, import_path.dirname)(require.resolve(`${REACT_QUERY_DEP_NAME}/package.json`))
   );
-  const devtoolPkgPath = (0, import_utils.winPath)(
-    (0, import_path.dirname)(require.resolve("@tanstack/react-query-devtools/package.json"))
+  const defaultDevtoolPkgPath = (0, import_utils.winPath)(
+    (0, import_path.dirname)(require.resolve(`${REACT_QUERY_DEVTOOLS_DEP_NAME}/package.json`))
   );
   try {
     const localQueryPath = (0, import_resolveProjectDep.resolveProjectDep)({
       pkg: api.pkg,
       cwd: api.cwd,
-      dep: "@tanstack/react-query"
+      dep: REACT_QUERY_DEP_NAME
     });
     pkgPath = localQueryPath ? (0, import_utils.winPath)(localQueryPath) : defaultPkgPath;
   } catch (e) {
-    throw new Error(`[reactQuery] package resolve failed, ${e.message}`);
+    throw new Error(
+      `[reactQuery] package '${REACT_QUERY_DEP_NAME}' resolve failed, ${e.message}`
+    );
   }
+  try {
+    const localDevtoolsPkgPath = (0, import_resolveProjectDep.resolveProjectDep)({
+      pkg: api.pkg,
+      cwd: api.cwd,
+      dep: REACT_QUERY_DEVTOOLS_DEP_NAME
+    });
+    devtoolsPkgPath = localDevtoolsPkgPath ? (0, import_utils.winPath)(localDevtoolsPkgPath) : defaultDevtoolPkgPath;
+  } catch (e) {
+    throw new Error(
+      `[reactQuery] package '${REACT_QUERY_DEVTOOLS_DEP_NAME}' resolve failed, ${e.message}`
+    );
+  }
+  const pkg = require((0, import_path.join)(pkgPath, "package.json"));
+  const devtoolsPkg = require((0, import_path.join)(devtoolsPkgPath, "package.json"));
+  const pkgVersion = pkg.version;
+  const devtoolsVersion = devtoolsPkg.version;
+  const useV4 = pkgVersion.startsWith("4");
+  const useV4Devtools = devtoolsVersion.startsWith("4");
+  const useV5 = pkgVersion.startsWith("5");
+  const useV5Devtools = devtoolsVersion.startsWith("5");
+  const canUseDevtools = useV4 && useV4Devtools || useV5 && useV5Devtools;
   api.onStart(() => {
-    if (pkgPath !== defaultPkgPath) {
-      api.logger.info(`[reactQuery] use local package ${pkgPath}`);
+    if (pkgPath !== defaultPkgPath && !process.env.IS_UMI_BUILD_WORKER) {
+      api.logger.info(`[reactQuery] use local package, version: ${pkgVersion}`);
     }
   });
   api.addRuntimePlugin(() => {
@@ -77,9 +93,16 @@ var react_query_default = (api) => {
   api.addRuntimePluginKey(() => {
     return ["reactQuery"];
   });
+  api.modifyConfig((memo) => {
+    memo.alias[REACT_QUERY_DEP_NAME] = pkgPath;
+    if (canUseDevtools) {
+      memo.alias[REACT_QUERY_DEVTOOLS_DEP_NAME] = devtoolsPkgPath;
+    }
+    return memo;
+  });
   api.onGenerateFiles(() => {
     var _a;
-    const enableDevTools = api.config.reactQuery.devtool !== false;
+    const enableDevTools = api.config.reactQuery.devtool !== false && canUseDevtools;
     const enableQueryClient = api.config.reactQuery.queryClient !== false;
     const reactQueryRuntimeCode = ((_a = api.appData.appJS) == null ? void 0 : _a.exports.includes(
       "reactQuery"
@@ -88,15 +111,26 @@ var react_query_default = (api) => {
       path: "runtime.tsx",
       content: enableQueryClient ? `
 import React from 'react';
-import { defaultContext, QueryClient, QueryClientProvider } from '${pkgPath}';
-import { ReactQueryDevtools } from '${devtoolPkgPath}';
+import {
+  ${useV4 ? "defaultContext," : ""}
+  QueryClient,
+  QueryClientProvider
+} from '${pkgPath}';
+${enableDevTools ? `import { ReactQueryDevtools } from '${devtoolsPkgPath}';` : ""}
 ${reactQueryRuntimeCode}
 const client = new QueryClient(reactQueryConfig.queryClient || {});
 export function rootContainer(container) {
   return (
-    <QueryClientProvider client={client} context={defaultContext}>
+    <QueryClientProvider
+      client={client}
+      ${useV4 ? "context={defaultContext}" : ""}
+    >
       {container}
-      ${enableDevTools ? "<ReactQueryDevtools context={defaultContext} initialIsOpen={false} {...(reactQueryConfig.devtool || {})} />" : ""}
+      ${enableDevTools ? `<ReactQueryDevtools
+  ${useV4 ? "context={defaultContext}" : ""}
+  initialIsOpen={false}
+  {...(reactQueryConfig.devtool || {})}
+/>` : ""}
     </QueryClientProvider>
   );
 }
@@ -127,6 +161,7 @@ export {
   useQueryClient,
   QueryErrorResetBoundary,
   useQueryErrorResetBoundary,
+  ${useV5 ? "queryOptions," : ""}
 } from '${pkgPath}';
       `
     });
@@ -141,7 +176,7 @@ export type {
   QueriesOptions,
   QueryErrorResetBoundaryProps,
   QueryClientProviderProps,
-  ContextOptions as QueryContextOptions,
+  ${useV4 ? "ContextOptions as QueryContextOptions," : ""}
   UseQueryOptions,
   UseBaseQueryOptions,
   UseQueryResult,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.1.4",
+  "version": "4.1.5",
   "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.1.4",
+    "@umijs/bundler-utils": "4.1.5",
     "@umijs/valtio": "1.0.4"
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.1.4"
+    "umi": "4.1.5"
   },
   "publishConfig": {
     "access": "public"