Skip to content
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

fix(rsa): Use dist filenames when registering server references #11417

Merged
merged 10 commits into from
Sep 4, 2024
Merged

fix(rsa): Use dist filenames when registering server references #11417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
18423e5
fix(rsa): Use dist filenames when registering server references
Tobbe Sep 3, 2024
7bb0b79
Only rewrite paths to src files
Tobbe Sep 4, 2024
daf060d
update tests
Tobbe Sep 4, 2024
4c0d06b
build full path
Tobbe Sep 4, 2024
d6b38cb
add missing param
Tobbe Sep 4, 2024
422a18b
distRsc
Tobbe Sep 4, 2024
bafab4c
file:// for Windows
Tobbe Sep 4, 2024
f1e0868
debug windows paths
Tobbe Sep 4, 2024
c0ea4e5
replace backslash for win
Tobbe Sep 4, 2024
4891334
prepend file://
Tobbe Sep 4, 2024
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
58 changes: 25 additions & 33 deletions packages/vite/src/plugins/__tests__/vite-plugin-rsc-transform-server.function-scope.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ afterAll(() => {
process.env.RWJS_CWD = RWJS_CWD
})

function getPluginTransform() {
const plugin = rscTransformUseServerPlugin()
function getPluginTransform(serverEntryFiles: Record<string, string>) {
const plugin = rscTransformUseServerPlugin('some/dist/path', serverEntryFiles)

if (typeof plugin.transform !== 'function') {
throw new Error('Plugin does not have a transform function')
Expand All @@ -33,12 +33,14 @@ function getPluginTransform() {
return plugin.transform.bind({} as TransformPluginContext)
}

const pluginTransform = getPluginTransform()
const id = 'rw-app/web/src/some/path/to/actions.ts'
const pluginTransform = getPluginTransform({
'rsa-actions.ts-0': id,
})

describe('rscTransformUseServerPlugin function scoped "use server"', () => {
describe('top-level exports', () => {
it('should handle named function', async () => {
const id = 'some/path/to/actions.ts'
const input = `
import fs from 'node:fs'

Expand All @@ -65,12 +67,11 @@ describe('rscTransformUseServerPlugin function scoped "use server"', () => {
await fs.promises.writeFile('settings.json', \`{ "delay": \${formData.get('delay')} }\`);
}
import { registerServerReference } from "react-server-dom-webpack/server";
registerServerReference(formAction, "some/path/to/actions.ts", "formAction");"
registerServerReference(formAction, "some/dist/path/assets/rsa-actions.ts-0.mjs", "formAction");"
`)
})

it('should handle arrow function', async () => {
const id = 'some/path/to/actions.ts'
const input = `
import fs from 'node:fs'

Expand All @@ -97,12 +98,11 @@ describe('rscTransformUseServerPlugin function scoped "use server"', () => {
await fs.promises.writeFile('settings.json', \`{ "delay": \${formData.get('delay')} }\`);
};
import { registerServerReference } from "react-server-dom-webpack/server";
registerServerReference(formAction, "some/path/to/actions.ts", "formAction");"
registerServerReference(formAction, "some/dist/path/assets/rsa-actions.ts-0.mjs", "formAction");"
`)
})

it('should handle default exported named function', async () => {
const id = 'some/path/to/actions.ts'
const input = `
import fs from 'node:fs'

Expand All @@ -129,12 +129,11 @@ describe('rscTransformUseServerPlugin function scoped "use server"', () => {
await fs.promises.writeFile('settings.json', \`{ "delay": \${formData.get('delay')} }\`);
}
import { registerServerReference } from "react-server-dom-webpack/server";
registerServerReference(formAction, "some/path/to/actions.ts", "default");"
registerServerReference(formAction, "some/dist/path/assets/rsa-actions.ts-0.mjs", "default");"
`)
})

it('should handle exports with two consts', async () => {
const id = 'some/path/to/actions.ts'
const input = `
import fs from 'node:fs'

Expand Down Expand Up @@ -162,13 +161,12 @@ describe('rscTransformUseServerPlugin function scoped "use server"', () => {
await fs.promises.writeFile('settings.json', \`{ "delay": \${formData.get('delay')} }\`);
};
import { registerServerReference } from "react-server-dom-webpack/server";
registerServerReference(fortyTwo, "some/path/to/actions.ts", "fortyTwo");
registerServerReference(formAction, "some/path/to/actions.ts", "formAction");"
registerServerReference(fortyTwo, "some/dist/path/assets/rsa-actions.ts-0.mjs", "fortyTwo");
registerServerReference(formAction, "some/dist/path/assets/rsa-actions.ts-0.mjs", "formAction");"
`)
})

it('should handle named function and arrow function with separate export', async () => {
const id = 'some/path/to/actions.ts'
const input = `
import fs from 'node:fs'

Expand Down Expand Up @@ -213,15 +211,14 @@ describe('rscTransformUseServerPlugin function scoped "use server"', () => {
await fs.promises.writeFile('settings.json', \`{ "delay": \${formData.get('delay')} }\`);
};
import { registerServerReference } from "react-server-dom-webpack/server";
registerServerReference(formAction, "some/path/to/actions.ts", "formAction");
registerServerReference(arrowAction, "some/path/to/actions.ts", "arrowAction");"
registerServerReference(formAction, "some/dist/path/assets/rsa-actions.ts-0.mjs", "formAction");
registerServerReference(arrowAction, "some/dist/path/assets/rsa-actions.ts-0.mjs", "arrowAction");"
`)
})

it.todo(
"should handle named function and 'let' arrow function with separate export",
async () => {
const id = 'some/path/to/actions.ts'
const input = `
import fs from 'node:fs'

Expand Down Expand Up @@ -280,14 +277,13 @@ describe('rscTransformUseServerPlugin function scoped "use server"', () => {
// Not 'use server' anymore
};
import { registerServerReference } from "react-server-dom-webpack/server";
registerServerReference(formAction, "some/path/to/actions.ts", "formAction");
if (typeof letArrowFunction === "function") registerServerReference(letArrowAction, "some/path/to/actions.ts", "letArrowAction");"
registerServerReference(formAction, "some/dist/path/assets/rsa-actions.ts-0.mjs", "formAction");
if (typeof letArrowFunction === "function") registerServerReference(letArrowAction, "some/dist/path/assets/rsa-actions.ts-0.mjs", "letArrowAction");"
`)
},
)

it('should handle separate renamed export', async () => {
const id = 'some/path/to/actions.ts'
const input = `
import fs from 'node:fs'

Expand Down Expand Up @@ -327,13 +323,12 @@ describe('rscTransformUseServerPlugin function scoped "use server"', () => {
};
export { formAction as fA, arrowAction };
import { registerServerReference } from "react-server-dom-webpack/server";
registerServerReference(formAction, "some/path/to/actions.ts", "fA");
registerServerReference(arrowAction, "some/path/to/actions.ts", "arrowAction");"
registerServerReference(formAction, "some/dist/path/assets/rsa-actions.ts-0.mjs", "fA");
registerServerReference(arrowAction, "some/dist/path/assets/rsa-actions.ts-0.mjs", "arrowAction");"
`)
})

it.todo('should handle default exported arrow function', async () => {
const id = 'some/path/to/actions.ts'
const input = `
import fs from 'node:fs'

Expand Down Expand Up @@ -365,14 +360,13 @@ describe('rscTransformUseServerPlugin function scoped "use server"', () => {
}

import {registerServerReference} from "react-server-dom-webpack/server";
if (typeof formAction === "function") registerServerReference(formAction,"some/path/to/actions.ts","formAction");
if (typeof formAction === "function") registerServerReference(formAction,"some/dist/path/assets/rsa-actions.ts-0.mjs","formAction");
"
`)
})

describe('without "use server"', () => {
it('should not register named function', async () => {
const id = 'some/path/to/actions.ts'
const input = `
import fs from 'node:fs'

Expand Down Expand Up @@ -401,7 +395,6 @@ describe('rscTransformUseServerPlugin function scoped "use server"', () => {
})

it('should not register arrow function', async () => {
const id = 'some/path/to/actions.ts'
const input = `
import fs from 'node:fs'

Expand Down Expand Up @@ -430,7 +423,6 @@ describe('rscTransformUseServerPlugin function scoped "use server"', () => {
})

it('should not register default exported named function', async () => {
const id = 'some/path/to/actions.ts'
const input = `
import fs from 'node:fs'

Expand Down Expand Up @@ -459,7 +451,6 @@ describe('rscTransformUseServerPlugin function scoped "use server"', () => {
})

it('should not register exports with two consts', async () => {
const id = 'some/path/to/actions.ts'
const input = `
import fs from 'node:fs'

Expand All @@ -483,12 +474,11 @@ describe('rscTransformUseServerPlugin function scoped "use server"', () => {
await fs.promises.writeFile('settings.json', \`{ "delay": \${formData.get('delay')} }\`);
};
import { registerServerReference } from "react-server-dom-webpack/server";
registerServerReference(formAction, "some/path/to/actions.ts", "formAction");"
registerServerReference(formAction, "some/dist/path/assets/rsa-actions.ts-0.mjs", "formAction");"
`)
})

it('should not register named function and arrow function with separate export', async () => {
const id = 'some/path/to/actions.ts'
const input = `
import fs from 'node:fs'

Expand Down Expand Up @@ -525,7 +515,6 @@ describe('rscTransformUseServerPlugin function scoped "use server"', () => {
})

it('should not register separate renamed export', async () => {
const id = 'some/path/to/actions.ts'
const input = `
import fs from 'node:fs'

Expand Down Expand Up @@ -564,7 +553,6 @@ describe('rscTransformUseServerPlugin function scoped "use server"', () => {
})

it('should not register default exported arrow function', async () => {
const id = 'some/path/to/actions.ts'
const input = `
import fs from 'node:fs'

Expand Down Expand Up @@ -597,7 +585,11 @@ describe('rscTransformUseServerPlugin function scoped "use server"', () => {

describe('actions inside components', async () => {
it('should handle self-contained named function inside default exported component', async () => {
const id = 'some/path/to/Component.tsx'
const id = 'rw-app/web/src/some/path/to/Component.tsx'
const pluginTransform = getPluginTransform({
'rsa-Component.tsx-0': id,
})

const input = `
import fs from 'node:fs'

Expand Down Expand Up @@ -640,7 +632,7 @@ describe('rscTransformUseServerPlugin function scoped "use server"', () => {

await fs.promises.writeFile('settings.json', \`{ "delay": \${formData.get('delay')} }\`);
}
registerServerReference(__rwjs__rsa0_formAction, "some/path/to/Component.tsx", "__rwjs__rsa0_formAction");"
registerServerReference(__rwjs__rsa0_formAction, "some/dist/path/assets/rsa-Component.tsx-0.mjs", "__rwjs__rsa0_formAction");"
`)
})

Expand Down
Loading
Loading