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

package/cjs/binding.d.ts

@@ -9,6 +9,12 @@ export declare class ExternalObject<T> {
     [K: symbol]: T
   }
 }
+export interface TransformOutput {
+  code: string
+  map?: string
+  output?: string
+  diagnostics: Array<string>
+}
 export interface NapiEndpointConfig {
   
 }
@@ -57,7 +63,7 @@ export interface NapiProjectOptions {
    * A map of environment variables which should get injected at compile
    * time.
    */
-  defineEnv: NapiDefineEnv
+  processDefineEnv: NapiDefineEnv
   /** The mode in which Next.js is running. */
   dev: boolean
   /** The build id. */
@@ -82,7 +88,7 @@ export interface NapiPartialProjectOptions {
    * A map of environment variables which should get injected at compile
    * time.
    */
-  defineEnv?: NapiDefineEnv
+  processDefineEnv?: NapiDefineEnv
   /** The mode in which Next.js is running. */
   dev?: boolean
   /** The build id. */
@@ -130,7 +136,7 @@ export interface NapiEntrypoints {
 }
 export declare function projectWriteAllEntrypointsToDisk(project: { __napiType: "Project" }): Promise<TurbopackResult>
 export declare function projectEntrypointsSubscribe(project: { __napiType: "Project" }, func: (...args: any[]) => any): { __napiType: "RootTask" }
-export declare function projectHmrEvents(project: { __napiType: "Project" }, identifier: RcStr, func: (...args: any[]) => any): { __napiType: "RootTask" }
+export declare function projectHmrEvents(project: { __napiType: "Project" }, identifier: string, func: (...args: any[]) => any): { __napiType: "RootTask" }
 export interface HmrIdentifiers {
   identifiers: Array<string>
 }
@@ -160,18 +166,16 @@ export declare function projectUpdateInfoSubscribe(project: { __napiType: "Proje
 export interface StackFrame {
   isServer: boolean
   isInternal?: boolean
-  originalFile?: RcStr
-  file: RcStr
-  /** 1-indexed, unlike source map tokens */
+  originalFile?: string
+  file: string
   line?: number
-  /** 1-indexed, unlike source map tokens */
   column?: number
-  methodName?: RcStr
+  methodName?: string
 }
 export declare function projectTraceSource(project: { __napiType: "Project" }, frame: StackFrame, currentDirectoryFileUrl: string): Promise<StackFrame | null>
 export declare function projectGetSourceForAsset(project: { __napiType: "Project" }, filePath: string): Promise<string | null>
-export declare function projectGetSourceMap(project: { __napiType: "Project" }, filePath: RcStr): Promise<string | null>
-export declare function projectGetSourceMapSync(project: { __napiType: "Project" }, filePath: RcStr): string | null
+export declare function projectGetSourceMap(project: { __napiType: "Project" }, filePath: string): Promise<string | null>
+export declare function projectGetSourceMapSync(project: { __napiType: "Project" }, filePath: string): string | null
 export declare function rootTaskDispose(rootTask: { __napiType: "RootTask" }): void
 export interface NapiIssue {
   severity: string
@@ -182,7 +186,7 @@ export interface NapiIssue {
   detail?: any
   source?: NapiIssueSource
   documentationLink: string
-  importTraces: any
+  subIssues: Array<NapiIssue>
 }
 export interface NapiIssueSource {
   source: NapiSource

package/cjs/build.d.ts

@@ -1,4 +1,2 @@
-import { BundleOptions } from "./types";
-import { WebpackConfig } from "./webpackCompat";
-export declare function build(bundleOptions: BundleOptions, projectPath?: string, rootPath?: string): Promise<void>;
-export declare function build(webpackConfig: WebpackConfig, projectPath?: string, rootPath?: string): Promise<void>;
+import { BuildOptions } from "./types";
+export declare function build(projectOptions: BuildOptions, projectPath?: string, rootPath?: string): Promise<void>;

package/cjs/build.js

@@ -4,34 +4,27 @@ exports.build = build;
 const nanoid_1 = require("nanoid");
 const project_1 = require("./project");
 const util_1 = require("./util");
-const webpackCompat_1 = require("./webpackCompat");
 const xcodeProfile_1 = require("./xcodeProfile");
-function build(options, projectPath, rootPath) {
-    const bundleOptions = options.compatMode
-        ? (0, webpackCompat_1.compatOptionsFromWebpack)(options)
-        : options;
-    return buildInternal(bundleOptions, projectPath, rootPath);
-}
-async function buildInternal(bundleOptions, projectPath, rootPath) {
-    var _a, _b, _c;
+async function build(projectOptions, projectPath, rootPath) {
+    var _a, _b, _c, _d;
     (0, util_1.blockStdout)();
     if (process.env.XCODE_PROFILE) {
         await (0, xcodeProfile_1.xcodeProfilingReady)();
     }
     const createProject = (0, project_1.projectFactory)();
     const project = await createProject({
-        processEnv: (_a = bundleOptions.processEnv) !== null && _a !== void 0 ? _a : {},
-        defineEnv: (0, util_1.createDefineEnv)({
-            config: bundleOptions.config,
-            dev: (_b = bundleOptions.dev) !== null && _b !== void 0 ? _b : false,
-            optionDefineEnv: bundleOptions.defineEnv,
+        processEnv: (_a = projectOptions.processEnv) !== null && _a !== void 0 ? _a : {},
+        processDefineEnv: (0, util_1.createDefineEnv)({
+            config: projectOptions.config,
+            dev: (_b = projectOptions.dev) !== null && _b !== void 0 ? _b : false,
+            optionDefineEnv: projectOptions.processDefineEnv,
         }),
-        watch: {
+        watch: (_c = projectOptions.watch) !== null && _c !== void 0 ? _c : {
             enable: false,
         },
-        dev: (_c = bundleOptions.dev) !== null && _c !== void 0 ? _c : false,
-        buildId: bundleOptions.buildId || (0, nanoid_1.nanoid)(),
-        config: bundleOptions.config,
+        dev: (_d = projectOptions.dev) !== null && _d !== void 0 ? _d : false,
+        buildId: (0, nanoid_1.nanoid)(),
+        config: projectOptions.config,
         projectPath: projectPath || process.cwd(),
         rootPath: rootPath || projectPath || process.cwd(),
     }, {

package/cjs/{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/cjs/{hmr.js → hotReloader.js}

@@ -4,34 +4,76 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FAST_REFRESH_RUNTIME_RELOAD = void 0;
+exports.setBundlerFindSourceMapImplementation = setBundlerFindSourceMapImplementation;
 exports.createHotReloader = createHotReloader;
-const nanoid_1 = require("nanoid");
 const ws_1 = __importDefault(require("ws"));
+const path_1 = require("path");
+const url_1 = require("url");
 const project_1 = require("./project");
 const util_1 = require("./util");
+const nanoid_1 = require("nanoid");
 const wsServer = new ws_1.default.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] = (0, url_1.pathToFileURL)((0, path_1.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;
+function setBundlerFindSourceMapImplementation(findSourceMapImplementation) {
+    bundlerFindSourceMapPayload = findSourceMapImplementation;
+}
 exports.FAST_REFRESH_RUNTIME_RELOAD = "Fast Refresh had to perform a full reload due to a runtime error.";
-async function createHotReloader(bundleOptions, projectPath, rootPath) {
-    var _a;
+async function createHotReloader(projectOptions, projectPath, rootPath) {
+    var _a, _b;
     const createProject = (0, project_1.projectFactory)();
     const project = await createProject({
-        processEnv: (_a = bundleOptions.processEnv) !== null && _a !== void 0 ? _a : {},
-        defineEnv: (0, util_1.createDefineEnv)({
-            config: bundleOptions.config,
+        processEnv: (_a = projectOptions.processEnv) !== null && _a !== void 0 ? _a : {},
+        processDefineEnv: (0, util_1.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 || (0, nanoid_1.nanoid)(),
+        buildId: (0, nanoid_1.nanoid)(),
         config: {
-            ...bundleOptions.config,
-            mode: "development",
+            ...projectOptions.config,
             optimization: {
-                ...bundleOptions.config.optimization,
+                ...projectOptions.config.optimization,
                 minify: false,
                 moduleIds: "named",
             },
@@ -41,6 +83,7 @@ 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));
@@ -73,6 +116,9 @@ async function createHotReloader(bundleOptions, projectPath, rootPath) {
     const sendEnqueuedMessagesDebounce = (0, util_1.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) {
@@ -136,9 +182,10 @@ 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/cjs/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/cjs/index.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serve = exports.build = void 0;
-const build_1 = require("./build");
+exports.watch = exports.build = void 0;
+var build_1 = require("./build");
 Object.defineProperty(exports, "build", { enumerable: true, get: function () { return build_1.build; } });
-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;
+var watch_1 = require("./watch");
+Object.defineProperty(exports, "watch", { enumerable: true, get: function () { return watch_1.watch; } });

package/cjs/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/cjs/project.js

@@ -37,6 +37,7 @@ exports.TurbopackInternalError = void 0;
 exports.projectFactory = projectFactory;
 const util_1 = require("util");
 const binding = __importStar(require("./binding"));
+const nanoid_1 = require("nanoid");
 const util_2 = require("./util");
 class TurbopackInternalError extends Error {
     constructor(cause) {
@@ -90,6 +91,7 @@ function ensureLoadersHaveSerializableOptions(turbopackRules) {
 async function serializeConfig(config) {
     var _a, _b;
     let configSerializable = { ...config };
+    configSerializable.generateBuildId = () => (0, nanoid_1.nanoid)();
     if ((_a = configSerializable.module) === null || _a === void 0 ? void 0 : _a.rules) {
         ensureLoadersHaveSerializableOptions(configSerializable.module.rules);
     }

package/cjs/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/cjs/sourceMap.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/cjs/types.d.ts

@@ -1,16 +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;
-    };
-}
+import { HmrIdentifiers, NapiIssue, NapiUpdateMessage, NapiWrittenEndpoint, StackFrame } from "./binding";
 export interface BaseUpdate {
     resource: {
         headers: unknown;
@@ -65,6 +53,7 @@ export interface DefineEnv {
 }
 export interface ExperimentalConfig {
 }
+export type TurbopackRuleConfigItemOrShortcut = TurbopackRuleConfigItem;
 export type TurbopackRuleConfigItem = TurbopackRuleConfigItemOptions | {
     [condition: string]: TurbopackRuleConfigItem;
 } | false;
@@ -80,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[]>>;
@@ -151,7 +140,6 @@ export interface ConfigComplete {
     images?: {
         inlineLimit?: number;
     };
-    stats?: boolean;
     experimental?: ExperimentalConfig;
     persistentCaching?: boolean;
     cacheHandler?: string;
@@ -205,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/cjs/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/cjs/util.js

@@ -10,8 +10,8 @@ exports.rustifyEnv = rustifyEnv;
 exports.createDefineEnv = createDefineEnv;
 exports.debounce = debounce;
 exports.blockStdout = blockStdout;
-const code_frame_1 = require("@babel/code-frame");
 const picocolors_1 = require("picocolors");
+const code_frame_1 = require("@babel/code-frame");
 const magicIdentifier_1 = require("./magicIdentifier");
 class ModuleBuildError extends Error {
     constructor() {

package/cjs/watch.d.ts

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

package/cjs/watch.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.watch = watch;
+const hotReloader_1 = require("./hotReloader");
+const util_1 = require("./util");
+const xcodeProfile_1 = require("./xcodeProfile");
+async function watch(options, projectPath, rootPath) {
+    (0, util_1.blockStdout)();
+    if (process.env.XCODE_PROFILE) {
+        await (0, xcodeProfile_1.xcodeProfilingReady)();
+    }
+    const hotReloader = await (0, hotReloader_1.createHotReloader)(options, projectPath, rootPath);
+    await hotReloader.start();
+}

package/esm/binding.d.ts

@@ -9,6 +9,12 @@ export declare class ExternalObject<T> {
     [K: symbol]: T
   }
 }
+export interface TransformOutput {
+  code: string
+  map?: string
+  output?: string
+  diagnostics: Array<string>
+}
 export interface NapiEndpointConfig {
   
 }
@@ -57,7 +63,7 @@ export interface NapiProjectOptions {
    * A map of environment variables which should get injected at compile
    * time.
    */
-  defineEnv: NapiDefineEnv
+  processDefineEnv: NapiDefineEnv
   /** The mode in which Next.js is running. */
   dev: boolean
   /** The build id. */
@@ -82,7 +88,7 @@ export interface NapiPartialProjectOptions {
    * A map of environment variables which should get injected at compile
    * time.
    */
-  defineEnv?: NapiDefineEnv
+  processDefineEnv?: NapiDefineEnv
   /** The mode in which Next.js is running. */
   dev?: boolean
   /** The build id. */
@@ -130,7 +136,7 @@ export interface NapiEntrypoints {
 }
 export declare function projectWriteAllEntrypointsToDisk(project: { __napiType: "Project" }): Promise<TurbopackResult>
 export declare function projectEntrypointsSubscribe(project: { __napiType: "Project" }, func: (...args: any[]) => any): { __napiType: "RootTask" }
-export declare function projectHmrEvents(project: { __napiType: "Project" }, identifier: RcStr, func: (...args: any[]) => any): { __napiType: "RootTask" }
+export declare function projectHmrEvents(project: { __napiType: "Project" }, identifier: string, func: (...args: any[]) => any): { __napiType: "RootTask" }
 export interface HmrIdentifiers {
   identifiers: Array<string>
 }
@@ -160,18 +166,16 @@ export declare function projectUpdateInfoSubscribe(project: { __napiType: "Proje
 export interface StackFrame {
   isServer: boolean
   isInternal?: boolean
-  originalFile?: RcStr
-  file: RcStr
-  /** 1-indexed, unlike source map tokens */
+  originalFile?: string
+  file: string
   line?: number
-  /** 1-indexed, unlike source map tokens */
   column?: number
-  methodName?: RcStr
+  methodName?: string
 }
 export declare function projectTraceSource(project: { __napiType: "Project" }, frame: StackFrame, currentDirectoryFileUrl: string): Promise<StackFrame | null>
 export declare function projectGetSourceForAsset(project: { __napiType: "Project" }, filePath: string): Promise<string | null>
-export declare function projectGetSourceMap(project: { __napiType: "Project" }, filePath: RcStr): Promise<string | null>
-export declare function projectGetSourceMapSync(project: { __napiType: "Project" }, filePath: RcStr): string | null
+export declare function projectGetSourceMap(project: { __napiType: "Project" }, filePath: string): Promise<string | null>
+export declare function projectGetSourceMapSync(project: { __napiType: "Project" }, filePath: string): string | null
 export declare function rootTaskDispose(rootTask: { __napiType: "RootTask" }): void
 export interface NapiIssue {
   severity: string
@@ -182,7 +186,7 @@ export interface NapiIssue {
   detail?: any
   source?: NapiIssueSource
   documentationLink: string
-  importTraces: any
+  subIssues: Array<NapiIssue>
 }
 export interface NapiIssueSource {
   source: NapiSource

package/esm/build.d.ts

@@ -1,4 +1,2 @@
-import { BundleOptions } from "./types";
-import { WebpackConfig } from "./webpackCompat";
-export declare function build(bundleOptions: BundleOptions, projectPath?: string, rootPath?: string): Promise<void>;
-export declare function build(webpackConfig: WebpackConfig, projectPath?: string, rootPath?: string): Promise<void>;
+import { BuildOptions } from "./types";
+export declare function build(projectOptions: BuildOptions, projectPath?: string, rootPath?: string): Promise<void>;

package/esm/build.js

@@ -1,34 +1,27 @@
 import { nanoid } from "nanoid";
 import { projectFactory } from "./project";
 import { blockStdout, createDefineEnv, formatIssue, isRelevantWarning, } from "./util";
-import { compatOptionsFromWebpack } from "./webpackCompat";
 import { xcodeProfilingReady } from "./xcodeProfile";
-export function build(options, projectPath, rootPath) {
-    const bundleOptions = options.compatMode
-        ? compatOptionsFromWebpack(options)
-        : options;
-    return buildInternal(bundleOptions, projectPath, rootPath);
-}
-async function buildInternal(bundleOptions, projectPath, rootPath) {
-    var _a, _b, _c;
+export async function build(projectOptions, projectPath, rootPath) {
+    var _a, _b, _c, _d;
     blockStdout();
     if (process.env.XCODE_PROFILE) {
         await xcodeProfilingReady();
     }
     const createProject = projectFactory();
     const project = await createProject({
-        processEnv: (_a = bundleOptions.processEnv) !== null && _a !== void 0 ? _a : {},
-        defineEnv: createDefineEnv({
-            config: bundleOptions.config,
-            dev: (_b = bundleOptions.dev) !== null && _b !== void 0 ? _b : false,
-            optionDefineEnv: bundleOptions.defineEnv,
+        processEnv: (_a = projectOptions.processEnv) !== null && _a !== void 0 ? _a : {},
+        processDefineEnv: createDefineEnv({
+            config: projectOptions.config,
+            dev: (_b = projectOptions.dev) !== null && _b !== void 0 ? _b : false,
+            optionDefineEnv: projectOptions.processDefineEnv,
         }),
-        watch: {
+        watch: (_c = projectOptions.watch) !== null && _c !== void 0 ? _c : {
             enable: false,
         },
-        dev: (_c = bundleOptions.dev) !== null && _c !== void 0 ? _c : false,
-        buildId: bundleOptions.buildId || nanoid(),
-        config: bundleOptions.config,
+        dev: (_d = projectOptions.dev) !== null && _d !== void 0 ? _d : false,
+        buildId: nanoid(),
+        config: projectOptions.config,
         projectPath: projectPath || process.cwd(),
         rootPath: rootPath || projectPath || process.cwd(),
     }, {