Skip to content

[remix] remove check based on never set remixRunVercelPkgJson #12971

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
erikareads merged 4 commits into from
Jan 31, 2025
Merged

[remix] remove check based on never set remixRunVercelPkgJson #12971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
311ceec
[remix] remove dead code path
erikareads Jan 30, 2025
ee7961e
add changeset
erikareads Jan 30, 2025
9bc3e8b
Merge branch 'main' into erikarowland/remove-dead-code-path-remix
erikareads Jan 30, 2025
81e0b11
Merge branch 'main' into erikarowland/remove-dead-code-path-remix
erikareads Jan 30, 2025
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/old-ladybugs-cross.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@vercel/remix-builder': patch
---

[remix] remove check based on never set remixRunVercelPkgJson
15 changes: 2 additions & 13 deletions packages/remix/src/build-vite.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { readFileSync, promises as fs, statSync, existsSync } from 'fs';
import { basename, dirname, join, relative, sep } from 'path';
import { basename, dirname, join, relative } from 'path';
import { isErrnoException } from '@vercel/error-utils';
import { nodeFileTrace, NodeFileTraceOptions } from '@vercel/nft';
import {
Expand All @@ -13,7 +13,6 @@ import {
runNpmInstall,
runPackageJsonScript,
scanParentDirs,
FileBlob,
FileFsRef,
EdgeFunction,
NodejsLambda,
Expand Down Expand Up @@ -635,8 +634,6 @@ async function createRenderEdgeFunction(
);
}

let remixRunVercelPkgJson: string | undefined;

// Trace the handler with `@vercel/nft`
const trace = await nodeFileTrace([handlerPath], {
base: rootDir,
Expand All @@ -648,15 +645,7 @@ async function createRenderEdgeFunction(
logNftWarnings(trace.warnings, '@remix-run/server-runtime');

for (const file of trace.fileList) {
if (
remixRunVercelPkgJson &&
file.endsWith(`@remix-run${sep}vercel${sep}package.json`)
) {
// Use the modified `@remix-run/vercel` package.json which contains "browser" field
files[file] = new FileBlob({ data: remixRunVercelPkgJson });
} else {
files[file] = await FileFsRef.fromFsPath({ fsPath: join(rootDir, file) });
}
files[file] = await FileFsRef.fromFsPath({ fsPath: join(rootDir, file) });
}

const fn = new EdgeFunction({
Expand Down