Skip to content

fix(optimizer): detect npm / yarn / pnpm dependency changes correctly (#17336) #18560

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
patak-dev merged 3 commits into from
Nov 18, 2024
Merged

fix(optimizer): detect npm / yarn / pnpm dependency changes correctly (#17336) #18560

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e60a6af
fix (deps-optimization): detect pnpm dependency changes correctly (#1…
DreierF Nov 3, 2024
a3fec97
fix(deps-optimization): detect yarn dependency changes correctly (#17…
DreierF Nov 5, 2024
5f72747
fix(deps-optimization): resolve patches relative to base dir (#17336)
DreierF Nov 17, 2024
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
49 changes: 38 additions & 11 deletions packages/vite/src/node/optimizer/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1150,14 +1150,40 @@ function isSingleDefaultExport(exports: readonly string[]) {
}

const lockfileFormats = [
{ name: 'package-lock.json', checkPatches: true, manager: 'npm' },
{ name: 'yarn.lock', checkPatches: true, manager: 'yarn' }, // Included in lockfile for v2+
{ name: 'pnpm-lock.yaml', checkPatches: false, manager: 'pnpm' }, // Included in lockfile
{ name: 'bun.lockb', checkPatches: true, manager: 'bun' },
{
path: 'node_modules/.package-lock.json',
checkPatches: true,
manager: 'npm',
},
{
// Yarn non-PnP
path: 'node_modules/.yarn-state.yml',
checkPatches: false,
manager: 'yarn',
},
{
// Yarn PnP
path: '.yarn/install-state',
checkPatches: false,
manager: 'yarn',
},
{
// yarn 1
path: 'node_modules/.yarn-integrity',
checkPatches: true,
manager: 'yarn',
},
{
path: 'node_modules/.pnpm/lock.yaml',
// Included in lockfile
checkPatches: false,
manager: 'pnpm',
},
{ name: 'bun.lockb', path: 'bun.lockb', checkPatches: true, manager: 'bun' },
].sort((_, { manager }) => {
return process.env.npm_config_user_agent?.startsWith(manager) ? 1 : -1
})
const lockfileNames = lockfileFormats.map((l) => l.name)
const lockfilePaths = lockfileFormats.map((l) => l.path)

function getConfigHash(environment: Environment): string {
// Take config into account
Expand Down Expand Up @@ -1195,16 +1221,17 @@ function getConfigHash(environment: Environment): string {
}

function getLockfileHash(environment: Environment): string {
const lockfilePath = lookupFile(environment.config.root, lockfileNames)
const lockfilePath = lookupFile(environment.config.root, lockfilePaths)
let content = lockfilePath ? fs.readFileSync(lockfilePath, 'utf-8') : ''
if (lockfilePath) {
const lockfileName = path.basename(lockfilePath)
const { checkPatches } = lockfileFormats.find(
(f) => f.name === lockfileName,
const normalizedLockfilePath = lockfilePath.replaceAll('\\', '/')
const lockfileFormat = lockfileFormats.find((f) =>
normalizedLockfilePath.endsWith(f.path),
)!
if (checkPatches) {
if (lockfileFormat.checkPatches) {
// Default of https://github.com/ds300/patch-package
const fullPath = path.join(path.dirname(lockfilePath), 'patches')
const baseDir = lockfilePath.slice(0, -lockfileFormat.path.length)
const fullPath = path.join(baseDir, 'patches')
const stat = tryStatSync(fullPath)
if (stat?.isDirectory()) {
content += stat.mtimeMs.toString()
Expand Down