@umijs/preset-umi 4.6.46 → 4.6.48

package/dist/features/tmpFiles/configTypes.js

@@ -86,12 +86,18 @@ import { ${interfaceName} } from "./pluginConfigJoi.d";
 
 interface ${typeName} ${typeString};
 
+type UtoopackConfigOverride = {
+  utoopack?: boolean | Partial<import('umi').IUtoopackUserConfig>;
+};
+
 type PrettifyWithCloseable<T> = {
   [K in keyof T]: T[K] | false;
 } & {};
 
 export type IConfigFromPlugins = PrettifyWithCloseable<
-  ${interfaceName} & Partial<${typeName}>
+  ${interfaceName} &
+    Omit<Partial<${typeName}>, keyof UtoopackConfigOverride> &
+    UtoopackConfigOverride
 >;
     `;
     api.writeTmpFile({

package/dist/features/utoopack/utoopack.d.ts

@@ -1,3 +1,4 @@
 import { IApi } from '../../types';
+export declare function getPackVersionFromBundler(bundlerEntry: string): any;
 declare const _default: (api: IApi) => void;
 export default _default;

package/dist/features/utoopack/utoopack.js

@@ -29,20 +29,40 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/features/utoopack/utoopack.ts
 var utoopack_exports = {};
 __export(utoopack_exports, {
-  default: () => utoopack_default
+  default: () => utoopack_default,
+  getPackVersionFromBundler: () => getPackVersionFromBundler
 });
 module.exports = __toCommonJS(utoopack_exports);
 var import_utils = require("@umijs/utils");
 var import_path = require("path");
 var import_extractEntryAssets = require("../../utils/extractEntryAssets");
+function getPackVersionFromBundler(bundlerEntry) {
+  var _a, _b;
+  const packageJsonCandidates = [
+    (0, import_path.join)((0, import_path.dirname)(bundlerEntry), "../package.json"),
+    (0, import_path.join)(bundlerEntry, "../package.json"),
+    (0, import_path.join)(bundlerEntry, "package.json")
+  ];
+  for (const packageJsonPath of packageJsonCandidates) {
+    try {
+      const pkg = require(packageJsonPath);
+      return (_b = (_a = pkg.dependencies) == null ? void 0 : _a["@utoo/pack"]) == null ? void 0 : _b.replace(/^[^\d]*/, "");
+    } catch {
+    }
+  }
+  return void 0;
+}
 var utoopack_default = (api) => {
   api.describe({
     key: "utoopack",
     config: {
       schema({ zod }) {
-        return zod.object({
-          root: zod.string()
-        }).partial();
+        return zod.union([
+          zod.boolean(),
+          zod.object({
+            root: zod.string()
+          }).partial()
+        ]);
       }
     },
     enableBy: () => Boolean(api.userConfig.utoopack) || Boolean(process.env.FORCE_UTOOPACK)
@@ -74,14 +94,12 @@ var utoopack_default = (api) => {
     };
   });
   api.onStart(() => {
-    process.env.UTOOPACK = process.env.UTOOPACK || require.resolve("@umijs/bundler-utoopack");
-    try {
-      const pkg = require((0, import_path.join)(
-        require.resolve("@utoo/pack"),
-        "../../package.json"
-      ));
-      process.env.UTOOPACK_VERSION = pkg.version;
-    } catch {
+    const bundlerEntry = process.env.UTOOPACK || require.resolve("@umijs/bundler-utoopack");
+    process.env.UTOOPACK = bundlerEntry;
+    const packVersion = getPackVersionFromBundler(bundlerEntry);
+    if (packVersion) {
+      process.env.UTOOPACK_VERSION = packVersion;
+    } else {
       delete process.env.UTOOPACK_VERSION;
     }
   });
@@ -134,3 +152,7 @@ var utoopack_default = (api) => {
     });
   });
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getPackVersionFromBundler
+});

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export type { UmiApiRequest, UmiApiResponse } from './features/apiRoute';
-export type { IApi, IConfig, IRoute, webpack } from './types';
+export type { IApi, IConfig, IRoute, IUtoopackUserConfig, webpack, } from './types';
 declare const _default: () => {
     plugins: (string | false)[];
 };

package/dist/types.d.ts

@@ -13,6 +13,7 @@ import type { InlineConfig as ViteInlineConfig } from 'vite';
 import type { getMarkupArgs } from './commands/dev/getMarkupArgs';
 import type { IOnDemandInstallDep } from './features/depsOnDemand/depsOnDemand';
 import type CodeFrameError from './features/transform/CodeFrameError';
+export type { IUtoopackUserConfig } from '@umijs/bundler-utoopack';
 export { UmiApiRequest, UmiApiResponse } from './features/apiRoute';
 export { webpack, IConfig };
 export declare type IScript = Partial<{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.6.46",
+  "version": "4.6.48",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -43,20 +43,20 @@
     "react-router": "6.3.0",
     "react-router-dom": "6.3.0",
     "regenerator-runtime": "0.13.11",
-    "@umijs/bundler-utils": "4.6.46",
-    "@umijs/bundler-utoopack": "4.6.46",
-    "@umijs/ast": "4.6.46",
-    "@umijs/babel-preset-umi": "4.6.46",
-    "@umijs/bundler-esbuild": "4.6.46",
-    "@umijs/plugin-run": "4.6.46",
-    "@umijs/renderer-react": "4.6.46",
-    "@umijs/bundler-webpack": "4.6.46",
-    "@umijs/core": "4.6.46",
-    "@umijs/bundler-vite": "4.6.46",
-    "@umijs/server": "4.6.46",
-    "@umijs/utils": "4.6.46",
-    "@umijs/zod2ts": "4.6.46",
-    "@umijs/mfsu": "4.6.46",
+    "@umijs/babel-preset-umi": "4.6.48",
+    "@umijs/ast": "4.6.48",
+    "@umijs/bundler-esbuild": "4.6.48",
+    "@umijs/bundler-vite": "4.6.48",
+    "@umijs/bundler-utils": "4.6.48",
+    "@umijs/bundler-webpack": "4.6.48",
+    "@umijs/bundler-utoopack": "4.6.48",
+    "@umijs/plugin-run": "4.6.48",
+    "@umijs/core": "4.6.48",
+    "@umijs/renderer-react": "4.6.48",
+    "@umijs/zod2ts": "4.6.48",
+    "@umijs/server": "4.6.48",
+    "@umijs/utils": "4.6.48",
+    "@umijs/mfsu": "4.6.48",
     "@umijs/ui": "3.0.1"
   },
   "devDependencies": {