@pnpm/fs.indexed-pkg-importer 1000.1.24 → 1000.1.26
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/importIndexedDir.d.ts +1 -0
- package/lib/importIndexedDir.js +58 -1
- package/lib/importIndexedDir.js.map +1 -1
- package/package.json +10 -10
package/lib/importIndexedDir.js
CHANGED
|
@@ -24,7 +24,6 @@ function importIndexedDir(importFile, newDir, filenames, opts) {
|
|
|
24
24
|
// Keeping node_modules is needed only when the hoisted node linker is used.
|
|
25
25
|
moveOrMergeModulesDirs(path_1.default.join(newDir, 'node_modules'), path_1.default.join(stage, 'node_modules'));
|
|
26
26
|
}
|
|
27
|
-
rename_overwrite_1.default.sync(stage, newDir);
|
|
28
27
|
}
|
|
29
28
|
catch (err) {
|
|
30
29
|
try {
|
|
@@ -59,6 +58,64 @@ They were renamed.`);
|
|
|
59
58
|
}
|
|
60
59
|
throw err;
|
|
61
60
|
}
|
|
61
|
+
if (opts.safeToSkip) {
|
|
62
|
+
// Content-addressable target (e.g. global virtual store): if the target
|
|
63
|
+
// already exists and has all expected files, it has the correct content.
|
|
64
|
+
// Skip instead of doing a swap-rename that temporarily removes the target
|
|
65
|
+
// directory — which breaks junctions read by other processes.
|
|
66
|
+
try {
|
|
67
|
+
fs_1.default.renameSync(stage, newDir);
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
70
|
+
catch (err) {
|
|
71
|
+
if (util_1.default.types.isNativeError(err) && 'code' in err && (err.code === 'ENOTEMPTY' || err.code === 'EEXIST' || err.code === 'EPERM')) {
|
|
72
|
+
if (allFilesMatch(newDir, filenames)) {
|
|
73
|
+
try {
|
|
74
|
+
(0, rimraf_1.sync)(stage);
|
|
75
|
+
}
|
|
76
|
+
catch { } // eslint-disable-line:no-empty
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
// Files missing or other error — fall through to renameOverwriteSync
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
try {
|
|
84
|
+
rename_overwrite_1.default.sync(stage, newDir);
|
|
85
|
+
}
|
|
86
|
+
catch (renameErr) {
|
|
87
|
+
try {
|
|
88
|
+
(0, rimraf_1.sync)(stage);
|
|
89
|
+
}
|
|
90
|
+
catch { } // eslint-disable-line:no-empty
|
|
91
|
+
throw renameErr;
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
function allFilesMatch(dir, filenames) {
|
|
95
|
+
for (const [f, src] of Object.entries(filenames)) {
|
|
96
|
+
const target = path_1.default.join(dir, f);
|
|
97
|
+
try {
|
|
98
|
+
const targetStat = graceful_fs_1.default.statSync(target);
|
|
99
|
+
const srcStat = graceful_fs_1.default.statSync(src);
|
|
100
|
+
// Fast path: hardlinks share the same inode
|
|
101
|
+
if (targetStat.ino === srcStat.ino && targetStat.dev === srcStat.dev)
|
|
102
|
+
continue;
|
|
103
|
+
// Copy path: compare size first, then content
|
|
104
|
+
if (targetStat.size !== srcStat.size) {
|
|
105
|
+
(0, logger_1.globalInfo)(`Re-importing "${dir}" because file "${f}" has a different size`);
|
|
106
|
+
return false;
|
|
107
|
+
}
|
|
108
|
+
if (!graceful_fs_1.default.readFileSync(target).equals(graceful_fs_1.default.readFileSync(src))) {
|
|
109
|
+
(0, logger_1.globalInfo)(`Re-importing "${dir}" because file "${f}" has different content`);
|
|
110
|
+
return false;
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
catch {
|
|
114
|
+
(0, logger_1.globalInfo)(`Re-importing "${dir}" because file "${f}" is missing or unreadable`);
|
|
115
|
+
return false;
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
return true;
|
|
62
119
|
}
|
|
63
120
|
function sanitizeFilenames(filenames) {
|
|
64
121
|
const sanitizedFilenames = {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"importIndexedDir.js","sourceRoot":"","sources":["../src/importIndexedDir.ts"],"names":[],"mappings":";;;;;AAgBA,
|
|
1
|
+
{"version":3,"file":"importIndexedDir.js","sourceRoot":"","sources":["../src/importIndexedDir.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/fs.indexed-pkg-importer",
|
|
3
|
-
"version": "1000.1.
|
|
3
|
+
"version": "1000.1.26",
|
|
4
4
|
"description": "Replicates indexed directories using hard links, copies, or cloning",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"pnpm",
|
|
@@ -36,25 +36,25 @@
|
|
|
36
36
|
"dependencies": {
|
|
37
37
|
"@reflink/reflink": "0.1.19",
|
|
38
38
|
"@zkochan/rimraf": "^3.0.2",
|
|
39
|
-
"fs-extra": "^11.3.
|
|
39
|
+
"fs-extra": "^11.3.4",
|
|
40
40
|
"make-empty-dir": "^3.0.2",
|
|
41
41
|
"p-limit": "^3.1.0",
|
|
42
|
-
"path-temp": "^2.1.
|
|
43
|
-
"rename-overwrite": "^6.0.
|
|
42
|
+
"path-temp": "^2.1.1",
|
|
43
|
+
"rename-overwrite": "^6.0.6",
|
|
44
44
|
"sanitize-filename": "^1.6.3",
|
|
45
|
-
"@pnpm/
|
|
45
|
+
"@pnpm/core-loggers": "1001.0.9",
|
|
46
46
|
"@pnpm/store-controller-types": "1004.5.1",
|
|
47
|
-
"@pnpm/
|
|
47
|
+
"@pnpm/graceful-fs": "1000.1.0"
|
|
48
48
|
},
|
|
49
49
|
"peerDependencies": {
|
|
50
|
-
"@pnpm/logger": "
|
|
50
|
+
"@pnpm/logger": "^1001.0.1"
|
|
51
51
|
},
|
|
52
52
|
"devDependencies": {
|
|
53
53
|
"@jest/globals": "29.7.0",
|
|
54
54
|
"@types/fs-extra": "^9.0.13",
|
|
55
|
-
"@pnpm/
|
|
56
|
-
"@pnpm/
|
|
57
|
-
"@pnpm/
|
|
55
|
+
"@pnpm/fs.indexed-pkg-importer": "1000.1.26",
|
|
56
|
+
"@pnpm/prepare": "1000.0.16",
|
|
57
|
+
"@pnpm/logger": "1001.0.1"
|
|
58
58
|
},
|
|
59
59
|
"engines": {
|
|
60
60
|
"node": ">=18.12"
|