@vercel/remix
Advanced tools
Comparing version 1.0.4 to 1.0.5
@@ -24,18 +24,8 @@ "use strict"; | ||
const { cliType, lockfileVersion } = await (0, build_utils_1.scanParentDirs)(entrypointFsDirname); | ||
if (cliType === 'npm') { | ||
if (typeof lockfileVersion === 'number' && | ||
lockfileVersion >= 2 && | ||
(nodeVersion?.major || 0) < 16) { | ||
// Ensure that npm 7 is at the beginning of the `$PATH` | ||
spawnOpts.env.PATH = `/node16/bin-npm7${path_1.delimiter}${spawnOpts.env.PATH}`; | ||
console.log('Detected `package-lock.json` generated by npm 7...'); | ||
} | ||
} | ||
else if (cliType === 'pnpm') { | ||
if (typeof lockfileVersion === 'number' && lockfileVersion === 5.4) { | ||
// Ensure that pnpm 7 is at the beginning of the `$PATH` | ||
spawnOpts.env.PATH = `/pnpm7/node_modules/.bin${path_1.delimiter}${spawnOpts.env.PATH}`; | ||
console.log('Detected `pnpm-lock.yaml` generated by pnpm 7...'); | ||
} | ||
} | ||
spawnOpts.env = (0, build_utils_1.getEnvForPackageManager)({ | ||
cliType, | ||
lockfileVersion, | ||
nodeVersion, | ||
env: spawnOpts.env || {}, | ||
}); | ||
// Ensure `@remix-run/vercel` is in the project's `package.json` | ||
@@ -78,9 +68,4 @@ const packageJsonPath = await (0, build_utils_1.walkParentDirs)({ | ||
console.log(`Running "install" command: \`${installCommand}\`...`); | ||
const env = { | ||
YARN_NODE_LINKER: 'node-modules', | ||
...spawnOpts.env, | ||
}; | ||
await (0, build_utils_1.execCommand)(installCommand, { | ||
...spawnOpts, | ||
env, | ||
cwd: entrypointFsDirname, | ||
@@ -87,0 +72,0 @@ }); |
{ | ||
"name": "@vercel/remix", | ||
"version": "1.0.4", | ||
"version": "1.0.5", | ||
"license": "MIT", | ||
@@ -29,6 +29,6 @@ "main": "./dist/index.js", | ||
"@types/node": "*", | ||
"@vercel/build-utils": "4.2.1", | ||
"@vercel/build-utils": "5.0.0", | ||
"typescript": "4.6.4" | ||
}, | ||
"gitHead": "547e88228e180e883e5f07ab815a16960767bbf5" | ||
"gitHead": "621b53bc49a1ac4aaf6ab986f9bbbdd517af01f5" | ||
} |
Sorry, the diff of this file is not supported yet
30252
262