@pnpm/get-context 1001.0.14 → 1001.1.0
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 +22 -8
- package/lib/index.js.map +1 -1
- package/lib/readLockfiles.d.ts +2 -1
- package/lib/readLockfiles.js +3 -4
- package/lib/readLockfiles.js.map +1 -1
- package/package.json +6 -7
package/lib/index.d.ts
CHANGED
|
@@ -58,12 +58,14 @@ interface HookOptions {
|
|
|
58
58
|
}
|
|
59
59
|
export interface GetContextOptions {
|
|
60
60
|
autoInstallPeers: boolean;
|
|
61
|
+
ci?: boolean;
|
|
61
62
|
excludeLinksFromLockfile: boolean;
|
|
62
63
|
peersSuffixMaxLength: number;
|
|
63
64
|
allProjects: Array<ProjectOptions & HookOptions>;
|
|
64
65
|
confirmModulesPurge?: boolean;
|
|
65
66
|
force: boolean;
|
|
66
67
|
frozenLockfile?: boolean;
|
|
68
|
+
enableGlobalVirtualStore?: boolean;
|
|
67
69
|
extraBinPaths: string[];
|
|
68
70
|
extendNodePath?: boolean;
|
|
69
71
|
lockfileDir: string;
|
|
@@ -120,6 +122,8 @@ export interface PnpmSingleContext {
|
|
|
120
122
|
}
|
|
121
123
|
export declare function getContextForSingleImporter(manifest: ProjectManifest, opts: {
|
|
122
124
|
autoInstallPeers: boolean;
|
|
125
|
+
ci?: boolean;
|
|
126
|
+
enableGlobalVirtualStore?: boolean;
|
|
123
127
|
excludeLinksFromLockfile: boolean;
|
|
124
128
|
peersSuffixMaxLength: number;
|
|
125
129
|
force: boolean;
|
package/lib/index.js
CHANGED
|
@@ -33,13 +33,19 @@ async function getContext(opts) {
|
|
|
33
33
|
const extraBinPaths = [
|
|
34
34
|
...opts.extraBinPaths || [],
|
|
35
35
|
];
|
|
36
|
-
const
|
|
36
|
+
const internalPnpmDir = path_1.default.join(importersContext.rootModulesDir, '.pnpm');
|
|
37
|
+
const hoistedModulesDir = path_1.default.join(opts.enableGlobalVirtualStore ? internalPnpmDir : virtualStoreDir, 'node_modules');
|
|
37
38
|
if (opts.hoistPattern?.length) {
|
|
38
39
|
extraBinPaths.unshift(path_1.default.join(hoistedModulesDir, '.bin'));
|
|
39
40
|
}
|
|
40
41
|
const ctx = {
|
|
41
42
|
extraBinPaths,
|
|
42
|
-
extraNodePaths: getExtraNodePaths({
|
|
43
|
+
extraNodePaths: getExtraNodePaths({
|
|
44
|
+
extendNodePath: opts.extendNodePath,
|
|
45
|
+
nodeLinker: opts.nodeLinker,
|
|
46
|
+
hoistPattern: importersContext.currentHoistPattern ?? opts.hoistPattern,
|
|
47
|
+
hoistedModulesDir,
|
|
48
|
+
}),
|
|
43
49
|
hoistedDependencies: importersContext.hoistedDependencies,
|
|
44
50
|
hoistedModulesDir,
|
|
45
51
|
hoistPattern: opts.hoistPattern,
|
|
@@ -60,6 +66,7 @@ async function getContext(opts) {
|
|
|
60
66
|
workspacePackages: opts.workspacePackages ?? arrayOfWorkspacePackagesToMap(opts.allProjects),
|
|
61
67
|
...await (0, readLockfiles_1.readLockfiles)({
|
|
62
68
|
autoInstallPeers: opts.autoInstallPeers,
|
|
69
|
+
ci: opts.ci,
|
|
63
70
|
excludeLinksFromLockfile: opts.excludeLinksFromLockfile,
|
|
64
71
|
peersSuffixMaxLength: opts.peersSuffixMaxLength,
|
|
65
72
|
force: opts.force,
|
|
@@ -70,7 +77,7 @@ async function getContext(opts) {
|
|
|
70
77
|
useLockfile: opts.useLockfile,
|
|
71
78
|
useGitBranchLockfile: opts.useGitBranchLockfile,
|
|
72
79
|
mergeGitBranchLockfiles: opts.mergeGitBranchLockfiles,
|
|
73
|
-
|
|
80
|
+
internalPnpmDir,
|
|
74
81
|
}),
|
|
75
82
|
};
|
|
76
83
|
core_loggers_1.contextLogger.debug({
|
|
@@ -98,13 +105,19 @@ async function getContextForSingleImporter(manifest, opts) {
|
|
|
98
105
|
const extraBinPaths = [
|
|
99
106
|
...opts.extraBinPaths || [],
|
|
100
107
|
];
|
|
101
|
-
const
|
|
108
|
+
const internalPnpmDir = path_1.default.join(rootModulesDir, '.pnpm');
|
|
109
|
+
const hoistedModulesDir = path_1.default.join(opts.enableGlobalVirtualStore ? internalPnpmDir : virtualStoreDir, 'node_modules');
|
|
102
110
|
if (opts.hoistPattern?.length) {
|
|
103
111
|
extraBinPaths.unshift(path_1.default.join(hoistedModulesDir, '.bin'));
|
|
104
112
|
}
|
|
105
113
|
const ctx = {
|
|
106
114
|
extraBinPaths,
|
|
107
|
-
extraNodePaths: getExtraNodePaths({
|
|
115
|
+
extraNodePaths: getExtraNodePaths({
|
|
116
|
+
extendNodePath: opts.extendNodePath,
|
|
117
|
+
nodeLinker: opts.nodeLinker,
|
|
118
|
+
hoistPattern: currentHoistPattern ?? opts.hoistPattern,
|
|
119
|
+
hoistedModulesDir,
|
|
120
|
+
}),
|
|
108
121
|
hoistedDependencies,
|
|
109
122
|
hoistedModulesDir,
|
|
110
123
|
hoistPattern: opts.hoistPattern,
|
|
@@ -127,6 +140,7 @@ async function getContextForSingleImporter(manifest, opts) {
|
|
|
127
140
|
virtualStoreDir,
|
|
128
141
|
...await (0, readLockfiles_1.readLockfiles)({
|
|
129
142
|
autoInstallPeers: opts.autoInstallPeers,
|
|
143
|
+
ci: opts.ci,
|
|
130
144
|
excludeLinksFromLockfile: opts.excludeLinksFromLockfile,
|
|
131
145
|
peersSuffixMaxLength: opts.peersSuffixMaxLength,
|
|
132
146
|
force: opts.force,
|
|
@@ -137,7 +151,7 @@ async function getContextForSingleImporter(manifest, opts) {
|
|
|
137
151
|
useLockfile: opts.useLockfile,
|
|
138
152
|
useGitBranchLockfile: opts.useGitBranchLockfile,
|
|
139
153
|
mergeGitBranchLockfiles: opts.mergeGitBranchLockfiles,
|
|
140
|
-
|
|
154
|
+
internalPnpmDir,
|
|
141
155
|
}),
|
|
142
156
|
};
|
|
143
157
|
core_loggers_1.packageManifestLogger.debug({
|
|
@@ -151,9 +165,9 @@ async function getContextForSingleImporter(manifest, opts) {
|
|
|
151
165
|
});
|
|
152
166
|
return ctx;
|
|
153
167
|
}
|
|
154
|
-
function getExtraNodePaths({ extendNodePath = true, hoistPattern, nodeLinker,
|
|
168
|
+
function getExtraNodePaths({ extendNodePath = true, hoistPattern, nodeLinker, hoistedModulesDir }) {
|
|
155
169
|
if (extendNodePath && nodeLinker === 'isolated' && hoistPattern?.length) {
|
|
156
|
-
return [
|
|
170
|
+
return [hoistedModulesDir];
|
|
157
171
|
}
|
|
158
172
|
return [];
|
|
159
173
|
}
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/lib/readLockfiles.d.ts
CHANGED
|
@@ -11,6 +11,7 @@ export declare function readLockfiles(opts: {
|
|
|
11
11
|
autoInstallPeers: boolean;
|
|
12
12
|
excludeLinksFromLockfile: boolean;
|
|
13
13
|
peersSuffixMaxLength: number;
|
|
14
|
+
ci?: boolean;
|
|
14
15
|
force: boolean;
|
|
15
16
|
frozenLockfile: boolean;
|
|
16
17
|
projects: Array<{
|
|
@@ -22,7 +23,7 @@ export declare function readLockfiles(opts: {
|
|
|
22
23
|
useLockfile: boolean;
|
|
23
24
|
useGitBranchLockfile?: boolean;
|
|
24
25
|
mergeGitBranchLockfiles?: boolean;
|
|
25
|
-
|
|
26
|
+
internalPnpmDir: string;
|
|
26
27
|
}): Promise<{
|
|
27
28
|
currentLockfile: LockfileObject;
|
|
28
29
|
currentLockfileIsUpToDate: boolean;
|
package/lib/readLockfiles.js
CHANGED
|
@@ -7,7 +7,6 @@ exports.readLockfiles = readLockfiles;
|
|
|
7
7
|
const constants_1 = require("@pnpm/constants");
|
|
8
8
|
const lockfile_fs_1 = require("@pnpm/lockfile.fs");
|
|
9
9
|
const logger_1 = require("@pnpm/logger");
|
|
10
|
-
const ci_info_1 = require("ci-info");
|
|
11
10
|
const clone_1 = __importDefault(require("ramda/src/clone"));
|
|
12
11
|
const equals_1 = __importDefault(require("ramda/src/equals"));
|
|
13
12
|
async function readLockfiles(opts) {
|
|
@@ -15,7 +14,7 @@ async function readLockfiles(opts) {
|
|
|
15
14
|
// ignore `pnpm-lock.yaml` on CI servers
|
|
16
15
|
// a latest pnpm should not break all the builds
|
|
17
16
|
const lockfileOpts = {
|
|
18
|
-
ignoreIncompatible: opts.force ||
|
|
17
|
+
ignoreIncompatible: opts.force || opts.ci === true,
|
|
19
18
|
wantedVersions: [constants_1.LOCKFILE_VERSION],
|
|
20
19
|
useGitBranchLockfile: opts.useGitBranchLockfile,
|
|
21
20
|
mergeGitBranchLockfiles: opts.mergeGitBranchLockfiles,
|
|
@@ -54,11 +53,11 @@ async function readLockfiles(opts) {
|
|
|
54
53
|
}
|
|
55
54
|
fileReads.push((async () => {
|
|
56
55
|
try {
|
|
57
|
-
return await (0, lockfile_fs_1.readCurrentLockfile)(opts.
|
|
56
|
+
return await (0, lockfile_fs_1.readCurrentLockfile)(opts.internalPnpmDir, lockfileOpts);
|
|
58
57
|
}
|
|
59
58
|
catch (err) { // eslint-disable-line
|
|
60
59
|
logger_1.logger.warn({
|
|
61
|
-
message: `Ignoring broken lockfile at ${opts.
|
|
60
|
+
message: `Ignoring broken lockfile at ${opts.internalPnpmDir}: ${err.message}`,
|
|
62
61
|
prefix: opts.lockfileDir,
|
|
63
62
|
});
|
|
64
63
|
return undefined;
|
package/lib/readLockfiles.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"readLockfiles.js","sourceRoot":"","sources":["../src/readLockfiles.ts"],"names":[],"mappings":";;;;;
|
|
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": "1001.0
|
|
3
|
+
"version": "1001.1.0",
|
|
4
4
|
"description": "Gets context information about a project",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"pnpm",
|
|
@@ -24,15 +24,14 @@
|
|
|
24
24
|
"!*.map"
|
|
25
25
|
],
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"ci-info": "^3.9.0",
|
|
28
27
|
"path-absolute": "^1.0.1",
|
|
29
28
|
"ramda": "npm:@pnpm/ramda@0.28.1",
|
|
30
29
|
"@pnpm/constants": "1001.1.0",
|
|
31
|
-
"@pnpm/
|
|
32
|
-
"@pnpm/lockfile.fs": "1001.1.12",
|
|
30
|
+
"@pnpm/lockfile.fs": "1001.1.13",
|
|
33
31
|
"@pnpm/modules-yaml": "1000.3.3",
|
|
34
|
-
"@pnpm/
|
|
35
|
-
"@pnpm/resolver-base": "
|
|
32
|
+
"@pnpm/core-loggers": "1001.0.1",
|
|
33
|
+
"@pnpm/resolver-base": "1004.0.0",
|
|
34
|
+
"@pnpm/read-projects-context": "1000.0.16",
|
|
36
35
|
"@pnpm/types": "1000.6.0"
|
|
37
36
|
},
|
|
38
37
|
"peerDependencies": {
|
|
@@ -40,7 +39,7 @@
|
|
|
40
39
|
},
|
|
41
40
|
"devDependencies": {
|
|
42
41
|
"@types/ramda": "0.29.12",
|
|
43
|
-
"@pnpm/get-context": "1001.0
|
|
42
|
+
"@pnpm/get-context": "1001.1.0",
|
|
44
43
|
"@pnpm/logger": "1001.0.0"
|
|
45
44
|
},
|
|
46
45
|
"engines": {
|