Skip to content

Backport #2732: fix(next): respect basePath for workflow routes#2791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NathanColosimo merged 3 commits into from
Jul 10, 2026
Merged

Backport #2732: fix(next): respect basePath for workflow routes #2791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4994b64
fix(next): respect basePath for workflow routes (#2732)
github-actions[bot] Jul 7, 2026
2a8c07f
fix(backport): preserve framework route wrappers
NathanColosimo Jul 8, 2026
31971e7
Merge branch 'stable' into backport/pr-2732-to-stable
VaguelySerious Jul 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .changeset/next-base-path.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
---
"@workflow/builders": patch
"@workflow/astro": patch
"@workflow/core": patch
"@workflow/next": patch
"@workflow/sveltekit": patch
"@workflow/utils": patch
"@workflow/world-local": patch
"@workflow/world-postgres": patch
---

Respect framework base paths when routing workflow traffic and expose health checks on generated Next.js workflow routes.
7 changes: 2 additions & 5 deletions packages/astro/src/builder.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -176,16 +176,13 @@ export const prerender = false;`,
// Normalize request, needed for preserving request through astro
workflowsRouteContent = replaceGeneratedRouteExport(
workflowsRouteContent,
/const handler = workflowEntrypoint\(workflowCode(?<options>[^)]*)\);\s*export const HEAD = handler;\s*export const POST = handler;?\s*$/m,
/export const POST = workflowEntrypoint\(workflowCode(?<options>[^)]*)\);?$/m,
(_match, options = '') => `${NORMALIZE_REQUEST_CODE}
const handleWorkflowRequest = async ({request}) => {
export const POST = async ({request}) => {
const normalRequest = await normalizeRequest(request);
return workflowEntrypoint(workflowCode${options})(normalRequest);
};

export const HEAD = handleWorkflowRequest;
export const POST = handleWorkflowRequest;

export const prerender = false;`,
'Failed to wrap generated Astro workflow route'
);
Expand Down
17 changes: 10 additions & 7 deletions packages/builders/src/base-builder.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,10 @@ import {
applySwcTransform,
type WorkflowManifest,
} from './apply-swc-transform.js';
import { createWorkflowEntrypointOptionsCode } from './constants.js';
import {
createWorkflowEntrypointOptionsCode,
createWorkflowRouteHandlersCode,
} from './constants.js';
import { getEsbuildTsconfigOptions } from './esbuild-tsconfig.js';
import {
fastDiscoverEntries,
Expand DownExpand Up@@ -1342,8 +1345,11 @@ export const __steps_registered = true;
}
}

const workflowEntrypointOptionsCode =
createWorkflowEntrypointOptionsCode();
const workflowEntrypointOptionsCode = createWorkflowEntrypointOptionsCode(
{
basePath: this.config.basePath,
}
);

const bundleFinal = async (interimBundle: string) => {
const workflowBundleCode = interimBundle;
Expand All@@ -1354,10 +1360,7 @@ import { workflowEntrypoint } from 'workflow/runtime';

const workflowCode = \`${workflowBundleCode.replace(/[\\`$]/g, '\\$&')}\`;

const handler = workflowEntrypoint(workflowCode${workflowEntrypointOptionsCode});

export const HEAD = handler;
export const POST = handler;`;
${createWorkflowRouteHandlersCode(`workflowEntrypoint(workflowCode${workflowEntrypointOptionsCode})`)}`;

// we skip the final bundling step for Next.js so it can bundle itself
if (!bundleFinalOutput) {
Expand Down
9 changes: 9 additions & 0 deletions packages/builders/src/constants.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,4 +48,13 @@ describe('createWorkflowEntrypointOptionsCode', () => {
', { namespace: "custom" }'
);
});

it('inlines basePath alongside namespace options', () => {
expect(
createWorkflowEntrypointOptionsCode({
namespace: 'custom',
basePath: '/v2',
})
).toBe(', { namespace: "custom", basePath: "/v2" }');
});
});
26 changes: 22 additions & 4 deletions packages/builders/src/constants.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -86,17 +86,35 @@ export function createWorkflowQueueTrigger(options?: { namespace?: string }) {
*/
export function createWorkflowEntrypointOptionsCode(options?: {
namespace?: string;
basePath?: string;
}) {
const namespace = resolveQueueNamespace(options?.namespace);
const fields: string[] = [];

if (!namespace) {
if (namespace) {
// Reuse prefix construction for namespace validation.
getQueueTopicPrefix('workflow', namespace);
fields.push(`namespace: ${JSON.stringify(namespace)}`);
}

if (options?.basePath !== undefined) {
fields.push(`basePath: ${JSON.stringify(options.basePath)}`);
}

if (fields.length === 0) {
return '';
}

// Reuse prefix construction for namespace validation.
getQueueTopicPrefix('workflow', namespace);
return `, { ${fields.join(', ')} }`;
}

return `, { namespace: ${JSON.stringify(namespace)} }`;
export function createWorkflowRouteHandlersCode(
workflowEntrypointCall: string
) {
return `export const POST = ${workflowEntrypointCall};
export const GET = POST;
export const HEAD = POST;
export const OPTIONS = POST;`;
}

/**
Expand Down
3 changes: 3 additions & 0 deletions packages/builders/src/types.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,9 @@ interface BaseWorkflowConfig {
// Optional prefix for debug files (e.g., "_" for Astro to ignore them)
debugFilePrefix?: string;

// Optional route prefix for apps deployed below the origin root.
basePath?: string;

// Suppress informational logs emitted by createWorkflowsBundle()
// (e.g. intermediate/final workflow bundle timing logs).
suppressCreateWorkflowsBundleLogs?: boolean;
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Backport #2732: fix(next): respect basePath for workflow routes by github-actions[bot] · Pull Request #2791 · vercel/workflow · GitHub
Skip to content
Backport #2732: fix(next): respect basePath for workflow routes#2791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

NathanColosimo
merged 3 commits into

from

Jul 10, 2026
 Merged


Backport #2732: fix(next): respect basePath for workflow routes
#2791
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
4994b64

fix(next): respect basePath for workflow routes (#2732)


github-actions[bot] Jul 7, 2026
2a8c07f

fix(backport): preserve framework route wrappers


NathanColosimo Jul 8, 2026
31971e7

Merge branch 'stable' into backport/pr-2732-to-stable


VaguelySerious Jul 8, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
.changeset/next-base-path.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
---
"@workflow/builders": patch
"@workflow/astro": patch
"@workflow/core": patch
"@workflow/next": patch
"@workflow/sveltekit": patch
"@workflow/utils": patch
"@workflow/world-local": patch
"@workflow/world-postgres": patch
---

Respect framework base paths when routing workflow traffic and expose health checks on generated Next.js workflow routes.

7 changes: 2 additions & 5 deletions
packages/astro/src/builder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -176,16 +176,13 @@ export const prerender = false;`,
 // Normalize request, needed for preserving request through astro
 workflowsRouteContent = replaceGeneratedRouteExport(
 workflowsRouteContent,
 /const handler = workflowEntrypoint\(workflowCode(?<options>[^)]*)\);\s*export const HEAD = handler;\s*export const POST = handler;?\s*$/m,
 /export const POST = workflowEntrypoint\(workflowCode(?<options>[^)]*)\);?$/m,
 (_match, options = '') => `${NORMALIZE_REQUEST_CODE}
const handleWorkflowRequest = async ({request}) => {
export const POST = async ({request}) => {
 const normalRequest = await normalizeRequest(request);
 return workflowEntrypoint(workflowCode${options})(normalRequest);
};

export const HEAD = handleWorkflowRequest;
export const POST = handleWorkflowRequest;

export const prerender = false;`,
 'Failed to wrap generated Astro workflow route'
 );
Expand Down

17 changes: 10 additions & 7 deletions
packages/builders/src/base-builder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,10 @@ import {
 applySwcTransform,
 type WorkflowManifest,
} from './apply-swc-transform.js';
import { createWorkflowEntrypointOptionsCode } from './constants.js';
import {
 createWorkflowEntrypointOptionsCode,
 createWorkflowRouteHandlersCode,
} from './constants.js';
import { getEsbuildTsconfigOptions } from './esbuild-tsconfig.js';
import {
 fastDiscoverEntries,
Expand DownExpand Up@@ -1342,8 +1345,11 @@ export const __steps_registered = true;
 }
 }

 const workflowEntrypointOptionsCode =
 createWorkflowEntrypointOptionsCode();
 const workflowEntrypointOptionsCode = createWorkflowEntrypointOptionsCode(
 {
 basePath: this.config.basePath,
 }
 );

 const bundleFinal = async (interimBundle: string) => {
 const workflowBundleCode = interimBundle;
Expand All@@ -1354,10 +1360,7 @@ import { workflowEntrypoint } from 'workflow/runtime';

const workflowCode = \`${workflowBundleCode.replace(/[\\`$]/g, '\\$&')}\`;

const handler = workflowEntrypoint(workflowCode${workflowEntrypointOptionsCode});

export const HEAD = handler;
export const POST = handler;`;
${createWorkflowRouteHandlersCode(`workflowEntrypoint(workflowCode${workflowEntrypointOptionsCode})`)}`;

 // we skip the final bundling step for Next.js so it can bundle itself
 if (!bundleFinalOutput) {
Expand Down

9 changes: 9 additions & 0 deletions
packages/builders/src/constants.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,4 +48,13 @@ describe('createWorkflowEntrypointOptionsCode', () => {
 ', { namespace: "custom" }'
 );
 });

 it('inlines basePath alongside namespace options', () => {
 expect(
 createWorkflowEntrypointOptionsCode({
 namespace: 'custom',
 basePath: '/v2',
 })
 ).toBe(', { namespace: "custom", basePath: "/v2" }');
 });
});

26 changes: 22 additions & 4 deletions
packages/builders/src/constants.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,17 +86,35 @@ export function createWorkflowQueueTrigger(options?: { namespace?: string }) {
 */
export function createWorkflowEntrypointOptionsCode(options?: {
 namespace?: string;
 basePath?: string;
}) {
 const namespace = resolveQueueNamespace(options?.namespace);
 const fields: string[] = [];

 if (!namespace) {
 if (namespace) {
 // Reuse prefix construction for namespace validation.
 getQueueTopicPrefix('workflow', namespace);
 fields.push(`namespace: ${JSON.stringify(namespace)}`);
 }

 if (options?.basePath !== undefined) {
 fields.push(`basePath: ${JSON.stringify(options.basePath)}`);
 }

 if (fields.length === 0) {
 return '';
 }

// Reuse prefix construction for namespace validation.
 getQueueTopicPrefix('workflow', namespace);
return `, { ${fields.join(', ')} }`;
}

 return `, { namespace: ${JSON.stringify(namespace)} }`;
export function createWorkflowRouteHandlersCode(
 workflowEntrypointCall: string
) {
 return `export const POST = ${workflowEntrypointCall};
export const GET = POST;
export const HEAD = POST;
export const OPTIONS = POST;`;
}

/**
Expand Down

3 changes: 3 additions & 0 deletions
packages/builders/src/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,9 @@ interface BaseWorkflowConfig {
 // Optional prefix for debug files (e.g., "_" for Astro to ignore them)
 debugFilePrefix?: string;

 // Optional route prefix for apps deployed below the origin root.
 basePath?: string;

 // Suppress informational logs emitted by createWorkflowsBundle()
 // (e.g. intermediate/final workflow bundle timing logs).
 suppressCreateWorkflowsBundleLogs?: boolean;
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Backport #2732: fix(next): respect basePath for workflow routes by github-actions[bot] · Pull Request #2791 · vercel/workflow · GitHub
Skip to content
Backport #2732: fix(next): respect basePath for workflow routes#2791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

NathanColosimo
merged 3 commits into

from

Jul 10, 2026
 Merged


Backport #2732: fix(next): respect basePath for workflow routes
#2791
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
4994b64

fix(next): respect basePath for workflow routes (#2732)


github-actions[bot] Jul 7, 2026
2a8c07f

fix(backport): preserve framework route wrappers


NathanColosimo Jul 8, 2026
31971e7

Merge branch 'stable' into backport/pr-2732-to-stable


VaguelySerious Jul 8, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
.changeset/next-base-path.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
---
"@workflow/builders": patch
"@workflow/astro": patch
"@workflow/core": patch
"@workflow/next": patch
"@workflow/sveltekit": patch
"@workflow/utils": patch
"@workflow/world-local": patch
"@workflow/world-postgres": patch
---

Respect framework base paths when routing workflow traffic and expose health checks on generated Next.js workflow routes.

7 changes: 2 additions & 5 deletions
packages/astro/src/builder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -176,16 +176,13 @@ export const prerender = false;`,
 // Normalize request, needed for preserving request through astro
 workflowsRouteContent = replaceGeneratedRouteExport(
 workflowsRouteContent,
 /const handler = workflowEntrypoint\(workflowCode(?<options>[^)]*)\);\s*export const HEAD = handler;\s*export const POST = handler;?\s*$/m,
 /export const POST = workflowEntrypoint\(workflowCode(?<options>[^)]*)\);?$/m,
 (_match, options = '') => `${NORMALIZE_REQUEST_CODE}
const handleWorkflowRequest = async ({request}) => {
export const POST = async ({request}) => {
 const normalRequest = await normalizeRequest(request);
 return workflowEntrypoint(workflowCode${options})(normalRequest);
};

export const HEAD = handleWorkflowRequest;
export const POST = handleWorkflowRequest;

export const prerender = false;`,
 'Failed to wrap generated Astro workflow route'
 );
Expand Down

17 changes: 10 additions & 7 deletions
packages/builders/src/base-builder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,10 @@ import {
 applySwcTransform,
 type WorkflowManifest,
} from './apply-swc-transform.js';
import { createWorkflowEntrypointOptionsCode } from './constants.js';
import {
 createWorkflowEntrypointOptionsCode,
 createWorkflowRouteHandlersCode,
} from './constants.js';
import { getEsbuildTsconfigOptions } from './esbuild-tsconfig.js';
import {
 fastDiscoverEntries,
Expand DownExpand Up@@ -1342,8 +1345,11 @@ export const __steps_registered = true;
 }
 }

 const workflowEntrypointOptionsCode =
 createWorkflowEntrypointOptionsCode();
 const workflowEntrypointOptionsCode = createWorkflowEntrypointOptionsCode(
 {
 basePath: this.config.basePath,
 }
 );

 const bundleFinal = async (interimBundle: string) => {
 const workflowBundleCode = interimBundle;
Expand All@@ -1354,10 +1360,7 @@ import { workflowEntrypoint } from 'workflow/runtime';

const workflowCode = \`${workflowBundleCode.replace(/[\\`$]/g, '\\$&')}\`;

const handler = workflowEntrypoint(workflowCode${workflowEntrypointOptionsCode});

export const HEAD = handler;
export const POST = handler;`;
${createWorkflowRouteHandlersCode(`workflowEntrypoint(workflowCode${workflowEntrypointOptionsCode})`)}`;

 // we skip the final bundling step for Next.js so it can bundle itself
 if (!bundleFinalOutput) {
Expand Down

9 changes: 9 additions & 0 deletions
packages/builders/src/constants.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,4 +48,13 @@ describe('createWorkflowEntrypointOptionsCode', () => {
 ', { namespace: "custom" }'
 );
 });

 it('inlines basePath alongside namespace options', () => {
 expect(
 createWorkflowEntrypointOptionsCode({
 namespace: 'custom',
 basePath: '/v2',
 })
 ).toBe(', { namespace: "custom", basePath: "/v2" }');
 });
});

26 changes: 22 additions & 4 deletions
packages/builders/src/constants.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,17 +86,35 @@ export function createWorkflowQueueTrigger(options?: { namespace?: string }) {
 */
export function createWorkflowEntrypointOptionsCode(options?: {
 namespace?: string;
 basePath?: string;
}) {
 const namespace = resolveQueueNamespace(options?.namespace);
 const fields: string[] = [];

 if (!namespace) {
 if (namespace) {
 // Reuse prefix construction for namespace validation.
 getQueueTopicPrefix('workflow', namespace);
 fields.push(`namespace: ${JSON.stringify(namespace)}`);
 }

 if (options?.basePath !== undefined) {
 fields.push(`basePath: ${JSON.stringify(options.basePath)}`);
 }

 if (fields.length === 0) {
 return '';
 }

// Reuse prefix construction for namespace validation.
 getQueueTopicPrefix('workflow', namespace);
return `, { ${fields.join(', ')} }`;
}

 return `, { namespace: ${JSON.stringify(namespace)} }`;
export function createWorkflowRouteHandlersCode(
 workflowEntrypointCall: string
) {
 return `export const POST = ${workflowEntrypointCall};
export const GET = POST;
export const HEAD = POST;
export const OPTIONS = POST;`;
}

/**
Expand Down

3 changes: 3 additions & 0 deletions
packages/builders/src/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,9 @@ interface BaseWorkflowConfig {
 // Optional prefix for debug files (e.g., "_" for Astro to ignore them)
 debugFilePrefix?: string;

 // Optional route prefix for apps deployed below the origin root.
 basePath?: string;

 // Suppress informational logs emitted by createWorkflowsBundle()
 // (e.g. intermediate/final workflow bundle timing logs).
 suppressCreateWorkflowsBundleLogs?: boolean;
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Backport #2732: fix(next): respect basePath for workflow routes by github-actions[bot] · Pull Request #2791 · vercel/workflow · GitHub
Skip to content
Backport #2732: fix(next): respect basePath for workflow routes#2791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

NathanColosimo
merged 3 commits into

from

Jul 10, 2026
 Merged


Backport #2732: fix(next): respect basePath for workflow routes
#2791
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
4994b64

fix(next): respect basePath for workflow routes (#2732)


github-actions[bot] Jul 7, 2026
2a8c07f

fix(backport): preserve framework route wrappers


NathanColosimo Jul 8, 2026
31971e7

Merge branch 'stable' into backport/pr-2732-to-stable


VaguelySerious Jul 8, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
.changeset/next-base-path.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
---
"@workflow/builders": patch
"@workflow/astro": patch
"@workflow/core": patch
"@workflow/next": patch
"@workflow/sveltekit": patch
"@workflow/utils": patch
"@workflow/world-local": patch
"@workflow/world-postgres": patch
---

Respect framework base paths when routing workflow traffic and expose health checks on generated Next.js workflow routes.

7 changes: 2 additions & 5 deletions
packages/astro/src/builder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -176,16 +176,13 @@ export const prerender = false;`,
 // Normalize request, needed for preserving request through astro
 workflowsRouteContent = replaceGeneratedRouteExport(
 workflowsRouteContent,
 /const handler = workflowEntrypoint\(workflowCode(?<options>[^)]*)\);\s*export const HEAD = handler;\s*export const POST = handler;?\s*$/m,
 /export const POST = workflowEntrypoint\(workflowCode(?<options>[^)]*)\);?$/m,
 (_match, options = '') => `${NORMALIZE_REQUEST_CODE}
const handleWorkflowRequest = async ({request}) => {
export const POST = async ({request}) => {
 const normalRequest = await normalizeRequest(request);
 return workflowEntrypoint(workflowCode${options})(normalRequest);
};

export const HEAD = handleWorkflowRequest;
export const POST = handleWorkflowRequest;

export const prerender = false;`,
 'Failed to wrap generated Astro workflow route'
 );
Expand Down

17 changes: 10 additions & 7 deletions
packages/builders/src/base-builder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,10 @@ import {
 applySwcTransform,
 type WorkflowManifest,
} from './apply-swc-transform.js';
import { createWorkflowEntrypointOptionsCode } from './constants.js';
import {
 createWorkflowEntrypointOptionsCode,
 createWorkflowRouteHandlersCode,
} from './constants.js';
import { getEsbuildTsconfigOptions } from './esbuild-tsconfig.js';
import {
 fastDiscoverEntries,
Expand DownExpand Up@@ -1342,8 +1345,11 @@ export const __steps_registered = true;
 }
 }

 const workflowEntrypointOptionsCode =
 createWorkflowEntrypointOptionsCode();
 const workflowEntrypointOptionsCode = createWorkflowEntrypointOptionsCode(
 {
 basePath: this.config.basePath,
 }
 );

 const bundleFinal = async (interimBundle: string) => {
 const workflowBundleCode = interimBundle;
Expand All@@ -1354,10 +1360,7 @@ import { workflowEntrypoint } from 'workflow/runtime';

const workflowCode = \`${workflowBundleCode.replace(/[\\`$]/g, '\\$&')}\`;

const handler = workflowEntrypoint(workflowCode${workflowEntrypointOptionsCode});

export const HEAD = handler;
export const POST = handler;`;
${createWorkflowRouteHandlersCode(`workflowEntrypoint(workflowCode${workflowEntrypointOptionsCode})`)}`;

 // we skip the final bundling step for Next.js so it can bundle itself
 if (!bundleFinalOutput) {
Expand Down

9 changes: 9 additions & 0 deletions
packages/builders/src/constants.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,4 +48,13 @@ describe('createWorkflowEntrypointOptionsCode', () => {
 ', { namespace: "custom" }'
 );
 });

 it('inlines basePath alongside namespace options', () => {
 expect(
 createWorkflowEntrypointOptionsCode({
 namespace: 'custom',
 basePath: '/v2',
 })
 ).toBe(', { namespace: "custom", basePath: "/v2" }');
 });
});

26 changes: 22 additions & 4 deletions
packages/builders/src/constants.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,17 +86,35 @@ export function createWorkflowQueueTrigger(options?: { namespace?: string }) {
 */
export function createWorkflowEntrypointOptionsCode(options?: {
 namespace?: string;
 basePath?: string;
}) {
 const namespace = resolveQueueNamespace(options?.namespace);
 const fields: string[] = [];

 if (!namespace) {
 if (namespace) {
 // Reuse prefix construction for namespace validation.
 getQueueTopicPrefix('workflow', namespace);
 fields.push(`namespace: ${JSON.stringify(namespace)}`);
 }

 if (options?.basePath !== undefined) {
 fields.push(`basePath: ${JSON.stringify(options.basePath)}`);
 }

 if (fields.length === 0) {
 return '';
 }

// Reuse prefix construction for namespace validation.
 getQueueTopicPrefix('workflow', namespace);
return `, { ${fields.join(', ')} }`;
}

 return `, { namespace: ${JSON.stringify(namespace)} }`;
export function createWorkflowRouteHandlersCode(
 workflowEntrypointCall: string
) {
 return `export const POST = ${workflowEntrypointCall};
export const GET = POST;
export const HEAD = POST;
export const OPTIONS = POST;`;
}

/**
Expand Down

3 changes: 3 additions & 0 deletions
packages/builders/src/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,9 @@ interface BaseWorkflowConfig {
 // Optional prefix for debug files (e.g., "_" for Astro to ignore them)
 debugFilePrefix?: string;

 // Optional route prefix for apps deployed below the origin root.
 basePath?: string;

 // Suppress informational logs emitted by createWorkflowsBundle()
 // (e.g. intermediate/final workflow bundle timing logs).
 suppressCreateWorkflowsBundleLogs?: boolean;
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Backport #2732: fix(next): respect basePath for workflow routes by github-actions[bot] · Pull Request #2791 · vercel/workflow · GitHub
Skip to content
Backport #2732: fix(next): respect basePath for workflow routes#2791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

NathanColosimo
merged 3 commits into

from

Jul 10, 2026
 Merged


Backport #2732: fix(next): respect basePath for workflow routes
#2791
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
4994b64

fix(next): respect basePath for workflow routes (#2732)


github-actions[bot] Jul 7, 2026
2a8c07f

fix(backport): preserve framework route wrappers


NathanColosimo Jul 8, 2026
31971e7

Merge branch 'stable' into backport/pr-2732-to-stable


VaguelySerious Jul 8, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
.changeset/next-base-path.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
---
"@workflow/builders": patch
"@workflow/astro": patch
"@workflow/core": patch
"@workflow/next": patch
"@workflow/sveltekit": patch
"@workflow/utils": patch
"@workflow/world-local": patch
"@workflow/world-postgres": patch
---

Respect framework base paths when routing workflow traffic and expose health checks on generated Next.js workflow routes.

7 changes: 2 additions & 5 deletions
packages/astro/src/builder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -176,16 +176,13 @@ export const prerender = false;`,
 // Normalize request, needed for preserving request through astro
 workflowsRouteContent = replaceGeneratedRouteExport(
 workflowsRouteContent,
 /const handler = workflowEntrypoint\(workflowCode(?<options>[^)]*)\);\s*export const HEAD = handler;\s*export const POST = handler;?\s*$/m,
 /export const POST = workflowEntrypoint\(workflowCode(?<options>[^)]*)\);?$/m,
 (_match, options = '') => `${NORMALIZE_REQUEST_CODE}
const handleWorkflowRequest = async ({request}) => {
export const POST = async ({request}) => {
 const normalRequest = await normalizeRequest(request);
 return workflowEntrypoint(workflowCode${options})(normalRequest);
};

export const HEAD = handleWorkflowRequest;
export const POST = handleWorkflowRequest;

export const prerender = false;`,
 'Failed to wrap generated Astro workflow route'
 );
Expand Down

17 changes: 10 additions & 7 deletions
packages/builders/src/base-builder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,10 @@ import {
 applySwcTransform,
 type WorkflowManifest,
} from './apply-swc-transform.js';
import { createWorkflowEntrypointOptionsCode } from './constants.js';
import {
 createWorkflowEntrypointOptionsCode,
 createWorkflowRouteHandlersCode,
} from './constants.js';
import { getEsbuildTsconfigOptions } from './esbuild-tsconfig.js';
import {
 fastDiscoverEntries,
Expand DownExpand Up@@ -1342,8 +1345,11 @@ export const __steps_registered = true;
 }
 }

 const workflowEntrypointOptionsCode =
 createWorkflowEntrypointOptionsCode();
 const workflowEntrypointOptionsCode = createWorkflowEntrypointOptionsCode(
 {
 basePath: this.config.basePath,
 }
 );

 const bundleFinal = async (interimBundle: string) => {
 const workflowBundleCode = interimBundle;
Expand All@@ -1354,10 +1360,7 @@ import { workflowEntrypoint } from 'workflow/runtime';

const workflowCode = \`${workflowBundleCode.replace(/[\\`$]/g, '\\$&')}\`;

const handler = workflowEntrypoint(workflowCode${workflowEntrypointOptionsCode});

export const HEAD = handler;
export const POST = handler;`;
${createWorkflowRouteHandlersCode(`workflowEntrypoint(workflowCode${workflowEntrypointOptionsCode})`)}`;

 // we skip the final bundling step for Next.js so it can bundle itself
 if (!bundleFinalOutput) {
Expand Down

9 changes: 9 additions & 0 deletions
packages/builders/src/constants.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,4 +48,13 @@ describe('createWorkflowEntrypointOptionsCode', () => {
 ', { namespace: "custom" }'
 );
 });

 it('inlines basePath alongside namespace options', () => {
 expect(
 createWorkflowEntrypointOptionsCode({
 namespace: 'custom',
 basePath: '/v2',
 })
 ).toBe(', { namespace: "custom", basePath: "/v2" }');
 });
});

26 changes: 22 additions & 4 deletions
packages/builders/src/constants.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,17 +86,35 @@ export function createWorkflowQueueTrigger(options?: { namespace?: string }) {
 */
export function createWorkflowEntrypointOptionsCode(options?: {
 namespace?: string;
 basePath?: string;
}) {
 const namespace = resolveQueueNamespace(options?.namespace);
 const fields: string[] = [];

 if (!namespace) {
 if (namespace) {
 // Reuse prefix construction for namespace validation.
 getQueueTopicPrefix('workflow', namespace);
 fields.push(`namespace: ${JSON.stringify(namespace)}`);
 }

 if (options?.basePath !== undefined) {
 fields.push(`basePath: ${JSON.stringify(options.basePath)}`);
 }

 if (fields.length === 0) {
 return '';
 }

// Reuse prefix construction for namespace validation.
 getQueueTopicPrefix('workflow', namespace);
return `, { ${fields.join(', ')} }`;
}

 return `, { namespace: ${JSON.stringify(namespace)} }`;
export function createWorkflowRouteHandlersCode(
 workflowEntrypointCall: string
) {
 return `export const POST = ${workflowEntrypointCall};
export const GET = POST;
export const HEAD = POST;
export const OPTIONS = POST;`;
}

/**
Expand Down

3 changes: 3 additions & 0 deletions
packages/builders/src/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,9 @@ interface BaseWorkflowConfig {
 // Optional prefix for debug files (e.g., "_" for Astro to ignore them)
 debugFilePrefix?: string;

 // Optional route prefix for apps deployed below the origin root.
 basePath?: string;

 // Suppress informational logs emitted by createWorkflowsBundle()
 // (e.g. intermediate/final workflow bundle timing logs).
 suppressCreateWorkflowsBundleLogs?: boolean;
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Backport #2732: fix(next): respect basePath for workflow routes by github-actions[bot] · Pull Request #2791 · vercel/workflow · GitHub
Skip to content
Backport #2732: fix(next): respect basePath for workflow routes#2791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

NathanColosimo
merged 3 commits into

from

Jul 10, 2026
 Merged


Backport #2732: fix(next): respect basePath for workflow routes
#2791
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
4994b64

fix(next): respect basePath for workflow routes (#2732)


github-actions[bot] Jul 7, 2026
2a8c07f

fix(backport): preserve framework route wrappers


NathanColosimo Jul 8, 2026
31971e7

Merge branch 'stable' into backport/pr-2732-to-stable


VaguelySerious Jul 8, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
.changeset/next-base-path.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
---
"@workflow/builders": patch
"@workflow/astro": patch
"@workflow/core": patch
"@workflow/next": patch
"@workflow/sveltekit": patch
"@workflow/utils": patch
"@workflow/world-local": patch
"@workflow/world-postgres": patch
---

Respect framework base paths when routing workflow traffic and expose health checks on generated Next.js workflow routes.

7 changes: 2 additions & 5 deletions
packages/astro/src/builder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -176,16 +176,13 @@ export const prerender = false;`,
 // Normalize request, needed for preserving request through astro
 workflowsRouteContent = replaceGeneratedRouteExport(
 workflowsRouteContent,
 /const handler = workflowEntrypoint\(workflowCode(?<options>[^)]*)\);\s*export const HEAD = handler;\s*export const POST = handler;?\s*$/m,
 /export const POST = workflowEntrypoint\(workflowCode(?<options>[^)]*)\);?$/m,
 (_match, options = '') => `${NORMALIZE_REQUEST_CODE}
const handleWorkflowRequest = async ({request}) => {
export const POST = async ({request}) => {
 const normalRequest = await normalizeRequest(request);
 return workflowEntrypoint(workflowCode${options})(normalRequest);
};

export const HEAD = handleWorkflowRequest;
export const POST = handleWorkflowRequest;

export const prerender = false;`,
 'Failed to wrap generated Astro workflow route'
 );
Expand Down

17 changes: 10 additions & 7 deletions
packages/builders/src/base-builder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,10 @@ import {
 applySwcTransform,
 type WorkflowManifest,
} from './apply-swc-transform.js';
import { createWorkflowEntrypointOptionsCode } from './constants.js';
import {
 createWorkflowEntrypointOptionsCode,
 createWorkflowRouteHandlersCode,
} from './constants.js';
import { getEsbuildTsconfigOptions } from './esbuild-tsconfig.js';
import {
 fastDiscoverEntries,
Expand DownExpand Up@@ -1342,8 +1345,11 @@ export const __steps_registered = true;
 }
 }

 const workflowEntrypointOptionsCode =
 createWorkflowEntrypointOptionsCode();
 const workflowEntrypointOptionsCode = createWorkflowEntrypointOptionsCode(
 {
 basePath: this.config.basePath,
 }
 );

 const bundleFinal = async (interimBundle: string) => {
 const workflowBundleCode = interimBundle;
Expand All@@ -1354,10 +1360,7 @@ import { workflowEntrypoint } from 'workflow/runtime';

const workflowCode = \`${workflowBundleCode.replace(/[\\`$]/g, '\\$&')}\`;

const handler = workflowEntrypoint(workflowCode${workflowEntrypointOptionsCode});

export const HEAD = handler;
export const POST = handler;`;
${createWorkflowRouteHandlersCode(`workflowEntrypoint(workflowCode${workflowEntrypointOptionsCode})`)}`;

 // we skip the final bundling step for Next.js so it can bundle itself
 if (!bundleFinalOutput) {
Expand Down

9 changes: 9 additions & 0 deletions
packages/builders/src/constants.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,4 +48,13 @@ describe('createWorkflowEntrypointOptionsCode', () => {
 ', { namespace: "custom" }'
 );
 });

 it('inlines basePath alongside namespace options', () => {
 expect(
 createWorkflowEntrypointOptionsCode({
 namespace: 'custom',
 basePath: '/v2',
 })
 ).toBe(', { namespace: "custom", basePath: "/v2" }');
 });
});

26 changes: 22 additions & 4 deletions
packages/builders/src/constants.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,17 +86,35 @@ export function createWorkflowQueueTrigger(options?: { namespace?: string }) {
 */
export function createWorkflowEntrypointOptionsCode(options?: {
 namespace?: string;
 basePath?: string;
}) {
 const namespace = resolveQueueNamespace(options?.namespace);
 const fields: string[] = [];

 if (!namespace) {
 if (namespace) {
 // Reuse prefix construction for namespace validation.
 getQueueTopicPrefix('workflow', namespace);
 fields.push(`namespace: ${JSON.stringify(namespace)}`);
 }

 if (options?.basePath !== undefined) {
 fields.push(`basePath: ${JSON.stringify(options.basePath)}`);
 }

 if (fields.length === 0) {
 return '';
 }

// Reuse prefix construction for namespace validation.
 getQueueTopicPrefix('workflow', namespace);
return `, { ${fields.join(', ')} }`;
}

 return `, { namespace: ${JSON.stringify(namespace)} }`;
export function createWorkflowRouteHandlersCode(
 workflowEntrypointCall: string
) {
 return `export const POST = ${workflowEntrypointCall};
export const GET = POST;
export const HEAD = POST;
export const OPTIONS = POST;`;
}

/**
Expand Down

3 changes: 3 additions & 0 deletions
packages/builders/src/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,9 @@ interface BaseWorkflowConfig {
 // Optional prefix for debug files (e.g., "_" for Astro to ignore them)
 debugFilePrefix?: string;

 // Optional route prefix for apps deployed below the origin root.
 basePath?: string;

 // Suppress informational logs emitted by createWorkflowsBundle()
 // (e.g. intermediate/final workflow bundle timing logs).
 suppressCreateWorkflowsBundleLogs?: boolean;
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Backport #2732: fix(next): respect basePath for workflow routes by github-actions[bot] · Pull Request #2791 · vercel/workflow · GitHub
Skip to content
Backport #2732: fix(next): respect basePath for workflow routes#2791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

NathanColosimo
merged 3 commits into

from

Jul 10, 2026
 Merged


Backport #2732: fix(next): respect basePath for workflow routes
#2791
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
4994b64

fix(next): respect basePath for workflow routes (#2732)


github-actions[bot] Jul 7, 2026
2a8c07f

fix(backport): preserve framework route wrappers


NathanColosimo Jul 8, 2026
31971e7

Merge branch 'stable' into backport/pr-2732-to-stable


VaguelySerious Jul 8, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
.changeset/next-base-path.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
---
"@workflow/builders": patch
"@workflow/astro": patch
"@workflow/core": patch
"@workflow/next": patch
"@workflow/sveltekit": patch
"@workflow/utils": patch
"@workflow/world-local": patch
"@workflow/world-postgres": patch
---

Respect framework base paths when routing workflow traffic and expose health checks on generated Next.js workflow routes.

7 changes: 2 additions & 5 deletions
packages/astro/src/builder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -176,16 +176,13 @@ export const prerender = false;`,
 // Normalize request, needed for preserving request through astro
 workflowsRouteContent = replaceGeneratedRouteExport(
 workflowsRouteContent,
 /const handler = workflowEntrypoint\(workflowCode(?<options>[^)]*)\);\s*export const HEAD = handler;\s*export const POST = handler;?\s*$/m,
 /export const POST = workflowEntrypoint\(workflowCode(?<options>[^)]*)\);?$/m,
 (_match, options = '') => `${NORMALIZE_REQUEST_CODE}
const handleWorkflowRequest = async ({request}) => {
export const POST = async ({request}) => {
 const normalRequest = await normalizeRequest(request);
 return workflowEntrypoint(workflowCode${options})(normalRequest);
};

export const HEAD = handleWorkflowRequest;
export const POST = handleWorkflowRequest;

export const prerender = false;`,
 'Failed to wrap generated Astro workflow route'
 );
Expand Down

17 changes: 10 additions & 7 deletions
packages/builders/src/base-builder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,10 @@ import {
 applySwcTransform,
 type WorkflowManifest,
} from './apply-swc-transform.js';
import { createWorkflowEntrypointOptionsCode } from './constants.js';
import {
 createWorkflowEntrypointOptionsCode,
 createWorkflowRouteHandlersCode,
} from './constants.js';
import { getEsbuildTsconfigOptions } from './esbuild-tsconfig.js';
import {
 fastDiscoverEntries,
Expand DownExpand Up@@ -1342,8 +1345,11 @@ export const __steps_registered = true;
 }
 }

 const workflowEntrypointOptionsCode =
 createWorkflowEntrypointOptionsCode();
 const workflowEntrypointOptionsCode = createWorkflowEntrypointOptionsCode(
 {
 basePath: this.config.basePath,
 }
 );

 const bundleFinal = async (interimBundle: string) => {
 const workflowBundleCode = interimBundle;
Expand All@@ -1354,10 +1360,7 @@ import { workflowEntrypoint } from 'workflow/runtime';

const workflowCode = \`${workflowBundleCode.replace(/[\\`$]/g, '\\$&')}\`;

const handler = workflowEntrypoint(workflowCode${workflowEntrypointOptionsCode});

export const HEAD = handler;
export const POST = handler;`;
${createWorkflowRouteHandlersCode(`workflowEntrypoint(workflowCode${workflowEntrypointOptionsCode})`)}`;

 // we skip the final bundling step for Next.js so it can bundle itself
 if (!bundleFinalOutput) {
Expand Down

9 changes: 9 additions & 0 deletions
packages/builders/src/constants.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,4 +48,13 @@ describe('createWorkflowEntrypointOptionsCode', () => {
 ', { namespace: "custom" }'
 );
 });

 it('inlines basePath alongside namespace options', () => {
 expect(
 createWorkflowEntrypointOptionsCode({
 namespace: 'custom',
 basePath: '/v2',
 })
 ).toBe(', { namespace: "custom", basePath: "/v2" }');
 });
});

26 changes: 22 additions & 4 deletions
packages/builders/src/constants.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,17 +86,35 @@ export function createWorkflowQueueTrigger(options?: { namespace?: string }) {
 */
export function createWorkflowEntrypointOptionsCode(options?: {
 namespace?: string;
 basePath?: string;
}) {
 const namespace = resolveQueueNamespace(options?.namespace);
 const fields: string[] = [];

 if (!namespace) {
 if (namespace) {
 // Reuse prefix construction for namespace validation.
 getQueueTopicPrefix('workflow', namespace);
 fields.push(`namespace: ${JSON.stringify(namespace)}`);
 }

 if (options?.basePath !== undefined) {
 fields.push(`basePath: ${JSON.stringify(options.basePath)}`);
 }

 if (fields.length === 0) {
 return '';
 }

// Reuse prefix construction for namespace validation.
 getQueueTopicPrefix('workflow', namespace);
return `, { ${fields.join(', ')} }`;
}

 return `, { namespace: ${JSON.stringify(namespace)} }`;
export function createWorkflowRouteHandlersCode(
 workflowEntrypointCall: string
) {
 return `export const POST = ${workflowEntrypointCall};
export const GET = POST;
export const HEAD = POST;
export const OPTIONS = POST;`;
}

/**
Expand Down

3 changes: 3 additions & 0 deletions
packages/builders/src/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,9 @@ interface BaseWorkflowConfig {
 // Optional prefix for debug files (e.g., "_" for Astro to ignore them)
 debugFilePrefix?: string;

 // Optional route prefix for apps deployed below the origin root.
 basePath?: string;

 // Suppress informational logs emitted by createWorkflowsBundle()
 // (e.g. intermediate/final workflow bundle timing logs).
 suppressCreateWorkflowsBundleLogs?: boolean;
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Backport #2732: fix(next): respect basePath for workflow routes by github-actions[bot] · Pull Request #2791 · vercel/workflow · GitHub
Skip to content
Backport #2732: fix(next): respect basePath for workflow routes#2791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

NathanColosimo
merged 3 commits into

from

Jul 10, 2026
 Merged


Backport #2732: fix(next): respect basePath for workflow routes
#2791
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
4994b64

fix(next): respect basePath for workflow routes (#2732)


github-actions[bot] Jul 7, 2026
2a8c07f

fix(backport): preserve framework route wrappers


NathanColosimo Jul 8, 2026
31971e7

Merge branch 'stable' into backport/pr-2732-to-stable


VaguelySerious Jul 8, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
.changeset/next-base-path.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
---
"@workflow/builders": patch
"@workflow/astro": patch
"@workflow/core": patch
"@workflow/next": patch
"@workflow/sveltekit": patch
"@workflow/utils": patch
"@workflow/world-local": patch
"@workflow/world-postgres": patch
---

Respect framework base paths when routing workflow traffic and expose health checks on generated Next.js workflow routes.

7 changes: 2 additions & 5 deletions
packages/astro/src/builder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -176,16 +176,13 @@ export const prerender = false;`,
 // Normalize request, needed for preserving request through astro
 workflowsRouteContent = replaceGeneratedRouteExport(
 workflowsRouteContent,
 /const handler = workflowEntrypoint\(workflowCode(?<options>[^)]*)\);\s*export const HEAD = handler;\s*export const POST = handler;?\s*$/m,
 /export const POST = workflowEntrypoint\(workflowCode(?<options>[^)]*)\);?$/m,
 (_match, options = '') => `${NORMALIZE_REQUEST_CODE}
const handleWorkflowRequest = async ({request}) => {
export const POST = async ({request}) => {
 const normalRequest = await normalizeRequest(request);
 return workflowEntrypoint(workflowCode${options})(normalRequest);
};

export const HEAD = handleWorkflowRequest;
export const POST = handleWorkflowRequest;

export const prerender = false;`,
 'Failed to wrap generated Astro workflow route'
 );
Expand Down

17 changes: 10 additions & 7 deletions
packages/builders/src/base-builder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,10 @@ import {
 applySwcTransform,
 type WorkflowManifest,
} from './apply-swc-transform.js';
import { createWorkflowEntrypointOptionsCode } from './constants.js';
import {
 createWorkflowEntrypointOptionsCode,
 createWorkflowRouteHandlersCode,
} from './constants.js';
import { getEsbuildTsconfigOptions } from './esbuild-tsconfig.js';
import {
 fastDiscoverEntries,
Expand DownExpand Up@@ -1342,8 +1345,11 @@ export const __steps_registered = true;
 }
 }

 const workflowEntrypointOptionsCode =
 createWorkflowEntrypointOptionsCode();
 const workflowEntrypointOptionsCode = createWorkflowEntrypointOptionsCode(
 {
 basePath: this.config.basePath,
 }
 );

 const bundleFinal = async (interimBundle: string) => {
 const workflowBundleCode = interimBundle;
Expand All@@ -1354,10 +1360,7 @@ import { workflowEntrypoint } from 'workflow/runtime';

const workflowCode = \`${workflowBundleCode.replace(/[\\`$]/g, '\\$&')}\`;

const handler = workflowEntrypoint(workflowCode${workflowEntrypointOptionsCode});

export const HEAD = handler;
export const POST = handler;`;
${createWorkflowRouteHandlersCode(`workflowEntrypoint(workflowCode${workflowEntrypointOptionsCode})`)}`;

 // we skip the final bundling step for Next.js so it can bundle itself
 if (!bundleFinalOutput) {
Expand Down

9 changes: 9 additions & 0 deletions
packages/builders/src/constants.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,4 +48,13 @@ describe('createWorkflowEntrypointOptionsCode', () => {
 ', { namespace: "custom" }'
 );
 });

 it('inlines basePath alongside namespace options', () => {
 expect(
 createWorkflowEntrypointOptionsCode({
 namespace: 'custom',
 basePath: '/v2',
 })
 ).toBe(', { namespace: "custom", basePath: "/v2" }');
 });
});

26 changes: 22 additions & 4 deletions
packages/builders/src/constants.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,17 +86,35 @@ export function createWorkflowQueueTrigger(options?: { namespace?: string }) {
 */
export function createWorkflowEntrypointOptionsCode(options?: {
 namespace?: string;
 basePath?: string;
}) {
 const namespace = resolveQueueNamespace(options?.namespace);
 const fields: string[] = [];

 if (!namespace) {
 if (namespace) {
 // Reuse prefix construction for namespace validation.
 getQueueTopicPrefix('workflow', namespace);
 fields.push(`namespace: ${JSON.stringify(namespace)}`);
 }

 if (options?.basePath !== undefined) {
 fields.push(`basePath: ${JSON.stringify(options.basePath)}`);
 }

 if (fields.length === 0) {
 return '';
 }

// Reuse prefix construction for namespace validation.
 getQueueTopicPrefix('workflow', namespace);
return `, { ${fields.join(', ')} }`;
}

 return `, { namespace: ${JSON.stringify(namespace)} }`;
export function createWorkflowRouteHandlersCode(
 workflowEntrypointCall: string
) {
 return `export const POST = ${workflowEntrypointCall};
export const GET = POST;
export const HEAD = POST;
export const OPTIONS = POST;`;
}

/**
Expand Down

3 changes: 3 additions & 0 deletions
packages/builders/src/types.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,9 @@ interface BaseWorkflowConfig {
 // Optional prefix for debug files (e.g., "_" for Astro to ignore them)
 debugFilePrefix?: string;

 // Optional route prefix for apps deployed below the origin root.
 basePath?: string;

 // Suppress informational logs emitted by createWorkflowsBundle()
 // (e.g. intermediate/final workflow bundle timing logs).
 suppressCreateWorkflowsBundleLogs?: boolean;
Expand Down
Loading
Loading