@utoo/pack 0.0.1-alpha.18 → 0.0.1-alpha.2

package/esm/{hmr.d.ts → hotReloader.d.ts}

@@ -1,7 +1,8 @@
+import { ModernSourceMapPayload } from "./sourceMap";
+import { Project, ProjectOptions, Update as TurbopackUpdate } from "./types";
+import type webpack from "webpack";
 import { IncomingMessage } from "http";
 import { Duplex } from "stream";
-import type webpack from "webpack";
-import { BundleOptions, Project, Update as TurbopackUpdate } from "./types";
 export declare const enum HMR_ACTIONS_SENT_TO_BROWSER {
     RELOAD = "reload",
     CLIENT_CHANGES = "clientChanges",
@@ -16,6 +17,10 @@ export interface TurbopackMessageAction {
     action: HMR_ACTIONS_SENT_TO_BROWSER.TURBOPACK_MESSAGE;
     data: TurbopackUpdate | TurbopackUpdate[];
 }
+export interface TurbopackMessageAction {
+    action: HMR_ACTIONS_SENT_TO_BROWSER.TURBOPACK_MESSAGE;
+    data: TurbopackUpdate | TurbopackUpdate[];
+}
 export interface TurbopackConnectedAction {
     action: HMR_ACTIONS_SENT_TO_BROWSER.TURBOPACK_CONNECTED;
     data: {
@@ -60,12 +65,14 @@ export interface HotReloaderInterface {
     clearHmrServerError(): void;
     start(): Promise<void>;
     send(action: HMR_ACTION_TYPES): void;
-    onHMR(req: IncomingMessage, socket: Duplex, head: Buffer, onUpgrade?: (client: {
+    onHMR(req: IncomingMessage, _socket: Duplex, head: Buffer, onUpgrade: (client: {
         send(data: string): void;
     }) => void): void;
     buildFallbackError(): Promise<void>;
     close(): void;
 }
+type FindSourceMapPayload = (sourceURL: string) => ModernSourceMapPayload | undefined;
+export declare function setBundlerFindSourceMapImplementation(findSourceMapImplementation: FindSourceMapPayload): void;
 export type ChangeSubscriptions = Map<string, Promise<AsyncIterableIterator<TurbopackResult>>>;
 export type ReadyIds = Set<string>;
 export type StartBuilding = (id: string, forceRebuild: boolean) => () => void;
@@ -76,5 +83,5 @@ export type ClientState = {
 };
 export type SendHmr = (id: string, payload: HMR_ACTION_TYPES) => void;
 export declare const FAST_REFRESH_RUNTIME_RELOAD = "Fast Refresh had to perform a full reload due to a runtime error.";
-export declare function createHotReloader(bundleOptions: BundleOptions, projectPath?: string, rootPath?: string): Promise<HotReloaderInterface>;
+export declare function createHotReloader(projectOptions: ProjectOptions, projectPath?: string, rootPath?: string): Promise<HotReloaderInterface>;
 export {};

package/esm/{hmr.js → hotReloader.js}

@@ -1,30 +1,71 @@
-import { nanoid } from "nanoid";
 import ws from "ws";
+import { join } from "path";
+import { pathToFileURL } from "url";
 import { projectFactory } from "./project";
 import { createDefineEnv, debounce, processIssues } from "./util";
+import { nanoid } from "nanoid";
 const wsServer = new ws.Server({ noServer: true });
 const sessionId = Math.floor(Number.MAX_SAFE_INTEGER * Math.random());
+/**
+ * Replaces turbopack:///[project] with the specified project in the `source` field.
+ */
+function rewriteTurbopackSources(projectRoot, sourceMap) {
+    if ("sections" in sourceMap) {
+        for (const section of sourceMap.sections) {
+            rewriteTurbopackSources(projectRoot, section.map);
+        }
+    }
+    else {
+        for (let i = 0; i < sourceMap.sources.length; i++) {
+            sourceMap.sources[i] = pathToFileURL(join(projectRoot, sourceMap.sources[i].replace(/turbopack:\/\/\/\[project\]/, ""))).toString();
+        }
+    }
+}
+function getSourceMapFromTurbopack(project, projectRoot, sourceURL) {
+    let sourceMapJson = null;
+    try {
+        sourceMapJson = project.getSourceMapSync(sourceURL);
+    }
+    catch (err) { }
+    if (sourceMapJson === null) {
+        return undefined;
+    }
+    else {
+        const payload = JSON.parse(sourceMapJson);
+        // The sourcemap from Turbopack is not yet written to disk so its `sources`
+        // are not absolute paths yet. We need to rewrite them to be absolute paths.
+        rewriteTurbopackSources(projectRoot, payload);
+        return payload;
+    }
+}
+// Find a source map using the bundler's API.
+// This is only a fallback for when Node.js fails to due to bugs e.g. https://github.com/nodejs/node/issues/52102
+// TODO: Remove once all supported Node.js versions are fixed.
+// TODO(veil): Set from Webpack as well
+let bundlerFindSourceMapPayload = () => undefined;
+export function setBundlerFindSourceMapImplementation(findSourceMapImplementation) {
+    bundlerFindSourceMapPayload = findSourceMapImplementation;
+}
 export const FAST_REFRESH_RUNTIME_RELOAD = "Fast Refresh had to perform a full reload due to a runtime error.";
-export async function createHotReloader(bundleOptions, projectPath, rootPath) {
-    var _a;
+export async function createHotReloader(projectOptions, projectPath, rootPath) {
+    var _a, _b;
     const createProject = projectFactory();
     const project = await createProject({
-        processEnv: (_a = bundleOptions.processEnv) !== null && _a !== void 0 ? _a : {},
-        defineEnv: createDefineEnv({
-            config: bundleOptions.config,
+        processEnv: (_a = projectOptions.processEnv) !== null && _a !== void 0 ? _a : {},
+        processDefineEnv: createDefineEnv({
+            config: projectOptions.config,
             dev: true,
-            optionDefineEnv: bundleOptions.defineEnv,
+            optionDefineEnv: projectOptions.processDefineEnv,
         }),
-        watch: {
-            enable: true,
+        watch: (_b = projectOptions.watch) !== null && _b !== void 0 ? _b : {
+            enable: false,
         },
         dev: true,
-        buildId: bundleOptions.buildId || nanoid(),
+        buildId: nanoid(),
         config: {
-            ...bundleOptions.config,
-            mode: "development",
+            ...projectOptions.config,
             optimization: {
-                ...bundleOptions.config.optimization,
+                ...projectOptions.config.optimization,
                 minify: false,
                 moduleIds: "named",
             },
@@ -34,6 +75,7 @@ export async function createHotReloader(bundleOptions, projectPath, rootPath) {
     }, {
         persistentCaching: true,
     });
+    setBundlerFindSourceMapImplementation(getSourceMapFromTurbopack.bind(null, project, projectOptions.projectPath));
     const entrypointsSubscription = project.entrypointsSubscribe();
     let currentEntriesHandlingResolve;
     let currentEntriesHandling = new Promise((resolve) => (currentEntriesHandlingResolve = resolve));
@@ -66,6 +108,9 @@ export async function createHotReloader(bundleOptions, projectPath, rootPath) {
     const sendEnqueuedMessagesDebounce = debounce(sendEnqueuedMessages, 2);
     function sendTurbopackMessage(payload) {
         var _a;
+        // TODO(PACK-2049): For some reason we end up emitting hundreds of issues messages on bigger apps,
+        //   a lot of which are duplicates.
+        //   They are currently not handled on the client at all, so might as well not send them for now.
         payload.diagnostics = [];
         payload.issues = [];
         for (const client of clients) {
@@ -129,9 +174,10 @@ export async function createHotReloader(bundleOptions, projectPath, rootPath) {
     const hotReloader = {
         turbopackProject: project,
         serverStats: null,
+        // TODO: Figure out if socket type can match the HotReloaderInterface
         onHMR(req, socket, head, onUpgrade) {
             wsServer.handleUpgrade(req, socket, head, (client) => {
-                onUpgrade === null || onUpgrade === void 0 ? void 0 : onUpgrade(client);
+                onUpgrade(client);
                 const subscriptions = new Map();
                 clients.add(client);
                 clientStates.set(client, {

package/esm/index.d.ts

@@ -1,14 +1,15 @@
-import { build } from "./build";
-import { serve } from "./dev";
-import * as webpackCompat from "./webpackCompat";
-export { build };
-export { serve };
-declare const utoopack: {
-    build: typeof build;
-    serve: typeof serve;
-};
-export default utoopack;
-export type WebpackConfig = webpackCompat.WebpackConfig;
-declare namespace utoopack {
-    type WebpackConfig = webpackCompat.WebpackConfig;
+import { NapiDiagnostic, NapiIssue } from "./binding";
+export { build } from "./build";
+export { watch } from "./watch";
+declare global {
+    export type TurbopackResult<T = {}> = T & {
+        issues: NapiIssue[];
+        diagnostics: NapiDiagnostic[];
+    };
+    export type RefCell = {
+        readonly __tag: unique symbol;
+    };
+    export type ExternalEndpoint = {
+        readonly __tag: unique symbol;
+    };
 }

package/esm/index.js

@@ -1,6 +1,2 @@
-import { build } from "./build";
-import { serve } from "./dev";
-export { build };
-export { serve };
-const utoopack = { build, serve };
-export default utoopack;
+export { build } from "./build";
+export { watch } from "./watch";

package/esm/project.d.ts

@@ -1,11 +1,11 @@
-import type { HmrIdentifiers, NapiUpdateMessage, NapiWrittenEndpoint, StackFrame } from "./binding";
 import * as binding from "./binding";
+import type { NapiWrittenEndpoint, StackFrame } from "./binding";
 import { ProjectOptions, RawEntrypoints, Update } from "./types";
 export declare class TurbopackInternalError extends Error {
     name: string;
     constructor(cause: Error);
 }
-export declare function projectFactory(): (options: Required<ProjectOptions>, turboEngineOptions: binding.NapiTurboEngineOptions) => Promise<{
+export declare function projectFactory(): (options: ProjectOptions, turboEngineOptions: binding.NapiTurboEngineOptions) => Promise<{
     readonly _nativeProject: {
         __napiType: "Project";
     };
@@ -32,12 +32,12 @@ export declare function projectFactory(): (options: Required<ProjectOptions>, tu
         diagnostics: binding.NapiDiagnostic[];
     }, void, unknown>;
     hmrEvents(identifier: string): AsyncIterableIterator<TurbopackResult<Update>>;
-    hmrIdentifiersSubscribe(): AsyncIterableIterator<TurbopackResult<HmrIdentifiers>>;
+    hmrIdentifiersSubscribe(): AsyncIterableIterator<TurbopackResult<binding.HmrIdentifiers>>;
     traceSource(stackFrame: StackFrame, currentDirectoryFileUrl: string): Promise<StackFrame | null>;
     getSourceForAsset(filePath: string): Promise<string | null>;
     getSourceMap(filePath: string): Promise<string | null>;
     getSourceMapSync(filePath: string): string | null;
-    updateInfoSubscribe(aggregationMs: number): AsyncIterableIterator<TurbopackResult<NapiUpdateMessage>>;
+    updateInfoSubscribe(aggregationMs: number): AsyncIterableIterator<TurbopackResult<binding.NapiUpdateMessage>>;
     shutdown(): Promise<void>;
     onExit(): Promise<void>;
 }>;

package/esm/project.js

@@ -1,5 +1,6 @@
 import { isDeepStrictEqual } from "util";
 import * as binding from "./binding";
+import { nanoid } from "nanoid";
 import { rustifyEnv } from "./util";
 export class TurbopackInternalError extends Error {
     constructor(cause) {
@@ -52,6 +53,7 @@ function ensureLoadersHaveSerializableOptions(turbopackRules) {
 async function serializeConfig(config) {
     var _a, _b;
     let configSerializable = { ...config };
+    configSerializable.generateBuildId = () => nanoid();
     if ((_a = configSerializable.module) === null || _a === void 0 ? void 0 : _a.rules) {
         ensureLoadersHaveSerializableOptions(configSerializable.module.rules);
     }

package/esm/sourceMap.d.ts

@@ -0,0 +1,21 @@
+import { type SourceMapPayload } from "module";
+/**
+ * https://tc39.es/source-map/#index-map
+ */
+interface IndexSourceMapSection {
+    offset: {
+        line: number;
+        column: number;
+    };
+    map: ModernRawSourceMap;
+}
+interface IndexSourceMap {
+    version: number;
+    file: string;
+    sections: IndexSourceMapSection[];
+}
+interface ModernRawSourceMap extends SourceMapPayload {
+    ignoreList?: number[];
+}
+export type ModernSourceMapPayload = ModernRawSourceMap | IndexSourceMap;
+export {};

package/esm/sourceMap.js

@@ -0,0 +1 @@
+export {};

package/esm/types.d.ts

@@ -1,17 +1,4 @@
-import { HmrIdentifiers, NapiDiagnostic, NapiIssue, NapiUpdateMessage, NapiWrittenEndpoint, StackFrame } from "./binding";
-declare global {
-    export type TurbopackResult<T = {}> = T & {
-        issues: NapiIssue[];
-        diagnostics: NapiDiagnostic[];
-    };
-    export type RefCell = {
-        readonly __tag: unique symbol;
-    };
-    export type ExternalEndpoint = {
-        readonly __tag: unique symbol;
-    };
-    export type RcStr = string;
-}
+import { HmrIdentifiers, NapiIssue, NapiUpdateMessage, NapiWrittenEndpoint, StackFrame } from "./binding";
 export interface BaseUpdate {
     resource: {
         headers: unknown;
@@ -66,6 +53,7 @@ export interface DefineEnv {
 }
 export interface ExperimentalConfig {
 }
+export type TurbopackRuleConfigItemOrShortcut = TurbopackRuleConfigItem;
 export type TurbopackRuleConfigItem = TurbopackRuleConfigItemOptions | {
     [condition: string]: TurbopackRuleConfigItem;
 } | false;
@@ -81,7 +69,7 @@ export type TurbopackRuleConfigItemOptions = {
     as?: string;
 };
 export interface ModuleOptions {
-    rules?: Record<string, TurbopackRuleConfigItem>;
+    rules?: Record<string, TurbopackRuleConfigItemOrShortcut>;
 }
 export interface ResolveOptions {
     alias?: Record<string, string | string[] | Record<string, string | string[]>>;
@@ -152,7 +140,6 @@ export interface ConfigComplete {
     images?: {
         inlineLimit?: number;
     };
-    stats?: boolean;
     experimental?: ExperimentalConfig;
     persistentCaching?: boolean;
     cacheHandler?: string;
@@ -206,25 +193,25 @@ export interface ProjectOptions {
     /**
      * A map of environment variables to use when compiling code.
      */
-    processEnv?: Record<string, string>;
-    defineEnv?: DefineEnv;
+    processEnv: Record<string, string>;
+    processDefineEnv: DefineEnv;
     /**
      * Whether to watch the filesystem for file changes.
      */
-    watch?: {
+    watch: {
         enable: boolean;
         pollIntervalMs?: number;
     };
     /**
      * The mode of utoo-pack.
      */
-    dev?: boolean;
+    dev: boolean;
     /**
      * The build id.
      */
-    buildId?: string;
+    buildId: string;
 }
-export type BundleOptions = Omit<ProjectOptions, "rootPath" | "projectPath">;
+export type BuildOptions = Omit<ProjectOptions, "rootPath" | "projectPath">;
 export interface Project {
     update(options: Partial<ProjectOptions>): Promise<void>;
     entrypointsSubscribe(): AsyncIterableIterator<TurbopackResult<RawEntrypoints>>;

package/esm/util.d.ts

@@ -1,5 +1,5 @@
 import { NapiIssue } from "./binding";
-import { ConfigComplete, DefineEnv, RustifiedEnv, StyledString } from "./types";
+import { DefineEnv, StyledString, RustifiedEnv, ConfigComplete } from "./types";
 export declare class ModuleBuildError extends Error {
     name: string;
 }

package/esm/util.js

@@ -1,5 +1,5 @@
-import { codeFrameColumns } from "@babel/code-frame";
 import { bold, green, magenta, red } from "picocolors";
+import { codeFrameColumns } from "@babel/code-frame";
 import { decodeMagicIdentifier, MAGIC_IDENTIFIER_REGEX, } from "./magicIdentifier";
 export class ModuleBuildError extends Error {
     constructor() {

package/esm/watch.d.ts

@@ -0,0 +1,2 @@
+import { ProjectOptions } from "./types";
+export declare function watch(options: ProjectOptions, projectPath: string, rootPath?: string): Promise<void>;

package/esm/watch.js

@@ -0,0 +1,11 @@
+import { createHotReloader } from "./hotReloader";
+import { blockStdout } from "./util";
+import { xcodeProfilingReady } from "./xcodeProfile";
+export async function watch(options, projectPath, rootPath) {
+    blockStdout();
+    if (process.env.XCODE_PROFILE) {
+        await xcodeProfilingReady();
+    }
+    const hotReloader = await createHotReloader(options, projectPath, rootPath);
+    await hotReloader.start();
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@utoo/pack",
-  "version": "0.0.1-alpha.18",
+  "version": "0.0.1-alpha.2",
   "main": "cjs/index.js",
   "module": "esm/index.js",
   "exports": {
@@ -49,8 +49,7 @@
     "resolve-url-loader": "^5.0.0",
     "sass": "1.54.0",
     "sass-loader": "^13.2.0",
-    "ws": "^8.18.1",
-    "send": "0.17.1"
+    "ws": "^8.18.1"
   },
   "devDependencies": {
     "@napi-rs/cli": "^2.18.0",
@@ -60,10 +59,6 @@
     "styled-jsx": "^5.1.6",
     "typescript": "^5.8.3",
     "@types/ws": "^8.18.1",
-    "@types/send": "0.14.4",
-    "@types/mime-types": "3.0.1"
-  },
-  "peerDependencies": {
     "@types/webpack": "^5.28.5"
   },
   "engines": {
@@ -76,17 +71,17 @@
     "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",
     "build:binding:local": "napi build src --platform --profile release-local -p pack-napi --cargo-cwd ../../ --cargo-name pack_napi --features plugin --js binding.js --dts binding.d.ts",
-    "prepublishOnly": "npm run build:esm && npm run build:cjs && napi prepublish -t npm --skip-gh-release",
+    "prepublishOnly": "npm run build:esm && npm run build:cjs && napi prepublish -t npm",
     "version": "napi version"
   },
   "repository": "git@github.com:umijs/mako.git",
   "optionalDependencies": {
-    "@utoo/pack-darwin-arm64": "0.0.1-alpha.18",
-    "@utoo/pack-darwin-x64": "0.0.1-alpha.18",
-    "@utoo/pack-linux-arm64-gnu": "0.0.1-alpha.18",
-    "@utoo/pack-linux-arm64-musl": "0.0.1-alpha.18",
-    "@utoo/pack-linux-x64-gnu": "0.0.1-alpha.18",
-    "@utoo/pack-linux-x64-musl": "0.0.1-alpha.18",
-    "@utoo/pack-win32-x64-msvc": "0.0.1-alpha.18"
+    "@utoo/pack-darwin-arm64": "0.0.1-alpha.2",
+    "@utoo/pack-darwin-x64": "0.0.1-alpha.2",
+    "@utoo/pack-linux-arm64-gnu": "0.0.1-alpha.2",
+    "@utoo/pack-linux-arm64-musl": "0.0.1-alpha.2",
+    "@utoo/pack-linux-x64-gnu": "0.0.1-alpha.2",
+    "@utoo/pack-linux-x64-musl": "0.0.1-alpha.2",
+    "@utoo/pack-win32-x64-msvc": "0.0.1-alpha.2"
   }
 }

package/cjs/dev.d.ts

@@ -1,44 +0,0 @@
-import { IncomingMessage, ServerResponse } from "http";
-import send from "send";
-import { Duplex, Writable } from "stream";
-import { BundleOptions } from "./types";
-import { WebpackConfig } from "./webpackCompat";
-export declare function serve(bundleOptions: BundleOptions, projectPath?: string, rootPath?: string, serverOptions?: StartServerOptions): Promise<void>;
-export declare function serve(webpackConfig: WebpackConfig, projectPath?: string, rootPath?: string, serverOptions?: StartServerOptions): Promise<void>;
-export interface SelfSignedCertificate {
-    key: string;
-    cert: string;
-    rootCA?: string;
-}
-export interface StartServerOptions {
-    port: number;
-    https?: boolean;
-    hostname?: string;
-    selfSignedCertificate?: SelfSignedCertificate;
-}
-export type RequestHandler = (req: IncomingMessage, res: ServerResponse) => Promise<void>;
-export type UpgradeHandler = (req: IncomingMessage, socket: Duplex, head: Buffer) => Promise<void>;
-export type ServerInitResult = {
-    requestHandler: RequestHandler;
-    upgradeHandler: UpgradeHandler;
-    closeUpgraded: () => void;
-};
-export declare function startServer(serverOptions: StartServerOptions, bundleOptions: BundleOptions, projectPath: string, rootPath?: string): Promise<void>;
-export declare function initialize(bundleOptions: BundleOptions, projectPath: string, rootPath?: string): Promise<ServerInitResult>;
-export declare function pipeToNodeResponse(readable: ReadableStream<Uint8Array>, res: ServerResponse, waitUntilForEnd?: Promise<unknown>): Promise<void>;
-export declare function createAbortController(response: Writable): AbortController;
-export declare function isAbortError(e: any): e is Error & {
-    name: "AbortError";
-};
-export declare const ResponseAbortedName = "ResponseAborted";
-export declare class ResponseAborted extends Error {
-    readonly name = "ResponseAborted";
-}
-export declare class DetachedPromise<T = any> {
-    readonly resolve: (value: T | PromiseLike<T>) => void;
-    readonly reject: (reason: any) => void;
-    readonly promise: Promise<T>;
-    constructor();
-}
-export declare function serveStatic(req: IncomingMessage, res: ServerResponse, path: string, opts?: Parameters<typeof send>[2]): Promise<void>;
-export declare function formatHostname(hostname: string): string;