@utoo/pack 0.0.1-alpha.39 → 0.0.1-alpha.41

package/cjs/build.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.build = build;
 const nanoid_1 = require("nanoid");
+const find_root_1 = require("./find-root");
 const project_1 = require("./project");
 const util_1 = require("./util");
 const webpackCompat_1 = require("./webpackCompat");
@@ -10,6 +11,10 @@ function build(options, projectPath, rootPath) {
     const bundleOptions = options.compatMode
         ? (0, webpackCompat_1.compatOptionsFromWebpack)(options)
         : options;
+    if (!rootPath) {
+        // help user to find the rootDir automatically.
+        rootPath = (0, find_root_1.findRootDir)(projectPath || process.cwd());
+    }
     return buildInternal(bundleOptions, projectPath, rootPath);
 }
 async function buildInternal(bundleOptions, projectPath, rootPath) {
@@ -49,10 +54,10 @@ async function buildInternal(bundleOptions, projectPath, rootPath) {
         }
     }
     if (topLevelWarnings.length > 0) {
-        console.warn(`Turbopack build encountered ${topLevelWarnings.length} warnings:\n${topLevelWarnings.join("\n")}`);
+        console.warn(`Utoopack build encountered ${topLevelWarnings.length} warnings:\n${topLevelWarnings.join("\n")}`);
     }
     if (topLevelErrors.length > 0) {
-        throw new Error(`Turbopack build failed with ${topLevelErrors.length} errors:\n${topLevelErrors.join("\n")}`);
+        throw new Error(`Utoopack build failed with ${topLevelErrors.length} errors:\n${topLevelErrors.join("\n")}`);
     }
     await project.shutdown();
     // TODO: Maybe run tasks in worker is a better way, see

package/cjs/dev.js

@@ -19,6 +19,7 @@ const net_1 = require("net");
 const path_1 = __importDefault(require("path"));
 const send_1 = __importDefault(require("send"));
 const url_1 = __importDefault(require("url"));
+const find_root_1 = require("./find-root");
 const hmr_1 = require("./hmr");
 const mkcert_1 = require("./mkcert");
 const util_1 = require("./util");
@@ -28,6 +29,10 @@ function serve(options, projectPath, rootPath, serverOptions) {
     const bundleOptions = options.compatMode
         ? (0, webpackCompat_1.compatOptionsFromWebpack)(options)
         : options;
+    if (!rootPath) {
+        // help user to find the rootDir automatically
+        rootPath = (0, find_root_1.findRootDir)(projectPath || process.cwd());
+    }
     return serveInternal(bundleOptions, projectPath, rootPath, serverOptions);
 }
 async function serveInternal(options, projectPath, rootPath, serverOptions) {
@@ -35,7 +40,7 @@ async function serveInternal(options, projectPath, rootPath, serverOptions) {
     if (process.env.XCODE_PROFILE) {
         await (0, xcodeProfile_1.xcodeProfilingReady)();
     }
-    startServer({
+    await startServer({
         hostname: (serverOptions === null || serverOptions === void 0 ? void 0 : serverOptions.hostname) || "localhost",
         port: (serverOptions === null || serverOptions === void 0 ? void 0 : serverOptions.port) || 3000,
         https: serverOptions === null || serverOptions === void 0 ? void 0 : serverOptions.https,

package/cjs/find-root.d.ts

@@ -0,0 +1,4 @@
+export declare function findRootLockFile(cwd: string): string | undefined;
+export declare function findPackageJson(cwd: string): string | undefined;
+export declare function findWorkspacesRoot(cwd: string): string;
+export declare function findRootDir(cwd: string): string;

package/cjs/find-root.js

@@ -0,0 +1,75 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findRootLockFile = findRootLockFile;
+exports.findPackageJson = findPackageJson;
+exports.findWorkspacesRoot = findWorkspacesRoot;
+exports.findRootDir = findRootDir;
+const find_up_1 = __importDefault(require("find-up"));
+const fs_1 = require("fs");
+const path_1 = require("path");
+function findRootLockFile(cwd) {
+    return find_up_1.default.sync([
+        "pnpm-lock.yaml",
+        "package-lock.json",
+        "yarn.lock",
+        "bun.lock",
+        "bun.lockb",
+    ], {
+        cwd,
+    });
+}
+// compitable with tnpm
+function findPackageJson(cwd) {
+    return find_up_1.default.sync(["package.json"], {
+        cwd,
+    });
+}
+function isWorkspaceRoot(pkgPath) {
+    const pkgJson = (0, fs_1.readFileSync)(pkgPath, "utf-8");
+    const pkgJsonContent = JSON.parse(pkgJson);
+    return Boolean(pkgJsonContent.workspaces);
+}
+// refer from: https://github.com/umijs/mako/blob/next/crates/cli/src/helper/workspace.rs#L153
+// TODO: 这块逻辑后续跟 utoo-pkg 使用一套方法
+function findWorkspacesRoot(cwd) {
+    const pkgJson = findPackageJson(cwd);
+    if (!pkgJson)
+        return cwd;
+    const pkgJsonFiles = [pkgJson];
+    while (true) {
+        const lastPkgJson = pkgJsonFiles[pkgJsonFiles.length - 1];
+        const currentDir = (0, path_1.dirname)(lastPkgJson);
+        const parentDir = (0, path_1.dirname)(currentDir);
+        if (parentDir === currentDir)
+            break;
+        if (isWorkspaceRoot(lastPkgJson))
+            break;
+        const newPkgJson = findPackageJson(parentDir);
+        if (!newPkgJson)
+            break;
+        pkgJsonFiles.push(newPkgJson);
+    }
+    return (0, path_1.dirname)(pkgJsonFiles[pkgJsonFiles.length - 1]);
+}
+function findRootDir(cwd) {
+    const lockFile = findRootLockFile(cwd);
+    if (!lockFile)
+        return findWorkspacesRoot(cwd);
+    const lockFiles = [lockFile];
+    while (true) {
+        const lastLockFile = lockFiles[lockFiles.length - 1];
+        const currentDir = (0, path_1.dirname)(lastLockFile);
+        const parentDir = (0, path_1.dirname)(currentDir);
+        // dirname('/')==='/' so if we happen to reach the FS root (as might happen in a container we need to quit to avoid looping forever
+        if (parentDir === currentDir)
+            break;
+        const newLockFile = findRootLockFile(parentDir);
+        if (!newLockFile)
+            break;
+        lockFiles.push(newLockFile);
+    }
+    return (0, path_1.dirname)(lockFiles[lockFiles.length - 1]);
+}

package/cjs/index.d.ts

@@ -8,6 +8,9 @@ declare const utoopack: {
     serve: typeof serve;
 };
 export default utoopack;
+export * from "./find-root";
+export * from "./types";
+export * from "./webpackCompat";
 export type WebpackConfig = webpackCompat.WebpackConfig;
 declare namespace utoopack {
     type WebpackConfig = webpackCompat.WebpackConfig;

package/cjs/index.js

@@ -1,4 +1,18 @@
 "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 __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serve = exports.build = void 0;
 const build_1 = require("./build");
@@ -7,3 +21,6 @@ const dev_1 = require("./dev");
 Object.defineProperty(exports, "serve", { enumerable: true, get: function () { return dev_1.serve; } });
 const utoopack = { build: build_1.build, serve: dev_1.serve };
 exports.default = utoopack;
+__exportStar(require("./find-root"), exports);
+__exportStar(require("./types"), exports);
+__exportStar(require("./webpackCompat"), exports);

package/esm/build.js

@@ -1,4 +1,5 @@
 import { nanoid } from "nanoid";
+import { findRootDir } from "./find-root";
 import { projectFactory } from "./project";
 import { blockStdout, createDefineEnv, formatIssue, isRelevantWarning, } from "./util";
 import { compatOptionsFromWebpack } from "./webpackCompat";
@@ -7,6 +8,10 @@ export function build(options, projectPath, rootPath) {
     const bundleOptions = options.compatMode
         ? compatOptionsFromWebpack(options)
         : options;
+    if (!rootPath) {
+        // help user to find the rootDir automatically.
+        rootPath = findRootDir(projectPath || process.cwd());
+    }
     return buildInternal(bundleOptions, projectPath, rootPath);
 }
 async function buildInternal(bundleOptions, projectPath, rootPath) {
@@ -46,10 +51,10 @@ async function buildInternal(bundleOptions, projectPath, rootPath) {
         }
     }
     if (topLevelWarnings.length > 0) {
-        console.warn(`Turbopack build encountered ${topLevelWarnings.length} warnings:\n${topLevelWarnings.join("\n")}`);
+        console.warn(`Utoopack build encountered ${topLevelWarnings.length} warnings:\n${topLevelWarnings.join("\n")}`);
     }
     if (topLevelErrors.length > 0) {
-        throw new Error(`Turbopack build failed with ${topLevelErrors.length} errors:\n${topLevelErrors.join("\n")}`);
+        throw new Error(`Utoopack build failed with ${topLevelErrors.length} errors:\n${topLevelErrors.join("\n")}`);
     }
     await project.shutdown();
     // TODO: Maybe run tasks in worker is a better way, see

package/esm/dev.js

@@ -5,6 +5,7 @@ import { isIPv6 } from "net";
 import path from "path";
 import send from "send";
 import url from "url";
+import { findRootDir } from "./find-root";
 import { createHotReloader } from "./hmr";
 import { createSelfSignedCertificate } from "./mkcert";
 import { blockStdout } from "./util";
@@ -14,6 +15,10 @@ export function serve(options, projectPath, rootPath, serverOptions) {
     const bundleOptions = options.compatMode
         ? compatOptionsFromWebpack(options)
         : options;
+    if (!rootPath) {
+        // help user to find the rootDir automatically
+        rootPath = findRootDir(projectPath || process.cwd());
+    }
     return serveInternal(bundleOptions, projectPath, rootPath, serverOptions);
 }
 async function serveInternal(options, projectPath, rootPath, serverOptions) {
@@ -21,7 +26,7 @@ async function serveInternal(options, projectPath, rootPath, serverOptions) {
     if (process.env.XCODE_PROFILE) {
         await xcodeProfilingReady();
     }
-    startServer({
+    await startServer({
         hostname: (serverOptions === null || serverOptions === void 0 ? void 0 : serverOptions.hostname) || "localhost",
         port: (serverOptions === null || serverOptions === void 0 ? void 0 : serverOptions.port) || 3000,
         https: serverOptions === null || serverOptions === void 0 ? void 0 : serverOptions.https,

package/esm/find-root.d.ts

@@ -0,0 +1,4 @@
+export declare function findRootLockFile(cwd: string): string | undefined;
+export declare function findPackageJson(cwd: string): string | undefined;
+export declare function findWorkspacesRoot(cwd: string): string;
+export declare function findRootDir(cwd: string): string;

package/esm/find-root.js

@@ -0,0 +1,66 @@
+import findUp from "find-up";
+import { readFileSync } from "fs";
+import { dirname } from "path";
+export function findRootLockFile(cwd) {
+    return findUp.sync([
+        "pnpm-lock.yaml",
+        "package-lock.json",
+        "yarn.lock",
+        "bun.lock",
+        "bun.lockb",
+    ], {
+        cwd,
+    });
+}
+// compitable with tnpm
+export function findPackageJson(cwd) {
+    return findUp.sync(["package.json"], {
+        cwd,
+    });
+}
+function isWorkspaceRoot(pkgPath) {
+    const pkgJson = readFileSync(pkgPath, "utf-8");
+    const pkgJsonContent = JSON.parse(pkgJson);
+    return Boolean(pkgJsonContent.workspaces);
+}
+// refer from: https://github.com/umijs/mako/blob/next/crates/cli/src/helper/workspace.rs#L153
+// TODO: 这块逻辑后续跟 utoo-pkg 使用一套方法
+export function findWorkspacesRoot(cwd) {
+    const pkgJson = findPackageJson(cwd);
+    if (!pkgJson)
+        return cwd;
+    const pkgJsonFiles = [pkgJson];
+    while (true) {
+        const lastPkgJson = pkgJsonFiles[pkgJsonFiles.length - 1];
+        const currentDir = dirname(lastPkgJson);
+        const parentDir = dirname(currentDir);
+        if (parentDir === currentDir)
+            break;
+        if (isWorkspaceRoot(lastPkgJson))
+            break;
+        const newPkgJson = findPackageJson(parentDir);
+        if (!newPkgJson)
+            break;
+        pkgJsonFiles.push(newPkgJson);
+    }
+    return dirname(pkgJsonFiles[pkgJsonFiles.length - 1]);
+}
+export function findRootDir(cwd) {
+    const lockFile = findRootLockFile(cwd);
+    if (!lockFile)
+        return findWorkspacesRoot(cwd);
+    const lockFiles = [lockFile];
+    while (true) {
+        const lastLockFile = lockFiles[lockFiles.length - 1];
+        const currentDir = dirname(lastLockFile);
+        const parentDir = dirname(currentDir);
+        // dirname('/')==='/' so if we happen to reach the FS root (as might happen in a container we need to quit to avoid looping forever
+        if (parentDir === currentDir)
+            break;
+        const newLockFile = findRootLockFile(parentDir);
+        if (!newLockFile)
+            break;
+        lockFiles.push(newLockFile);
+    }
+    return dirname(lockFiles[lockFiles.length - 1]);
+}

package/esm/index.d.ts

@@ -8,6 +8,9 @@ declare const utoopack: {
     serve: typeof serve;
 };
 export default utoopack;
+export * from "./find-root";
+export * from "./types";
+export * from "./webpackCompat";
 export type WebpackConfig = webpackCompat.WebpackConfig;
 declare namespace utoopack {
     type WebpackConfig = webpackCompat.WebpackConfig;

package/esm/index.js

@@ -4,3 +4,6 @@ export { build };
 export { serve };
 const utoopack = { build, serve };
 export default utoopack;
+export * from "./find-root";
+export * from "./types";
+export * from "./webpackCompat";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@utoo/pack",
-  "version": "0.0.1-alpha.39",
+  "version": "0.0.1-alpha.41",
   "main": "cjs/index.js",
   "module": "esm/index.js",
   "exports": {
@@ -41,6 +41,7 @@
     "react-refresh": "^0.12.0",
     "@babel/code-frame": "7.22.5",
     "@swc/helpers": "0.5.15",
+    "find-up": "4.1.0",
     "loader-runner": "^4.3.0",
     "less": "^4.0.0",
     "less-loader": "^12.0.0",
@@ -69,7 +70,7 @@
     "@types/webpack": "^5.28.5"
   },
   "engines": {
-    "node": ">= 10"
+    "node": ">= 20"
   },
   "scripts": {
     "build:cjs": "rm -rf cjs && tsc -p ./tsconfig.json --module commonjs --outDir cjs && cp src/*.d.ts cjs/",
@@ -84,12 +85,12 @@
   },
   "repository": "git@github.com:umijs/mako.git",
   "optionalDependencies": {
-    "@utoo/pack-darwin-arm64": "0.0.1-alpha.39",
-    "@utoo/pack-darwin-x64": "0.0.1-alpha.39",
-    "@utoo/pack-linux-arm64-gnu": "0.0.1-alpha.39",
-    "@utoo/pack-linux-arm64-musl": "0.0.1-alpha.39",
-    "@utoo/pack-linux-x64-gnu": "0.0.1-alpha.39",
-    "@utoo/pack-linux-x64-musl": "0.0.1-alpha.39",
-    "@utoo/pack-win32-x64-msvc": "0.0.1-alpha.39"
+    "@utoo/pack-darwin-arm64": "0.0.1-alpha.41",
+    "@utoo/pack-darwin-x64": "0.0.1-alpha.41",
+    "@utoo/pack-linux-arm64-gnu": "0.0.1-alpha.41",
+    "@utoo/pack-linux-arm64-musl": "0.0.1-alpha.41",
+    "@utoo/pack-linux-x64-gnu": "0.0.1-alpha.41",
+    "@utoo/pack-linux-x64-musl": "0.0.1-alpha.41",
+    "@utoo/pack-win32-x64-msvc": "0.0.1-alpha.41"
   }
 }