Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/silly-chairs-rest.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@workflow/nitro': patch
---

Skip Workflow transforms for generated Nitro build artifacts.
51 changes: 51 additions & 0 deletions packages/nitro/src/index.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import type { Nitro } from 'nitro/types';
import { describe, expect, it, onTestFinished } from 'vitest';
import { LocalBuilder, VercelBuilder } from './builders.js';
import nitroModule from './index.js';
import { workflow as viteWorkflow } from './vite.js';

type StubOptions = {
routing: boolean;
Expand DownExpand Up@@ -180,3 +181,53 @@ describe('@workflow/nitro projectRoot', () => {
});
}
});

describe('@workflow/nitro transform boundaries', () => {
it('does not re-transform generated Nitro build artifacts', async () => {
const rollupBeforeHooks: Array<(nitro: any, config: any) => void> = [];
const nitro = createNitroStub({ routing: true });
nitro.hooks.hook = (
name: string,
hook: (nitro: any, config: any) => void
) => {
if (name === 'rollup:before') rollupBeforeHooks.push(hook);
};

const plugins = viteWorkflow();
const viteTransform = plugins.find(
(plugin) => plugin.name === 'workflow:transform'
) as any;
const viteNitro = plugins.find(
(plugin) => plugin.name === 'workflow:nitro'
) as any;

await viteNitro.nitro.setup(nitro);

const config: { plugins: any[] } = { plugins: [] };
for (const hook of rollupBeforeHooks) {
hook(nitro, config);
}
const nitroTransform = config.plugins.find(
(plugin: { name?: string }) => plugin.name === 'workflow:transform'
);

const code = `
import { WORKFLOW_SERIALIZE, WORKFLOW_DESERIALIZE } from '@workflow/serde';
export class Serializable {
static [WORKFLOW_SERIALIZE](value) { return value; }
static [WORKFLOW_DESERIALIZE]() { return new Serializable(); }
}
`;
const generatedId = '/tmp/.nitro/vite/services/ssr/assets/index.js';
const siblingId = '/tmp/.nitro-source/index.js';

for (const transform of [viteTransform, nitroTransform]) {
await expect(
transform.transform.call({}, code, generatedId)
).resolves.toBeNull();
await expect(
transform.transform.call({}, code, siblingId)
).resolves.not.toBeNull();
}
});
});
12 changes: 6 additions & 6 deletions packages/nitro/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,18 +15,18 @@ export default {
const isVercelDeploy =
!nitro.options.dev && nitro.options.preset === 'vercel';

// Pre-built workflow bundles directory - must be excluded from re-transformation
const workflowBuildDir = join(nitro.options.buildDir, 'workflow');
// Nitro build artifacts have already been transformed; exclude the whole
// build directory from re-transformation.
const nitroBuildDir = `${nitro.options.buildDir.replace(/[\\/]+$/, '')}/`;

// Add transform plugin at the BEGINNING to run before other transforms
// (especially before class property transforms that rename classes like _ClassName)
nitro.hooks.hook('rollup:before', (_nitro: Nitro, config: RollupConfig) => {
(config.plugins as Array<unknown>).unshift(
workflowTransformPlugin({
// Exclude pre-built workflow bundles from re-transformation
// These are already processed and re-processing causes issues like
// undefined class references when Nitro's bundler renames variables
exclude: [workflowBuildDir],
// Nitro build artifacts have already been transformed.
// Re-processing them can duplicate class registration.
exclude: [nitroBuildDir],
})
);
});
Expand Down
13 changes: 6 additions & 7 deletions packages/nitro/src/vite.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,26 +3,25 @@ import { workflowTransformPlugin } from '@workflow/rollup';
import { workflowHotUpdatePlugin } from '@workflow/vite';
import type { Nitro } from 'nitro/types';
import type {} from 'nitro/vite';
import { join } from 'pathe';
import type { Plugin } from 'vite';
import { LocalBuilder } from './builders.js';
import type { ModuleOptions } from './index.js';
import nitroModule from './index.js';

export function workflow(options?: ModuleOptions): Plugin[] {
let builder: LocalBuilder;
let workflowBuildDir: string;
let nitroBuildDir: string;
const enqueue = createBuildQueue();

// Create a lazy transform plugin that excludes the workflow build directory
// Create a lazy transform plugin that excludes Nitro build artifacts.
// The exclusion path is set during nitro setup, so we need to defer plugin creation
const lazyTransformPlugin: Plugin = {
name: 'workflow:transform',
transform(code, id) {
// Delegate to the actual transform plugin with exclusion
// workflowBuildDir is set during nitro setup before transforms run
// nitroBuildDir is set during nitro setup before transforms run
const plugin = workflowTransformPlugin({
exclude: workflowBuildDir ? [workflowBuildDir] : [],
exclude: nitroBuildDir ? [nitroBuildDir] : [],
});
return (plugin.transform as Function)?.call(this, code, id);
},
Expand All@@ -34,8 +33,8 @@ export function workflow(options?: ModuleOptions): Plugin[] {
name: 'workflow:nitro',
nitro: {
setup: (nitro: Nitro) => {
// Capture the workflow build directory for exclusion
workflowBuildDir = join(nitro.options.buildDir, 'workflow');
// Capture the Nitro build directory for exclusion
nitroBuildDir = `${nitro.options.buildDir.replace(/[\\/]+$/, '')}/`;
nitro.options.workflow = {
...nitro.options.workflow,
...options,
Expand Down
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 #2925: Fix duplicate transforms of Nitro build artifacts by github-actions[bot] · Pull Request #2928 · vercel/workflow · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/silly-chairs-rest.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@workflow/nitro': patch
---

Skip Workflow transforms for generated Nitro build artifacts.
51 changes: 51 additions & 0 deletions packages/nitro/src/index.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import type { Nitro } from 'nitro/types';
import { describe, expect, it, onTestFinished } from 'vitest';
import { LocalBuilder, VercelBuilder } from './builders.js';
import nitroModule from './index.js';
import { workflow as viteWorkflow } from './vite.js';

type StubOptions = {
routing: boolean;
Expand DownExpand Up@@ -180,3 +181,53 @@ describe('@workflow/nitro projectRoot', () => {
});
}
});

describe('@workflow/nitro transform boundaries', () => {
it('does not re-transform generated Nitro build artifacts', async () => {
const rollupBeforeHooks: Array<(nitro: any, config: any) => void> = [];
const nitro = createNitroStub({ routing: true });
nitro.hooks.hook = (
name: string,
hook: (nitro: any, config: any) => void
) => {
if (name === 'rollup:before') rollupBeforeHooks.push(hook);
};

const plugins = viteWorkflow();
const viteTransform = plugins.find(
(plugin) => plugin.name === 'workflow:transform'
) as any;
const viteNitro = plugins.find(
(plugin) => plugin.name === 'workflow:nitro'
) as any;

await viteNitro.nitro.setup(nitro);

const config: { plugins: any[] } = { plugins: [] };
for (const hook of rollupBeforeHooks) {
hook(nitro, config);
}
const nitroTransform = config.plugins.find(
(plugin: { name?: string }) => plugin.name === 'workflow:transform'
);

const code = `
import { WORKFLOW_SERIALIZE, WORKFLOW_DESERIALIZE } from '@workflow/serde';
export class Serializable {
static [WORKFLOW_SERIALIZE](value) { return value; }
static [WORKFLOW_DESERIALIZE]() { return new Serializable(); }
}
`;
const generatedId = '/tmp/.nitro/vite/services/ssr/assets/index.js';
const siblingId = '/tmp/.nitro-source/index.js';

for (const transform of [viteTransform, nitroTransform]) {
await expect(
transform.transform.call({}, code, generatedId)
).resolves.toBeNull();
await expect(
transform.transform.call({}, code, siblingId)
).resolves.not.toBeNull();
}
});
});
12 changes: 6 additions & 6 deletions packages/nitro/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,18 +15,18 @@ export default {
const isVercelDeploy =
!nitro.options.dev && nitro.options.preset === 'vercel';

// Pre-built workflow bundles directory - must be excluded from re-transformation
const workflowBuildDir = join(nitro.options.buildDir, 'workflow');
// Nitro build artifacts have already been transformed; exclude the whole
// build directory from re-transformation.
const nitroBuildDir = `${nitro.options.buildDir.replace(/[\\/]+$/, '')}/`;

// Add transform plugin at the BEGINNING to run before other transforms
// (especially before class property transforms that rename classes like _ClassName)
nitro.hooks.hook('rollup:before', (_nitro: Nitro, config: RollupConfig) => {
(config.plugins as Array<unknown>).unshift(
workflowTransformPlugin({
// Exclude pre-built workflow bundles from re-transformation
// These are already processed and re-processing causes issues like
// undefined class references when Nitro's bundler renames variables
exclude: [workflowBuildDir],
// Nitro build artifacts have already been transformed.
// Re-processing them can duplicate class registration.
exclude: [nitroBuildDir],
})
);
});
Expand Down
13 changes: 6 additions & 7 deletions packages/nitro/src/vite.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,26 +3,25 @@ import { workflowTransformPlugin } from '@workflow/rollup';
import { workflowHotUpdatePlugin } from '@workflow/vite';
import type { Nitro } from 'nitro/types';
import type {} from 'nitro/vite';
import { join } from 'pathe';
import type { Plugin } from 'vite';
import { LocalBuilder } from './builders.js';
import type { ModuleOptions } from './index.js';
import nitroModule from './index.js';

export function workflow(options?: ModuleOptions): Plugin[] {
let builder: LocalBuilder;
let workflowBuildDir: string;
let nitroBuildDir: string;
const enqueue = createBuildQueue();

// Create a lazy transform plugin that excludes the workflow build directory
// Create a lazy transform plugin that excludes Nitro build artifacts.
// The exclusion path is set during nitro setup, so we need to defer plugin creation
const lazyTransformPlugin: Plugin = {
name: 'workflow:transform',
transform(code, id) {
// Delegate to the actual transform plugin with exclusion
// workflowBuildDir is set during nitro setup before transforms run
// nitroBuildDir is set during nitro setup before transforms run
const plugin = workflowTransformPlugin({
exclude: workflowBuildDir ? [workflowBuildDir] : [],
exclude: nitroBuildDir ? [nitroBuildDir] : [],
});
return (plugin.transform as Function)?.call(this, code, id);
},
Expand All@@ -34,8 +33,8 @@ export function workflow(options?: ModuleOptions): Plugin[] {
name: 'workflow:nitro',
nitro: {
setup: (nitro: Nitro) => {
// Capture the workflow build directory for exclusion
workflowBuildDir = join(nitro.options.buildDir, 'workflow');
// Capture the Nitro build directory for exclusion
nitroBuildDir = `${nitro.options.buildDir.replace(/[\\/]+$/, '')}/`;
nitro.options.workflow = {
...nitro.options.workflow,
...options,
Expand Down
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 #2925: Fix duplicate transforms of Nitro build artifacts by github-actions[bot] · Pull Request #2928 · vercel/workflow · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/silly-chairs-rest.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@workflow/nitro': patch
---

Skip Workflow transforms for generated Nitro build artifacts.
51 changes: 51 additions & 0 deletions packages/nitro/src/index.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import type { Nitro } from 'nitro/types';
import { describe, expect, it, onTestFinished } from 'vitest';
import { LocalBuilder, VercelBuilder } from './builders.js';
import nitroModule from './index.js';
import { workflow as viteWorkflow } from './vite.js';

type StubOptions = {
routing: boolean;
Expand DownExpand Up@@ -180,3 +181,53 @@ describe('@workflow/nitro projectRoot', () => {
});
}
});

describe('@workflow/nitro transform boundaries', () => {
it('does not re-transform generated Nitro build artifacts', async () => {
const rollupBeforeHooks: Array<(nitro: any, config: any) => void> = [];
const nitro = createNitroStub({ routing: true });
nitro.hooks.hook = (
name: string,
hook: (nitro: any, config: any) => void
) => {
if (name === 'rollup:before') rollupBeforeHooks.push(hook);
};

const plugins = viteWorkflow();
const viteTransform = plugins.find(
(plugin) => plugin.name === 'workflow:transform'
) as any;
const viteNitro = plugins.find(
(plugin) => plugin.name === 'workflow:nitro'
) as any;

await viteNitro.nitro.setup(nitro);

const config: { plugins: any[] } = { plugins: [] };
for (const hook of rollupBeforeHooks) {
hook(nitro, config);
}
const nitroTransform = config.plugins.find(
(plugin: { name?: string }) => plugin.name === 'workflow:transform'
);

const code = `
import { WORKFLOW_SERIALIZE, WORKFLOW_DESERIALIZE } from '@workflow/serde';
export class Serializable {
static [WORKFLOW_SERIALIZE](value) { return value; }
static [WORKFLOW_DESERIALIZE]() { return new Serializable(); }
}
`;
const generatedId = '/tmp/.nitro/vite/services/ssr/assets/index.js';
const siblingId = '/tmp/.nitro-source/index.js';

for (const transform of [viteTransform, nitroTransform]) {
await expect(
transform.transform.call({}, code, generatedId)
).resolves.toBeNull();
await expect(
transform.transform.call({}, code, siblingId)
).resolves.not.toBeNull();
}
});
});
12 changes: 6 additions & 6 deletions packages/nitro/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,18 +15,18 @@ export default {
const isVercelDeploy =
!nitro.options.dev && nitro.options.preset === 'vercel';

// Pre-built workflow bundles directory - must be excluded from re-transformation
const workflowBuildDir = join(nitro.options.buildDir, 'workflow');
// Nitro build artifacts have already been transformed; exclude the whole
// build directory from re-transformation.
const nitroBuildDir = `${nitro.options.buildDir.replace(/[\\/]+$/, '')}/`;

// Add transform plugin at the BEGINNING to run before other transforms
// (especially before class property transforms that rename classes like _ClassName)
nitro.hooks.hook('rollup:before', (_nitro: Nitro, config: RollupConfig) => {
(config.plugins as Array<unknown>).unshift(
workflowTransformPlugin({
// Exclude pre-built workflow bundles from re-transformation
// These are already processed and re-processing causes issues like
// undefined class references when Nitro's bundler renames variables
exclude: [workflowBuildDir],
// Nitro build artifacts have already been transformed.
// Re-processing them can duplicate class registration.
exclude: [nitroBuildDir],
})
);
});
Expand Down
13 changes: 6 additions & 7 deletions packages/nitro/src/vite.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,26 +3,25 @@ import { workflowTransformPlugin } from '@workflow/rollup';
import { workflowHotUpdatePlugin } from '@workflow/vite';
import type { Nitro } from 'nitro/types';
import type {} from 'nitro/vite';
import { join } from 'pathe';
import type { Plugin } from 'vite';
import { LocalBuilder } from './builders.js';
import type { ModuleOptions } from './index.js';
import nitroModule from './index.js';

export function workflow(options?: ModuleOptions): Plugin[] {
let builder: LocalBuilder;
let workflowBuildDir: string;
let nitroBuildDir: string;
const enqueue = createBuildQueue();

// Create a lazy transform plugin that excludes the workflow build directory
// Create a lazy transform plugin that excludes Nitro build artifacts.
// The exclusion path is set during nitro setup, so we need to defer plugin creation
const lazyTransformPlugin: Plugin = {
name: 'workflow:transform',
transform(code, id) {
// Delegate to the actual transform plugin with exclusion
// workflowBuildDir is set during nitro setup before transforms run
// nitroBuildDir is set during nitro setup before transforms run
const plugin = workflowTransformPlugin({
exclude: workflowBuildDir ? [workflowBuildDir] : [],
exclude: nitroBuildDir ? [nitroBuildDir] : [],
});
return (plugin.transform as Function)?.call(this, code, id);
},
Expand All@@ -34,8 +33,8 @@ export function workflow(options?: ModuleOptions): Plugin[] {
name: 'workflow:nitro',
nitro: {
setup: (nitro: Nitro) => {
// Capture the workflow build directory for exclusion
workflowBuildDir = join(nitro.options.buildDir, 'workflow');
// Capture the Nitro build directory for exclusion
nitroBuildDir = `${nitro.options.buildDir.replace(/[\\/]+$/, '')}/`;
nitro.options.workflow = {
...nitro.options.workflow,
...options,
Expand Down
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 #2925: Fix duplicate transforms of Nitro build artifacts by github-actions[bot] · Pull Request #2928 · vercel/workflow · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/silly-chairs-rest.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@workflow/nitro': patch
---

Skip Workflow transforms for generated Nitro build artifacts.
51 changes: 51 additions & 0 deletions packages/nitro/src/index.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import type { Nitro } from 'nitro/types';
import { describe, expect, it, onTestFinished } from 'vitest';
import { LocalBuilder, VercelBuilder } from './builders.js';
import nitroModule from './index.js';
import { workflow as viteWorkflow } from './vite.js';

type StubOptions = {
routing: boolean;
Expand DownExpand Up@@ -180,3 +181,53 @@ describe('@workflow/nitro projectRoot', () => {
});
}
});

describe('@workflow/nitro transform boundaries', () => {
it('does not re-transform generated Nitro build artifacts', async () => {
const rollupBeforeHooks: Array<(nitro: any, config: any) => void> = [];
const nitro = createNitroStub({ routing: true });
nitro.hooks.hook = (
name: string,
hook: (nitro: any, config: any) => void
) => {
if (name === 'rollup:before') rollupBeforeHooks.push(hook);
};

const plugins = viteWorkflow();
const viteTransform = plugins.find(
(plugin) => plugin.name === 'workflow:transform'
) as any;
const viteNitro = plugins.find(
(plugin) => plugin.name === 'workflow:nitro'
) as any;

await viteNitro.nitro.setup(nitro);

const config: { plugins: any[] } = { plugins: [] };
for (const hook of rollupBeforeHooks) {
hook(nitro, config);
}
const nitroTransform = config.plugins.find(
(plugin: { name?: string }) => plugin.name === 'workflow:transform'
);

const code = `
import { WORKFLOW_SERIALIZE, WORKFLOW_DESERIALIZE } from '@workflow/serde';
export class Serializable {
static [WORKFLOW_SERIALIZE](value) { return value; }
static [WORKFLOW_DESERIALIZE]() { return new Serializable(); }
}
`;
const generatedId = '/tmp/.nitro/vite/services/ssr/assets/index.js';
const siblingId = '/tmp/.nitro-source/index.js';

for (const transform of [viteTransform, nitroTransform]) {
await expect(
transform.transform.call({}, code, generatedId)
).resolves.toBeNull();
await expect(
transform.transform.call({}, code, siblingId)
).resolves.not.toBeNull();
}
});
});
12 changes: 6 additions & 6 deletions packages/nitro/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,18 +15,18 @@ export default {
const isVercelDeploy =
!nitro.options.dev && nitro.options.preset === 'vercel';

// Pre-built workflow bundles directory - must be excluded from re-transformation
const workflowBuildDir = join(nitro.options.buildDir, 'workflow');
// Nitro build artifacts have already been transformed; exclude the whole
// build directory from re-transformation.
const nitroBuildDir = `${nitro.options.buildDir.replace(/[\\/]+$/, '')}/`;

// Add transform plugin at the BEGINNING to run before other transforms
// (especially before class property transforms that rename classes like _ClassName)
nitro.hooks.hook('rollup:before', (_nitro: Nitro, config: RollupConfig) => {
(config.plugins as Array<unknown>).unshift(
workflowTransformPlugin({
// Exclude pre-built workflow bundles from re-transformation
// These are already processed and re-processing causes issues like
// undefined class references when Nitro's bundler renames variables
exclude: [workflowBuildDir],
// Nitro build artifacts have already been transformed.
// Re-processing them can duplicate class registration.
exclude: [nitroBuildDir],
})
);
});
Expand Down
13 changes: 6 additions & 7 deletions packages/nitro/src/vite.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,26 +3,25 @@ import { workflowTransformPlugin } from '@workflow/rollup';
import { workflowHotUpdatePlugin } from '@workflow/vite';
import type { Nitro } from 'nitro/types';
import type {} from 'nitro/vite';
import { join } from 'pathe';
import type { Plugin } from 'vite';
import { LocalBuilder } from './builders.js';
import type { ModuleOptions } from './index.js';
import nitroModule from './index.js';

export function workflow(options?: ModuleOptions): Plugin[] {
let builder: LocalBuilder;
let workflowBuildDir: string;
let nitroBuildDir: string;
const enqueue = createBuildQueue();

// Create a lazy transform plugin that excludes the workflow build directory
// Create a lazy transform plugin that excludes Nitro build artifacts.
// The exclusion path is set during nitro setup, so we need to defer plugin creation
const lazyTransformPlugin: Plugin = {
name: 'workflow:transform',
transform(code, id) {
// Delegate to the actual transform plugin with exclusion
// workflowBuildDir is set during nitro setup before transforms run
// nitroBuildDir is set during nitro setup before transforms run
const plugin = workflowTransformPlugin({
exclude: workflowBuildDir ? [workflowBuildDir] : [],
exclude: nitroBuildDir ? [nitroBuildDir] : [],
});
return (plugin.transform as Function)?.call(this, code, id);
},
Expand All@@ -34,8 +33,8 @@ export function workflow(options?: ModuleOptions): Plugin[] {
name: 'workflow:nitro',
nitro: {
setup: (nitro: Nitro) => {
// Capture the workflow build directory for exclusion
workflowBuildDir = join(nitro.options.buildDir, 'workflow');
// Capture the Nitro build directory for exclusion
nitroBuildDir = `${nitro.options.buildDir.replace(/[\\/]+$/, '')}/`;
nitro.options.workflow = {
...nitro.options.workflow,
...options,
Expand Down
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 #2925: Fix duplicate transforms of Nitro build artifacts by github-actions[bot] · Pull Request #2928 · vercel/workflow · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/silly-chairs-rest.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@workflow/nitro': patch
---

Skip Workflow transforms for generated Nitro build artifacts.
51 changes: 51 additions & 0 deletions packages/nitro/src/index.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import type { Nitro } from 'nitro/types';
import { describe, expect, it, onTestFinished } from 'vitest';
import { LocalBuilder, VercelBuilder } from './builders.js';
import nitroModule from './index.js';
import { workflow as viteWorkflow } from './vite.js';

type StubOptions = {
routing: boolean;
Expand DownExpand Up@@ -180,3 +181,53 @@ describe('@workflow/nitro projectRoot', () => {
});
}
});

describe('@workflow/nitro transform boundaries', () => {
it('does not re-transform generated Nitro build artifacts', async () => {
const rollupBeforeHooks: Array<(nitro: any, config: any) => void> = [];
const nitro = createNitroStub({ routing: true });
nitro.hooks.hook = (
name: string,
hook: (nitro: any, config: any) => void
) => {
if (name === 'rollup:before') rollupBeforeHooks.push(hook);
};

const plugins = viteWorkflow();
const viteTransform = plugins.find(
(plugin) => plugin.name === 'workflow:transform'
) as any;
const viteNitro = plugins.find(
(plugin) => plugin.name === 'workflow:nitro'
) as any;

await viteNitro.nitro.setup(nitro);

const config: { plugins: any[] } = { plugins: [] };
for (const hook of rollupBeforeHooks) {
hook(nitro, config);
}
const nitroTransform = config.plugins.find(
(plugin: { name?: string }) => plugin.name === 'workflow:transform'
);

const code = `
import { WORKFLOW_SERIALIZE, WORKFLOW_DESERIALIZE } from '@workflow/serde';
export class Serializable {
static [WORKFLOW_SERIALIZE](value) { return value; }
static [WORKFLOW_DESERIALIZE]() { return new Serializable(); }
}
`;
const generatedId = '/tmp/.nitro/vite/services/ssr/assets/index.js';
const siblingId = '/tmp/.nitro-source/index.js';

for (const transform of [viteTransform, nitroTransform]) {
await expect(
transform.transform.call({}, code, generatedId)
).resolves.toBeNull();
await expect(
transform.transform.call({}, code, siblingId)
).resolves.not.toBeNull();
}
});
});
12 changes: 6 additions & 6 deletions packages/nitro/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,18 +15,18 @@ export default {
const isVercelDeploy =
!nitro.options.dev && nitro.options.preset === 'vercel';

// Pre-built workflow bundles directory - must be excluded from re-transformation
const workflowBuildDir = join(nitro.options.buildDir, 'workflow');
// Nitro build artifacts have already been transformed; exclude the whole
// build directory from re-transformation.
const nitroBuildDir = `${nitro.options.buildDir.replace(/[\\/]+$/, '')}/`;

// Add transform plugin at the BEGINNING to run before other transforms
// (especially before class property transforms that rename classes like _ClassName)
nitro.hooks.hook('rollup:before', (_nitro: Nitro, config: RollupConfig) => {
(config.plugins as Array<unknown>).unshift(
workflowTransformPlugin({
// Exclude pre-built workflow bundles from re-transformation
// These are already processed and re-processing causes issues like
// undefined class references when Nitro's bundler renames variables
exclude: [workflowBuildDir],
// Nitro build artifacts have already been transformed.
// Re-processing them can duplicate class registration.
exclude: [nitroBuildDir],
})
);
});
Expand Down
13 changes: 6 additions & 7 deletions packages/nitro/src/vite.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,26 +3,25 @@ import { workflowTransformPlugin } from '@workflow/rollup';
import { workflowHotUpdatePlugin } from '@workflow/vite';
import type { Nitro } from 'nitro/types';
import type {} from 'nitro/vite';
import { join } from 'pathe';
import type { Plugin } from 'vite';
import { LocalBuilder } from './builders.js';
import type { ModuleOptions } from './index.js';
import nitroModule from './index.js';

export function workflow(options?: ModuleOptions): Plugin[] {
let builder: LocalBuilder;
let workflowBuildDir: string;
let nitroBuildDir: string;
const enqueue = createBuildQueue();

// Create a lazy transform plugin that excludes the workflow build directory
// Create a lazy transform plugin that excludes Nitro build artifacts.
// The exclusion path is set during nitro setup, so we need to defer plugin creation
const lazyTransformPlugin: Plugin = {
name: 'workflow:transform',
transform(code, id) {
// Delegate to the actual transform plugin with exclusion
// workflowBuildDir is set during nitro setup before transforms run
// nitroBuildDir is set during nitro setup before transforms run
const plugin = workflowTransformPlugin({
exclude: workflowBuildDir ? [workflowBuildDir] : [],
exclude: nitroBuildDir ? [nitroBuildDir] : [],
});
return (plugin.transform as Function)?.call(this, code, id);
},
Expand All@@ -34,8 +33,8 @@ export function workflow(options?: ModuleOptions): Plugin[] {
name: 'workflow:nitro',
nitro: {
setup: (nitro: Nitro) => {
// Capture the workflow build directory for exclusion
workflowBuildDir = join(nitro.options.buildDir, 'workflow');
// Capture the Nitro build directory for exclusion
nitroBuildDir = `${nitro.options.buildDir.replace(/[\\/]+$/, '')}/`;
nitro.options.workflow = {
...nitro.options.workflow,
...options,
Expand Down
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 #2925: Fix duplicate transforms of Nitro build artifacts by github-actions[bot] · Pull Request #2928 · vercel/workflow · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/silly-chairs-rest.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@workflow/nitro': patch
---

Skip Workflow transforms for generated Nitro build artifacts.
51 changes: 51 additions & 0 deletions packages/nitro/src/index.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import type { Nitro } from 'nitro/types';
import { describe, expect, it, onTestFinished } from 'vitest';
import { LocalBuilder, VercelBuilder } from './builders.js';
import nitroModule from './index.js';
import { workflow as viteWorkflow } from './vite.js';

type StubOptions = {
routing: boolean;
Expand DownExpand Up@@ -180,3 +181,53 @@ describe('@workflow/nitro projectRoot', () => {
});
}
});

describe('@workflow/nitro transform boundaries', () => {
it('does not re-transform generated Nitro build artifacts', async () => {
const rollupBeforeHooks: Array<(nitro: any, config: any) => void> = [];
const nitro = createNitroStub({ routing: true });
nitro.hooks.hook = (
name: string,
hook: (nitro: any, config: any) => void
) => {
if (name === 'rollup:before') rollupBeforeHooks.push(hook);
};

const plugins = viteWorkflow();
const viteTransform = plugins.find(
(plugin) => plugin.name === 'workflow:transform'
) as any;
const viteNitro = plugins.find(
(plugin) => plugin.name === 'workflow:nitro'
) as any;

await viteNitro.nitro.setup(nitro);

const config: { plugins: any[] } = { plugins: [] };
for (const hook of rollupBeforeHooks) {
hook(nitro, config);
}
const nitroTransform = config.plugins.find(
(plugin: { name?: string }) => plugin.name === 'workflow:transform'
);

const code = `
import { WORKFLOW_SERIALIZE, WORKFLOW_DESERIALIZE } from '@workflow/serde';
export class Serializable {
static [WORKFLOW_SERIALIZE](value) { return value; }
static [WORKFLOW_DESERIALIZE]() { return new Serializable(); }
}
`;
const generatedId = '/tmp/.nitro/vite/services/ssr/assets/index.js';
const siblingId = '/tmp/.nitro-source/index.js';

for (const transform of [viteTransform, nitroTransform]) {
await expect(
transform.transform.call({}, code, generatedId)
).resolves.toBeNull();
await expect(
transform.transform.call({}, code, siblingId)
).resolves.not.toBeNull();
}
});
});
12 changes: 6 additions & 6 deletions packages/nitro/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,18 +15,18 @@ export default {
const isVercelDeploy =
!nitro.options.dev && nitro.options.preset === 'vercel';

// Pre-built workflow bundles directory - must be excluded from re-transformation
const workflowBuildDir = join(nitro.options.buildDir, 'workflow');
// Nitro build artifacts have already been transformed; exclude the whole
// build directory from re-transformation.
const nitroBuildDir = `${nitro.options.buildDir.replace(/[\\/]+$/, '')}/`;

// Add transform plugin at the BEGINNING to run before other transforms
// (especially before class property transforms that rename classes like _ClassName)
nitro.hooks.hook('rollup:before', (_nitro: Nitro, config: RollupConfig) => {
(config.plugins as Array<unknown>).unshift(
workflowTransformPlugin({
// Exclude pre-built workflow bundles from re-transformation
// These are already processed and re-processing causes issues like
// undefined class references when Nitro's bundler renames variables
exclude: [workflowBuildDir],
// Nitro build artifacts have already been transformed.
// Re-processing them can duplicate class registration.
exclude: [nitroBuildDir],
})
);
});
Expand Down
13 changes: 6 additions & 7 deletions packages/nitro/src/vite.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,26 +3,25 @@ import { workflowTransformPlugin } from '@workflow/rollup';
import { workflowHotUpdatePlugin } from '@workflow/vite';
import type { Nitro } from 'nitro/types';
import type {} from 'nitro/vite';
import { join } from 'pathe';
import type { Plugin } from 'vite';
import { LocalBuilder } from './builders.js';
import type { ModuleOptions } from './index.js';
import nitroModule from './index.js';

export function workflow(options?: ModuleOptions): Plugin[] {
let builder: LocalBuilder;
let workflowBuildDir: string;
let nitroBuildDir: string;
const enqueue = createBuildQueue();

// Create a lazy transform plugin that excludes the workflow build directory
// Create a lazy transform plugin that excludes Nitro build artifacts.
// The exclusion path is set during nitro setup, so we need to defer plugin creation
const lazyTransformPlugin: Plugin = {
name: 'workflow:transform',
transform(code, id) {
// Delegate to the actual transform plugin with exclusion
// workflowBuildDir is set during nitro setup before transforms run
// nitroBuildDir is set during nitro setup before transforms run
const plugin = workflowTransformPlugin({
exclude: workflowBuildDir ? [workflowBuildDir] : [],
exclude: nitroBuildDir ? [nitroBuildDir] : [],
});
return (plugin.transform as Function)?.call(this, code, id);
},
Expand All@@ -34,8 +33,8 @@ export function workflow(options?: ModuleOptions): Plugin[] {
name: 'workflow:nitro',
nitro: {
setup: (nitro: Nitro) => {
// Capture the workflow build directory for exclusion
workflowBuildDir = join(nitro.options.buildDir, 'workflow');
// Capture the Nitro build directory for exclusion
nitroBuildDir = `${nitro.options.buildDir.replace(/[\\/]+$/, '')}/`;
nitro.options.workflow = {
...nitro.options.workflow,
...options,
Expand Down
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 #2925: Fix duplicate transforms of Nitro build artifacts by github-actions[bot] · Pull Request #2928 · vercel/workflow · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/silly-chairs-rest.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@workflow/nitro': patch
---

Skip Workflow transforms for generated Nitro build artifacts.
51 changes: 51 additions & 0 deletions packages/nitro/src/index.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import type { Nitro } from 'nitro/types';
import { describe, expect, it, onTestFinished } from 'vitest';
import { LocalBuilder, VercelBuilder } from './builders.js';
import nitroModule from './index.js';
import { workflow as viteWorkflow } from './vite.js';

type StubOptions = {
routing: boolean;
Expand DownExpand Up@@ -180,3 +181,53 @@ describe('@workflow/nitro projectRoot', () => {
});
}
});

describe('@workflow/nitro transform boundaries', () => {
it('does not re-transform generated Nitro build artifacts', async () => {
const rollupBeforeHooks: Array<(nitro: any, config: any) => void> = [];
const nitro = createNitroStub({ routing: true });
nitro.hooks.hook = (
name: string,
hook: (nitro: any, config: any) => void
) => {
if (name === 'rollup:before') rollupBeforeHooks.push(hook);
};

const plugins = viteWorkflow();
const viteTransform = plugins.find(
(plugin) => plugin.name === 'workflow:transform'
) as any;
const viteNitro = plugins.find(
(plugin) => plugin.name === 'workflow:nitro'
) as any;

await viteNitro.nitro.setup(nitro);

const config: { plugins: any[] } = { plugins: [] };
for (const hook of rollupBeforeHooks) {
hook(nitro, config);
}
const nitroTransform = config.plugins.find(
(plugin: { name?: string }) => plugin.name === 'workflow:transform'
);

const code = `
import { WORKFLOW_SERIALIZE, WORKFLOW_DESERIALIZE } from '@workflow/serde';
export class Serializable {
static [WORKFLOW_SERIALIZE](value) { return value; }
static [WORKFLOW_DESERIALIZE]() { return new Serializable(); }
}
`;
const generatedId = '/tmp/.nitro/vite/services/ssr/assets/index.js';
const siblingId = '/tmp/.nitro-source/index.js';

for (const transform of [viteTransform, nitroTransform]) {
await expect(
transform.transform.call({}, code, generatedId)
).resolves.toBeNull();
await expect(
transform.transform.call({}, code, siblingId)
).resolves.not.toBeNull();
}
});
});
12 changes: 6 additions & 6 deletions packages/nitro/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,18 +15,18 @@ export default {
const isVercelDeploy =
!nitro.options.dev && nitro.options.preset === 'vercel';

// Pre-built workflow bundles directory - must be excluded from re-transformation
const workflowBuildDir = join(nitro.options.buildDir, 'workflow');
// Nitro build artifacts have already been transformed; exclude the whole
// build directory from re-transformation.
const nitroBuildDir = `${nitro.options.buildDir.replace(/[\\/]+$/, '')}/`;

// Add transform plugin at the BEGINNING to run before other transforms
// (especially before class property transforms that rename classes like _ClassName)
nitro.hooks.hook('rollup:before', (_nitro: Nitro, config: RollupConfig) => {
(config.plugins as Array<unknown>).unshift(
workflowTransformPlugin({
// Exclude pre-built workflow bundles from re-transformation
// These are already processed and re-processing causes issues like
// undefined class references when Nitro's bundler renames variables
exclude: [workflowBuildDir],
// Nitro build artifacts have already been transformed.
// Re-processing them can duplicate class registration.
exclude: [nitroBuildDir],
})
);
});
Expand Down
13 changes: 6 additions & 7 deletions packages/nitro/src/vite.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,26 +3,25 @@ import { workflowTransformPlugin } from '@workflow/rollup';
import { workflowHotUpdatePlugin } from '@workflow/vite';
import type { Nitro } from 'nitro/types';
import type {} from 'nitro/vite';
import { join } from 'pathe';
import type { Plugin } from 'vite';
import { LocalBuilder } from './builders.js';
import type { ModuleOptions } from './index.js';
import nitroModule from './index.js';

export function workflow(options?: ModuleOptions): Plugin[] {
let builder: LocalBuilder;
let workflowBuildDir: string;
let nitroBuildDir: string;
const enqueue = createBuildQueue();

// Create a lazy transform plugin that excludes the workflow build directory
// Create a lazy transform plugin that excludes Nitro build artifacts.
// The exclusion path is set during nitro setup, so we need to defer plugin creation
const lazyTransformPlugin: Plugin = {
name: 'workflow:transform',
transform(code, id) {
// Delegate to the actual transform plugin with exclusion
// workflowBuildDir is set during nitro setup before transforms run
// nitroBuildDir is set during nitro setup before transforms run
const plugin = workflowTransformPlugin({
exclude: workflowBuildDir ? [workflowBuildDir] : [],
exclude: nitroBuildDir ? [nitroBuildDir] : [],
});
return (plugin.transform as Function)?.call(this, code, id);
},
Expand All@@ -34,8 +33,8 @@ export function workflow(options?: ModuleOptions): Plugin[] {
name: 'workflow:nitro',
nitro: {
setup: (nitro: Nitro) => {
// Capture the workflow build directory for exclusion
workflowBuildDir = join(nitro.options.buildDir, 'workflow');
// Capture the Nitro build directory for exclusion
nitroBuildDir = `${nitro.options.buildDir.replace(/[\\/]+$/, '')}/`;
nitro.options.workflow = {
...nitro.options.workflow,
...options,
Expand Down
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 #2925: Fix duplicate transforms of Nitro build artifacts by github-actions[bot] · Pull Request #2928 · vercel/workflow · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/silly-chairs-rest.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@workflow/nitro': patch
---

Skip Workflow transforms for generated Nitro build artifacts.
51 changes: 51 additions & 0 deletions packages/nitro/src/index.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import type { Nitro } from 'nitro/types';
import { describe, expect, it, onTestFinished } from 'vitest';
import { LocalBuilder, VercelBuilder } from './builders.js';
import nitroModule from './index.js';
import { workflow as viteWorkflow } from './vite.js';

type StubOptions = {
routing: boolean;
Expand DownExpand Up@@ -180,3 +181,53 @@ describe('@workflow/nitro projectRoot', () => {
});
}
});

describe('@workflow/nitro transform boundaries', () => {
it('does not re-transform generated Nitro build artifacts', async () => {
const rollupBeforeHooks: Array<(nitro: any, config: any) => void> = [];
const nitro = createNitroStub({ routing: true });
nitro.hooks.hook = (
name: string,
hook: (nitro: any, config: any) => void
) => {
if (name === 'rollup:before') rollupBeforeHooks.push(hook);
};

const plugins = viteWorkflow();
const viteTransform = plugins.find(
(plugin) => plugin.name === 'workflow:transform'
) as any;
const viteNitro = plugins.find(
(plugin) => plugin.name === 'workflow:nitro'
) as any;

await viteNitro.nitro.setup(nitro);

const config: { plugins: any[] } = { plugins: [] };
for (const hook of rollupBeforeHooks) {
hook(nitro, config);
}
const nitroTransform = config.plugins.find(
(plugin: { name?: string }) => plugin.name === 'workflow:transform'
);

const code = `
import { WORKFLOW_SERIALIZE, WORKFLOW_DESERIALIZE } from '@workflow/serde';
export class Serializable {
static [WORKFLOW_SERIALIZE](value) { return value; }
static [WORKFLOW_DESERIALIZE]() { return new Serializable(); }
}
`;
const generatedId = '/tmp/.nitro/vite/services/ssr/assets/index.js';
const siblingId = '/tmp/.nitro-source/index.js';

for (const transform of [viteTransform, nitroTransform]) {
await expect(
transform.transform.call({}, code, generatedId)
).resolves.toBeNull();
await expect(
transform.transform.call({}, code, siblingId)
).resolves.not.toBeNull();
}
});
});
12 changes: 6 additions & 6 deletions packages/nitro/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,18 +15,18 @@ export default {
const isVercelDeploy =
!nitro.options.dev && nitro.options.preset === 'vercel';

// Pre-built workflow bundles directory - must be excluded from re-transformation
const workflowBuildDir = join(nitro.options.buildDir, 'workflow');
// Nitro build artifacts have already been transformed; exclude the whole
// build directory from re-transformation.
const nitroBuildDir = `${nitro.options.buildDir.replace(/[\\/]+$/, '')}/`;

// Add transform plugin at the BEGINNING to run before other transforms
// (especially before class property transforms that rename classes like _ClassName)
nitro.hooks.hook('rollup:before', (_nitro: Nitro, config: RollupConfig) => {
(config.plugins as Array<unknown>).unshift(
workflowTransformPlugin({
// Exclude pre-built workflow bundles from re-transformation
// These are already processed and re-processing causes issues like
// undefined class references when Nitro's bundler renames variables
exclude: [workflowBuildDir],
// Nitro build artifacts have already been transformed.
// Re-processing them can duplicate class registration.
exclude: [nitroBuildDir],
})
);
});
Expand Down
13 changes: 6 additions & 7 deletions packages/nitro/src/vite.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,26 +3,25 @@ import { workflowTransformPlugin } from '@workflow/rollup';
import { workflowHotUpdatePlugin } from '@workflow/vite';
import type { Nitro } from 'nitro/types';
import type {} from 'nitro/vite';
import { join } from 'pathe';
import type { Plugin } from 'vite';
import { LocalBuilder } from './builders.js';
import type { ModuleOptions } from './index.js';
import nitroModule from './index.js';

export function workflow(options?: ModuleOptions): Plugin[] {
let builder: LocalBuilder;
let workflowBuildDir: string;
let nitroBuildDir: string;
const enqueue = createBuildQueue();

// Create a lazy transform plugin that excludes the workflow build directory
// Create a lazy transform plugin that excludes Nitro build artifacts.
// The exclusion path is set during nitro setup, so we need to defer plugin creation
const lazyTransformPlugin: Plugin = {
name: 'workflow:transform',
transform(code, id) {
// Delegate to the actual transform plugin with exclusion
// workflowBuildDir is set during nitro setup before transforms run
// nitroBuildDir is set during nitro setup before transforms run
const plugin = workflowTransformPlugin({
exclude: workflowBuildDir ? [workflowBuildDir] : [],
exclude: nitroBuildDir ? [nitroBuildDir] : [],
});
return (plugin.transform as Function)?.call(this, code, id);
},
Expand All@@ -34,8 +33,8 @@ export function workflow(options?: ModuleOptions): Plugin[] {
name: 'workflow:nitro',
nitro: {
setup: (nitro: Nitro) => {
// Capture the workflow build directory for exclusion
workflowBuildDir = join(nitro.options.buildDir, 'workflow');
// Capture the Nitro build directory for exclusion
nitroBuildDir = `${nitro.options.buildDir.replace(/[\\/]+$/, '')}/`;
nitro.options.workflow = {
...nitro.options.workflow,
...options,
Expand Down
Loading