mirror/pnpm
1
0
Fork 0
mirror of https://github.com/pnpm/pnpm.git synced 2025-12-23 23:29:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: don't reimport node.js on every install (#10239)

Browse Source
This commit is contained in:
Zoltan Kochan
2025-11-26 01:10:36 +01:00
committed by GitHub
parent 69ebe38764
commit 60b5fd17ed
2 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.changeset/stupid-grapes-press.md Normal file
View File

@@ -0,0 +1,6 @@
---
"@pnpm/fs.indexed-pkg-importer": patch
"pnpm": patch
---
Packages that don't have a `package.json` file (like Node.js) should not be reimported from the store on every install. Another file from the package should be checked in order to verify its presence in `node_modules`.

46
fs/indexed-pkg-importer/src/index.ts
View File

@@ -119,15 +119,31 @@ function clonePkg (
to: string,
opts: ImportOptions
): 'clone' | undefined {
const pkgJsonPath = path.join(to, 'package.json')
if (opts.resolvedFrom !== 'store' || opts.force || !existsSync(pkgJsonPath)) {
if (opts.resolvedFrom !== 'store' || opts.force || !pkgExistsAtTargetDir(to, opts.filesMap)) {
importIndexedDir(clone, to, opts.filesMap, opts)
return 'clone'
}
return undefined
}
function pkgExistsAtTargetDir (targetDir: string, filesMap: FilesMap): boolean {
return existsSync(path.join(targetDir, pickFileFromFilesMap(filesMap)))
}
function pickFileFromFilesMap (filesMap: FilesMap): string {
// A package might not have a package.json file.
// For instance, the Node.js package.
// Or injected packages in a Bit workspace.
if (filesMap['package.json']) {
return 'package.json'
}
const files = Object.keys(filesMap)
if (files.length === 0) {
throw new Error('pickFileFromFilesMap cannot pick a file from an empty FilesMap')
}
return files[0]
}
function createCloneFunction (): CloneFunction {
// Node.js currently does not natively support reflinks on Windows and macOS.
// Hence, we use a third party solution.
@@ -195,24 +211,8 @@ function linkOrCopy (existingPath: string, newPath: string): void {
}
}
function pkgLinkedToStore (
filesMap: FilesMap,
to: string
): boolean {
if (filesMap['package.json']) {
if (isSameFile('package.json', to, filesMap)) {
return true
}
} else {
// An injected package might not have a package.json.
// This will probably only even happen in a Bit workspace.
const [anyFile] = Object.keys(filesMap)
if (isSameFile(anyFile, to, filesMap)) return true
}
return false
}
function isSameFile (filename: string, linkedPkgDir: string, filesMap: FilesMap): boolean {
function pkgLinkedToStore (filesMap: FilesMap, linkedPkgDir: string): boolean {
const filename = pickFileFromFilesMap(filesMap)
const linkedFile = path.join(linkedPkgDir, filename)
let stats0!: Stats
try {
@@ -230,9 +230,7 @@ export function copyPkg (
to: string,
opts: ImportOptions
): 'copy' | undefined {
const pkgJsonPath = path.join(to, 'package.json')
if (opts.resolvedFrom !== 'store' || opts.force || !existsSync(pkgJsonPath)) {
if (opts.resolvedFrom !== 'store' || opts.force || !pkgExistsAtTargetDir(to, opts.filesMap)) {
importIndexedDir(fs.copyFileSync, to, opts.filesMap, opts)
return 'copy'
}