@umijs/plugins 4.2.3 → 4.2.5

package/dist/react-query.js

@@ -27,23 +27,17 @@ var import_path = require("path");
 var import_npmClient = require("./utils/npmClient");
 var import_resolveProjectDep = require("./utils/resolveProjectDep");
 var import_withTmpPath = require("./utils/withTmpPath");
-var react_query_default = (api) => {
-  api.describe({
-    key: "reactQuery",
-    config: {
-      schema({ zod }) {
-        return zod.object({
-          devtool: zod.union([zod.record(zod.any()), zod.boolean()]),
-          queryClient: zod.union([zod.record(zod.any()), zod.boolean()])
-        }).deepPartial();
-      }
-    },
-    enableBy: api.EnableBy.config
-  });
+var reactQueryInfo;
+var REACT_QUERY_DEP_NAME = "@tanstack/react-query";
+var REACT_QUERY_DEVTOOLS_DEP_NAME = "@tanstack/react-query-devtools";
+var REACT_QUERY_CORE_DEP_NAME = "@tanstack/query-core";
+var getReactQueryPkgInfo = (api) => {
+  if (reactQueryInfo) {
+    return reactQueryInfo;
+  }
   let pkgPath;
   let devtoolsPkgPath;
-  const REACT_QUERY_DEP_NAME = "@tanstack/react-query";
-  const REACT_QUERY_DEVTOOLS_DEP_NAME = "@tanstack/react-query-devtools";
+  let corePath;
   const defaultPkgPath = (0, import_utils.winPath)(
     (0, import_path.dirname)(require.resolve(`${REACT_QUERY_DEP_NAME}/package.json`))
   );
@@ -62,6 +56,16 @@ var react_query_default = (api) => {
       `[reactQuery] package '${REACT_QUERY_DEP_NAME}' resolve failed, ${e.message}`
     );
   }
+  try {
+    corePath = (0, import_utils.winPath)(
+      (0, import_path.dirname)(
+        require.resolve(`${REACT_QUERY_CORE_DEP_NAME}/package.json`, {
+          paths: [pkgPath]
+        })
+      )
+    );
+  } catch {
+  }
   try {
     const localDevtoolsPkgPath = (0, import_resolveProjectDep.resolveProjectDep)({
       pkg: api.pkg,
@@ -83,7 +87,35 @@ var react_query_default = (api) => {
   const useV5 = pkgVersion.startsWith("5");
   const useV5Devtools = devtoolsVersion.startsWith("5");
   const canUseDevtools = useV4 && useV4Devtools || useV5 && useV5Devtools;
+  reactQueryInfo = {
+    pkgPath,
+    devtoolsPkgPath,
+    defaultPkgPath,
+    defaultDevtoolPkgPath,
+    pkgVersion,
+    canUseDevtools,
+    useV4,
+    useV5,
+    corePath
+  };
+  return reactQueryInfo;
+};
+var react_query_default = (api) => {
+  api.describe({
+    key: "reactQuery",
+    config: {
+      schema({ zod }) {
+        return zod.object({
+          devtool: zod.union([zod.record(zod.any()), zod.boolean()]),
+          queryClient: zod.union([zod.record(zod.any()), zod.boolean()])
+        }).deepPartial();
+      }
+    },
+    enableBy: api.EnableBy.config
+  });
   api.onStart(() => {
+    getReactQueryPkgInfo(api);
+    const { pkgPath, defaultPkgPath, pkgVersion } = reactQueryInfo;
     if (pkgPath !== defaultPkgPath && !process.env.IS_UMI_BUILD_WORKER) {
       api.logger.info(`[reactQuery] use local package, version: ${pkgVersion}`);
     }
@@ -95,6 +127,7 @@ var react_query_default = (api) => {
     return ["reactQuery"];
   });
   api.modifyConfig((memo) => {
+    const { pkgPath, devtoolsPkgPath, canUseDevtools } = getReactQueryPkgInfo(api);
     memo.alias[REACT_QUERY_DEP_NAME] = pkgPath;
     if (canUseDevtools) {
       memo.alias[REACT_QUERY_DEVTOOLS_DEP_NAME] = devtoolsPkgPath;
@@ -103,6 +136,7 @@ var react_query_default = (api) => {
   });
   api.onGenerateFiles(() => {
     var _a;
+    const { pkgPath, devtoolsPkgPath, canUseDevtools, useV4, useV5 } = getReactQueryPkgInfo(api);
     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(
@@ -223,28 +257,16 @@ export type RuntimeReactQueryType = {
     });
   });
   const isFlattedDepsDir = (0, import_npmClient.isFlattedNodeModulesDir)(api);
-  if (useV5 && !isFlattedDepsDir) {
-    let corePath;
-    const REACT_QUERY_CORE_DEP_NAME = "@tanstack/query-core";
-    try {
-      corePath = (0, import_utils.winPath)(
-        (0, import_path.dirname)(
-          require.resolve(`${REACT_QUERY_CORE_DEP_NAME}/package.json`, {
-            paths: [pkgPath]
-          })
-        )
-      );
-    } catch (e) {
-      throw new Error(
-        `[reactQuery] package '${REACT_QUERY_CORE_DEP_NAME}' resolve failed, ${e.message}`
-      );
-    }
+  if (!isFlattedDepsDir) {
     api.modifyTSConfig((config) => {
-      import_utils.lodash.set(
-        config,
-        `compilerOptions.paths["${REACT_QUERY_CORE_DEP_NAME}"]`,
-        [corePath]
-      );
+      const { corePath, useV5 } = getReactQueryPkgInfo(api);
+      if (useV5 && (corePath == null ? void 0 : corePath.length)) {
+        import_utils.lodash.set(
+          config,
+          `compilerOptions.paths["${REACT_QUERY_CORE_DEP_NAME}"]`,
+          [corePath]
+        );
+      }
       return config;
     });
   }

package/package.json

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