@utoo/pack-cli 1.2.12 → 1.2.13

package/cjs/commands/build.js

@@ -58,7 +58,7 @@ exports.default = (0, citty_1.defineCommand)({
         },
     },
     async run({ args }) {
-        const { projectOptions, projectPath, rootPath } = (0, common_1.resolveBuildOptions)(args);
+        const { projectOptions, projectPath, rootPath } = await (0, common_1.resolveBuildOptions)(args);
         await utooPack.build(projectOptions, projectPath, rootPath);
     },
 });

package/cjs/commands/dev.js

@@ -58,7 +58,7 @@ exports.default = (0, citty_1.defineCommand)({
         },
     },
     async run({ args }) {
-        const { projectOptions, projectPath, rootPath } = (0, common_1.resolveBuildOptions)(args);
+        const { projectOptions, projectPath, rootPath } = await (0, common_1.resolveBuildOptions)(args);
         await utooPack.serve(projectOptions, projectPath, rootPath, {
             logServerInfo: true,
             port: 3000,

package/cjs/utils/common.d.ts

@@ -4,8 +4,9 @@ export interface BuildOptions {
     rootPath: string | undefined;
     projectOptions: utooPack.WebpackConfig | utooPack.BundleOptions;
 }
+export declare function resolveFromConfigFile(configDir: string): Promise<Record<string, unknown>>;
 export declare function resolveBuildOptions(flags: {
     project?: string;
     root?: string;
     webpack?: boolean;
-}): BuildOptions;
+}): Promise<BuildOptions>;

package/cjs/utils/common.js

@@ -1,12 +1,76 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveFromConfigFile = resolveFromConfigFile;
 exports.resolveBuildOptions = resolveBuildOptions;
+const promises_1 = require("node:fs/promises");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-function resolveBuildOptions(flags) {
+const CONFIG_FILE_NAMES = [
+    "utoopack.json",
+    "utoopack.config.mjs",
+    "utoopack.config.js",
+];
+async function resolveFromConfigFile(configDir) {
+    const resolvedDir = path_1.default.resolve(configDir);
+    for (const name of CONFIG_FILE_NAMES) {
+        const configPath = path_1.default.join(resolvedDir, name);
+        if (!fs_1.default.existsSync(configPath))
+            continue;
+        if (name.endsWith(".json")) {
+            const content = await (0, promises_1.readFile)(configPath, "utf8");
+            return JSON.parse(content);
+        }
+        if (name.endsWith(".js") || name.endsWith(".mjs")) {
+            const mod = (await Promise.resolve(`${configPath}`).then(s => __importStar(require(s))));
+            const raw = typeof mod?.default === "object" && mod.default !== null
+                ? mod.default
+                : mod;
+            return raw;
+        }
+    }
+    const tried = CONFIG_FILE_NAMES.map((n) => path_1.default.join(resolvedDir, n)).join(", ");
+    console.error(`Error: Config file not found in ${resolvedDir}`);
+    console.error(`Tried: ${tried}`);
+    console.error("Ensure utoopack.json or utoopack.config.mjs / utoopack.config.js exists in the project directory.");
+    process.exit(1);
+}
+async function resolveBuildOptions(flags) {
     const { project, root, webpack } = flags;
     const cwd = process.cwd();
     let projectPath = path_1.default.resolve(cwd, project || cwd);
@@ -16,9 +80,8 @@ function resolveBuildOptions(flags) {
         projectOptions = { webpackMode: true };
     }
     else {
-        const rawOptions = JSON.parse(fs_1.default.readFileSync(path_1.default.resolve(cwd, project || "", "utoopack.json"), {
-            encoding: "utf-8",
-        }));
+        const configDir = path_1.default.resolve(cwd, project || "");
+        const rawOptions = await resolveFromConfigFile(configDir);
         const { processEnv, defineEnv, watch, dev, buildId, packPath, rootPath: _rootPath, projectPath: _projectPath, ...config } = rawOptions;
         projectOptions = {
             config,

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@utoo/pack-cli",
   "description": "Utoo pack cli",
-  "version": "1.2.12",
+  "version": "1.2.13",
   "author": "xusd320",
   "bin": {
     "up": "./bin/run.js"
   },
   "dependencies": {
-    "@utoo/pack": "1.2.12",
+    "@utoo/pack": "1.2.13",
     "citty": "^0.1.6"
   },
   "devDependencies": {