LukeParke/vercel
1
0
Fork 0
mirror of https://github.com/LukeHagar/vercel.git synced 2025-12-10 12:57:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[remix] Make symlink logic of @remix-run/dev work in monorepos (#9591)

Browse Source 
Utilize `require.resolve()` to determine the correct location of
`@remix-run/dev`, instead of assuming it's in
"node_modules/@remix-run/dev" relative to the project work path.

Fixes https://github.com/orgs/vercel/discussions/1671.

Manually tested with yarn and pnpm on this template:
https://github.com/remix-run/examples/tree/main/turborepo-vercel
This commit is contained in:
Nathan Rajlich
2023-03-02 08:58:00 -08:00
committed by GitHub
parent cfc1c9e818
commit 6e4ea0774e
1 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
packages/remix/src/build.ts
View File

@@ -122,21 +122,13 @@ export const build: BuildV2 = async ({
// Make our version of `remix` CLI available to the project's build
// command by creating a symlink to the copy in our node modules,
// so that `serverBundles` works: https://github.com/remix-run/remix/pull/5479
const nodeModulesDir = join(entrypointFsDirname, 'node_modules');
const remixRunDevPath = join(nodeModulesDir, '@remix-run/dev');
let backupRemixRunDevPath:
| string
| false = `${remixRunDevPath}.__vercel_backup`;
try {
await fs.rename(remixRunDevPath, backupRemixRunDevPath);
} catch (err: any) {
if (err.code !== 'ENOENT') {
throw err;
}
backupRemixRunDevPath = false;
}
const remixRunDevPath = await ensureResolvable(
entrypointFsDirname,
repoRootPath,
'@remix-run/dev'
);
const backupRemixRunDevPath = `${remixRunDevPath}.__vercel_backup`;
await fs.rename(remixRunDevPath, backupRemixRunDevPath);
await fs.symlink(REMIX_RUN_DEV_PATH, remixRunDevPath);
// Make `remix build` output production mode
@@ -274,10 +266,7 @@ module.exports = config;`;
// Remove `@remix-run/dev` symlink
await fs.unlink(remixRunDevPath);
if (backupRemixRunDevPath) {
// Restore previous version if it was existed
await fs.rename(backupRemixRunDevPath, remixRunDevPath);
}
await fs.rename(backupRemixRunDevPath, remixRunDevPath);
}
// This needs to happen before we run NFT to create the Node/Edge functions
@@ -593,13 +582,20 @@ async function createRenderEdgeFunction(
return fn;
}
async function ensureResolvable(start: string, base: string, pkgName: string) {
async function ensureResolvable(
start: string,
base: string,
pkgName: string
): Promise<string> {
try {
const resolvedPath = _require.resolve(pkgName, { paths: [start] });
const resolvedPkgPath = _require.resolve(`${pkgName}/package.json`, {
paths: [start],
});
const resolvedPath = dirname(resolvedPkgPath);
if (!relative(base, resolvedPath).startsWith(`..${sep}`)) {
// Resolved path is within the root of the project, so all good
debug(`"${pkgName}" resolved to '${resolvedPath}'`);
return;
return resolvedPath;
}
} catch (err: any) {
if (err.code !== 'MODULE_NOT_FOUND') {
@@ -623,7 +619,7 @@ async function ensureResolvable(start: string, base: string, pkgName: string) {
if (match) {
const pkgDir = join(pnpmDir, match, 'node_modules', pkgName);
await ensureSymlink(pkgDir, join(pnpmDir, '..'), pkgName);
return;
return pkgDir;
}
}
@@ -641,7 +637,7 @@ async function ensureResolvable(start: string, base: string, pkgName: string) {
if (match) {
const pkgDir = join(prefixDir, match, 'node_modules', pkgName);
await ensureSymlink(pkgDir, join(npmDir, '..'), pkgName);
return;
return pkgDir;
}
}