@pnpm/core 6.0.3 → 7.0.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/api.d.ts +0 -2
- package/lib/api.js +1 -6
- package/lib/api.js.map +1 -1
- package/lib/getPeerDependencyIssues.js +6 -31
- package/lib/getPeerDependencyIssues.js.map +1 -1
- package/lib/install/allProjectsAreUpToDate.d.ts +1 -1
- package/lib/install/allProjectsAreUpToDate.js +3 -2
- package/lib/install/allProjectsAreUpToDate.js.map +1 -1
- package/lib/install/extendInstallOptions.d.ts +3 -2
- package/lib/install/extendInstallOptions.js +12 -36
- package/lib/install/extendInstallOptions.js.map +1 -1
- package/lib/install/index.d.ts +12 -7
- package/lib/install/index.js +114 -99
- package/lib/install/index.js.map +1 -1
- package/lib/install/link.d.ts +1 -1
- package/lib/install/link.js +11 -33
- package/lib/install/link.js.map +1 -1
- package/lib/install/reportPeerDependencyIssues.d.ts +2 -2
- package/lib/install/reportPeerDependencyIssues.js +5 -5
- package/lib/install/reportPeerDependencyIssues.js.map +1 -1
- package/lib/link/index.d.ts +1 -1
- package/lib/link/index.js +12 -32
- package/lib/link/index.js.map +1 -1
- package/lib/link/options.js +2 -25
- package/lib/link/options.js.map +1 -1
- package/lib/parseWantedDependencies.d.ts +1 -1
- package/lib/parseWantedDependencies.js +6 -8
- package/lib/parseWantedDependencies.js.map +1 -1
- package/lib/pnpmPkgJson.d.ts +2 -2
- package/lib/pnpmPkgJson.js +5 -4
- package/lib/pnpmPkgJson.js.map +1 -1
- package/lib/uninstall/removeDeps.d.ts +1 -1
- package/lib/uninstall/removeDeps.js +3 -2
- package/lib/uninstall/removeDeps.js.map +1 -1
- package/package.json +46 -46
- package/lib/err.d.ts +0 -1
- package/lib/err.js +0 -15
- package/lib/err.js.map +0 -1
package/lib/api.d.ts
CHANGED
package/lib/api.js
CHANGED
|
@@ -13,13 +13,8 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
|
|
|
13
13
|
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
17
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
18
|
-
};
|
|
19
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
20
|
-
exports.
|
|
21
|
-
const link_1 = __importDefault(require("./link"));
|
|
22
|
-
exports.link = link_1.default;
|
|
17
|
+
exports.PeerDependencyIssuesError = void 0;
|
|
23
18
|
__exportStar(require("./install"), exports);
|
|
24
19
|
var reportPeerDependencyIssues_1 = require("./install/reportPeerDependencyIssues");
|
|
25
20
|
Object.defineProperty(exports, "PeerDependencyIssuesError", { enumerable: true, get: function () { return reportPeerDependencyIssues_1.PeerDependencyIssuesError; } });
|
package/lib/api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,4CAAyB;AACzB,mFAAgF;AAAvE,uIAAA,yBAAyB,OAAA;AAClC,yCAAsB;AACtB,4DAAyC"}
|
|
@@ -1,40 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
-
};
|
|
28
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
3
|
exports.getPeerDependencyIssues = void 0;
|
|
30
|
-
const resolve_dependencies_1 =
|
|
31
|
-
const get_context_1 =
|
|
4
|
+
const resolve_dependencies_1 = require("@pnpm/resolve-dependencies");
|
|
5
|
+
const get_context_1 = require("@pnpm/get-context");
|
|
32
6
|
const hooks_read_package_hook_1 = require("@pnpm/hooks.read-package-hook");
|
|
33
7
|
const getPreferredVersions_1 = require("./install/getPreferredVersions");
|
|
34
8
|
const normalize_registries_1 = require("@pnpm/normalize-registries");
|
|
35
9
|
async function getPeerDependencyIssues(projects, opts) {
|
|
36
10
|
const lockfileDir = opts.lockfileDir ?? process.cwd();
|
|
37
|
-
const ctx = await (0, get_context_1.
|
|
11
|
+
const ctx = await (0, get_context_1.getContext)({
|
|
38
12
|
force: false,
|
|
39
13
|
forceSharedLockfile: false,
|
|
40
14
|
extraBinPaths: [],
|
|
@@ -42,15 +16,16 @@ async function getPeerDependencyIssues(projects, opts) {
|
|
|
42
16
|
nodeLinker: opts.nodeLinker ?? 'isolated',
|
|
43
17
|
registries: normalize_registries_1.DEFAULT_REGISTRIES,
|
|
44
18
|
useLockfile: true,
|
|
19
|
+
allProjects: projects,
|
|
45
20
|
...opts,
|
|
46
21
|
});
|
|
47
|
-
const projectsToResolve = ctx.projects.map((project) => ({
|
|
22
|
+
const projectsToResolve = Object.values(ctx.projects).map((project) => ({
|
|
48
23
|
...project,
|
|
49
24
|
updatePackageManifest: false,
|
|
50
25
|
wantedDependencies: (0, resolve_dependencies_1.getWantedDependencies)(project.manifest),
|
|
51
26
|
}));
|
|
52
27
|
const preferredVersions = ctx.wantedLockfile.packages ? (0, getPreferredVersions_1.getPreferredVersionsFromLockfile)(ctx.wantedLockfile.packages) : undefined;
|
|
53
|
-
const { peerDependencyIssuesByProjects, waitTillAllFetchingsFinish, } = await (0, resolve_dependencies_1.
|
|
28
|
+
const { peerDependencyIssuesByProjects, waitTillAllFetchingsFinish, } = await (0, resolve_dependencies_1.resolveDependencies)(projectsToResolve, {
|
|
54
29
|
currentLockfile: ctx.currentLockfile,
|
|
55
30
|
allowedDeprecatedVersions: {},
|
|
56
31
|
allowNonAppliedPatches: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPeerDependencyIssues.js","sourceRoot":"","sources":["../src/getPeerDependencyIssues.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getPeerDependencyIssues.js","sourceRoot":"","sources":["../src/getPeerDependencyIssues.ts"],"names":[],"mappings":";;;AAAA,qEAAuF;AAEvF,mDAAiF;AACjF,2EAAqE;AACrE,yEAAiF;AAEjF,qEAA+D;AAkBxD,KAAK,UAAU,uBAAuB,CAC3C,QAA0B,EAC1B,IAA6B;IAE7B,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,EAAE,CAAA;IACrD,MAAM,GAAG,GAAG,MAAM,IAAA,wBAAU,EAAC;QAC3B,KAAK,EAAE,KAAK;QACZ,mBAAmB,EAAE,KAAK;QAC1B,aAAa,EAAE,EAAE;QACjB,WAAW;QACX,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,UAAU;QACzC,UAAU,EAAE,yCAAkB;QAC9B,WAAW,EAAE,IAAI;QACjB,WAAW,EAAE,QAAQ;QACrB,GAAG,IAAI;KACR,CAAC,CAAA;IACF,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACtE,GAAG,OAAO;QACV,qBAAqB,EAAE,KAAK;QAC5B,kBAAkB,EAAE,IAAA,4CAAqB,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,0CAAmB,EAC3B,iBAAiB,EACjB;QACE,eAAe,EAAE,GAAG,CAAC,eAAe;QACpC,yBAAyB,EAAE,EAAE;QAC7B,sBAAsB,EAAE,KAAK;QAC7B,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,+CAAqB,EAAC;gBACjC,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;gBACjD,WAAW;gBACX,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;gBACzC,eAAe,EAAE,IAAI,CAAC,KAAK,EAAE,WAAW;aACzC,CAAC;SACH;QACD,0BAA0B,EAAE,IAAI,CAAC,0BAA0B,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpG,WAAW;QACX,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,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,IAAI,CAAC,iBAAiB,IAAI,EAAE;KAChD,CACF,CAAA;IAED,MAAM,0BAA0B,EAAE,CAAA;IAElC,OAAO,8BAA8B,CAAA;AACvC,CAAC;AAjED,0DAiEC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ProjectOptions } from '@pnpm/get-context';
|
|
2
2
|
import { Lockfile } from '@pnpm/lockfile-file';
|
|
3
3
|
import { WorkspacePackages } from '@pnpm/resolver-base';
|
|
4
|
-
export
|
|
4
|
+
export declare function allProjectsAreUpToDate(projects: Array<ProjectOptions & {
|
|
5
5
|
id: string;
|
|
6
6
|
}>, opts: {
|
|
7
7
|
autoInstallPeers: boolean;
|
|
@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.allProjectsAreUpToDate = void 0;
|
|
6
7
|
const path_1 = __importDefault(require("path"));
|
|
7
8
|
const lockfile_utils_1 = require("@pnpm/lockfile-utils");
|
|
8
9
|
const read_package_json_1 = require("@pnpm/read-package-json");
|
|
@@ -29,7 +30,7 @@ async function allProjectsAreUpToDate(projects, opts) {
|
|
|
29
30
|
});
|
|
30
31
|
});
|
|
31
32
|
}
|
|
32
|
-
exports.
|
|
33
|
+
exports.allProjectsAreUpToDate = allProjectsAreUpToDate;
|
|
33
34
|
function getWorkspacePackagesByDirectory(workspacePackages) {
|
|
34
35
|
const workspacePackagesByDirectory = {};
|
|
35
36
|
Object.keys(workspacePackages || {}).forEach((pkgName) => {
|
|
@@ -68,7 +69,7 @@ async function linkedPackagesAreUpToDate({ linkWorkspacePackages, manifestsByDir
|
|
|
68
69
|
// workspace:x.x.x dependency
|
|
69
70
|
continue;
|
|
70
71
|
}
|
|
71
|
-
const linkedPkg = manifestsByDir[linkedDir] ?? await (0, read_package_json_1.
|
|
72
|
+
const linkedPkg = manifestsByDir[linkedDir] ?? await (0, read_package_json_1.safeReadPackageJsonFromDir)(linkedDir);
|
|
72
73
|
const availableRange = getVersionRange(currentSpec);
|
|
73
74
|
// This should pass the same options to semver as @pnpm/npm-resolver
|
|
74
75
|
const localPackageSatisfiesRange = availableRange === '*' || availableRange === '^' || availableRange === '~' ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"allProjectsAreUpToDate.js","sourceRoot":"","sources":["../../src/install/allProjectsAreUpToDate.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"allProjectsAreUpToDate.js","sourceRoot":"","sources":["../../src/install/allProjectsAreUpToDate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { ProjectOptions } from '@pnpm/get-context';
|
|
1
2
|
import { HoistingLimits } from '@pnpm/headless';
|
|
2
3
|
import { Lockfile } from '@pnpm/lockfile-file';
|
|
3
4
|
import { IncludedDependencies } from '@pnpm/modules-yaml';
|
|
@@ -98,10 +99,10 @@ export interface StrictInstallOptions {
|
|
|
98
99
|
global: boolean;
|
|
99
100
|
globalBin?: string;
|
|
100
101
|
patchedDependencies?: Record<string, string>;
|
|
102
|
+
allProjects: ProjectOptions[];
|
|
101
103
|
}
|
|
102
104
|
export declare type InstallOptions = Partial<StrictInstallOptions> & Pick<StrictInstallOptions, 'storeDir' | 'storeController'>;
|
|
103
105
|
export declare type ProcessedInstallOptions = StrictInstallOptions & {
|
|
104
106
|
readPackageHook?: ReadPackageHook;
|
|
105
107
|
};
|
|
106
|
-
declare
|
|
107
|
-
export default _default;
|
|
108
|
+
export declare function extendOptions(opts: InstallOptions): Promise<ProcessedInstallOptions>;
|
|
@@ -1,40 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
-
};
|
|
28
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.extendOptions = void 0;
|
|
29
4
|
const constants_1 = require("@pnpm/constants");
|
|
30
|
-
const error_1 =
|
|
5
|
+
const error_1 = require("@pnpm/error");
|
|
31
6
|
const hooks_read_package_hook_1 = require("@pnpm/hooks.read-package-hook");
|
|
32
|
-
const normalize_registries_1 =
|
|
33
|
-
const pnpmPkgJson_1 =
|
|
7
|
+
const normalize_registries_1 = require("@pnpm/normalize-registries");
|
|
8
|
+
const pnpmPkgJson_1 = require("../pnpmPkgJson");
|
|
34
9
|
const defaults = async (opts) => {
|
|
35
10
|
const packageManager = opts.packageManager ?? {
|
|
36
|
-
name: pnpmPkgJson_1.
|
|
37
|
-
version: pnpmPkgJson_1.
|
|
11
|
+
name: pnpmPkgJson_1.pnpmPkgJson.name,
|
|
12
|
+
version: pnpmPkgJson_1.pnpmPkgJson.version,
|
|
38
13
|
};
|
|
39
14
|
return {
|
|
40
15
|
allowedDeprecatedVersions: {},
|
|
@@ -110,7 +85,7 @@ const defaults = async (opts) => {
|
|
|
110
85
|
modulesCacheMaxAge: 7 * 24 * 60,
|
|
111
86
|
};
|
|
112
87
|
};
|
|
113
|
-
|
|
88
|
+
async function extendOptions(opts) {
|
|
114
89
|
if (opts) {
|
|
115
90
|
for (const key in opts) {
|
|
116
91
|
if (opts[key] === undefined) {
|
|
@@ -119,7 +94,7 @@ exports.default = async (opts) => {
|
|
|
119
94
|
}
|
|
120
95
|
}
|
|
121
96
|
if (opts.onlyBuiltDependencies && opts.neverBuiltDependencies) {
|
|
122
|
-
throw new error_1.
|
|
97
|
+
throw new error_1.PnpmError('CONFIG_CONFLICT_BUILT_DEPENDENCIES', 'Cannot have both neverBuiltDependencies and onlyBuiltDependencies');
|
|
123
98
|
}
|
|
124
99
|
const defaultOpts = await defaults(opts);
|
|
125
100
|
const extendedOpts = {
|
|
@@ -138,14 +113,15 @@ exports.default = async (opts) => {
|
|
|
138
113
|
if (extendedOpts.lockfileOnly) {
|
|
139
114
|
extendedOpts.ignoreScripts = true;
|
|
140
115
|
if (!extendedOpts.useLockfile) {
|
|
141
|
-
throw new error_1.
|
|
116
|
+
throw new error_1.PnpmError('CONFIG_CONFLICT_LOCKFILE_ONLY_WITH_NO_LOCKFILE', `Cannot generate a ${constants_1.WANTED_LOCKFILE} because lockfile is set to false`);
|
|
142
117
|
}
|
|
143
118
|
}
|
|
144
119
|
if (extendedOpts.userAgent.startsWith('npm/')) {
|
|
145
120
|
extendedOpts.userAgent = `${extendedOpts.packageManager.name}/${extendedOpts.packageManager.version} ${extendedOpts.userAgent}`;
|
|
146
121
|
}
|
|
147
|
-
extendedOpts.registries = (0, normalize_registries_1.
|
|
122
|
+
extendedOpts.registries = (0, normalize_registries_1.normalizeRegistries)(extendedOpts.registries);
|
|
148
123
|
extendedOpts.rawConfig['registry'] = extendedOpts.registries.default;
|
|
149
124
|
return extendedOpts;
|
|
150
|
-
}
|
|
125
|
+
}
|
|
126
|
+
exports.extendOptions = extendOptions;
|
|
151
127
|
//# sourceMappingURL=extendInstallOptions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extendInstallOptions.js","sourceRoot":"","sources":["../../src/install/extendInstallOptions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"extendInstallOptions.js","sourceRoot":"","sources":["../../src/install/extendInstallOptions.ts"],"names":[],"mappings":"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"}
|
package/lib/install/index.d.ts
CHANGED
|
@@ -1,10 +1,8 @@
|
|
|
1
|
-
import { ProjectOptions } from '@pnpm/get-context';
|
|
2
1
|
import { PinnedVersion, WantedDependency } from '@pnpm/resolve-dependencies';
|
|
3
2
|
import { PreferredVersions } from '@pnpm/resolver-base';
|
|
4
3
|
import { DependenciesField, PeerDependencyIssues, ProjectManifest, ReadPackageHook } from '@pnpm/types';
|
|
5
4
|
import { InstallOptions } from './extendInstallOptions';
|
|
6
5
|
export declare type DependenciesMutation = ({
|
|
7
|
-
buildIndex: number;
|
|
8
6
|
mutation: 'install';
|
|
9
7
|
pruneDirectDependencies?: boolean;
|
|
10
8
|
} | {
|
|
@@ -24,23 +22,29 @@ export declare type DependenciesMutation = ({
|
|
|
24
22
|
} | {
|
|
25
23
|
mutation: 'unlinkSome';
|
|
26
24
|
dependencyNames: string[];
|
|
27
|
-
}) & ({
|
|
28
|
-
manifest: ProjectManifest;
|
|
29
25
|
});
|
|
30
|
-
export declare function install(manifest: ProjectManifest, opts: InstallOptions & {
|
|
26
|
+
export declare function install(manifest: ProjectManifest, opts: Omit<InstallOptions, 'allProjects'> & {
|
|
31
27
|
preferredVersions?: PreferredVersions;
|
|
32
28
|
pruneDirectDependencies?: boolean;
|
|
33
29
|
}): Promise<ProjectManifest>;
|
|
34
|
-
export declare type MutatedProject =
|
|
30
|
+
export declare type MutatedProject = DependenciesMutation & {
|
|
31
|
+
rootDir: string;
|
|
32
|
+
};
|
|
35
33
|
export declare type MutateModulesOptions = InstallOptions & {
|
|
36
34
|
preferredVersions?: PreferredVersions;
|
|
37
35
|
hooks?: {
|
|
38
36
|
readPackage?: ReadPackageHook[] | ReadPackageHook;
|
|
39
37
|
} | InstallOptions['hooks'];
|
|
40
38
|
};
|
|
39
|
+
export declare function mutateModulesInSingleProject(project: MutatedProject & {
|
|
40
|
+
binsDir?: string;
|
|
41
|
+
manifest: ProjectManifest;
|
|
42
|
+
rootDir: string;
|
|
43
|
+
modulesDir?: string;
|
|
44
|
+
}, maybeOpts: Omit<MutateModulesOptions, 'allProjects'>): Promise<UpdatedProject>;
|
|
41
45
|
export declare function mutateModules(projects: MutatedProject[], maybeOpts: MutateModulesOptions): Promise<UpdatedProject[]>;
|
|
42
46
|
export declare function createObjectChecksum(obj: Object): string;
|
|
43
|
-
export declare function addDependenciesToPackage(manifest: ProjectManifest, dependencySelectors: string[], opts: InstallOptions & {
|
|
47
|
+
export declare function addDependenciesToPackage(manifest: ProjectManifest, dependencySelectors: string[], opts: Omit<InstallOptions, 'allProjects'> & {
|
|
44
48
|
bin?: string;
|
|
45
49
|
allowNew?: boolean;
|
|
46
50
|
peer?: boolean;
|
|
@@ -48,6 +52,7 @@ export declare function addDependenciesToPackage(manifest: ProjectManifest, depe
|
|
|
48
52
|
targetDependenciesField?: DependenciesField;
|
|
49
53
|
}): Promise<ProjectManifest>;
|
|
50
54
|
export declare type ImporterToUpdate = {
|
|
55
|
+
buildIndex: number;
|
|
51
56
|
binsDir: string;
|
|
52
57
|
id: string;
|
|
53
58
|
manifest: ProjectManifest;
|