@umijs/bundler-utoopack 4.6.45 → 4.6.46

package/dist/config.js

@@ -300,6 +300,7 @@ async function getProdUtooPackConfig(opts) {
   const userUtoopackConfig = getUserUtoopackConfig(opts.config.utoopack);
   utooBundlerOpts = {
     ...utooBundlerOpts,
+    tracing: false,
     config: import_utils.lodash.merge(
       import_utils.lodash.omit(utooBundlerOpts.config, ["define"]),
       {
@@ -397,6 +398,12 @@ async function getDevUtooPackConfig(opts) {
   const userUtoopackConfig = getUserUtoopackConfig(opts.config.utoopack);
   utooBundlerOpts = {
     ...utooBundlerOpts,
+    ...process.env.SOCKET_SERVER ? {
+      processEnv: {
+        ...utooBundlerOpts.processEnv || {},
+        "process.env.SOCKET_SERVER": define["process.env.SOCKET_SERVER"]
+      }
+    } : {},
     config: import_utils.lodash.merge(
       import_utils.lodash.omit(utooBundlerOpts.config, ["define"]),
       {
@@ -433,6 +440,12 @@ async function getDevUtooPackConfig(opts) {
         persistentCaching: true,
         nodePolyfill: true,
         externals: getNormalizedExternals(userExternals),
+        ...opts.config.clickToComponent ? {
+          // clickToComponent relies on source filename metadata in dev.
+          react: {
+            absoluteSourceFilename: true
+          }
+        } : {},
         ...getSvgModuleRules({ svgr, svgo, inlineLimit })
       },
       userUtoopackConfig
@@ -440,7 +453,8 @@ async function getDevUtooPackConfig(opts) {
     watch: {
       enable: true
     },
-    dev: true
+    dev: true,
+    tracing: false
   };
   return utooBundlerOpts;
 }

package/dist/index.js

@@ -53,8 +53,9 @@ function getUtoopackRootDir(cwd, utoopackConfig, findRootDir2) {
   return findRootDir2(cwd);
 }
 async function build(opts) {
-  var _a;
+  var _a, _b, _c;
   const { cwd, onBuildComplete } = opts;
+  const buildStartTime = Date.now();
   const { build: utooPackBuild, findRootDir: findRootDir2 } = require("@utoo/pack");
   const rootDir = getUtoopackRootDir(cwd, opts.config.utoopack, findRootDir2);
   const utooPackConfig = await (0, import_config.getProdUtooPackConfig)({
@@ -85,9 +86,24 @@ async function build(opts) {
       {}
     )
   };
+  const time = Date.now() - buildStartTime;
   await (onBuildComplete == null ? void 0 : onBuildComplete({
-    stats
+    stats,
+    time,
+    isFirstCompile: true
   }));
+  const absOutputPath = import_path.default.resolve(
+    cwd,
+    ((_b = utooPackConfig.config.output) == null ? void 0 : _b.path) || "dist"
+  );
+  console.log(
+    (0, import_util.getBuildBanner)({
+      packVersion: process.env.UTOOPACK_VERSION,
+      duration: time,
+      outputPath: import_path.default.relative(cwd, absOutputPath) || ".",
+      assetCount: (_c = stats.assets) == null ? void 0 : _c.length
+    })
+  );
   return stats;
 }
 async function dev(opts) {
@@ -95,6 +111,8 @@ async function dev(opts) {
   if (!opts) {
     throw new Error("opts should be supplied");
   }
+  const devStartTime = Date.now();
+  const protocol = opts.config.https ? "https:" : "http:";
   const { findRootDir: findRootDir2, serve: utooPackServe } = require("@utoo/pack");
   const rootDir = getUtoopackRootDir(cwd, opts.config.utoopack, findRootDir2);
   const utooPackConfig = await (0, import_config.getDevUtooPackConfig)({
@@ -182,15 +200,12 @@ async function dev(opts) {
   } else {
     server = import_http.default.createServer(app);
   }
-  server.listen(port, () => {
-    const protocol = opts.config.https ? "https:" : "http:";
-    const banner = (0, import_util.getDevBanner)(
-      protocol,
-      opts.host,
-      port,
-      opts.ip ?? "0.0.0.0"
-    );
-    console.log(banner);
+  const serverReady = new Promise((resolve, reject) => {
+    server.once("error", reject);
+    server.listen(port, () => {
+      server.off("error", reject);
+      resolve();
+    });
   });
   if (wsProxy.upgrade) {
     server.on("upgrade", wsProxy.upgrade);
@@ -221,15 +236,31 @@ async function dev(opts) {
     return stats;
   };
   try {
-    await utooPackServe(utooPackConfig, cwd, rootDir, {
-      port: utooServePort,
-      hostname: "127.0.0.1",
-      logServerInfo: false
-    });
+    await Promise.all([
+      serverReady,
+      utooPackServe(utooPackConfig, cwd, rootDir, {
+        port: utooServePort,
+        hostname: "127.0.0.1",
+        logServerInfo: false
+      })
+    ]);
+    const time = Date.now() - devStartTime;
     const stats = createStatsObject();
     await (onDevCompileDone == null ? void 0 : onDevCompileDone({
-      stats
+      stats,
+      time,
+      isFirstCompile: true
     }));
+    console.log(
+      (0, import_util.getDevBanner)({
+        protocol,
+        host: opts.host,
+        port,
+        ip: opts.ip,
+        packVersion: process.env.UTOOPACK_VERSION,
+        duration: time
+      })
+    );
     return stats;
   } catch (e) {
     console.error(e.message);

package/dist/util.d.ts

@@ -1 +1,18 @@
-export declare function getDevBanner(protocol: string, host?: string, port?: number, ip?: string): string;
+declare type IDevBannerOpts = {
+    duration?: number;
+    host?: string;
+    ip?: string;
+    packVersion?: string;
+    port?: number;
+    protocol: string;
+};
+declare type IBuildBannerOpts = {
+    assetCount?: number;
+    duration?: number;
+    outputPath?: string;
+    packVersion?: string;
+};
+export declare function getPackVersion(packVersion?: string): any;
+export declare function getDevBanner({ protocol, host, port, ip, packVersion, duration, }: IDevBannerOpts): string;
+export declare function getBuildBanner({ packVersion, duration, outputPath, assetCount, }: IBuildBannerOpts): string;
+export {};

package/dist/util.js

@@ -19,21 +19,99 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/util.ts
 var util_exports = {};
 __export(util_exports, {
-  getDevBanner: () => getDevBanner
+  getBuildBanner: () => getBuildBanner,
+  getDevBanner: () => getDevBanner,
+  getPackVersion: () => getPackVersion
 });
 module.exports = __toCommonJS(util_exports);
 var import_utils = require("@umijs/utils");
-function getDevBanner(protocol, host, port, ip) {
-  const hostStr = host === "0.0.0.0" ? "localhost" : host;
-  const messages = [];
-  messages.push("  App listening at:");
-  messages.push(
-    `  - Local:   ${import_utils.chalk.cyan(`${protocol}//${hostStr}:${port}`)}`
-  );
-  messages.push(`  - Network: ${import_utils.chalk.cyan(`${protocol}//${ip}:${port}`)}`);
+function getPackVersion(packVersion) {
+  var _a, _b;
+  if (packVersion) {
+    return packVersion;
+  }
+  try {
+    const pkg = require("../package.json");
+    return (_b = (_a = pkg.dependencies) == null ? void 0 : _a["@utoo/pack"]) == null ? void 0 : _b.replace(/^[^\d]*/, "");
+  } catch {
+    return void 0;
+  }
+}
+function formatDuration(duration) {
+  if (typeof duration !== "number") {
+    return void 0;
+  }
+  return `${Math.max(0, Math.round(duration))}ms`;
+}
+function getDevBanner({
+  protocol,
+  host,
+  port,
+  ip,
+  packVersion,
+  duration
+}) {
+  const hostStr = !host || host === "0.0.0.0" ? "localhost" : host;
+  const resolvedPackVersion = getPackVersion(packVersion);
+  const readyTime = formatDuration(duration);
+  const header = [
+    import_utils.chalk.cyan.bold("utoo pack"),
+    resolvedPackVersion ? import_utils.chalk.blueBright(`v${resolvedPackVersion}`) : null,
+    import_utils.chalk.green("ready"),
+    readyTime ? import_utils.chalk.dim(`in ${readyTime}`) : null
+  ].filter(Boolean).join(" ");
+  const messages = [
+    "",
+    `  ${header}`,
+    "",
+    `  ${import_utils.chalk.green("➜")}  Local:   ${import_utils.chalk.cyan(
+      `${protocol}//${hostStr}:${port}`
+    )}`
+  ];
+  if (ip && ip !== "0.0.0.0" && ip !== hostStr) {
+    messages.push(
+      `  ${import_utils.chalk.green("➜")}  Network: ${import_utils.chalk.cyan(
+        `${protocol}//${ip}:${port}`
+      )}`
+    );
+  }
+  return messages.join("\n");
+}
+function getBuildBanner({
+  packVersion,
+  duration,
+  outputPath,
+  assetCount
+}) {
+  const resolvedPackVersion = getPackVersion(packVersion);
+  const builtTime = formatDuration(duration);
+  const messages = [
+    "",
+    `  ${[
+      import_utils.chalk.cyan.bold("utoo pack"),
+      resolvedPackVersion ? import_utils.chalk.blueBright(`v${resolvedPackVersion}`) : null,
+      import_utils.chalk.green("built"),
+      builtTime ? import_utils.chalk.dim(`in ${builtTime}`) : null
+    ].filter(Boolean).join(" ")}`
+  ];
+  if (outputPath || typeof assetCount === "number") {
+    messages.push("");
+  }
+  if (outputPath) {
+    messages.push(`  ${import_utils.chalk.green("➜")}  Output:  ${import_utils.chalk.cyan(outputPath)}`);
+  }
+  if (typeof assetCount === "number") {
+    messages.push(
+      `  ${import_utils.chalk.green("➜")}  Assets:  ${import_utils.chalk.cyan(
+        `${assetCount} file${assetCount === 1 ? "" : "s"}`
+      )}`
+    );
+  }
   return messages.join("\n");
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getDevBanner
+  getBuildBanner,
+  getDevBanner,
+  getPackVersion
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-utoopack",
-  "version": "4.6.45",
+  "version": "4.6.46",
   "description": "@umijs/bundler-utoopack",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -8,7 +8,7 @@
     "dist"
   ],
   "dependencies": {
-    "@utoo/pack": "1.3.11",
+    "@utoo/pack": "1.4.0-alpha.4",
     "compression": "^1.7.4",
     "connect-history-api-fallback": "^2.0.0",
     "cors": "^2.8.5",
@@ -20,8 +20,8 @@
     "resolve-url-loader": "5.0.0",
     "sass": "1.54.0",
     "sass-loader": "13.2.0",
-    "@umijs/bundler-webpack": "4.6.45",
-    "@umijs/bundler-utils": "4.6.45"
+    "@umijs/bundler-webpack": "4.6.46",
+    "@umijs/bundler-utils": "4.6.46"
   },
   "devDependencies": {
     "father": "4.1.5"
@@ -32,6 +32,7 @@
   "scripts": {
     "build": "father build",
     "build:deps": "umi-scripts bundleDeps",
-    "dev": "father dev"
+    "dev": "father dev",
+    "test": "umi-scripts jest-turbo"
   }
 }