@umijs/preset-umi 4.6.45 → 4.6.47

package/dist/commands/build.js

@@ -48,7 +48,10 @@ umi build --clean
 `,
     fn: async function() {
       var _a;
-      import_utils.logger.info(import_utils.chalk.cyan.bold(`Umi v${api.appData.umi.version}`));
+      const isUtoopack = api.appData.bundler === "utoopack";
+      if (!isUtoopack) {
+        import_utils.logger.info(import_utils.chalk.cyan.bold(`Umi v${api.appData.umi.version}`));
+      }
       import_utils.rimraf.sync(api.paths.absTmpPath);
       await api.applyPlugins({
         key: "onCheckPkgJSON",

package/dist/commands/dev/createRouteMiddleware.js

@@ -35,8 +35,12 @@ function createRouteMiddleware(opts) {
     });
     async function getStats(api) {
       if (!compiler && (api.config.mako || api.config.utoopack)) {
+        const assets = { "umi.js": "umi.js" };
+        if (api.config.mako) {
+          assets["umi.css"] = "umi.css";
+        }
         return {
-          compilation: { assets: { "umi.js": "umi.js", "umi.css": "umi.css" } },
+          compilation: { assets },
           hasErrors: () => false
         };
       }

package/dist/commands/dev/dev.js

@@ -68,7 +68,10 @@ PORT=8888 umi dev
 `,
     async fn() {
       var _a, _b, _c, _d, _e, _f;
-      import_utils.logger.info(import_utils.chalk.cyan.bold(`Umi v${api.appData.umi.version}`));
+      const isUtoopack = api.appData.bundler === "utoopack";
+      if (!isUtoopack) {
+        import_utils.logger.info(import_utils.chalk.cyan.bold(`Umi v${api.appData.umi.version}`));
+      }
       const enableVite = !!api.config.vite;
       import_utils.rimraf.sync(api.paths.absTmpPath);
       if (process.env.STRICT_PORT) {

package/dist/features/prepare/prepare.js

@@ -85,7 +85,9 @@ var prepare_default = (api) => {
         return;
       }
       if (!isFirstTime) return;
-      import_utils.logger.info("Preparing...");
+      if (api.appData.bundler !== "utoopack") {
+        import_utils.logger.info("Preparing...");
+      }
       const umiEntry = import_path.default.join(api.paths.absTmpPath, "umi.ts");
       const entryPoints = [umiEntry];
       const { build } = await import("./build.js");

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,12 +29,29 @@ 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",
@@ -74,15 +91,13 @@ 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"
-      ));
-      api.logger.info(`Using @utoo/pack@${pkg.version}`);
-    } catch (e) {
-      console.error(e);
+    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;
     }
   });
   api.onDevCompileDone(({ stats }) => {
@@ -134,3 +149,7 @@ var utoopack_default = (api) => {
     });
   });
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getPackVersionFromBundler
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.6.45",
+  "version": "4.6.47",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -28,7 +28,7 @@
     "@umijs/history": "5.3.1",
     "babel-plugin-dynamic-import-node": "2.3.3",
     "babel-plugin-react-compiler": "0.0.0-experimental-c23de8d-20240515",
-    "click-to-react-component": "1.1.0",
+    "click-to-react-component": "1.1.3",
     "core-js": "3.34.0",
     "current-script-polyfill": "1.0.0",
     "enhanced-resolve": "5.9.3",
@@ -43,21 +43,21 @@
     "react-router": "6.3.0",
     "react-router-dom": "6.3.0",
     "regenerator-runtime": "0.13.11",
-    "@umijs/babel-preset-umi": "4.6.45",
-    "@umijs/ast": "4.6.45",
-    "@umijs/bundler-utils": "4.6.45",
-    "@umijs/bundler-esbuild": "4.6.45",
-    "@umijs/bundler-utoopack": "4.6.45",
-    "@umijs/bundler-vite": "4.6.45",
-    "@umijs/mfsu": "4.6.45",
-    "@umijs/bundler-webpack": "4.6.45",
-    "@umijs/renderer-react": "4.6.45",
+    "@umijs/babel-preset-umi": "4.6.47",
+    "@umijs/bundler-esbuild": "4.6.47",
+    "@umijs/ast": "4.6.47",
+    "@umijs/bundler-utils": "4.6.47",
+    "@umijs/bundler-vite": "4.6.47",
+    "@umijs/bundler-webpack": "4.6.47",
+    "@umijs/mfsu": "4.6.47",
+    "@umijs/core": "4.6.47",
+    "@umijs/bundler-utoopack": "4.6.47",
+    "@umijs/plugin-run": "4.6.47",
+    "@umijs/server": "4.6.47",
+    "@umijs/renderer-react": "4.6.47",
+    "@umijs/utils": "4.6.47",
     "@umijs/ui": "3.0.1",
-    "@umijs/core": "4.6.45",
-    "@umijs/zod2ts": "4.6.45",
-    "@umijs/plugin-run": "4.6.45",
-    "@umijs/utils": "4.6.45",
-    "@umijs/server": "4.6.45"
+    "@umijs/zod2ts": "4.6.47"
   },
   "devDependencies": {
     "@manypkg/get-packages": "1.1.3",