@pnpm/fs.indexed-pkg-importer 2.1.3 → 2.1.4
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/index.js +8 -7
- package/lib/index.js.map +1 -1
- package/package.json +5 -4
package/lib/index.js
CHANGED
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.copyPkg = exports.createIndexedPkgImporter = void 0;
|
|
7
7
|
const fs_1 = require("fs");
|
|
8
|
+
const graceful_fs_1 = __importDefault(require("@pnpm/graceful-fs"));
|
|
8
9
|
const path_1 = __importDefault(require("path"));
|
|
9
10
|
const logger_1 = require("@pnpm/logger");
|
|
10
11
|
const core_loggers_1 = require("@pnpm/core-loggers");
|
|
@@ -57,7 +58,7 @@ function createAutoImporter() {
|
|
|
57
58
|
// ignore
|
|
58
59
|
}
|
|
59
60
|
try {
|
|
60
|
-
if (!await hardlinkPkg(
|
|
61
|
+
if (!await hardlinkPkg(graceful_fs_1.default.link, to, opts))
|
|
61
62
|
return undefined;
|
|
62
63
|
core_loggers_1.packageImportMethodLogger.debug({ method: 'hardlink' });
|
|
63
64
|
auto = hardlinkPkg.bind(null, linkOrCopy);
|
|
@@ -106,7 +107,7 @@ async function clonePkg(to, opts) {
|
|
|
106
107
|
return undefined;
|
|
107
108
|
}
|
|
108
109
|
async function cloneFile(from, to) {
|
|
109
|
-
await
|
|
110
|
+
await graceful_fs_1.default.copyFile(from, to, fs_1.constants.COPYFILE_FICLONE_FORCE);
|
|
110
111
|
}
|
|
111
112
|
async function hardlinkPkg(importFile, to, opts) {
|
|
112
113
|
if (!opts.fromStore ||
|
|
@@ -119,7 +120,7 @@ async function hardlinkPkg(importFile, to, opts) {
|
|
|
119
120
|
}
|
|
120
121
|
async function linkOrCopy(existingPath, newPath) {
|
|
121
122
|
try {
|
|
122
|
-
await
|
|
123
|
+
await graceful_fs_1.default.link(existingPath, newPath);
|
|
123
124
|
}
|
|
124
125
|
catch (err) { // eslint-disable-line
|
|
125
126
|
// If a hard link to the same file already exists
|
|
@@ -129,7 +130,7 @@ async function linkOrCopy(existingPath, newPath) {
|
|
|
129
130
|
// In some VERY rare cases (1 in a thousand), hard-link creation fails on Windows.
|
|
130
131
|
// In that case, we just fall back to copying.
|
|
131
132
|
// This issue is reproducible with "pnpm add @material-ui/icons@4.9.1"
|
|
132
|
-
await
|
|
133
|
+
await graceful_fs_1.default.copyFile(existingPath, newPath);
|
|
133
134
|
}
|
|
134
135
|
}
|
|
135
136
|
async function pkgLinkedToStore(filesMap, to) {
|
|
@@ -151,13 +152,13 @@ async function isSameFile(filename, linkedPkgDir, filesMap) {
|
|
|
151
152
|
const linkedFile = path_1.default.join(linkedPkgDir, filename);
|
|
152
153
|
let stats0;
|
|
153
154
|
try {
|
|
154
|
-
stats0 = await
|
|
155
|
+
stats0 = await graceful_fs_1.default.stat(linkedFile);
|
|
155
156
|
}
|
|
156
157
|
catch (err) { // eslint-disable-line
|
|
157
158
|
if (err.code === 'ENOENT')
|
|
158
159
|
return false;
|
|
159
160
|
}
|
|
160
|
-
const stats1 = await
|
|
161
|
+
const stats1 = await graceful_fs_1.default.stat(filesMap[filename]);
|
|
161
162
|
if (stats0.ino === stats1.ino)
|
|
162
163
|
return true;
|
|
163
164
|
(0, logger_1.globalInfo)(`Relinking ${linkedPkgDir} from the store`);
|
|
@@ -166,7 +167,7 @@ async function isSameFile(filename, linkedPkgDir, filesMap) {
|
|
|
166
167
|
async function copyPkg(to, opts) {
|
|
167
168
|
const pkgJsonPath = path_1.default.join(to, 'package.json');
|
|
168
169
|
if (!opts.fromStore || opts.force || !await (0, path_exists_1.default)(pkgJsonPath)) {
|
|
169
|
-
await (0, importIndexedDir_1.importIndexedDir)(
|
|
170
|
+
await (0, importIndexedDir_1.importIndexedDir)(graceful_fs_1.default.copyFile, to, opts.filesMap, opts);
|
|
170
171
|
return 'copy';
|
|
171
172
|
}
|
|
172
173
|
return undefined;
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/fs.indexed-pkg-importer",
|
|
3
3
|
"description": "Replicates indexed directories using hard links, copies, or cloning",
|
|
4
|
-
"version": "2.1.
|
|
4
|
+
"version": "2.1.4",
|
|
5
5
|
"bugs": {
|
|
6
6
|
"url": "https://github.com/pnpm/pnpm/issues"
|
|
7
7
|
},
|
|
@@ -24,12 +24,13 @@
|
|
|
24
24
|
"rename-overwrite": "^4.0.3",
|
|
25
25
|
"sanitize-filename": "^1.6.3",
|
|
26
26
|
"@pnpm/core-loggers": "8.0.3",
|
|
27
|
+
"@pnpm/graceful-fs": "2.1.0",
|
|
27
28
|
"@pnpm/store-controller-types": "14.3.1"
|
|
28
29
|
},
|
|
29
30
|
"devDependencies": {
|
|
30
31
|
"@types/fs-extra": "^9.0.13",
|
|
31
|
-
"@pnpm/fs.indexed-pkg-importer": "2.1.
|
|
32
|
-
"@pnpm/prepare": "0.0.
|
|
32
|
+
"@pnpm/fs.indexed-pkg-importer": "2.1.4",
|
|
33
|
+
"@pnpm/prepare": "0.0.64"
|
|
33
34
|
},
|
|
34
35
|
"directories": {
|
|
35
36
|
"test": "test"
|
|
@@ -57,7 +58,7 @@
|
|
|
57
58
|
"scripts": {
|
|
58
59
|
"start": "tsc --watch",
|
|
59
60
|
"fix": "tslint -c tslint.json src/**/*.ts test/**/*.ts --fix",
|
|
60
|
-
"lint": "eslint src/**/*.ts test/**/*.ts",
|
|
61
|
+
"lint": "eslint \"src/**/*.ts\" \"test/**/*.ts\"",
|
|
61
62
|
"pretest": "rimraf .tmp",
|
|
62
63
|
"_test": "pnpm pretest && jest",
|
|
63
64
|
"test": "pnpm run compile && pnpm run _test",
|