@pnpm/get-context 5.3.8 → 6.1.1
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.d.ts +4 -0
- package/lib/index.js +24 -16
- package/lib/index.js.map +1 -1
- package/lib/readLockfiles.js +4 -3
- package/lib/readLockfiles.js.map +1 -1
- package/package.json +14 -11
package/lib/index.d.ts
CHANGED
|
@@ -10,6 +10,7 @@ export interface PnpmContext<T> {
|
|
|
10
10
|
existsCurrentLockfile: boolean;
|
|
11
11
|
existsWantedLockfile: boolean;
|
|
12
12
|
extraBinPaths: string[];
|
|
13
|
+
extraNodePaths: string[];
|
|
13
14
|
lockfileHadConflicts: boolean;
|
|
14
15
|
hoistedDependencies: HoistedDependencies;
|
|
15
16
|
include: IncludedDependencies;
|
|
@@ -47,6 +48,7 @@ export interface GetContextOptions {
|
|
|
47
48
|
extraBinPaths: string[];
|
|
48
49
|
lockfileDir: string;
|
|
49
50
|
modulesDir?: string;
|
|
51
|
+
nodeLinker: 'isolated' | 'hoisted' | 'pnp';
|
|
50
52
|
hooks?: {
|
|
51
53
|
readPackage?: ReadPackageHook;
|
|
52
54
|
};
|
|
@@ -67,6 +69,7 @@ export interface PnpmSingleContext {
|
|
|
67
69
|
existsCurrentLockfile: boolean;
|
|
68
70
|
existsWantedLockfile: boolean;
|
|
69
71
|
extraBinPaths: string[];
|
|
72
|
+
extraNodePaths: string[];
|
|
70
73
|
lockfileHadConflicts: boolean;
|
|
71
74
|
hoistedDependencies: HoistedDependencies;
|
|
72
75
|
hoistedModulesDir: string;
|
|
@@ -93,6 +96,7 @@ export declare function getContextForSingleImporter(manifest: ProjectManifest, o
|
|
|
93
96
|
forceSharedLockfile: boolean;
|
|
94
97
|
extraBinPaths: string[];
|
|
95
98
|
lockfileDir: string;
|
|
99
|
+
nodeLinker: 'isolated' | 'hoisted' | 'pnp';
|
|
96
100
|
modulesDir?: string;
|
|
97
101
|
hooks?: {
|
|
98
102
|
readPackage?: ReadPackageHook;
|
package/lib/index.js
CHANGED
|
@@ -22,10 +22,9 @@ const UnexpectedVirtualStoreDirError_1 = __importDefault(require("./checkCompati
|
|
|
22
22
|
exports.UnexpectedVirtualStoreDirError = UnexpectedVirtualStoreDirError_1.default;
|
|
23
23
|
const readLockfiles_1 = __importDefault(require("./readLockfiles"));
|
|
24
24
|
async function getContext(projects, opts) {
|
|
25
|
-
|
|
26
|
-
const modulesDir = (_a = opts.modulesDir) !== null && _a !== void 0 ? _a : 'node_modules';
|
|
25
|
+
const modulesDir = opts.modulesDir ?? 'node_modules';
|
|
27
26
|
let importersContext = await (0, read_projects_context_1.default)(projects, { lockfileDir: opts.lockfileDir, modulesDir });
|
|
28
|
-
const virtualStoreDir = (0, path_absolute_1.default)(
|
|
27
|
+
const virtualStoreDir = (0, path_absolute_1.default)(opts.virtualStoreDir ?? path_1.default.join(modulesDir, '.pnpm'), opts.lockfileDir);
|
|
29
28
|
if (importersContext.modules != null) {
|
|
30
29
|
const { purged } = await validateModules(importersContext.modules, importersContext.projects, {
|
|
31
30
|
currentHoistPattern: importersContext.currentHoistPattern,
|
|
@@ -56,7 +55,7 @@ async function getContext(projects, opts) {
|
|
|
56
55
|
prefix: project.rootDir,
|
|
57
56
|
});
|
|
58
57
|
});
|
|
59
|
-
if ((
|
|
58
|
+
if ((opts.hooks?.readPackage) != null) {
|
|
60
59
|
for (const project of importersContext.projects) {
|
|
61
60
|
project.originalManifest = project.manifest;
|
|
62
61
|
project.manifest = await opts.hooks.readPackage((0, clone_1.default)(project.manifest), project.rootDir);
|
|
@@ -66,20 +65,22 @@ async function getContext(projects, opts) {
|
|
|
66
65
|
...opts.extraBinPaths || [],
|
|
67
66
|
];
|
|
68
67
|
const hoistedModulesDir = path_1.default.join(virtualStoreDir, 'node_modules');
|
|
69
|
-
if (
|
|
68
|
+
if (opts.hoistPattern?.length) {
|
|
70
69
|
extraBinPaths.unshift(path_1.default.join(hoistedModulesDir, '.bin'));
|
|
71
70
|
}
|
|
71
|
+
const hoistPattern = importersContext.currentHoistPattern ?? opts.hoistPattern;
|
|
72
72
|
const ctx = {
|
|
73
73
|
extraBinPaths,
|
|
74
|
+
extraNodePaths: getExtraNodePaths({ nodeLinker: opts.nodeLinker, hoistPattern, virtualStoreDir }),
|
|
74
75
|
hoistedDependencies: importersContext.hoistedDependencies,
|
|
75
76
|
hoistedModulesDir,
|
|
76
|
-
hoistPattern
|
|
77
|
-
include:
|
|
77
|
+
hoistPattern,
|
|
78
|
+
include: opts.include ?? importersContext.include,
|
|
78
79
|
lockfileDir: opts.lockfileDir,
|
|
79
80
|
modulesFile: importersContext.modules,
|
|
80
81
|
pendingBuilds: importersContext.pendingBuilds,
|
|
81
82
|
projects: importersContext.projects,
|
|
82
|
-
publicHoistPattern:
|
|
83
|
+
publicHoistPattern: importersContext.currentPublicHoistPattern ?? opts.publicHoistPattern,
|
|
83
84
|
registries: {
|
|
84
85
|
...opts.registries,
|
|
85
86
|
...importersContext.registries,
|
|
@@ -209,7 +210,6 @@ function stringifyIncludedDeps(included) {
|
|
|
209
210
|
return types_1.DEPENDENCIES_FIELDS.filter((depsField) => included[depsField]).join(', ');
|
|
210
211
|
}
|
|
211
212
|
async function getContextForSingleImporter(manifest, opts, alreadyPurged = false) {
|
|
212
|
-
var _a, _b, _c, _d, _e, _f, _g;
|
|
213
213
|
const { currentHoistPattern, currentPublicHoistPattern, hoistedDependencies, projects, include, modules, pendingBuilds, registries, skipped, rootModulesDir, } = await (0, read_projects_context_1.default)([
|
|
214
214
|
{
|
|
215
215
|
rootDir: opts.dir,
|
|
@@ -222,7 +222,7 @@ async function getContextForSingleImporter(manifest, opts, alreadyPurged = false
|
|
|
222
222
|
const importer = projects[0];
|
|
223
223
|
const modulesDir = importer.modulesDir;
|
|
224
224
|
const importerId = importer.id;
|
|
225
|
-
const virtualStoreDir = (0, path_absolute_1.default)(
|
|
225
|
+
const virtualStoreDir = (0, path_absolute_1.default)(opts.virtualStoreDir ?? 'node_modules/.pnpm', opts.lockfileDir);
|
|
226
226
|
if ((modules != null) && !alreadyPurged) {
|
|
227
227
|
const { purged } = await validateModules(modules, projects, {
|
|
228
228
|
currentHoistPattern,
|
|
@@ -230,7 +230,7 @@ async function getContextForSingleImporter(manifest, opts, alreadyPurged = false
|
|
|
230
230
|
forceNewModules: opts.forceNewModules === true,
|
|
231
231
|
include: opts.include,
|
|
232
232
|
lockfileDir: opts.lockfileDir,
|
|
233
|
-
modulesDir:
|
|
233
|
+
modulesDir: opts.modulesDir ?? 'node_modules',
|
|
234
234
|
registries: opts.registries,
|
|
235
235
|
storeDir: opts.storeDir,
|
|
236
236
|
virtualStoreDir,
|
|
@@ -248,23 +248,25 @@ async function getContextForSingleImporter(manifest, opts, alreadyPurged = false
|
|
|
248
248
|
...opts.extraBinPaths || [],
|
|
249
249
|
];
|
|
250
250
|
const hoistedModulesDir = path_1.default.join(virtualStoreDir, 'node_modules');
|
|
251
|
-
if (
|
|
251
|
+
if (opts.hoistPattern?.length) {
|
|
252
252
|
extraBinPaths.unshift(path_1.default.join(hoistedModulesDir, '.bin'));
|
|
253
253
|
}
|
|
254
|
+
const hoistPattern = currentHoistPattern ?? opts.hoistPattern;
|
|
254
255
|
const ctx = {
|
|
255
256
|
extraBinPaths,
|
|
257
|
+
extraNodePaths: getExtraNodePaths({ nodeLinker: opts.nodeLinker, hoistPattern, virtualStoreDir }),
|
|
256
258
|
hoistedDependencies,
|
|
257
259
|
hoistedModulesDir,
|
|
258
|
-
hoistPattern
|
|
260
|
+
hoistPattern,
|
|
259
261
|
importerId,
|
|
260
|
-
include:
|
|
262
|
+
include: opts.include ?? include,
|
|
261
263
|
lockfileDir: opts.lockfileDir,
|
|
262
|
-
manifest:
|
|
264
|
+
manifest: await opts.hooks?.readPackage?.(manifest) ?? manifest,
|
|
263
265
|
modulesDir,
|
|
264
266
|
modulesFile: modules,
|
|
265
267
|
pendingBuilds,
|
|
266
268
|
prefix: opts.dir,
|
|
267
|
-
publicHoistPattern: currentPublicHoistPattern
|
|
269
|
+
publicHoistPattern: currentPublicHoistPattern ?? opts.publicHoistPattern,
|
|
268
270
|
registries: {
|
|
269
271
|
...opts.registries,
|
|
270
272
|
...registries,
|
|
@@ -296,4 +298,10 @@ async function getContextForSingleImporter(manifest, opts, alreadyPurged = false
|
|
|
296
298
|
return ctx;
|
|
297
299
|
}
|
|
298
300
|
exports.getContextForSingleImporter = getContextForSingleImporter;
|
|
301
|
+
function getExtraNodePaths({ hoistPattern, nodeLinker, virtualStoreDir }) {
|
|
302
|
+
if (nodeLinker === 'isolated' && hoistPattern?.length) {
|
|
303
|
+
return [path_1.default.join(virtualStoreDir, 'node_modules')];
|
|
304
|
+
}
|
|
305
|
+
return [];
|
|
306
|
+
}
|
|
299
307
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,2BAAmC;AACnC,gDAAuB;AACvB,qDAAyE;AACzE,wDAAmC;AAEnC,0DAAiC;AAKjC,wFAA6D;AAC7D,uCAMoB;AACpB,6DAAoC;AACpC,kEAAwC;AACxC,4DAAmC;AACnC,8DAAqC;AACrC,8EAAqD;AACrD,qGAA4E;AAInE,+BAJF,8BAAoB,CAIE;AAH7B,yHAAgG;AAGjE,yCAHxB,wCAA8B,CAGwB;AAF7D,oEAA8C;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/lib/readLockfiles.js
CHANGED
|
@@ -10,7 +10,6 @@ const is_ci_1 = __importDefault(require("is-ci"));
|
|
|
10
10
|
const clone_1 = __importDefault(require("ramda/src/clone"));
|
|
11
11
|
const equals_1 = __importDefault(require("ramda/src/equals"));
|
|
12
12
|
async function default_1(opts) {
|
|
13
|
-
var _a, _b, _c;
|
|
14
13
|
// ignore `pnpm-lock.yaml` on CI servers
|
|
15
14
|
// a latest pnpm should not break all the builds
|
|
16
15
|
const lockfileOpts = {
|
|
@@ -65,7 +64,7 @@ async function default_1(opts) {
|
|
|
65
64
|
const files = await Promise.all(fileReads);
|
|
66
65
|
const sopts = { lockfileVersion: constants_1.LOCKFILE_VERSION };
|
|
67
66
|
const importerIds = opts.projects.map((importer) => importer.id);
|
|
68
|
-
const currentLockfile =
|
|
67
|
+
const currentLockfile = files[1] ?? (0, lockfile_file_1.createLockfileObject)(importerIds, sopts);
|
|
69
68
|
for (const importerId of importerIds) {
|
|
70
69
|
if (!currentLockfile.importers[importerId]) {
|
|
71
70
|
currentLockfile.importers[importerId] = {
|
|
@@ -73,7 +72,9 @@ async function default_1(opts) {
|
|
|
73
72
|
};
|
|
74
73
|
}
|
|
75
74
|
}
|
|
76
|
-
const wantedLockfile =
|
|
75
|
+
const wantedLockfile = files[0] ??
|
|
76
|
+
(currentLockfile && (0, clone_1.default)(currentLockfile)) ??
|
|
77
|
+
(0, lockfile_file_1.createLockfileObject)(importerIds, sopts);
|
|
77
78
|
for (const importerId of importerIds) {
|
|
78
79
|
if (!wantedLockfile.importers[importerId]) {
|
|
79
80
|
wantedLockfile.importers[importerId] = {
|
package/lib/readLockfiles.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"readLockfiles.js","sourceRoot":"","sources":["../src/readLockfiles.ts"],"names":[],"mappings":";;;;;AAAA,+CAGwB;AACxB,uDAO4B;AAC5B,0DAAiC;AACjC,kDAAwB;AACxB,4DAAmC;AACnC,8DAAqC;AAStB,KAAK,oBAClB,IAYC
|
|
1
|
+
{"version":3,"file":"readLockfiles.js","sourceRoot":"","sources":["../src/readLockfiles.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/get-context",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "6.1.1",
|
|
4
4
|
"description": "Gets context information about a project",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -9,11 +9,11 @@
|
|
|
9
9
|
"!*.map"
|
|
10
10
|
],
|
|
11
11
|
"engines": {
|
|
12
|
-
"node": ">=
|
|
12
|
+
"node": ">=14.19"
|
|
13
13
|
},
|
|
14
14
|
"repository": "https://github.com/pnpm/pnpm/blob/main/packages/get-context",
|
|
15
15
|
"keywords": [
|
|
16
|
-
"
|
|
16
|
+
"pnpm7",
|
|
17
17
|
"pnpm",
|
|
18
18
|
"scripts"
|
|
19
19
|
],
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
},
|
|
24
24
|
"homepage": "https://github.com/pnpm/pnpm/blob/main/packages/get-context#readme",
|
|
25
25
|
"devDependencies": {
|
|
26
|
-
"@pnpm/get-context": "
|
|
26
|
+
"@pnpm/get-context": "6.1.1",
|
|
27
27
|
"@pnpm/logger": "^4.0.0",
|
|
28
28
|
"@types/is-ci": "^3.0.0",
|
|
29
29
|
"@types/ramda": "0.27.39"
|
|
@@ -32,19 +32,22 @@
|
|
|
32
32
|
"@pnpm/logger": "^4.0.0"
|
|
33
33
|
},
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@pnpm/constants": "
|
|
36
|
-
"@pnpm/core-loggers": "
|
|
37
|
-
"@pnpm/error": "
|
|
38
|
-
"@pnpm/lockfile-file": "
|
|
39
|
-
"@pnpm/modules-yaml": "
|
|
40
|
-
"@pnpm/read-projects-context": "
|
|
41
|
-
"@pnpm/types": "
|
|
35
|
+
"@pnpm/constants": "6.1.0",
|
|
36
|
+
"@pnpm/core-loggers": "7.0.1",
|
|
37
|
+
"@pnpm/error": "3.0.1",
|
|
38
|
+
"@pnpm/lockfile-file": "5.0.2",
|
|
39
|
+
"@pnpm/modules-yaml": "10.0.1",
|
|
40
|
+
"@pnpm/read-projects-context": "6.0.2",
|
|
41
|
+
"@pnpm/types": "8.0.1",
|
|
42
42
|
"@zkochan/rimraf": "^2.1.2",
|
|
43
43
|
"is-ci": "^3.0.0",
|
|
44
44
|
"path-absolute": "^1.0.1",
|
|
45
45
|
"ramda": "^0.27.1"
|
|
46
46
|
},
|
|
47
47
|
"funding": "https://opencollective.com/pnpm",
|
|
48
|
+
"exports": {
|
|
49
|
+
".": "./lib/index.js"
|
|
50
|
+
},
|
|
48
51
|
"scripts": {
|
|
49
52
|
"lint": "eslint src/**/*.ts",
|
|
50
53
|
"test": "pnpm run compile",
|