@pnpm/core 1.3.1 → 2.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/api.d.ts +2 -0
- package/lib/api.js +4 -1
- package/lib/api.js.map +1 -1
- package/lib/getPeerDependencyIssues.d.ts +5 -0
- package/lib/getPeerDependencyIssues.js +65 -0
- package/lib/getPeerDependencyIssues.js.map +1 -0
- package/lib/install/createVersionsOverrider.js +16 -32
- package/lib/install/createVersionsOverrider.js.map +1 -1
- package/lib/install/extendInstallOptions.d.ts +4 -1
- package/lib/install/extendInstallOptions.js +3 -0
- package/lib/install/extendInstallOptions.js.map +1 -1
- package/lib/install/getPreferredVersions.d.ts +1 -2
- package/lib/install/getPreferredVersions.js +0 -32
- package/lib/install/getPreferredVersions.js.map +1 -1
- package/lib/install/index.d.ts +10 -4
- package/lib/install/index.js +29 -127
- package/lib/install/index.js.map +1 -1
- package/lib/install/link.d.ts +3 -3
- package/lib/install/link.js.map +1 -1
- package/lib/install/reportPeerDependencyIssues.d.ts +10 -0
- package/lib/install/reportPeerDependencyIssues.js +29 -0
- package/lib/install/reportPeerDependencyIssues.js.map +1 -0
- package/lib/parseWantedDependencies.d.ts +1 -1
- package/lib/parseWantedDependencies.js +2 -2
- package/lib/parseWantedDependencies.js.map +1 -1
- package/package.json +37 -37
- package/lib/guessPinnedVersionFromExistingSpec.d.ts +0 -1
- package/lib/guessPinnedVersionFromExistingSpec.js +0 -25
- package/lib/guessPinnedVersionFromExistingSpec.js.map +0 -1
- package/lib/install/getWantedDependencies.d.ts +0 -15
- package/lib/install/getWantedDependencies.js +0 -54
- package/lib/install/getWantedDependencies.js.map +0 -1
- package/lib/safeIsInnerLink.d.ts +0 -6
- package/lib/safeIsInnerLink.js +0 -36
- package/lib/safeIsInnerLink.js.map +0 -1
package/lib/api.d.ts
CHANGED
package/lib/api.js
CHANGED
|
@@ -13,9 +13,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
14
14
|
};
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
|
-
exports.link = void 0;
|
|
16
|
+
exports.link = exports.PeerDependencyIssuesError = void 0;
|
|
17
17
|
const link_1 = __importDefault(require("./link"));
|
|
18
18
|
exports.link = link_1.default;
|
|
19
19
|
__exportStar(require("./install"), exports);
|
|
20
|
+
var reportPeerDependencyIssues_1 = require("./install/reportPeerDependencyIssues");
|
|
21
|
+
Object.defineProperty(exports, "PeerDependencyIssuesError", { enumerable: true, get: function () { return reportPeerDependencyIssues_1.PeerDependencyIssuesError; } });
|
|
20
22
|
__exportStar(require("./link"), exports);
|
|
23
|
+
__exportStar(require("./getPeerDependencyIssues"), exports);
|
|
21
24
|
//# sourceMappingURL=api.js.map
|
package/lib/api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,kDAAyB;
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,kDAAyB;AAOvB,eAPK,cAAI,CAOL;AALN,4CAAyB;AACzB,mFAAgF;AAAvE,uIAAA,yBAAyB,OAAA;AAClC,yCAAsB;AACtB,4DAAyC"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { PeerDependencyIssuesByProjects } from '@pnpm/types';
|
|
2
|
+
import { GetContextOptions, ProjectOptions } from '@pnpm/get-context';
|
|
3
|
+
import { InstallOptions } from './install/extendInstallOptions';
|
|
4
|
+
export declare type ListMissingPeersOptions = Partial<GetContextOptions> & Pick<InstallOptions, 'hooks' | 'linkWorkspacePackagesDepth' | 'nodeVersion' | 'overrides' | 'packageExtensions' | 'preferWorkspacePackages' | 'saveWorkspaceProtocol' | 'storeController' | 'workspacePackages'> & Pick<GetContextOptions, 'storeDir'>;
|
|
5
|
+
export declare function getPeerDependencyIssues(projects: ProjectOptions[], opts: ListMissingPeersOptions): Promise<PeerDependencyIssuesByProjects>;
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.getPeerDependencyIssues = void 0;
|
|
7
|
+
const resolve_dependencies_1 = __importDefault(require("@pnpm/resolve-dependencies"));
|
|
8
|
+
const getWantedDependencies_1 = __importDefault(require("@pnpm/resolve-dependencies/lib/getWantedDependencies"));
|
|
9
|
+
const get_context_1 = __importDefault(require("@pnpm/get-context"));
|
|
10
|
+
const install_1 = require("./install");
|
|
11
|
+
const getPreferredVersions_1 = require("./install/getPreferredVersions");
|
|
12
|
+
const normalize_registries_1 = require("@pnpm/normalize-registries");
|
|
13
|
+
async function getPeerDependencyIssues(projects, opts) {
|
|
14
|
+
var _a, _b, _c, _d, _e;
|
|
15
|
+
const lockfileDir = (_a = opts.lockfileDir) !== null && _a !== void 0 ? _a : process.cwd();
|
|
16
|
+
const ctx = await (0, get_context_1.default)(projects, {
|
|
17
|
+
force: false,
|
|
18
|
+
forceSharedLockfile: false,
|
|
19
|
+
extraBinPaths: [],
|
|
20
|
+
lockfileDir,
|
|
21
|
+
registries: normalize_registries_1.DEFAULT_REGISTRIES,
|
|
22
|
+
useLockfile: true,
|
|
23
|
+
...opts,
|
|
24
|
+
});
|
|
25
|
+
const projectsToResolve = ctx.projects.map((project) => ({
|
|
26
|
+
...project,
|
|
27
|
+
updatePackageManifest: false,
|
|
28
|
+
wantedDependencies: (0, getWantedDependencies_1.default)(project.manifest),
|
|
29
|
+
}));
|
|
30
|
+
const preferredVersions = ctx.wantedLockfile.packages ? (0, getPreferredVersions_1.getPreferredVersionsFromLockfile)(ctx.wantedLockfile.packages) : undefined;
|
|
31
|
+
const { peerDependencyIssuesByProjects, waitTillAllFetchingsFinish, } = await (0, resolve_dependencies_1.default)(projectsToResolve, {
|
|
32
|
+
currentLockfile: ctx.currentLockfile,
|
|
33
|
+
defaultUpdateDepth: -1,
|
|
34
|
+
dryRun: true,
|
|
35
|
+
engineStrict: false,
|
|
36
|
+
force: false,
|
|
37
|
+
forceFullResolution: true,
|
|
38
|
+
hooks: {
|
|
39
|
+
readPackage: (0, install_1.createReadPackageHook)({
|
|
40
|
+
lockfileDir,
|
|
41
|
+
overrides: opts.overrides,
|
|
42
|
+
packageExtensions: opts.packageExtensions,
|
|
43
|
+
readPackageHook: (_b = opts.hooks) === null || _b === void 0 ? void 0 : _b.readPackage,
|
|
44
|
+
}),
|
|
45
|
+
},
|
|
46
|
+
linkWorkspacePackagesDepth: (_c = opts.linkWorkspacePackagesDepth) !== null && _c !== void 0 ? _c : (opts.saveWorkspaceProtocol ? 0 : -1),
|
|
47
|
+
lockfileDir,
|
|
48
|
+
nodeVersion: (_d = opts.nodeVersion) !== null && _d !== void 0 ? _d : process.version,
|
|
49
|
+
pnpmVersion: '',
|
|
50
|
+
preferWorkspacePackages: opts.preferWorkspacePackages,
|
|
51
|
+
preferredVersions,
|
|
52
|
+
preserveWorkspaceProtocol: false,
|
|
53
|
+
registries: ctx.registries,
|
|
54
|
+
saveWorkspaceProtocol: false,
|
|
55
|
+
storeController: opts.storeController,
|
|
56
|
+
tag: 'latest',
|
|
57
|
+
virtualStoreDir: ctx.virtualStoreDir,
|
|
58
|
+
wantedLockfile: ctx.wantedLockfile,
|
|
59
|
+
workspacePackages: (_e = opts.workspacePackages) !== null && _e !== void 0 ? _e : {},
|
|
60
|
+
});
|
|
61
|
+
await waitTillAllFetchingsFinish();
|
|
62
|
+
return peerDependencyIssuesByProjects;
|
|
63
|
+
}
|
|
64
|
+
exports.getPeerDependencyIssues = getPeerDependencyIssues;
|
|
65
|
+
//# sourceMappingURL=getPeerDependencyIssues.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getPeerDependencyIssues.js","sourceRoot":"","sources":["../src/getPeerDependencyIssues.ts"],"names":[],"mappings":";;;;;;AAAA,sFAA4D;AAC5D,iHAAwF;AAExF,oEAAiF;AACjF,uCAAiD;AACjD,yEAAiF;AAEjF,qEAA+D;AAexD,KAAK,UAAU,uBAAuB,CAC3C,QAA0B,EAC1B,IAA6B;;IAE7B,MAAM,WAAW,GAAG,MAAA,IAAI,CAAC,WAAW,mCAAI,OAAO,CAAC,GAAG,EAAE,CAAA;IACrD,MAAM,GAAG,GAAG,MAAM,IAAA,qBAAU,EAAC,QAAQ,EAAE;QACrC,KAAK,EAAE,KAAK;QACZ,mBAAmB,EAAE,KAAK;QAC1B,aAAa,EAAE,EAAE;QACjB,WAAW;QACX,UAAU,EAAE,yCAAkB;QAC9B,WAAW,EAAE,IAAI;QACjB,GAAG,IAAI;KACR,CAAC,CAAA;IACF,MAAM,iBAAiB,GAAG,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACvD,GAAG,OAAO;QACV,qBAAqB,EAAE,KAAK;QAC5B,kBAAkB,EAAE,IAAA,+BAAqB,EAAC,OAAO,CAAC,QAAQ,CAAC;KAC5D,CAAC,CAAC,CAAA;IACH,MAAM,iBAAiB,GAAG,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAA,uDAAgC,EAAC,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACjI,MAAM,EACJ,8BAA8B,EAC9B,0BAA0B,GAC3B,GAAG,MAAM,IAAA,8BAAmB,EAC3B,iBAAiB,EACjB;QACE,eAAe,EAAE,GAAG,CAAC,eAAe;QACpC,kBAAkB,EAAE,CAAC,CAAC;QACtB,MAAM,EAAE,IAAI;QACZ,YAAY,EAAE,KAAK;QACnB,KAAK,EAAE,KAAK;QACZ,mBAAmB,EAAE,IAAI;QACzB,KAAK,EAAE;YACL,WAAW,EAAE,IAAA,+BAAqB,EAAC;gBACjC,WAAW;gBACX,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;gBACzC,eAAe,EAAE,MAAA,IAAI,CAAC,KAAK,0CAAE,WAAW;aACzC,CAAC;SACH;QACD,0BAA0B,EAAE,MAAA,IAAI,CAAC,0BAA0B,mCAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpG,WAAW;QACX,WAAW,EAAE,MAAA,IAAI,CAAC,WAAW,mCAAI,OAAO,CAAC,OAAO;QAChD,WAAW,EAAE,EAAE;QACf,uBAAuB,EAAE,IAAI,CAAC,uBAAuB;QACrD,iBAAiB;QACjB,yBAAyB,EAAE,KAAK;QAChC,UAAU,EAAE,GAAG,CAAC,UAAU;QAC1B,qBAAqB,EAAE,KAAK;QAC5B,eAAe,EAAE,IAAI,CAAC,eAAe;QACrC,GAAG,EAAE,QAAQ;QACb,eAAe,EAAE,GAAG,CAAC,eAAe;QACpC,cAAc,EAAE,GAAG,CAAC,cAAc;QAClC,iBAAiB,EAAE,MAAA,IAAI,CAAC,iBAAiB,mCAAI,EAAE;KAChD,CACF,CAAA;IAED,MAAM,0BAA0B,EAAE,CAAA;IAElC,OAAO,8BAA8B,CAAA;AACvC,CAAC;AA5DD,0DA4DC"}
|
|
@@ -4,41 +4,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const path_1 = __importDefault(require("path"));
|
|
7
|
-
const
|
|
7
|
+
const partition_1 = __importDefault(require("ramda/src/partition"));
|
|
8
|
+
const parse_overrides_1 = __importDefault(require("@pnpm/parse-overrides"));
|
|
8
9
|
const normalize_path_1 = __importDefault(require("normalize-path"));
|
|
9
10
|
const semver_1 = __importDefault(require("semver"));
|
|
10
|
-
const DELIMITER_REGEX = /[^ |@]>/;
|
|
11
11
|
function default_1(overrides, rootDir) {
|
|
12
|
-
const genericVersionOverrides =
|
|
13
|
-
|
|
14
|
-
Object.entries(overrides)
|
|
15
|
-
.forEach(([selector, newPref]) => {
|
|
12
|
+
const [versionOverrides, genericVersionOverrides] = (0, partition_1.default)(({ parentPkg }) => parentPkg != null, (0, parse_overrides_1.default)(overrides)
|
|
13
|
+
.map((override) => {
|
|
16
14
|
let linkTarget;
|
|
17
|
-
if (newPref.startsWith('link:')) {
|
|
18
|
-
linkTarget = path_1.default.join(rootDir, newPref.substring(5));
|
|
15
|
+
if (override.newPref.startsWith('link:')) {
|
|
16
|
+
linkTarget = path_1.default.join(rootDir, override.newPref.substring(5));
|
|
19
17
|
}
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
delimiterIndex++;
|
|
23
|
-
const parentSelector = selector.substring(0, delimiterIndex);
|
|
24
|
-
const childSelector = selector.substring(delimiterIndex + 1);
|
|
25
|
-
versionOverrides.push({
|
|
26
|
-
linkTarget,
|
|
27
|
-
newPref,
|
|
28
|
-
parentWantedDependency: (0, parse_wanted_dependency_1.default)(parentSelector),
|
|
29
|
-
wantedDependency: (0, parse_wanted_dependency_1.default)(childSelector),
|
|
30
|
-
});
|
|
31
|
-
return;
|
|
32
|
-
}
|
|
33
|
-
genericVersionOverrides.push({
|
|
18
|
+
return {
|
|
19
|
+
...override,
|
|
34
20
|
linkTarget,
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
});
|
|
38
|
-
});
|
|
21
|
+
};
|
|
22
|
+
}));
|
|
39
23
|
return ((manifest, dir) => {
|
|
40
|
-
overrideDepsOfPkg({ manifest, dir }, versionOverrides.filter(({
|
|
41
|
-
return
|
|
24
|
+
overrideDepsOfPkg({ manifest, dir }, versionOverrides.filter(({ parentPkg }) => {
|
|
25
|
+
return parentPkg.name === manifest.name && (!parentPkg.pref || semver_1.default.satisfies(manifest.version, parentPkg.pref));
|
|
42
26
|
}));
|
|
43
27
|
overrideDepsOfPkg({ manifest, dir }, genericVersionOverrides);
|
|
44
28
|
return manifest;
|
|
@@ -56,16 +40,16 @@ function overrideDepsOfPkg({ manifest, dir }, versionOverrides) {
|
|
|
56
40
|
}
|
|
57
41
|
function overrideDeps(versionOverrides, deps, dir) {
|
|
58
42
|
for (const versionOverride of versionOverrides) {
|
|
59
|
-
const actual = deps[versionOverride.
|
|
43
|
+
const actual = deps[versionOverride.targetPkg.name];
|
|
60
44
|
if (actual == null)
|
|
61
45
|
continue;
|
|
62
|
-
if (!isSubRange(versionOverride.
|
|
46
|
+
if (!isSubRange(versionOverride.targetPkg.pref, actual))
|
|
63
47
|
continue;
|
|
64
48
|
if (versionOverride.linkTarget && dir) {
|
|
65
|
-
deps[versionOverride.
|
|
49
|
+
deps[versionOverride.targetPkg.name] = `link:${(0, normalize_path_1.default)(path_1.default.relative(dir, versionOverride.linkTarget))}`;
|
|
66
50
|
continue;
|
|
67
51
|
}
|
|
68
|
-
deps[versionOverride.
|
|
52
|
+
deps[versionOverride.targetPkg.name] = versionOverride.newPref;
|
|
69
53
|
}
|
|
70
54
|
}
|
|
71
55
|
function isSubRange(superRange, subRange) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createVersionsOverrider.js","sourceRoot":"","sources":["../../src/install/createVersionsOverrider.ts"],"names":[],"mappings":";;;;;AAAA,gDAAuB;
|
|
1
|
+
{"version":3,"file":"createVersionsOverrider.js","sourceRoot":"","sources":["../../src/install/createVersionsOverrider.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { Lockfile } from '@pnpm/lockfile-file';
|
|
|
2
2
|
import { IncludedDependencies } from '@pnpm/modules-yaml';
|
|
3
3
|
import { WorkspacePackages } from '@pnpm/resolver-base';
|
|
4
4
|
import { StoreController } from '@pnpm/store-controller-types';
|
|
5
|
-
import { ReadPackageHook, Registries } from '@pnpm/types';
|
|
5
|
+
import { PackageExtension, ReadPackageHook, Registries } from '@pnpm/types';
|
|
6
6
|
import { ReporterFunction } from '../types';
|
|
7
7
|
export interface StrictInstallOptions {
|
|
8
8
|
forceSharedLockfile: boolean;
|
|
@@ -36,8 +36,10 @@ export interface StrictInstallOptions {
|
|
|
36
36
|
rawConfig: object;
|
|
37
37
|
verifyStoreIntegrity: boolean;
|
|
38
38
|
engineStrict: boolean;
|
|
39
|
+
neverBuiltDependencies: string[];
|
|
39
40
|
nodeExecPath?: string;
|
|
40
41
|
nodeVersion: string;
|
|
42
|
+
packageExtensions: Record<string, PackageExtension>;
|
|
41
43
|
packageManager: {
|
|
42
44
|
name: string;
|
|
43
45
|
version: string;
|
|
@@ -59,6 +61,7 @@ export interface StrictInstallOptions {
|
|
|
59
61
|
unsafePerm: boolean;
|
|
60
62
|
registries: Registries;
|
|
61
63
|
tag: string;
|
|
64
|
+
overrides: Record<string, string>;
|
|
62
65
|
ownLifecycleHooksStdio: 'inherit' | 'pipe';
|
|
63
66
|
workspacePackages: WorkspacePackages;
|
|
64
67
|
pruneStore: boolean;
|
|
@@ -57,9 +57,12 @@ const defaults = async (opts) => {
|
|
|
57
57
|
},
|
|
58
58
|
lockfileDir: (_c = (_b = opts.lockfileDir) !== null && _b !== void 0 ? _b : opts.dir) !== null && _c !== void 0 ? _c : process.cwd(),
|
|
59
59
|
lockfileOnly: false,
|
|
60
|
+
neverBuiltDependencies: [],
|
|
60
61
|
nodeVersion: process.version,
|
|
62
|
+
overrides: {},
|
|
61
63
|
ownLifecycleHooksStdio: 'inherit',
|
|
62
64
|
ignorePackageManifest: false,
|
|
65
|
+
packageExtensions: {},
|
|
63
66
|
packageManager,
|
|
64
67
|
preferFrozenLockfile: true,
|
|
65
68
|
preferWorkspacePackages: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extendInstallOptions.js","sourceRoot":"","sources":["../../src/install/extendInstallOptions.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAiD;AACjD,wDAAmC;AAGnC,mFAAoF;
|
|
1
|
+
{"version":3,"file":"extendInstallOptions.js","sourceRoot":"","sources":["../../src/install/extendInstallOptions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { PackageSnapshots } from '@pnpm/lockfile-utils';
|
|
2
2
|
import { PreferredVersions } from '@pnpm/resolver-base';
|
|
3
|
-
import { DependencyManifest
|
|
3
|
+
import { DependencyManifest } from '@pnpm/types';
|
|
4
4
|
export declare function getAllUniqueSpecs(manifests: DependencyManifest[]): Record<string, string>;
|
|
5
|
-
export default function getPreferredVersionsFromPackage(pkg: Pick<ProjectManifest, 'devDependencies' | 'dependencies' | 'optionalDependencies'>): PreferredVersions;
|
|
6
5
|
export declare function getPreferredVersionsFromLockfile(snapshots: PackageSnapshots): PreferredVersions;
|
|
@@ -1,12 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.getPreferredVersionsFromLockfile = exports.getAllUniqueSpecs = void 0;
|
|
7
4
|
const lockfile_utils_1 = require("@pnpm/lockfile-utils");
|
|
8
5
|
const manifest_utils_1 = require("@pnpm/manifest-utils");
|
|
9
|
-
const version_selector_type_1 = __importDefault(require("version-selector-type"));
|
|
10
6
|
function getAllUniqueSpecs(manifests) {
|
|
11
7
|
const allSpecs = {};
|
|
12
8
|
const ignored = new Set();
|
|
@@ -26,34 +22,6 @@ function getAllUniqueSpecs(manifests) {
|
|
|
26
22
|
return allSpecs;
|
|
27
23
|
}
|
|
28
24
|
exports.getAllUniqueSpecs = getAllUniqueSpecs;
|
|
29
|
-
function getPreferredVersionsFromPackage(pkg) {
|
|
30
|
-
return getVersionSpecsByRealNames((0, manifest_utils_1.getAllDependenciesFromManifest)(pkg));
|
|
31
|
-
}
|
|
32
|
-
exports.default = getPreferredVersionsFromPackage;
|
|
33
|
-
function getVersionSpecsByRealNames(deps) {
|
|
34
|
-
return Object.keys(deps)
|
|
35
|
-
.reduce((acc, depName) => {
|
|
36
|
-
if (deps[depName].startsWith('npm:')) {
|
|
37
|
-
const pref = deps[depName].substr(4);
|
|
38
|
-
const index = pref.lastIndexOf('@');
|
|
39
|
-
const spec = pref.substr(index + 1);
|
|
40
|
-
const selector = (0, version_selector_type_1.default)(spec);
|
|
41
|
-
if (selector != null) {
|
|
42
|
-
const pkgName = pref.substr(0, index);
|
|
43
|
-
acc[pkgName] = acc[pkgName] || {};
|
|
44
|
-
acc[pkgName][selector.normalized] = selector.type;
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
else if (!deps[depName].includes(':')) { // we really care only about semver specs
|
|
48
|
-
const selector = (0, version_selector_type_1.default)(deps[depName]);
|
|
49
|
-
if (selector != null) {
|
|
50
|
-
acc[depName] = acc[depName] || {};
|
|
51
|
-
acc[depName][selector.normalized] = selector.type;
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
return acc;
|
|
55
|
-
}, {});
|
|
56
|
-
}
|
|
57
25
|
function getPreferredVersionsFromLockfile(snapshots) {
|
|
58
26
|
const preferredVersions = {};
|
|
59
27
|
for (const [depPath, snapshot] of Object.entries(snapshots)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPreferredVersions.js","sourceRoot":"","sources":["../../src/install/getPreferredVersions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getPreferredVersions.js","sourceRoot":"","sources":["../../src/install/getPreferredVersions.ts"],"names":[],"mappings":";;;AAAA,yDAA+E;AAC/E,yDAAqE;AAIrE,SAAgB,iBAAiB,CAAE,SAA+B;IAChE,MAAM,QAAQ,GAA2B,EAAE,CAAA;IAC3C,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAA;IACjC,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;QAChC,MAAM,KAAK,GAAG,IAAA,+CAA8B,EAAC,QAAQ,CAAC,CAAA;QACtD,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAChD,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;gBAAE,SAAQ;YAC/B,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,QAAQ,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAC3E,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;gBACjB,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAA;gBACrB,SAAQ;aACT;YACD,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;SACtB;KACF;IACD,OAAO,QAAQ,CAAA;AACjB,CAAC;AAhBD,8CAgBC;AAED,SAAgB,gCAAgC,CAAE,SAA2B;IAC3E,MAAM,iBAAiB,GAAsB,EAAE,CAAA;IAC/C,KAAK,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC3D,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAA,uCAAsB,EAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;QACnE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE;YAC5B,iBAAiB,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,CAAA;SACnD;aAAM;YACL,iBAAiB,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,SAAS,CAAA;SAC7C;KACF;IACD,OAAO,iBAAiB,CAAA;AAC1B,CAAC;AAXD,4EAWC"}
|
package/lib/install/index.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { ProjectOptions } from '@pnpm/get-context';
|
|
2
|
+
import { PinnedVersion, WantedDependency } from '@pnpm/resolve-dependencies/lib/getWantedDependencies';
|
|
2
3
|
import { PreferredVersions } from '@pnpm/resolver-base';
|
|
3
|
-
import { DependenciesField, ProjectManifest } from '@pnpm/types';
|
|
4
|
+
import { DependenciesField, PackageExtension, ProjectManifest, ReadPackageHook } from '@pnpm/types';
|
|
4
5
|
import { InstallOptions } from './extendInstallOptions';
|
|
5
|
-
import { PinnedVersion, WantedDependency } from './getWantedDependencies';
|
|
6
6
|
export declare type DependenciesMutation = ({
|
|
7
7
|
buildIndex: number;
|
|
8
8
|
mutation: 'install';
|
|
@@ -38,6 +38,12 @@ export declare function mutateModules(projects: MutatedProject[], maybeOpts: Ins
|
|
|
38
38
|
manifest: ProjectManifest;
|
|
39
39
|
}[]>;
|
|
40
40
|
export declare function createObjectChecksum(obj: Object): string;
|
|
41
|
+
export declare function createReadPackageHook({ lockfileDir, overrides, packageExtensions, readPackageHook, }: {
|
|
42
|
+
lockfileDir: string;
|
|
43
|
+
overrides?: Record<string, string>;
|
|
44
|
+
packageExtensions?: Record<string, PackageExtension>;
|
|
45
|
+
readPackageHook?: ReadPackageHook;
|
|
46
|
+
}): ReadPackageHook | undefined;
|
|
41
47
|
export declare function addDependenciesToPackage(manifest: ProjectManifest, dependencySelectors: string[], opts: InstallOptions & {
|
|
42
48
|
allowNew?: boolean;
|
|
43
49
|
peer?: boolean;
|
|
@@ -55,7 +61,7 @@ export declare type ImporterToUpdate = {
|
|
|
55
61
|
removePackages?: string[];
|
|
56
62
|
updatePackageManifest: boolean;
|
|
57
63
|
wantedDependencies: Array<WantedDependency & {
|
|
58
|
-
isNew?:
|
|
59
|
-
updateSpec?:
|
|
64
|
+
isNew?: boolean;
|
|
65
|
+
updateSpec?: boolean;
|
|
60
66
|
}>;
|
|
61
67
|
} & DependenciesMutation;
|