Skip to content

fix: improve windows support #394

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 1 commit into from
Feb 18, 2025
Merged

fix: improve windows support #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/ten-mangos-rush.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@opennextjs/cloudflare": patch
---

fix: improve windows support
2 changes: 2 additions & 0 deletions packages/cloudflare/src/cli/build/patches/plugins/eval-manifest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ function evalManifest($PATH, $$$ARGS) {
},
fix: `
function evalManifest($PATH, $$$ARGS) {
const { platform } = require('process');
$PATH = platform === 'win32' ? $PATH.replaceAll('\\\\', '/') : $PATH;
${returnManifests}
throw new Error(\`Unexpected evalManifest(\${$PATH}) call!\`);
}`,
Expand Down
2 changes: 2 additions & 0 deletions packages/cloudflare/src/cli/build/patches/plugins/find-dir.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ rule:
pattern: function findDir($DIR, $NAME) { $$$_ }
fix: |-
function findDir($DIR, $NAME) {
const { platform } = require('process');
$DIR = platform === 'win32' ? $DIR.replaceAll('\\\\', '/') : $DIR;
if ($DIR.endsWith(".next/server")) {
if ($NAME === "app") {
return ${appExists};
Expand Down
2 changes: 2 additions & 0 deletions packages/cloudflare/src/cli/build/patches/plugins/load-manifest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ function loadManifest($PATH, $$$ARGS) {
},
fix: `
function loadManifest($PATH, $$$ARGS) {
const { platform } = require('process');
$PATH = platform === 'win32' ? $PATH.replaceAll('\\\\', '/') : $PATH;
${returnManifests}
throw new Error(\`Unexpected loadManifest(\${$PATH}) call!\`);
}`,
Expand Down
6 changes: 4 additions & 2 deletions packages/cloudflare/src/cli/build/patches/plugins/require-page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { join } from "node:path";
import { type BuildOptions, getPackagePath } from "@opennextjs/aws/build/helper.js";
import { getCrossPlatformPathRegex } from "@opennextjs/aws/utils/regex.js";

import { normalizePath } from "../../utils/normalize-path.js";
import { patchCode, type RuleConfig } from "../ast/util.js";
import type { ContentUpdater } from "./content-updater.js";

Expand Down Expand Up @@ -41,7 +42,7 @@ async function getRule(buildOpts: BuildOptions) {
appPathsManifests = [];
}

const manifests = pagesManifests.concat(appPathsManifests);
const manifests = pagesManifests.concat(appPathsManifests).map((path) => normalizePath(path));

const htmlFiles = manifests.filter((file) => file.endsWith(".html"));
const jsFiles = manifests.filter((file) => file.endsWith(".js"));
Expand Down Expand Up @@ -83,7 +84,8 @@ function requirePage($PAGE, $DIST_DIR, $IS_APP_PATH) {
},
fix: `
function requirePage($PAGE, $DIST_DIR, $IS_APP_PATH) {
const pagePath = getPagePath($$$ARGS);
const { platform } = require('process');
const pagePath = platform === 'win32' ? getPagePath($$$ARGS).replaceAll('\\\\', '/') : getPagePath($$$ARGS);
${fnBody}
}`,
} satisfies RuleConfig;
Expand Down