Skip to content

fix: sync createServerBundle.ts with aws #377

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 13, 2025
Merged

fix: sync createServerBundle.ts with aws #377

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
15 changes: 9 additions & 6 deletions packages/cloudflare/src/cli/build/open-next/createServerBundle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,15 @@ export async function createServerBundle(options: buildHelper.BuildOptions) {

const remainingRoutes = new Set<string>();

const { appBuildOutputPath, monorepoRoot } = options;

const packagePath = path.relative(monorepoRoot, appBuildOutputPath);
const { appBuildOutputPath } = options;

// Find remaining routes
const serverPath = path.join(appBuildOutputPath, ".next", "standalone", packagePath, ".next", "server");
const serverPath = path.join(
appBuildOutputPath,
".next/standalone",
buildHelper.getPackagePath(options),
".next/server"
);

// Find app dir routes
if (fs.existsSync(path.join(serverPath, "app"))) {
Expand Down Expand Up @@ -111,7 +114,7 @@ async function generateBundle(
// `node_modules` inside `.next/standalone`, and others inside
// `.next/standalone/package/path` (ie. `.next`, `server.js`).
// We need to output the handler file inside the package path.
const packagePath = path.relative(monorepoRoot, appBuildOutputPath);
const packagePath = buildHelper.getPackagePath(options);
fs.mkdirSync(path.join(outputPath, packagePath), { recursive: true });

const ext = fnOptions.runtime === "deno" ? "mjs" : "cjs";
Expand Down Expand Up @@ -167,7 +170,7 @@ async function generateBundle(
const overrides = fnOptions.override ?? {};

const isBefore13413 = buildHelper.compareSemver(options.nextVersion, "13.4.13") <= 0;
const isAfter141 = buildHelper.compareSemver(options.nextVersion, "14.0.4") >= 0;
const isAfter141 = buildHelper.compareSemver(options.nextVersion, "14.1") >= 0;

const disableRouting = isBefore13413 || config.middleware?.external;

Expand Down