@utoo/pack 1.2.9 → 1.2.10-alpha.1

package/cjs/core/hmr.js

@@ -8,7 +8,7 @@ exports.createHotReloader = createHotReloader;
 const pack_shared_1 = require("@utoo/pack-shared");
 const nanoid_1 = require("nanoid");
 const path_1 = __importDefault(require("path"));
-const ws_1 = __importDefault(require("ws"));
+const ws_1 = require("ws");
 const HtmlPlugin_1 = require("../plugins/HtmlPlugin");
 const common_1 = require("../utils/common");
 const getInitialAssets_1 = require("../utils/getInitialAssets");
@@ -16,7 +16,7 @@ const htmlEntry_1 = require("../utils/htmlEntry");
 const normalize_path_1 = require("../utils/normalize-path");
 const validateEntry_1 = require("../utils/validateEntry");
 const project_1 = require("./project");
-const wsServer = new ws_1.default.Server({ noServer: true });
+const wsServer = new ws_1.WebSocketServer({ noServer: true });
 const sessionId = Math.floor(Number.MAX_SAFE_INTEGER * Math.random());
 // Re-export HMR types from pack-shared for backward compatibility
 var pack_shared_2 = require("@utoo/pack-shared");

package/cjs/core/project.js

@@ -35,6 +35,8 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TurbopackInternalError = void 0;
 exports.projectFactory = projectFactory;
+const path_1 = require("path");
+const util_1 = require("util");
 const binding = __importStar(require("../binding"));
 const common_1 = require("../utils/common");
 const loaderWorkerPool_1 = require("./loaderWorkerPool");
@@ -80,8 +82,109 @@ async function serializeConfig(config) {
             ]));
         }
     }
+    if (configSerializable.module && configSerializable.module.rules) {
+        configSerializable.module.rules = serializeModuleRules(configSerializable.module.rules);
+    }
     return JSON.stringify(configSerializable, null, 2);
 }
+// converts regexes to a `RegexComponents` object so that it can be JSON-serialized when passed to
+// Turbopack
+function serializeRuleCondition(cond) {
+    function regexComponents(regex) {
+        return {
+            source: regex.source,
+            flags: regex.flags,
+        };
+    }
+    if (typeof cond === "string") {
+        return cond;
+    }
+    else if ("all" in cond) {
+        return { ...cond, all: cond.all.map(serializeRuleCondition) };
+    }
+    else if ("any" in cond) {
+        return { ...cond, any: cond.any.map(serializeRuleCondition) };
+    }
+    else if ("not" in cond) {
+        return { ...cond, not: serializeRuleCondition(cond.not) };
+    }
+    else {
+        return {
+            ...cond,
+            path: cond.path == null
+                ? undefined
+                : cond.path instanceof RegExp
+                    ? {
+                        type: "regex",
+                        value: regexComponents(cond.path),
+                    }
+                    : { type: "glob", value: cond.path },
+            content: cond.content && regexComponents(cond.content),
+            query: cond.query == null
+                ? undefined
+                : cond.query instanceof RegExp
+                    ? {
+                        type: "regex",
+                        value: regexComponents(cond.query),
+                    }
+                    : { type: "constant", value: cond.query },
+            contentType: cond.contentType == null
+                ? undefined
+                : cond.contentType instanceof RegExp
+                    ? {
+                        type: "regex",
+                        value: regexComponents(cond.contentType),
+                    }
+                    : { type: "glob", value: cond.contentType },
+        };
+    }
+}
+// Note: Returns an updated `turbopackRules` with serialized conditions. Does not mutate in-place.
+function serializeModuleRules(turbopackRules) {
+    const serializedRules = {};
+    for (const [glob, rule] of Object.entries(turbopackRules)) {
+        if (Array.isArray(rule)) {
+            serializedRules[glob] = rule.map((item) => {
+                if (typeof item !== "string" &&
+                    ("loaders" in item || "type" in item || "condition" in item)) {
+                    return serializeConfigItem(item, glob);
+                }
+                else {
+                    checkLoaderItem(item, glob);
+                    return item;
+                }
+            });
+        }
+        else {
+            serializedRules[glob] = serializeConfigItem(rule, glob);
+        }
+    }
+    return serializedRules;
+    function serializeConfigItem(rule, glob) {
+        if (!rule)
+            return rule;
+        if (rule.loaders) {
+            for (const item of rule.loaders) {
+                checkLoaderItem(item, glob);
+            }
+        }
+        let serializedRule = rule;
+        if (rule.condition != null) {
+            serializedRule = {
+                ...rule,
+                condition: serializeRuleCondition(rule.condition),
+            };
+        }
+        return serializedRule;
+    }
+    function checkLoaderItem(loaderItem, glob) {
+        if (typeof loaderItem !== "string" &&
+            !(0, util_1.isDeepStrictEqual)(loaderItem, JSON.parse(JSON.stringify(loaderItem)))) {
+            throw new Error(`loader ${loaderItem.loader} for match "${glob}" does not have serializable options. ` +
+                "Ensure that options passed are plain JavaScript objects and values.");
+        }
+    }
+}
 async function rustifyPartialProjectOptions(options) {
     return {
         ...options,
@@ -173,7 +276,7 @@ function projectFactory() {
         constructor(nativeProject) {
             this._nativeProject = nativeProject;
             if (typeof binding.registerWorkerScheduler === "function") {
-                (0, loaderWorkerPool_1.runLoaderWorkerPool)(binding, require.resolve("@utoo/pack/cjs/binding.js"));
+                (0, loaderWorkerPool_1.runLoaderWorkerPool)(binding, (0, path_1.resolve)((0, common_1.getPackPath)(), "./binding.js"));
             }
         }
         async update(options) {

package/cjs/utils/common.d.ts

@@ -1,3 +1,8 @@
 export { createDefineEnv, debounce, isWellKnownError, ModuleBuildError, processIssues, rustifyEnv, } from "@utoo/pack-shared";
 export declare function blockStdout(): void;
+/**
+ * Pack 根目录（pack 包所在目录）。
+ * - CJS：使用 __dirname。
+ * - ESM：在构建后由脚本注入 __dirname（基于 import.meta.url），此处仅用 __dirname 以保持 CJS 产物不含 import.meta，避免 Node 将 .js 判为 ESM。
+ */
 export declare function getPackPath(): string;

package/cjs/utils/common.js

@@ -27,6 +27,11 @@ function blockStdout() {
         process.stderr._handle.setBlocking(true);
     }
 }
+/**
+ * Pack 根目录（pack 包所在目录）。
+ * - CJS：使用 __dirname。
+ * - ESM：在构建后由脚本注入 __dirname（基于 import.meta.url），此处仅用 __dirname 以保持 CJS 产物不含 import.meta，避免 Node 将 .js 判为 ESM。
+ */
 function getPackPath() {
     return path_1.default.resolve(__dirname, "..");
 }

package/cjs/utils/mkcert.js

@@ -9,8 +9,8 @@ const node_child_process_1 = require("node:child_process");
 const node_crypto_1 = require("node:crypto");
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
+const web_1 = require("node:stream/web");
 const os_1 = __importDefault(require("os"));
-const { WritableStream } = require("node:stream/web");
 const MKCERT_VERSION = "v1.4.4";
 function getBinaryName() {
     const platform = process.platform;
@@ -43,7 +43,7 @@ async function downloadBinary() {
         }
         console.log(`Download response was successful, writing to disk`);
         const binaryWriteStream = node_fs_1.default.createWriteStream(binaryPath);
-        await response.body.pipeTo(new WritableStream({
+        await response.body.pipeTo(new web_1.WritableStream({
             write(chunk) {
                 return new Promise((resolve, reject) => {
                     binaryWriteStream.write(chunk, (error) => {

package/esm/commands/build.js

@@ -3,16 +3,16 @@ import { spawn } from "child_process";
 import fs from "fs";
 import { nanoid } from "nanoid";
 import path from "path";
-import { resolveBundleOptions } from "../config/webpackCompat";
-import { projectFactory } from "../core/project";
-import { HtmlPlugin } from "../plugins/HtmlPlugin";
-import { blockStdout, createDefineEnv, getPackPath } from "../utils/common";
-import { findRootDir } from "../utils/findRoot";
-import { getInitialAssetsFromStats } from "../utils/getInitialAssets";
-import { processHtmlEntry } from "../utils/htmlEntry";
-import { normalizePath } from "../utils/normalize-path";
-import { validateEntryPaths } from "../utils/validateEntry";
-import { xcodeProfilingReady } from "../utils/xcodeProfile";
+import { resolveBundleOptions } from "../config/webpackCompat.js";
+import { projectFactory } from "../core/project.js";
+import { HtmlPlugin } from "../plugins/HtmlPlugin.js";
+import { blockStdout, createDefineEnv, getPackPath } from "../utils/common.js";
+import { findRootDir } from "../utils/findRoot.js";
+import { getInitialAssetsFromStats } from "../utils/getInitialAssets.js";
+import { processHtmlEntry } from "../utils/htmlEntry.js";
+import { normalizePath } from "../utils/normalize-path.js";
+import { validateEntryPaths } from "../utils/validateEntry.js";
+import { xcodeProfilingReady } from "../utils/xcodeProfile.js";
 export function build(options, projectPath, rootPath) {
     const bundleOptions = resolveBundleOptions(options, projectPath, rootPath);
     if (!rootPath) {

package/esm/commands/dev.js

@@ -5,13 +5,13 @@ import { isIPv6 } from "net";
 import path from "path";
 import send from "send";
 import url from "url";
-import { resolveBundleOptions } from "../config/webpackCompat";
-import { createHotReloader } from "../core/hmr";
-import { blockStdout, getPackPath } from "../utils/common";
-import { findRootDir } from "../utils/findRoot";
-import { createSelfSignedCertificate } from "../utils/mkcert";
-import { printServerInfo } from "../utils/printServerInfo";
-import { xcodeProfilingReady } from "../utils/xcodeProfile";
+import { resolveBundleOptions } from "../config/webpackCompat.js";
+import { createHotReloader } from "../core/hmr.js";
+import { blockStdout, getPackPath } from "../utils/common.js";
+import { findRootDir } from "../utils/findRoot.js";
+import { createSelfSignedCertificate } from "../utils/mkcert.js";
+import { printServerInfo } from "../utils/printServerInfo.js";
+import { xcodeProfilingReady } from "../utils/xcodeProfile.js";
 function parsePath(pathStr) {
     const hashIndex = pathStr.indexOf("#");
     const queryIndex = pathStr.indexOf("?");

package/esm/config/webpackCompat.js

@@ -1,7 +1,7 @@
 import { compatOptionsFromWebpack, } from "@utoo/pack-shared";
-import { readWebpackConfig } from "./readWebpackConfig";
+import { readWebpackConfig } from "./readWebpackConfig.js";
 export { compatOptionsFromWebpack, } from "@utoo/pack-shared";
-export { readWebpackConfig } from "./readWebpackConfig";
+export { readWebpackConfig } from "./readWebpackConfig.js";
 export function resolveBundleOptions(options, projectPath, rootPath) {
     if (options.webpackMode) {
         let webpackConfig = options;

package/esm/core/hmr.js

@@ -1,15 +1,15 @@
 import { HMR_ACTIONS_SENT_TO_BROWSER, } from "@utoo/pack-shared";
 import { nanoid } from "nanoid";
 import path from "path";
-import ws from "ws";
-import { HtmlPlugin } from "../plugins/HtmlPlugin";
-import { createDefineEnv, debounce, getPackPath, processIssues, } from "../utils/common";
-import { getInitialAssetsFromStats } from "../utils/getInitialAssets";
-import { processHtmlEntry } from "../utils/htmlEntry";
-import { normalizePath } from "../utils/normalize-path";
-import { validateEntryPaths } from "../utils/validateEntry";
-import { projectFactory } from "./project";
-const wsServer = new ws.Server({ noServer: true });
+import { WebSocketServer } from "ws";
+import { HtmlPlugin } from "../plugins/HtmlPlugin.js";
+import { createDefineEnv, debounce, getPackPath, processIssues, } from "../utils/common.js";
+import { getInitialAssetsFromStats } from "../utils/getInitialAssets.js";
+import { processHtmlEntry } from "../utils/htmlEntry.js";
+import { normalizePath } from "../utils/normalize-path.js";
+import { validateEntryPaths } from "../utils/validateEntry.js";
+import { projectFactory } from "./project.js";
+const wsServer = new WebSocketServer({ noServer: true });
 const sessionId = Math.floor(Number.MAX_SAFE_INTEGER * Math.random());
 // Re-export HMR types from pack-shared for backward compatibility
 export { HMR_ACTIONS_SENT_TO_BROWSER, } from "@utoo/pack-shared";

package/esm/core/project.js

@@ -1,6 +1,8 @@
-import * as binding from "../binding";
-import { rustifyEnv } from "../utils/common";
-import { runLoaderWorkerPool } from "./loaderWorkerPool";
+import { resolve } from "path";
+import { isDeepStrictEqual } from "util";
+import * as binding from "../binding.js";
+import { getPackPath, rustifyEnv } from "../utils/common.js";
+import { runLoaderWorkerPool } from "./loaderWorkerPool.js";
 export class TurbopackInternalError extends Error {
     constructor(cause) {
         super(cause.message);
@@ -42,8 +44,109 @@ async function serializeConfig(config) {
             ]));
         }
     }
+    if (configSerializable.module && configSerializable.module.rules) {
+        configSerializable.module.rules = serializeModuleRules(configSerializable.module.rules);
+    }
     return JSON.stringify(configSerializable, null, 2);
 }
+// converts regexes to a `RegexComponents` object so that it can be JSON-serialized when passed to
+// Turbopack
+function serializeRuleCondition(cond) {
+    function regexComponents(regex) {
+        return {
+            source: regex.source,
+            flags: regex.flags,
+        };
+    }
+    if (typeof cond === "string") {
+        return cond;
+    }
+    else if ("all" in cond) {
+        return { ...cond, all: cond.all.map(serializeRuleCondition) };
+    }
+    else if ("any" in cond) {
+        return { ...cond, any: cond.any.map(serializeRuleCondition) };
+    }
+    else if ("not" in cond) {
+        return { ...cond, not: serializeRuleCondition(cond.not) };
+    }
+    else {
+        return {
+            ...cond,
+            path: cond.path == null
+                ? undefined
+                : cond.path instanceof RegExp
+                    ? {
+                        type: "regex",
+                        value: regexComponents(cond.path),
+                    }
+                    : { type: "glob", value: cond.path },
+            content: cond.content && regexComponents(cond.content),
+            query: cond.query == null
+                ? undefined
+                : cond.query instanceof RegExp
+                    ? {
+                        type: "regex",
+                        value: regexComponents(cond.query),
+                    }
+                    : { type: "constant", value: cond.query },
+            contentType: cond.contentType == null
+                ? undefined
+                : cond.contentType instanceof RegExp
+                    ? {
+                        type: "regex",
+                        value: regexComponents(cond.contentType),
+                    }
+                    : { type: "glob", value: cond.contentType },
+        };
+    }
+}
+// Note: Returns an updated `turbopackRules` with serialized conditions. Does not mutate in-place.
+function serializeModuleRules(turbopackRules) {
+    const serializedRules = {};
+    for (const [glob, rule] of Object.entries(turbopackRules)) {
+        if (Array.isArray(rule)) {
+            serializedRules[glob] = rule.map((item) => {
+                if (typeof item !== "string" &&
+                    ("loaders" in item || "type" in item || "condition" in item)) {
+                    return serializeConfigItem(item, glob);
+                }
+                else {
+                    checkLoaderItem(item, glob);
+                    return item;
+                }
+            });
+        }
+        else {
+            serializedRules[glob] = serializeConfigItem(rule, glob);
+        }
+    }
+    return serializedRules;
+    function serializeConfigItem(rule, glob) {
+        if (!rule)
+            return rule;
+        if (rule.loaders) {
+            for (const item of rule.loaders) {
+                checkLoaderItem(item, glob);
+            }
+        }
+        let serializedRule = rule;
+        if (rule.condition != null) {
+            serializedRule = {
+                ...rule,
+                condition: serializeRuleCondition(rule.condition),
+            };
+        }
+        return serializedRule;
+    }
+    function checkLoaderItem(loaderItem, glob) {
+        if (typeof loaderItem !== "string" &&
+            !isDeepStrictEqual(loaderItem, JSON.parse(JSON.stringify(loaderItem)))) {
+            throw new Error(`loader ${loaderItem.loader} for match "${glob}" does not have serializable options. ` +
+                "Ensure that options passed are plain JavaScript objects and values.");
+        }
+    }
+}
 async function rustifyPartialProjectOptions(options) {
     return {
         ...options,
@@ -135,7 +238,7 @@ export function projectFactory() {
         constructor(nativeProject) {
             this._nativeProject = nativeProject;
             if (typeof binding.registerWorkerScheduler === "function") {
-                runLoaderWorkerPool(binding, require.resolve("@utoo/pack/cjs/binding.js"));
+                runLoaderWorkerPool(binding, resolve(getPackPath(), "./binding.js"));
             }
         }
         async update(options) {

package/esm/index.js

@@ -1,10 +1,10 @@
-import { build } from "./commands/build";
-import { serve } from "./commands/dev";
+import { build } from "./commands/build.js";
+import { serve } from "./commands/dev.js";
 export { build };
 export { serve };
 const utoopack = { build, serve };
 export default utoopack;
-export * from "./config/types";
-export * from "./config/webpackCompat";
-export * from "./core/types";
-export * from "./utils/findRoot";
+export * from "./config/types.js";
+export * from "./config/webpackCompat.js";
+export * from "./core/types.js";
+export * from "./utils/findRoot.js";

package/esm/utils/common.d.ts

@@ -1,3 +1,8 @@
 export { createDefineEnv, debounce, isWellKnownError, ModuleBuildError, processIssues, rustifyEnv, } from "@utoo/pack-shared";
 export declare function blockStdout(): void;
+/**
+ * Pack 根目录（pack 包所在目录）。
+ * - CJS：使用 __dirname。
+ * - ESM：在构建后由脚本注入 __dirname（基于 import.meta.url），此处仅用 __dirname 以保持 CJS 产物不含 import.meta，避免 Node 将 .js 判为 ESM。
+ */
 export declare function getPackPath(): string;

package/esm/utils/common.js

@@ -1,4 +1,6 @@
 import path from "path";
+import { fileURLToPath } from "node:url";
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 export { createDefineEnv, debounce, isWellKnownError, ModuleBuildError, processIssues, rustifyEnv, } from "@utoo/pack-shared";
 // ref:
 // https://github.com/vercel/next.js/pull/51883
@@ -13,6 +15,11 @@ export function blockStdout() {
         process.stderr._handle.setBlocking(true);
     }
 }
+/**
+ * Pack 根目录（pack 包所在目录）。
+ * - CJS：使用 __dirname。
+ * - ESM：在构建后由脚本注入 __dirname（基于 import.meta.url），此处仅用 __dirname 以保持 CJS 产物不含 import.meta，避免 Node 将 .js 判为 ESM。
+ */
 export function getPackPath() {
     return path.resolve(__dirname, "..");
 }

package/esm/utils/mkcert.js

@@ -2,8 +2,8 @@ import { execSync } from "node:child_process";
 import { createPrivateKey, X509Certificate } from "node:crypto";
 import fs from "node:fs";
 import path from "node:path";
+import { WritableStream } from "node:stream/web";
 import os from "os";
-const { WritableStream } = require("node:stream/web");
 const MKCERT_VERSION = "v1.4.4";
 function getBinaryName() {
     const platform = process.platform;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@utoo/pack",
-  "version": "1.2.9",
+  "version": "1.2.10-alpha.1",
   "main": "cjs/index.js",
   "module": "esm/index.js",
   "types": "esm/index.d.ts",
@@ -39,7 +39,7 @@
   "dependencies": {
     "@babel/code-frame": "7.22.5",
     "@swc/helpers": "0.5.15",
-    "@utoo/pack-shared": "1.2.9",
+    "@utoo/pack-shared": "1.2.10-alpha.1",
     "@utoo/style-loader": "^1.0.0",
     "domparser-rs": "^0.0.7",
     "find-up": "4.1.0",
@@ -74,7 +74,7 @@
     "build": "npm run build:binding && npm run build:cjs && npm run build:esm",
     "build:js": "npm run build:cjs && npm run build:esm",
     "build:cjs": "rm -rf cjs && tsc -p ./tsconfig.json --module commonjs --outDir cjs && cp src/*.d.ts cjs/",
-    "build:esm": "rm -rf esm && tsc -p ./tsconfig.json --module esnext --outDir esm && cp src/*.d.ts esm/",
+    "build:esm": "rm -rf esm && tsc -p ./tsconfig.json --module esnext --outDir esm && cp src/*.d.ts esm/ && node ../../scripts/add-esm-extensions.cjs && node scripts/inject-esm-dirname.cjs",
     "build:local": "npm run build:binding:local && npx turbo run build --filter=@utoo/pack-shared && npm run build:cjs && npm run build:esm && cp src/*.node cjs/ && cp src/*.node esm/",
     "artifacts": "napi artifacts --dir ./src --dist npm",
     "build:binding": "napi build src --platform --release -p pack-napi --cargo-cwd ../../ --cargo-name pack_napi --features plugin --js binding.js --dts binding.d.ts",
@@ -86,12 +86,12 @@
   },
   "repository": "git@github.com:utooland/utoo.git",
   "optionalDependencies": {
-    "@utoo/pack-darwin-arm64": "1.2.9",
-    "@utoo/pack-darwin-x64": "1.2.9",
-    "@utoo/pack-linux-arm64-gnu": "1.2.9",
-    "@utoo/pack-linux-arm64-musl": "1.2.9",
-    "@utoo/pack-linux-x64-gnu": "1.2.9",
-    "@utoo/pack-linux-x64-musl": "1.2.9",
-    "@utoo/pack-win32-x64-msvc": "1.2.9"
+    "@utoo/pack-darwin-arm64": "1.2.10-alpha.1",
+    "@utoo/pack-darwin-x64": "1.2.10-alpha.1",
+    "@utoo/pack-linux-arm64-gnu": "1.2.10-alpha.1",
+    "@utoo/pack-linux-arm64-musl": "1.2.10-alpha.1",
+    "@utoo/pack-linux-x64-gnu": "1.2.10-alpha.1",
+    "@utoo/pack-linux-x64-musl": "1.2.10-alpha.1",
+    "@utoo/pack-win32-x64-msvc": "1.2.10-alpha.1"
   }
 }