Skip to content

fix: Windows support #81

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
merged 5 commits into from
Oct 9, 2024
Merged

fix: Windows support #81

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3d64038
fix: Windows support
clansty Oct 9, 2024
8e7047e
fix: Prettier
clansty Oct 9, 2024
d3e41d2
fix: Replace with path.sep and path.posix.sep
clansty Oct 9, 2024
77834dd
Update packages/cloudflare/src/cli/build/patches/to-investigate/inlin…
clansty Oct 9, 2024
ab89461
Update packages/cloudflare/src/cli/build/patches/to-investigate/patch…
clansty Oct 9, 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
12 changes: 9 additions & 3 deletions packages/cloudflare/src/cli/build/patches/to-investigate/inline-eval-manifest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,22 @@ import path from "node:path";
export function inlineEvalManifest(code: string, config: Config): string {
console.log("# inlineEvalManifest");
const manifestJss = globSync(
path.join(config.paths.standaloneAppDotNext, "**", "*_client-reference-manifest.js")
).map((file) => file.replace(`${config.paths.standaloneApp}/`, ""));
path
.join(config.paths.standaloneAppDotNext, "**", "*_client-reference-manifest.js")
.replaceAll(path.sep, path.posix.sep)
).map((file) =>
file
.replaceAll(path.sep, path.posix.sep)
.replace(`${config.paths.standaloneApp.replaceAll(path.sep, path.posix.sep)}/`, "")
);
return code.replace(
/function evalManifest\((.+?), .+?\) {/,
`$&
${manifestJss
.map(
(manifestJs) => `
if ($1.endsWith("${manifestJs}")) {
require("${path.join(config.paths.standaloneApp, manifestJs)}");
require(${JSON.stringify(path.join(config.paths.standaloneApp, manifestJs))});
return {
__RSC_MANIFEST: {
"${manifestJs
Expand Down
2 changes: 1 addition & 1 deletion packages/cloudflare/src/cli/build/patches/to-investigate/inline-next-require.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export function inlineNextRequire(code: string, config: Config) {
.map(
(module) => `
if (pagePath.endsWith("${module}")) {
return require("${path.join(config.paths.standaloneApp, module)}");
return require(${JSON.stringify(path.join(config.paths.standaloneApp, module))});
}
`
)
Expand Down
10 changes: 7 additions & 3 deletions packages/cloudflare/src/cli/build/patches/to-investigate/patch-read-file.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,15 @@ export function patchReadFile(code: string, config: Config): string {
`
);

// Same as above, the next-server code loads the manifests with `readyFileSync` and we want to avoid that
// Same as above, the next-server code loads the manifests with `readFileSync` and we want to avoid that
// (source: https://github.com/vercel/next.js/blob/15aeb92e/packages/next/src/server/load-manifest.ts#L34-L56)
// Note: we could/should probably just patch readFileSync here or something!
const manifestJsons = globSync(path.join(config.paths.standaloneAppDotNext, "**", "*-manifest.json")).map(
(file) => file.replace(config.paths.standaloneApp + "/", "")
const manifestJsons = globSync(
path.join(config.paths.standaloneAppDotNext, "**", "*-manifest.json").replaceAll(path.sep, path.posix.sep)
).map((file) =>
file
.replaceAll(path.sep, path.posix.sep)
.replace(config.paths.standaloneApp.replaceAll(path.sep, path.posix.sep) + "/", "")
);
code = code.replace(
/function loadManifest\((.+?), .+?\) {/,
Expand Down