@workflow/next 4.0.1-beta.9 → 4.0.2

package/dist/builder.js

@@ -3,318 +3,32 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NextBuilder = void 0;
-const node_fs_1 = require("node:fs");
-const promises_1 = require("node:fs/promises");
-const node_path_1 = require("node:path");
-const watchpack_1 = __importDefault(require("watchpack"));
-const builders_1 = require("@workflow/builders");
-class NextBuilder extends builders_1.BaseBuilder {
-    async build() {
-        const outputDir = await this.findAppDirectory();
-        const workflowGeneratedDir = (0, node_path_1.join)(outputDir, '.well-known/workflow/v1');
-        // Ensure output directories exist
-        await (0, promises_1.mkdir)(workflowGeneratedDir, { recursive: true });
-        // ignore the generated assets
-        await (0, promises_1.writeFile)((0, node_path_1.join)(workflowGeneratedDir, '.gitignore'), '*');
-        const inputFiles = await this.getInputFiles();
-        const tsConfig = await this.getTsConfigOptions();
-        const options = {
-            inputFiles,
-            workflowGeneratedDir,
-            tsBaseUrl: tsConfig.baseUrl,
-            tsPaths: tsConfig.paths,
-        };
-        const stepsBuildContext = await this.buildStepsFunction(options);
-        const workflowsBundle = await this.buildWorkflowsFunction(options);
-        await this.buildWebhookRoute({ workflowGeneratedDir });
-        await this.writeFunctionsConfig(outputDir);
-        if (this.config.watch) {
-            if (!stepsBuildContext) {
-                throw new Error('Invariant: expected steps build context in watch mode');
-            }
-            if (!workflowsBundle) {
-                throw new Error('Invariant: expected workflows bundle in watch mode');
-            }
-            let stepsCtx = stepsBuildContext;
-            let workflowsCtx = workflowsBundle;
-            const normalizePath = (pathname) => pathname.replace(/\\/g, '/');
-            const knownFiles = new Set();
-            let previousTimeInfo = new Map();
-            const watchableExtensions = new Set([
-                '.js',
-                '.jsx',
-                '.ts',
-                '.tsx',
-                '.mts',
-                '.cjs',
-                '.mjs',
-            ]);
-            const ignoredPathFragments = [
-                '/.git/',
-                '/node_modules/',
-                '/.next/',
-                '/.turbo/',
-                '/.vercel/',
-                '/dist/',
-                '/build/',
-                '/out/',
-                '/.cache/',
-                '/.yarn/',
-                '/.pnpm-store/',
-                '/.parcel-cache/',
-                '/.well-known/workflow/',
-            ];
-            const normalizedGeneratedDir = workflowGeneratedDir.replace(/\\/g, '/');
-            ignoredPathFragments.push(normalizedGeneratedDir);
-            // There is a node.js bug on MacOS which causes closing file watchers to be really slow.
-            // This limits the number of watchers to mitigate the issue.
-            // https://github.com/nodejs/node/issues/29949
-            process.env.WATCHPACK_WATCHER_LIMIT =
-                process.platform === 'darwin' ? '20' : undefined;
-            const watcher = new watchpack_1.default({
-                // Watchpack default is 200ms which adds 200ms of dead time on bootup.
-                aggregateTimeout: 5,
-                ignored: (pathname) => {
-                    const normalizedPath = pathname.replace(/\\/g, '/');
-                    const extension = (0, node_path_1.extname)(normalizedPath);
-                    if (extension && !watchableExtensions.has(extension)) {
-                        return true;
-                    }
-                    if (normalizedPath.startsWith(normalizedGeneratedDir)) {
-                        return true;
-                    }
-                    for (const fragment of ignoredPathFragments) {
-                        if (normalizedPath.includes(fragment)) {
-                            return true;
-                        }
-                    }
-                    return false;
-                },
-            });
-            const readTimeInfoEntries = () => {
-                const rawEntries = watcher.getTimeInfoEntries();
-                const normalizedEntries = new Map();
-                for (const [path, info] of rawEntries) {
-                    normalizedEntries.set(normalizePath(path), info);
-                }
-                return normalizedEntries;
-            };
-            let rebuildQueue = Promise.resolve();
-            const enqueue = (task) => {
-                rebuildQueue = rebuildQueue.then(task).catch((error) => {
-                    console.error('Failed to process file change', error);
-                });
-                return rebuildQueue;
-            };
-            const fullRebuild = async () => {
-                const newInputFiles = await this.getInputFiles();
-                options.inputFiles = newInputFiles;
-                await stepsCtx.dispose();
-                const newStepsCtx = await this.buildStepsFunction(options);
-                if (!newStepsCtx) {
-                    throw new Error('Invariant: expected steps build context after rebuild');
-                }
-                stepsCtx = newStepsCtx;
-                await workflowsCtx.interimBundleCtx.dispose();
-                const newWorkflowsCtx = await this.buildWorkflowsFunction(options);
-                if (!newWorkflowsCtx) {
-                    throw new Error('Invariant: expected workflows bundle context after rebuild');
-                }
-                workflowsCtx = newWorkflowsCtx;
-            };
-            const logBuildMessages = (result, label) => {
-                const logByType = (messages, method) => {
-                    if (!messages || messages.length === 0) {
-                        return;
-                    }
-                    const descriptor = method === 'error' ? 'errors' : 'warnings';
-                    console[method](`${descriptor} while rebuilding ${label}`);
-                    for (const message of messages) {
-                        console[method](message);
-                    }
-                };
-                logByType(result.errors, 'error');
-                logByType(result.warnings, 'warn');
-            };
-            const rebuildExistingFiles = async () => {
-                const rebuiltStepStart = Date.now();
-                const stepsResult = await stepsCtx.rebuild();
-                logBuildMessages(stepsResult, 'steps bundle');
-                console.log('Rebuilt steps bundle', `${Date.now() - rebuiltStepStart}ms`);
-                const rebuiltWorkflowStart = Date.now();
-                const workflowResult = await workflowsCtx.interimBundleCtx.rebuild();
-                logBuildMessages(workflowResult, 'workflows bundle');
-                if (!workflowResult.outputFiles ||
-                    workflowResult.outputFiles.length === 0) {
-                    console.error('No output generated while rebuilding workflows bundle');
-                    return;
-                }
-                await workflowsCtx.bundleFinal(workflowResult.outputFiles[0].text);
-                console.log('Rebuilt workflow bundle', `${Date.now() - rebuiltWorkflowStart}ms`);
-            };
-            const isWatchableFile = (path) => watchableExtensions.has((0, node_path_1.extname)(path));
-            const getComparableTimestamp = (entry) => entry.timestamp ?? entry.safeTime;
-            const findRemovedFiles = (currentEntries, previousEntries) => {
-                const removed = [];
-                for (const path of previousEntries.keys()) {
-                    if (!currentEntries.has(path) && isWatchableFile(path)) {
-                        removed.push(path);
-                    }
-                }
-                return removed;
-            };
-            const findAddedAndModifiedFiles = (currentEntries, previousEntries) => {
-                const added = [];
-                const modified = [];
-                for (const [path, info] of currentEntries) {
-                    if (!isWatchableFile(path)) {
-                        continue;
-                    }
-                    const previous = previousEntries.get(path);
-                    if (!previous) {
-                        added.push(path);
-                        continue;
-                    }
-                    if (getComparableTimestamp(info) !== getComparableTimestamp(previous)) {
-                        modified.push(path);
-                    }
-                }
-                return { added, modified };
-            };
-            const determineFileChanges = (currentEntries, previousEntries) => {
-                const removedFiles = findRemovedFiles(currentEntries, previousEntries);
-                const { added, modified } = findAddedAndModifiedFiles(currentEntries, previousEntries);
-                return {
-                    addedFiles: added,
-                    modifiedFiles: modified,
-                    removedFiles,
-                };
-            };
-            let isInitial = true;
-            watcher.on('aggregated', () => {
-                const currentEntries = readTimeInfoEntries();
-                const { addedFiles, modifiedFiles, removedFiles } = determineFileChanges(currentEntries, previousTimeInfo);
-                previousTimeInfo = currentEntries;
-                if (isInitial) {
-                    isInitial = false;
-                    return;
-                }
-                if (addedFiles.length === 0 &&
-                    modifiedFiles.length === 0 &&
-                    removedFiles.length === 0) {
-                    return;
-                }
-                for (const removal of removedFiles) {
-                    knownFiles.delete(removal);
-                }
-                for (const added of addedFiles) {
-                    knownFiles.add(added);
-                }
-                enqueue(async () => {
-                    if (addedFiles.length > 0 || removedFiles.length > 0) {
-                        await fullRebuild();
-                        return;
-                    }
-                    if (modifiedFiles.length > 0) {
-                        await rebuildExistingFiles();
-                    }
-                });
-            });
-            watcher.watch({
-                directories: [this.config.workingDir],
-                startTime: 0,
-            });
-        }
+exports.WORKFLOW_DEFERRED_ENTRIES = exports.DEFERRED_BUILDER_MIN_VERSION = void 0;
+exports.shouldUseDeferredBuilder = shouldUseDeferredBuilder;
+exports.getNextBuilder = getNextBuilder;
+const semver_1 = __importDefault(require("semver"));
+const builder_deferred_js_1 = require("./builder-deferred.js");
+const builder_eager_js_1 = require("./builder-eager.js");
+exports.DEFERRED_BUILDER_MIN_VERSION = '16.2.0-canary.48';
+exports.WORKFLOW_DEFERRED_ENTRIES = [
+    '/.well-known/workflow/v1/flow',
+    '/.well-known/workflow/v1/step',
+    '/.well-known/workflow/v1/webhook/[token]',
+];
+let warnedAboutFlagAndVersion = false;
+function shouldUseDeferredBuilder(nextVersion) {
+    const flagEnabled = Boolean(process.env.WORKFLOW_NEXT_LAZY_DISCOVERY);
+    const versionCompatible = semver_1.default.gte(nextVersion, exports.DEFERRED_BUILDER_MIN_VERSION);
+    if (flagEnabled && !versionCompatible && !warnedAboutFlagAndVersion) {
+        warnedAboutFlagAndVersion = true;
+        console.warn(`Enabled lazyDiscovery but Next.js version is not compatible, needs ${exports.DEFERRED_BUILDER_MIN_VERSION} have ${nextVersion}`);
     }
-    async getInputFiles() {
-        const inputFiles = await super.getInputFiles();
-        return inputFiles.filter((item) => 
-        // non-exact pattern match to try to narrow
-        // down to just app route entrypoints, this will
-        // not be valid when pages router support is added
-        item.match(/[/\\](route|page|layout)\./));
-    }
-    async writeFunctionsConfig(outputDir) {
-        // we don't run this in development mode as it's not needed
-        if (process.env.NODE_ENV === 'development') {
-            return;
-        }
-        const generatedConfig = {
-            version: '0',
-            steps: {
-                experimentalTriggers: [builders_1.STEP_QUEUE_TRIGGER],
-            },
-            workflows: {
-                experimentalTriggers: [builders_1.WORKFLOW_QUEUE_TRIGGER],
-            },
-        };
-        // We write this file to the generated directory for
-        // the Next.js builder to consume
-        await (0, promises_1.writeFile)((0, node_path_1.join)(outputDir, '.well-known/workflow/v1/config.json'), JSON.stringify(generatedConfig, null, 2));
-    }
-    async buildStepsFunction({ inputFiles, workflowGeneratedDir, tsPaths, tsBaseUrl, }) {
-        // Create steps bundle
-        const stepsRouteDir = (0, node_path_1.join)(workflowGeneratedDir, 'step');
-        await (0, promises_1.mkdir)(stepsRouteDir, { recursive: true });
-        return await this.createStepsBundle({
-            // If any dynamic requires are used when bundling with ESM
-            // esbuild will create a too dynamic wrapper around require
-            // which turbopack/webpack fail to analyze. If we externalize
-            // correctly this shouldn't be an issue although we might want
-            // to use cjs as alternative to avoid
-            format: 'esm',
-            inputFiles,
-            outfile: (0, node_path_1.join)(stepsRouteDir, 'route.js'),
-            externalizeNonSteps: true,
-            tsBaseUrl,
-            tsPaths,
-        });
-    }
-    async buildWorkflowsFunction({ inputFiles, workflowGeneratedDir, tsPaths, tsBaseUrl, }) {
-        const workflowsRouteDir = (0, node_path_1.join)(workflowGeneratedDir, 'flow');
-        await (0, promises_1.mkdir)(workflowsRouteDir, { recursive: true });
-        return await this.createWorkflowsBundle({
-            format: 'esm',
-            outfile: (0, node_path_1.join)(workflowsRouteDir, 'route.js'),
-            bundleFinalOutput: false,
-            inputFiles,
-            tsBaseUrl,
-            tsPaths,
-        });
-    }
-    async buildWebhookRoute({ workflowGeneratedDir, }) {
-        const webhookRouteFile = (0, node_path_1.join)(workflowGeneratedDir, 'webhook/[token]/route.js');
-        await this.createWebhookBundle({
-            outfile: webhookRouteFile,
-            bundle: false, // Next.js doesn't need bundling
-        });
-    }
-    async findAppDirectory() {
-        const appDir = (0, node_path_1.resolve)(this.config.workingDir, 'app');
-        const srcAppDir = (0, node_path_1.resolve)(this.config.workingDir, 'src/app');
-        try {
-            await (0, promises_1.access)(appDir, node_fs_1.constants.F_OK);
-            const appStats = await (0, promises_1.stat)(appDir);
-            if (!appStats.isDirectory()) {
-                throw new Error(`Path exists but is not a directory: ${appDir}`);
-            }
-            return appDir;
-        }
-        catch {
-            try {
-                await (0, promises_1.access)(srcAppDir, node_fs_1.constants.F_OK);
-                const srcAppStats = await (0, promises_1.stat)(srcAppDir);
-                if (!srcAppStats.isDirectory()) {
-                    throw new Error(`Path exists but is not a directory: ${srcAppDir}`);
-                }
-                return srcAppDir;
-            }
-            catch {
-                throw new Error('Could not find Next.js app directory. Expected either "app" or "src/app" to exist.');
-            }
-        }
+    return flagEnabled && versionCompatible;
+}
+async function getNextBuilder(nextVersion) {
+    if (shouldUseDeferredBuilder(nextVersion)) {
+        return (0, builder_deferred_js_1.getNextBuilderDeferred)();
     }
+    return (0, builder_eager_js_1.getNextBuilderEager)();
 }
-exports.NextBuilder = NextBuilder;
 //# sourceMappingURL=builder.js.map

package/dist/builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"builder.js","sourceRoot":"","sources":["../src/builder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"builder.js","sourceRoot":"","sources":["../src/builder.ts"],"names":[],"mappings":";;;;;;AAcA,4DAeC;AAED,wCAMC;AArCD,oDAA4B;AAC5B,+DAA+D;AAC/D,yDAAyD;AAE5C,QAAA,4BAA4B,GAAG,kBAAkB,CAAC;AAElD,QAAA,yBAAyB,GAAG;IACvC,+BAA+B;IAC/B,+BAA+B;IAC/B,0CAA0C;CAClC,CAAC;AAEX,IAAI,yBAAyB,GAAG,KAAK,CAAC;AAEtC,SAAgB,wBAAwB,CAAC,WAAmB;IAC1D,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;IACtE,MAAM,iBAAiB,GAAG,gBAAM,CAAC,GAAG,CAClC,WAAW,EACX,oCAA4B,CAC7B,CAAC;IAEF,IAAI,WAAW,IAAI,CAAC,iBAAiB,IAAI,CAAC,yBAAyB,EAAE,CAAC;QACpE,yBAAyB,GAAG,IAAI,CAAC;QACjC,OAAO,CAAC,IAAI,CACV,sEAAsE,oCAA4B,SAAS,WAAW,EAAE,CACzH,CAAC;IACJ,CAAC;IAED,OAAO,WAAW,IAAI,iBAAiB,CAAC;AAC1C,CAAC;AAEM,KAAK,UAAU,cAAc,CAAC,WAAmB;IACtD,IAAI,wBAAwB,CAAC,WAAW,CAAC,EAAE,CAAC;QAC1C,OAAO,IAAA,4CAAsB,GAAE,CAAC;IAClC,CAAC;IAED,OAAO,IAAA,sCAAmB,GAAE,CAAC;AAC/B,CAAC"}

package/dist/index.d.ts

@@ -3,9 +3,9 @@ export declare function withWorkflow(nextConfigOrFn: NextConfig | ((phase: strin
     defaultConfig: NextConfig;
 }) => Promise<NextConfig>), { workflows, }?: {
     workflows?: {
-        embedded?: {
+        lazyDiscovery?: boolean;
+        local?: {
             port?: number;
-            dataDir?: string;
         };
     };
 }): (phase: string, ctx: {

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAGvC,wBAAgB,YAAY,CAC1B,cAAc,EACV,UAAU,GACV,CAAC,CACC,KAAK,EAAE,MAAM,EACb,GAAG,EAAE;IAAE,aAAa,EAAE,UAAU,CAAA;CAAE,KAC/B,OAAO,CAAC,UAAU,CAAC,CAAC,EAC7B,EACE,SAAS,GACV,GAAE;IACD,SAAS,CAAC,EAAE;QACV,QAAQ,CAAC,EAAE;YACT,IAAI,CAAC,EAAE,MAAM,CAAC;YACd,OAAO,CAAC,EAAE,MAAM,CAAC;SAClB,CAAC;KACH,CAAC;CACE,IAkBJ,OAAO,MAAM,EACb,KAAK;IAAE,aAAa,EAAE,UAAU,CAAA;CAAE,yBA6FrC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AA0BvC,wBAAgB,YAAY,CAC1B,cAAc,EACV,UAAU,GACV,CAAC,CACC,KAAK,EAAE,MAAM,EACb,GAAG,EAAE;IAAE,aAAa,EAAE,UAAU,CAAA;CAAE,KAC/B,OAAO,CAAC,UAAU,CAAC,CAAC,EAC7B,EACE,SAAS,GACV,GAAE;IACD,SAAS,CAAC,EAAE;QACV,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,KAAK,CAAC,EAAE;YACN,IAAI,CAAC,EAAE,MAAM,CAAC;SACf,CAAC;KACH,CAAC;CACE,IAsBJ,OAAO,MAAM,EACb,KAAK;IAAE,aAAa,EAAE,UAAU,CAAA;CAAE,yBAsLrC"}

package/dist/index.js

@@ -4,15 +4,33 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withWorkflow = withWorkflow;
-const builder_js_1 = require("./builder.js");
 const semver_1 = __importDefault(require("semver"));
+const builder_js_1 = require("./builder.js");
+function resolveNextVersion(workingDir) {
+    const fallbackVersion = require('next/package.json').version;
+    try {
+        const packageJsonPath = require.resolve('next/package.json', {
+            paths: [workingDir],
+        });
+        const resolvedPackageJson = require(packageJsonPath);
+        return typeof resolvedPackageJson.version === 'string'
+            ? resolvedPackageJson.version
+            : fallbackVersion;
+    }
+    catch {
+        return fallbackVersion;
+    }
+}
 function withWorkflow(nextConfigOrFn, { workflows, } = {}) {
+    if (workflows?.lazyDiscovery) {
+        process.env.WORKFLOW_NEXT_LAZY_DISCOVERY = '1';
+    }
     if (!process.env.VERCEL_DEPLOYMENT_ID) {
         if (!process.env.WORKFLOW_TARGET_WORLD) {
-            process.env.WORKFLOW_TARGET_WORLD = 'embedded';
-            process.env.WORKFLOW_EMBEDDED_DATA_DIR = '.next/workflow-data';
+            process.env.WORKFLOW_TARGET_WORLD = 'local';
+            process.env.WORKFLOW_LOCAL_DATA_DIR = '.next/workflow-data';
         }
-        const maybePort = workflows?.embedded?.port;
+        const maybePort = workflows?.local?.port;
         if (maybePort) {
             process.env.PORT = maybePort.toString();
         }
@@ -24,6 +42,7 @@ function withWorkflow(nextConfigOrFn, { workflows, } = {}) {
     }
     return async function buildConfig(phase, ctx) {
         const loaderPath = require.resolve('./loader');
+        let runDeferredBuildFromCallback;
         let nextConfig;
         if (typeof nextConfigOrFn === 'function') {
             nextConfig = await nextConfigOrFn(phase, ctx);
@@ -41,18 +60,105 @@ function withWorkflow(nextConfigOrFn, { workflows, } = {}) {
             nextConfig.turbopack.rules = {};
         }
         const existingRules = nextConfig.turbopack.rules;
-        const nextVersion = require('next/package.json').version;
+        const nextVersion = resolveNextVersion(process.cwd());
         const supportsTurboCondition = semver_1.default.gte(nextVersion, 'v16.0.0');
-        for (const key of ['*.tsx', '*.ts', '*.jsx', '*.js']) {
+        const useDeferredBuilder = (0, builder_js_1.shouldUseDeferredBuilder)(nextVersion);
+        // Deferred builder discovers files via loader socket notifications, so
+        // turbopack content conditions are only needed with the eager builder.
+        const shouldApplyTurboCondition = supportsTurboCondition && !useDeferredBuilder;
+        const shouldWatch = process.env.NODE_ENV === 'development';
+        let workflowBuilderPromise;
+        const getWorkflowBuilder = async () => {
+            if (!workflowBuilderPromise) {
+                workflowBuilderPromise = (async () => {
+                    const NextBuilder = await (0, builder_js_1.getNextBuilder)(nextVersion);
+                    return new NextBuilder({
+                        watch: shouldWatch,
+                        // discover workflows from pages/app entries
+                        dirs: ['pages', 'app', 'src/pages', 'src/app'],
+                        projectRoot: nextConfig.outputFileTracingRoot,
+                        workingDir: process.cwd(),
+                        distDir: nextConfig.distDir || '.next',
+                        buildTarget: 'next',
+                        workflowsBundlePath: '', // not used in base
+                        stepsBundlePath: '', // not used in base
+                        webhookBundlePath: '', // node used in base
+                        suppressCreateWorkflowsBundleLogs: useDeferredBuilder,
+                        suppressCreateWorkflowsBundleWarnings: useDeferredBuilder,
+                        suppressCreateWebhookBundleLogs: useDeferredBuilder,
+                        suppressCreateManifestLogs: useDeferredBuilder,
+                        externalPackages: [
+                            // server-only and client-only are pseudo-packages handled by Next.js
+                            // during its build process. We mark them as external to prevent esbuild
+                            // from failing when bundling code that imports them.
+                            // See: https://nextjs.org/docs/app/getting-started/server-and-client-components
+                            'server-only',
+                            'client-only',
+                            ...(nextConfig.serverExternalPackages || []),
+                        ],
+                    });
+                })();
+            }
+            return workflowBuilderPromise;
+        };
+        if (useDeferredBuilder) {
+            runDeferredBuildFromCallback = async () => {
+                const workflowBuilder = await getWorkflowBuilder();
+                if (typeof workflowBuilder.onBeforeDeferredEntries === 'function') {
+                    await workflowBuilder.onBeforeDeferredEntries();
+                }
+            };
+            const existingExperimental = (nextConfig.experimental ?? {});
+            const existingDeferredEntries = Array.isArray(existingExperimental.deferredEntries)
+                ? existingExperimental.deferredEntries
+                : [];
+            const existingOnBeforeDeferredEntries = typeof existingExperimental.onBeforeDeferredEntries === 'function'
+                ? existingExperimental.onBeforeDeferredEntries
+                : undefined;
+            nextConfig.experimental = {
+                ...existingExperimental,
+                // biome-ignore lint/suspicious/noTsIgnore: expect-error is wrong as it will work on valid version
+                // @ts-ignore this is only available in canary Next.js
+                deferredEntries: [
+                    ...new Set([
+                        ...existingDeferredEntries,
+                        ...builder_js_1.WORKFLOW_DEFERRED_ENTRIES,
+                    ]),
+                ],
+                onBeforeDeferredEntries: async (...args) => {
+                    if (existingOnBeforeDeferredEntries) {
+                        await existingOnBeforeDeferredEntries(...args);
+                    }
+                    if (runDeferredBuildFromCallback) {
+                        await runDeferredBuildFromCallback();
+                    }
+                },
+            };
+        }
+        for (const key of [
+            '*.tsx',
+            '*.ts',
+            '*.jsx',
+            '*.js',
+            '*.mjs',
+            '*.mts',
+            '*.cjs',
+            '*.cts',
+        ]) {
             nextConfig.turbopack.rules[key] = {
-                ...(supportsTurboCondition
+                ...(shouldApplyTurboCondition
                     ? {
                         condition: {
-                            ...existingRules[key]?.condition,
-                            any: [
-                                ...(existingRules[key]?.condition.any || []),
+                            // Use 'all' to combine: must match content AND must NOT be in generated path
+                            // Merge with any existing 'all' conditions from user config
+                            all: [
+                                ...(existingRules[key]?.condition?.all || []),
+                                // Exclude generated workflow route files from transformation
+                                { not: { path: /[/\\]\.well-known[/\\]workflow[/\\]/ } },
+                                // Match files with workflow directives or custom serialization patterns
+                                // Uses backreferences (\2, \3) to ensure matching quote types
                                 {
-                                    content: /(use workflow|use step)/,
+                                    content: /(use workflow|use step|from\s+(['"])@workflow\/serde\2|Symbol\.for\s*\(\s*(['"])workflow-(?:serialize|deserialize)\3\s*\))/,
                                 },
                             ],
                         },
@@ -85,21 +191,7 @@ function withWorkflow(nextConfigOrFn, { workflows, } = {}) {
         // as Next.js uses child processes for different builds
         if (!process.env.WORKFLOW_NEXT_PRIVATE_BUILT &&
             phase !== 'phase-production-server') {
-            const shouldWatch = process.env.NODE_ENV === 'development';
-            const workflowBuilder = new builder_js_1.NextBuilder({
-                watch: shouldWatch,
-                // discover workflows from pages/app entries
-                dirs: ['pages', 'app', 'src/pages', 'src/app'],
-                workingDir: process.cwd(),
-                buildTarget: 'next',
-                workflowsBundlePath: '', // not used in base
-                stepsBundlePath: '', // not used in base
-                webhookBundlePath: '', // node used in base
-                externalPackages: [
-                    ...require('next/dist/lib/server-external-packages.json'),
-                    ...(nextConfig.serverExternalPackages || []),
-                ],
-            });
+            const workflowBuilder = await getWorkflowBuilder();
             await workflowBuilder.build();
             process.env.WORKFLOW_NEXT_PRIVATE_BUILT = '1';
         }

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/loader.d.ts

@@ -1,4 +1,9 @@
-export default function workflowLoader(this: {
+type WorkflowLoaderContext = {
     resourcePath: string;
-}, source: string | Buffer, sourceMap: any): Promise<string>;
+    async?: () => (error: Error | null, content?: string, sourceMap?: any) => void;
+    addDependency?: (dependency: string) => void;
+    addBuildDependency?: (dependency: string) => void;
+};
+export default function workflowLoader(this: WorkflowLoaderContext, source: string | Buffer, sourceMap: any): string | Promise<string> | void;
+export {};
 //# sourceMappingURL=loader.d.ts.map

package/dist/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AAKA,wBAA8B,cAAc,CAC1C,IAAI,EAAE;IACJ,YAAY,EAAE,MAAM,CAAC;CACtB,EACD,MAAM,EAAE,MAAM,GAAG,MAAM,EACvB,SAAS,EAAE,GAAG,GACb,OAAO,CAAC,MAAM,CAAC,CAyEjB"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AAobA,KAAK,qBAAqB,GAAG;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CACZ,KAAK,EAAE,KAAK,GAAG,IAAI,EACnB,OAAO,CAAC,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,GAAG,KACZ,IAAI,CAAC;IACV,aAAa,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7C,kBAAkB,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;CACnD,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,cAAc,CACpC,IAAI,EAAE,qBAAqB,EAC3B,MAAM,EAAE,MAAM,GAAG,MAAM,EACvB,SAAS,EAAE,GAAG,GACb,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,CAyJjC"}