@pnpm/plugin-commands-installation 11.0.8 → 11.0.10
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/add.d.ts +1 -1
- package/lib/import/index.d.ts +1 -1
- package/lib/import/index.js +9 -13
- package/lib/import/index.js.map +1 -1
- package/lib/import/yarnUtil.d.ts +3 -3
- package/lib/install.d.ts +1 -1
- package/lib/installDeps.d.ts +1 -1
- package/lib/installDeps.js +6 -2
- package/lib/installDeps.js.map +1 -1
- package/lib/recursive.d.ts +2 -2
- package/lib/recursive.js +1 -1
- package/lib/recursive.js.map +1 -1
- package/lib/update/index.d.ts +1 -1
- package/lib/updateWorkspaceDependencies.js +4 -4
- package/lib/updateWorkspaceDependencies.js.map +1 -1
- package/package.json +37 -37
package/lib/add.d.ts
CHANGED
|
@@ -7,7 +7,7 @@ export declare function cliOptionsTypes(): {
|
|
|
7
7
|
};
|
|
8
8
|
export declare const commandNames: string[];
|
|
9
9
|
export declare function help(): string;
|
|
10
|
-
export
|
|
10
|
+
export type AddCommandOptions = InstallCommandOptions & {
|
|
11
11
|
allowNew?: boolean;
|
|
12
12
|
ignoreWorkspaceRootCheck?: boolean;
|
|
13
13
|
save?: boolean;
|
package/lib/import/index.d.ts
CHANGED
|
@@ -5,5 +5,5 @@ export declare const rcOptionsTypes: typeof cliOptionsTypes;
|
|
|
5
5
|
export declare function cliOptionsTypes(): {};
|
|
6
6
|
export declare function help(): string;
|
|
7
7
|
export declare const commandNames: string[];
|
|
8
|
-
export
|
|
8
|
+
export type ImportCommandOptions = Pick<Config, 'allProjects' | 'allProjectsGraph' | 'selectedProjectsGraph' | 'workspaceDir'> & CreateStoreControllerOptions & Omit<InstallOptions, 'storeController' | 'lockfileOnly' | 'preferredVersions'>;
|
|
9
9
|
export declare function handler(opts: ImportCommandOptions, params: string[]): Promise<void>;
|
package/lib/import/index.js
CHANGED
|
@@ -40,6 +40,8 @@ const logger_1 = require("@pnpm/logger");
|
|
|
40
40
|
const sort_packages_1 = require("@pnpm/sort-packages");
|
|
41
41
|
const rimraf_1 = __importDefault(require("@zkochan/rimraf"));
|
|
42
42
|
const load_json_file_1 = __importDefault(require("load-json-file"));
|
|
43
|
+
const fromPairs_1 = __importDefault(require("ramda/src/fromPairs"));
|
|
44
|
+
const map_1 = __importDefault(require("ramda/src/map"));
|
|
43
45
|
const render_help_1 = __importDefault(require("render-help"));
|
|
44
46
|
const lockfile_1 = require("@yarnpkg/lockfile");
|
|
45
47
|
const yarnCore = __importStar(require("@yarnpkg/core"));
|
|
@@ -194,35 +196,29 @@ async function readNpmLockfile(dir) {
|
|
|
194
196
|
throw new error_1.PnpmError('NPM_LOCKFILE_NOT_FOUND', 'No package-lock.json or npm-shrinkwrap.json found');
|
|
195
197
|
}
|
|
196
198
|
function getPreferredVersions(versionsByPackageNames) {
|
|
197
|
-
const preferredVersions =
|
|
198
|
-
for (const packageName of Object.keys(versionsByPackageNames)) {
|
|
199
|
-
preferredVersions[packageName] = Array.from(versionsByPackageNames[packageName]).reduce((acc, version) => {
|
|
200
|
-
acc[version] = 'version';
|
|
201
|
-
return acc;
|
|
202
|
-
}, {});
|
|
203
|
-
}
|
|
199
|
+
const preferredVersions = (0, map_1.default)((versions) => (0, fromPairs_1.default)(Array.from(versions).map((version) => [version, 'version'])), versionsByPackageNames);
|
|
204
200
|
return preferredVersions;
|
|
205
201
|
}
|
|
206
202
|
function getAllVersionsByPackageNames(npmPackageLock, versionsByPackageNames) {
|
|
207
203
|
if (npmPackageLock.dependencies == null)
|
|
208
204
|
return;
|
|
209
|
-
for (const packageName of Object.
|
|
205
|
+
for (const [packageName, { version }] of Object.entries(npmPackageLock.dependencies)) {
|
|
210
206
|
if (!versionsByPackageNames[packageName]) {
|
|
211
207
|
versionsByPackageNames[packageName] = new Set();
|
|
212
208
|
}
|
|
213
|
-
versionsByPackageNames[packageName].add(
|
|
209
|
+
versionsByPackageNames[packageName].add(version);
|
|
214
210
|
}
|
|
215
|
-
for (const
|
|
216
|
-
getAllVersionsByPackageNames(
|
|
211
|
+
for (const dep of Object.values(npmPackageLock.dependencies)) {
|
|
212
|
+
getAllVersionsByPackageNames(dep, versionsByPackageNames);
|
|
217
213
|
}
|
|
218
214
|
}
|
|
219
215
|
function getAllVersionsFromYarnLockFile(yarnPackageLock, versionsByPackageNames) {
|
|
220
|
-
for (const packageName of Object.
|
|
216
|
+
for (const [packageName, { version }] of Object.entries(yarnPackageLock)) {
|
|
221
217
|
const pkgName = packageName.substring(0, packageName.lastIndexOf('@'));
|
|
222
218
|
if (!versionsByPackageNames[pkgName]) {
|
|
223
219
|
versionsByPackageNames[pkgName] = new Set();
|
|
224
220
|
}
|
|
225
|
-
versionsByPackageNames[pkgName].add(
|
|
221
|
+
versionsByPackageNames[pkgName].add(version);
|
|
226
222
|
}
|
|
227
223
|
}
|
|
228
224
|
function selectProjectByDir(projects, searchedDir) {
|
package/lib/import/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/import/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAuB;AACvB,+CAAyC;AACzC,+CAAiD;AACjD,uCAAuC;AACvC,uEAAqE;AACrE,6EAGuC;AACvC,oEAAmC;AACnC,qCAAoD;AAEpD,2EAAqE;AAErE,yCAAqC;AACrC,uDAAmD;AACnD,6DAAoC;AACpC,oEAAyC;AACzC,8DAAoC;AACpC,gDAA0D;AAC1D,wDAAyC;AACzC,8CAA4C;AAC5C,8DAAgC;AAChC,8EAA0E;AAC1E,4CAAwC;AACxC,yCAAsD;AA8BtD,IAAK,YAGJ;AAHD,WAAK,YAAY;IACf,6BAAa,CAAA;IACb,+BAAe,CAAA;AACjB,CAAC,EAHI,YAAY,KAAZ,YAAY,QAGhB;AAQY,QAAA,cAAc,GAAG,eAAe,CAAA;AAE7C,SAAgB,eAAe;IAC7B,OAAO,EAAE,CAAA;AACX,CAAC;AAFD,0CAEC;AAED,SAAgB,IAAI;IAClB,OAAO,IAAA,qBAAU,EAAC;QAChB,WAAW,EAAE,aAAa,2BAAe,0EAA0E;QACnH,GAAG,EAAE,IAAA,mBAAO,EAAC,QAAQ,CAAC;QACtB,MAAM,EAAE;YACN,aAAa;SACd;KACF,CAAC,CAAA;AACJ,CAAC;AARD,oBAQC;AAEY,QAAA,YAAY,GAAG,CAAC,QAAQ,CAAC,CAAA;AAS/B,KAAK,UAAU,OAAO,CAC3B,IAA0B,EAC1B,MAAgB;IAEhB,kCAAkC;IAClC,sCAAsC;IACtC,MAAM,IAAA,gBAAM,EAAC,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,2BAAe,CAAC,CAAC,CAAA;IAClD,MAAM,sBAAsB,GAAG,EAAE,CAAA;IACjC,IAAI,iBAAiB,GAAG,EAAE,CAAA;IAC1B,IAAI,MAAM,IAAA,qBAAM,EAAC,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,EAAE;QAClD,MAAM,mBAAmB,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAC5D,8BAA8B,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,CAAA;KAC5E;SAAM,IACL,MAAM,IAAA,qBAAM,EAAC,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;QACtD,MAAM,IAAA,qBAAM,EAAC,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,qBAAqB,CAAC,CAAC,EACxD;QACA,MAAM,cAAc,GAAG,MAAM,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QACtD,4BAA4B,CAAC,cAAc,EAAE,sBAAsB,CAAC,CAAA;KACrE;SAAM;QACL,MAAM,IAAI,iBAAS,CAAC,oBAAoB,EAAE,mBAAmB,CAAC,CAAA;KAC/D;IACD,iBAAiB,GAAG,oBAAoB,CAAC,sBAAsB,CAAC,CAAA;IAEhE,uCAAuC;IACvC,IAAI,IAAI,CAAC,YAAY,EAAE;QACrB,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,MAAM,IAAA,+CAAqB,EAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,CAAA;QAC5F,MAAM,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,IAAI,kBAAkB,CAAC,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,CAAA;QACrG,IAAI,qBAAqB,IAAI,IAAI,EAAE;YACjC,MAAM,cAAc,GAAG,IAAA,6BAAa,EAAC,qBAAqB,CAAC,CAAA;YAC3D,kDAAkD;YAClD,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE;gBACxB,MAAM,sBAAsB,GAAG,cAAc,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC;oBAC7D,CAAC,CAAC,KAAK,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;oBACtE,CAAC,CAAC,EAAE,CAAA;gBACN,eAAM,CAAC,IAAI,CAAC;oBACV,OAAO,EAAE,0CAA0C,sBAAsB,EAAE;oBAC3E,MAAM,EAAE,IAAI,CAAC,YAAY;iBAC1B,CAAC,CAAA;aACH;YACD,MAAM,IAAA,qBAAS,EAAC,WAAW,EACzB,MAAM;YACN,mBAAmB;YACnB;gBACE,GAAG,IAAI;gBACP,YAAY,EAAE,IAAI;gBAClB,qBAAqB;gBACrB,iBAAiB;gBACjB,YAAY,EAAE,IAAI,CAAC,YAAY;aAChC,EACD,QAAQ,CACT,CAAA;SACF;QACD,OAAM;KACP;IAED,MAAM,KAAK,GAAG,MAAM,IAAA,yDAA8B,EAAC,IAAI,CAAC,CAAA;IACxD,MAAM,QAAQ,GAAG,MAAM,IAAA,+CAAuB,EAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACxD,MAAM,WAAW,GAAG;QAClB,GAAG,IAAI;QACP,GAAG,IAAA,uDAA0B,EAAC,QAAQ,CAAC;QACvC,YAAY,EAAE,IAAI;QAClB,iBAAiB;QACjB,eAAe,EAAE,KAAK,CAAC,IAAI;QAC3B,QAAQ,EAAE,KAAK,CAAC,GAAG;KACpB,CAAA;IACD,MAAM,IAAA,cAAO,EAAC,QAAQ,EAAE,WAAW,CAAC,CAAA;AACtC,CAAC;AAlED,0BAkEC;AAED,KAAK,UAAU,gBAAgB,CAAE,GAAW;IAC1C,IAAI;QACF,MAAM,YAAY,GAAG,MAAM,qBAAG,CAAC,QAAQ,CAAC,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,EAAE,MAAM,CAAC,CAAA;QAC5E,IAAI,YAAY,CAAA;QAChB,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,YAAY,CAAC,CAAA;QAC1D,IAAI,gBAAgB,KAAK,YAAY,CAAC,IAAI,EAAE;YAC1C,YAAY,GAAG,IAAA,gBAAa,EAAC,YAAY,CAAC,CAAA;YAC1C,IAAI,YAAY,CAAC,IAAI,KAAK,SAAS,EAAE;gBACnC,OAAO,YAAY,CAAC,MAAM,CAAA;aAC3B;iBAAM;gBACL,MAAM,IAAI,iBAAS,CAAC,4BAA4B,EAAE,sBAAsB,YAAY,CAAC,IAAI,EAAE,CAAC,CAAA;aAC7F;SACF;aAAM,IAAI,gBAAgB,KAAK,YAAY,CAAC,KAAK,EAAE;YAClD,YAAY,GAAG,cAAc,CAAC,YAAY,CAAC,CAAA;YAC3C,IAAI,YAAY,CAAC,IAAI,KAAK,YAAY,CAAC,KAAK,EAAE;gBAC5C,OAAO,YAAY,CAAC,MAAM,CAAA;aAC3B;SACF;KACF;IAAC,OAAO,GAAQ,EAAE,EAAE,sBAAsB;QACzC,IAAI,GAAG,CAAC,MAAM,CAAC,KAAK,QAAQ;YAAE,MAAM,GAAG,CAAA;KACxC;IACD,MAAM,IAAI,iBAAS,CAAC,yBAAyB,EAAE,oBAAoB,CAAC,CAAA;AACtE,CAAC;AAED,SAAS,cAAc,CAAE,gBAAwB;IAC/C,2BAA2B;IAC3B,MAAM,aAAa,GAAQ,IAAA,mBAAS,EAAC,gBAAgB,CAAC,CAAA;IAEtD,OAAO,aAAa,CAAC,UAAU,CAAA;IAC/B,MAAM,YAAY,GAAoB,EAAE,CAAA;IAExC,MAAM,EAAE,WAAW,EAAE,GAAG,QAAQ,CAAA;IAChC,MAAM,EAAE,eAAe,EAAE,UAAU,EAAE,GAAG,WAAW,CAAA;IACnD,MAAM,aAAa,GAAG,IAAA,oCAAyB,EAC7C,eAAe,EACf,UAAU,CACX,CAAA;IAED,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,OAAO;IACnC,2BAA2B;IAC3B,CAAC,CAAC,cAAc,EAAE,WAAW,CAAgB,EAAE,EAAE;QAC/C,aAAa,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;YACnD,YAAY,CAAC,UAAU,CAAC,GAAG,WAAW,CAAA;QACxC,CAAC,CAAC,CAAA;IACJ,CAAC,CACF,CAAA;IACD,OAAO;QACL,MAAM,EAAE,YAAY;QACpB,IAAI,EAAE,YAAY,CAAC,KAAK;KACzB,CAAA;AACH,CAAC;AAED,KAAK,UAAU,eAAe,CAAE,GAAW;IACzC,IAAI;QACF,OAAO,MAAM,IAAA,wBAAY,EAAgB,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC,CAAA;KAC9E;IAAC,OAAO,GAAQ,EAAE,EAAE,sBAAsB;QACzC,IAAI,GAAG,CAAC,MAAM,CAAC,KAAK,QAAQ;YAAE,MAAM,GAAG,CAAA;KACxC;IACD,IAAI;QACF,OAAO,MAAM,IAAA,wBAAY,EAAgB,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,qBAAqB,CAAC,CAAC,CAAA;KAChF;IAAC,OAAO,GAAQ,EAAE,EAAE,sBAAsB;QACzC,IAAI,GAAG,CAAC,MAAM,CAAC,KAAK,QAAQ;YAAE,MAAM,GAAG,CAAA;KACxC;IACD,MAAM,IAAI,iBAAS,CAAC,wBAAwB,EAAE,mDAAmD,CAAC,CAAA;AACpG,CAAC;AAED,SAAS,oBAAoB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/import/index.ts"],"names":[],"mappings":"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"}
|
package/lib/import/yarnUtil.d.ts
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* https://github.com/snyk/nodejs-lockfile-parser/blob/master/lib/parsers/yarn-utils.ts
|
|
3
3
|
*/
|
|
4
4
|
import { structUtils } from '@yarnpkg/core';
|
|
5
|
-
export
|
|
6
|
-
export
|
|
7
|
-
export
|
|
5
|
+
export type ParseDescriptor = typeof structUtils.parseDescriptor;
|
|
6
|
+
export type ParseRange = typeof structUtils.parseRange;
|
|
7
|
+
export type YarnLockFileKeyNormalizer = (fullDescriptor: string) => Set<string>;
|
|
8
8
|
export declare const yarnLockFileKeyNormalizer: (parseDescriptor: ParseDescriptor, parseRange: ParseRange) => YarnLockFileKeyNormalizer;
|
package/lib/install.d.ts
CHANGED
|
@@ -11,7 +11,7 @@ export declare const shorthands: {
|
|
|
11
11
|
};
|
|
12
12
|
export declare const commandNames: string[];
|
|
13
13
|
export declare function help(): string;
|
|
14
|
-
export
|
|
14
|
+
export type InstallCommandOptions = Pick<Config, 'allProjects' | 'autoInstallPeers' | 'bail' | 'bin' | 'cliOptions' | 'depth' | 'dev' | 'engineStrict' | 'frozenLockfile' | 'global' | 'globalPnpmfile' | 'hooks' | 'ignorePnpmfile' | 'ignoreScripts' | 'linkWorkspacePackages' | 'rawLocalConfig' | 'lockfileDir' | 'lockfileOnly' | 'modulesDir' | 'pnpmfile' | 'preferFrozenLockfile' | 'production' | 'registries' | 'save' | 'saveDev' | 'saveExact' | 'saveOptional' | 'savePeer' | 'savePrefix' | 'saveProd' | 'saveWorkspaceProtocol' | 'lockfileIncludeTarballUrl' | 'allProjectsGraph' | 'selectedProjectsGraph' | 'sideEffectsCache' | 'sideEffectsCacheReadonly' | 'sort' | 'sharedWorkspaceLockfile' | 'tag' | 'optional' | 'virtualStoreDir' | 'workspaceConcurrency' | 'workspaceDir' | 'extraEnv'> & CreateStoreControllerOptions & {
|
|
15
15
|
argv: {
|
|
16
16
|
original: string[];
|
|
17
17
|
};
|
package/lib/installDeps.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Config } from '@pnpm/config';
|
|
2
2
|
import { CreateStoreControllerOptions } from '@pnpm/store-connection-manager';
|
|
3
3
|
import { IncludedDependencies } from '@pnpm/types';
|
|
4
|
-
export
|
|
4
|
+
export type InstallDepsOptions = Pick<Config, 'allProjects' | 'allProjectsGraph' | 'autoInstallPeers' | 'bail' | 'bin' | 'cliOptions' | 'depth' | 'dev' | 'engineStrict' | 'global' | 'globalPnpmfile' | 'hooks' | 'ignorePnpmfile' | 'ignoreScripts' | 'linkWorkspacePackages' | 'lockfileDir' | 'lockfileOnly' | 'pnpmfile' | 'production' | 'rawLocalConfig' | 'registries' | 'save' | 'saveDev' | 'saveExact' | 'saveOptional' | 'savePeer' | 'savePrefix' | 'saveProd' | 'saveWorkspaceProtocol' | 'lockfileIncludeTarballUrl' | 'scriptsPrependNodePath' | 'scriptShell' | 'selectedProjectsGraph' | 'sideEffectsCache' | 'sideEffectsCacheReadonly' | 'sort' | 'sharedWorkspaceLockfile' | 'shellEmulator' | 'tag' | 'optional' | 'workspaceConcurrency' | 'workspaceDir' | 'extraEnv'> & CreateStoreControllerOptions & {
|
|
5
5
|
argv: {
|
|
6
6
|
original: string[];
|
|
7
7
|
};
|
package/lib/installDeps.js
CHANGED
|
@@ -134,8 +134,12 @@ when running add/update with the --workspace option');
|
|
|
134
134
|
}
|
|
135
135
|
if (updateMatch != null) {
|
|
136
136
|
params = (0, recursive_1.matchDependencies)(updateMatch, manifest, includeDirect);
|
|
137
|
-
if (params.length === 0
|
|
138
|
-
|
|
137
|
+
if (params.length === 0) {
|
|
138
|
+
if (opts.latest)
|
|
139
|
+
return;
|
|
140
|
+
if (opts.depth === 0) {
|
|
141
|
+
throw new error_1.PnpmError('NO_PACKAGE_IN_DEPENDENCIES', 'None of the specified packages were found in the dependencies.');
|
|
142
|
+
}
|
|
139
143
|
}
|
|
140
144
|
}
|
|
141
145
|
if (opts.update && opts.latest) {
|
package/lib/installDeps.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installDeps.js","sourceRoot":"","sources":["../src/installDeps.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"installDeps.js","sourceRoot":"","sources":["../src/installDeps.ts"],"names":[],"mappings":"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"}
|
package/lib/recursive.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { Config } from '@pnpm/config';
|
|
|
2
2
|
import { CreateStoreControllerOptions } from '@pnpm/store-connection-manager';
|
|
3
3
|
import { IncludedDependencies, Project, ProjectManifest, ProjectsGraph } from '@pnpm/types';
|
|
4
4
|
import { PreferredVersions } from '@pnpm/resolver-base';
|
|
5
|
-
|
|
5
|
+
type RecursiveOptions = CreateStoreControllerOptions & Pick<Config, 'bail' | 'depth' | 'globalPnpmfile' | 'hoistPattern' | 'hooks' | 'ignorePnpmfile' | 'ignoreScripts' | 'linkWorkspacePackages' | 'lockfileDir' | 'lockfileOnly' | 'modulesDir' | 'pnpmfile' | 'rawLocalConfig' | 'registries' | 'save' | 'saveDev' | 'saveExact' | 'saveOptional' | 'savePeer' | 'savePrefix' | 'saveProd' | 'saveWorkspaceProtocol' | 'lockfileIncludeTarballUrl' | 'sharedWorkspaceLockfile' | 'tag'> & {
|
|
6
6
|
include?: IncludedDependencies;
|
|
7
7
|
includeDirect?: IncludedDependencies;
|
|
8
8
|
latest?: boolean;
|
|
@@ -21,7 +21,7 @@ declare type RecursiveOptions = CreateStoreControllerOptions & Pick<Config, 'bai
|
|
|
21
21
|
} & Partial<Pick<Config, 'sort' | 'workspaceConcurrency'>> & Required<Pick<Config, 'workspaceDir'>>;
|
|
22
22
|
export declare function recursive(allProjects: Project[], params: string[], opts: RecursiveOptions, cmdFullName: 'install' | 'add' | 'remove' | 'unlink' | 'update' | 'import'): Promise<boolean | string>;
|
|
23
23
|
export declare function matchDependencies(match: (input: string) => string | null, manifest: ProjectManifest, include: IncludedDependencies): string[];
|
|
24
|
-
export
|
|
24
|
+
export type UpdateDepsMatcher = (input: string) => string | null;
|
|
25
25
|
export declare function createMatcher(params: string[]): UpdateDepsMatcher;
|
|
26
26
|
export declare function makeIgnorePatterns(ignoredDependencies: string[]): string[];
|
|
27
27
|
export {};
|
package/lib/recursive.js
CHANGED
|
@@ -180,7 +180,7 @@ async function recursive(allProjects, params, opts, cmdFullName) {
|
|
|
180
180
|
});
|
|
181
181
|
if (opts.save !== false) {
|
|
182
182
|
await Promise.all(mutatedPkgs
|
|
183
|
-
.map(async ({ manifest }, index) => writeProjectManifests[index](manifest)));
|
|
183
|
+
.map(async ({ originalManifest, manifest }, index) => writeProjectManifests[index](originalManifest ?? manifest)));
|
|
184
184
|
}
|
|
185
185
|
return true;
|
|
186
186
|
}
|
package/lib/recursive.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recursive.js","sourceRoot":"","sources":["../src/recursive.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"recursive.js","sourceRoot":"","sources":["../src/recursive.ts"],"names":[],"mappings":"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"}
|
package/lib/update/index.d.ts
CHANGED
|
@@ -14,7 +14,7 @@ export declare const shorthands: {
|
|
|
14
14
|
export declare const commandNames: string[];
|
|
15
15
|
export declare const completion: CompletionFunc;
|
|
16
16
|
export declare function help(): string;
|
|
17
|
-
export
|
|
17
|
+
export type UpdateCommandOptions = InstallCommandOptions & {
|
|
18
18
|
interactive?: boolean;
|
|
19
19
|
latest?: boolean;
|
|
20
20
|
};
|
|
@@ -9,12 +9,12 @@ function updateToWorkspacePackagesFromManifest(manifest, include, workspacePacka
|
|
|
9
9
|
...(include.dependencies ? manifest.dependencies : {}),
|
|
10
10
|
...(include.optionalDependencies ? manifest.optionalDependencies : {}),
|
|
11
11
|
};
|
|
12
|
-
const updateSpecs =
|
|
13
|
-
for (const depName of Object.keys(allDeps)) {
|
|
12
|
+
const updateSpecs = Object.keys(allDeps).reduce((acc, depName) => {
|
|
14
13
|
if (workspacePackages[depName]) {
|
|
15
|
-
|
|
14
|
+
acc.push(`${depName}@workspace:*`);
|
|
16
15
|
}
|
|
17
|
-
|
|
16
|
+
return acc;
|
|
17
|
+
}, []);
|
|
18
18
|
return updateSpecs;
|
|
19
19
|
}
|
|
20
20
|
exports.updateToWorkspacePackagesFromManifest = updateToWorkspacePackagesFromManifest;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateWorkspaceDependencies.js","sourceRoot":"","sources":["../src/updateWorkspaceDependencies.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,2EAAqE;AAIrE,SAAgB,qCAAqC,
|
|
1
|
+
{"version":3,"file":"updateWorkspaceDependencies.js","sourceRoot":"","sources":["../src/updateWorkspaceDependencies.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,2EAAqE;AAIrE,SAAgB,qCAAqC,CACnD,QAAyB,EACzB,OAA6B,EAC7B,iBAAoC;IAEpC,MAAM,OAAO,GAAG;QACd,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5D,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;QACtD,GAAG,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC;KAC7C,CAAA;IAC3B,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAa,EAAE,OAAO,EAAE,EAAE;QACzE,IAAI,iBAAiB,CAAC,OAAO,CAAC,EAAE;YAC9B,GAAG,CAAC,IAAI,CAAC,GAAG,OAAO,cAAc,CAAC,CAAA;SACnC;QACD,OAAO,GAAG,CAAA;IACZ,CAAC,EAAE,EAAE,CAAC,CAAA;IACN,OAAO,WAAW,CAAA;AACpB,CAAC;AAjBD,sFAiBC;AAED,SAAgB,oBAAoB,CAAE,KAAe,EAAE,iBAAoC;IACzF,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACxB,MAAM,MAAM,GAAG,IAAA,+CAAqB,EAAC,IAAI,CAAC,CAAA;QAC1C,IAAI,CAAC,MAAM,CAAC,KAAK;YAAE,MAAM,IAAI,iBAAS,CAAC,qBAAqB,EAAE,iDAAiD,IAAI,GAAG,CAAC,CAAA;QACvH,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC;YAAE,MAAM,IAAI,iBAAS,CAAC,6BAA6B,EAAE,IAAI,MAAM,CAAC,KAAK,8BAA8B,CAAC,CAAA;QACxI,IAAI,CAAC,MAAM,CAAC,IAAI;YAAE,OAAO,GAAG,MAAM,CAAC,KAAK,cAAc,CAAA;QACtD,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC;YAAE,OAAO,IAAI,CAAA;QACrD,OAAO,GAAG,MAAM,CAAC,KAAK,cAAc,MAAM,CAAC,IAAI,EAAE,CAAA;IACnD,CAAC,CAAC,CAAA;AACJ,CAAC;AATD,oDASC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/plugin-commands-installation",
|
|
3
|
-
"version": "11.0.
|
|
3
|
+
"version": "11.0.10",
|
|
4
4
|
"description": "Commands for installation",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"engines": {
|
|
12
12
|
"node": ">=14.6"
|
|
13
13
|
},
|
|
14
|
-
"repository": "https://github.com/pnpm/pnpm/blob/main/
|
|
14
|
+
"repository": "https://github.com/pnpm/pnpm/blob/main/pkg-manager/plugin-commands-installation",
|
|
15
15
|
"keywords": [
|
|
16
16
|
"pnpm7",
|
|
17
17
|
"pnpm"
|
|
@@ -20,15 +20,9 @@
|
|
|
20
20
|
"bugs": {
|
|
21
21
|
"url": "https://github.com/pnpm/pnpm/issues"
|
|
22
22
|
},
|
|
23
|
-
"homepage": "https://github.com/pnpm/pnpm/blob/main/
|
|
23
|
+
"homepage": "https://github.com/pnpm/pnpm/blob/main/pkg-manager/plugin-commands-installation#readme",
|
|
24
24
|
"devDependencies": {
|
|
25
|
-
"@pnpm/assert-project": "2.3.14",
|
|
26
|
-
"@pnpm/lockfile-types": "4.3.5",
|
|
27
|
-
"@pnpm/modules-yaml": "11.0.2",
|
|
28
|
-
"@pnpm/plugin-commands-installation": "11.0.8",
|
|
29
|
-
"@pnpm/prepare": "0.0.57",
|
|
30
25
|
"@pnpm/registry-mock": "3.1.0",
|
|
31
|
-
"@pnpm/test-fixtures": "0.0.26",
|
|
32
26
|
"@types/is-ci": "^3.0.0",
|
|
33
27
|
"@types/proxyquire": "^1.3.28",
|
|
34
28
|
"@types/ramda": "0.28.15",
|
|
@@ -39,39 +33,22 @@
|
|
|
39
33
|
"path-name": "^1.0.0",
|
|
40
34
|
"proxyquire": "^2.1.3",
|
|
41
35
|
"read-yaml-file": "^2.1.0",
|
|
42
|
-
"sinon": "^14.0.
|
|
43
|
-
"symlink-dir": "^5.0
|
|
36
|
+
"sinon": "^14.0.2",
|
|
37
|
+
"symlink-dir": "^5.1.0",
|
|
44
38
|
"tempy": "^1.0.1",
|
|
45
39
|
"write-json-file": "^4.3.0",
|
|
46
40
|
"write-pkg": "4.0.0",
|
|
47
|
-
"write-yaml-file": "^4.2.0"
|
|
41
|
+
"write-yaml-file": "^4.2.0",
|
|
42
|
+
"@pnpm/assert-project": "2.3.14",
|
|
43
|
+
"@pnpm/lockfile-types": "4.3.5",
|
|
44
|
+
"@pnpm/modules-yaml": "11.0.2",
|
|
45
|
+
"@pnpm/plugin-commands-installation": "11.0.10",
|
|
46
|
+
"@pnpm/prepare": "0.0.57",
|
|
47
|
+
"@pnpm/test-fixtures": "0.0.26"
|
|
48
48
|
},
|
|
49
49
|
"dependencies": {
|
|
50
|
-
"@pnpm/cli-utils": "1.0.8",
|
|
51
50
|
"@pnpm/colorize-semver-diff": "^1.0.1",
|
|
52
|
-
"@pnpm/command": "3.0.0",
|
|
53
|
-
"@pnpm/common-cli-options-help": "0.9.0",
|
|
54
|
-
"@pnpm/config": "16.1.2",
|
|
55
|
-
"@pnpm/constants": "6.1.0",
|
|
56
|
-
"@pnpm/core": "7.1.0",
|
|
57
|
-
"@pnpm/error": "4.0.0",
|
|
58
|
-
"@pnpm/filter-workspace-packages": "6.0.8",
|
|
59
|
-
"@pnpm/find-workspace-dir": "5.0.0",
|
|
60
|
-
"@pnpm/find-workspace-packages": "5.0.8",
|
|
61
|
-
"@pnpm/graceful-fs": "2.0.0",
|
|
62
|
-
"@pnpm/manifest-utils": "4.1.1",
|
|
63
|
-
"@pnpm/matcher": "4.0.0",
|
|
64
|
-
"@pnpm/outdated": "11.0.4",
|
|
65
|
-
"@pnpm/package-store": "15.0.2",
|
|
66
|
-
"@pnpm/parse-wanted-dependency": "4.0.0",
|
|
67
|
-
"@pnpm/plugin-commands-rebuild": "7.0.8",
|
|
68
|
-
"@pnpm/pnpmfile": "4.0.8",
|
|
69
|
-
"@pnpm/read-project-manifest": "4.0.2",
|
|
70
|
-
"@pnpm/resolver-base": "9.1.4",
|
|
71
51
|
"@pnpm/semver-diff": "^1.1.0",
|
|
72
|
-
"@pnpm/sort-packages": "4.0.2",
|
|
73
|
-
"@pnpm/store-connection-manager": "5.1.1",
|
|
74
|
-
"@pnpm/types": "8.9.0",
|
|
75
52
|
"@yarnpkg/core": "4.0.0-rc.27",
|
|
76
53
|
"@yarnpkg/lockfile": "^1.1.0",
|
|
77
54
|
"@yarnpkg/parsers": "3.0.0-rc.27",
|
|
@@ -90,7 +67,30 @@
|
|
|
90
67
|
"path-exists": "^4.0.0",
|
|
91
68
|
"ramda": "npm:@pnpm/ramda@0.28.1",
|
|
92
69
|
"render-help": "^1.0.2",
|
|
93
|
-
"version-selector-type": "^3.0.0"
|
|
70
|
+
"version-selector-type": "^3.0.0",
|
|
71
|
+
"@pnpm/cli-utils": "1.0.10",
|
|
72
|
+
"@pnpm/command": "3.0.0",
|
|
73
|
+
"@pnpm/common-cli-options-help": "0.9.0",
|
|
74
|
+
"@pnpm/config": "16.1.4",
|
|
75
|
+
"@pnpm/constants": "6.1.0",
|
|
76
|
+
"@pnpm/core": "7.2.0",
|
|
77
|
+
"@pnpm/error": "4.0.0",
|
|
78
|
+
"@pnpm/filter-workspace-packages": "6.0.10",
|
|
79
|
+
"@pnpm/find-workspace-dir": "5.0.0",
|
|
80
|
+
"@pnpm/find-workspace-packages": "5.0.10",
|
|
81
|
+
"@pnpm/graceful-fs": "2.0.0",
|
|
82
|
+
"@pnpm/manifest-utils": "4.1.1",
|
|
83
|
+
"@pnpm/matcher": "4.0.1",
|
|
84
|
+
"@pnpm/outdated": "11.0.6",
|
|
85
|
+
"@pnpm/package-store": "15.0.2",
|
|
86
|
+
"@pnpm/parse-wanted-dependency": "4.0.0",
|
|
87
|
+
"@pnpm/plugin-commands-rebuild": "7.0.10",
|
|
88
|
+
"@pnpm/pnpmfile": "4.0.10",
|
|
89
|
+
"@pnpm/read-project-manifest": "4.1.0",
|
|
90
|
+
"@pnpm/resolver-base": "9.1.4",
|
|
91
|
+
"@pnpm/sort-packages": "4.0.2",
|
|
92
|
+
"@pnpm/store-connection-manager": "5.1.3",
|
|
93
|
+
"@pnpm/types": "8.9.0"
|
|
94
94
|
},
|
|
95
95
|
"peerDependencies": {
|
|
96
96
|
"@pnpm/logger": "^5.0.0"
|
|
@@ -105,7 +105,7 @@
|
|
|
105
105
|
"registry-mock": "registry-mock",
|
|
106
106
|
"test:jest": "jest",
|
|
107
107
|
"test:e2e": "registry-mock prepare && run-p -r registry-mock test:jest",
|
|
108
|
-
"_test": "cross-env PNPM_REGISTRY_MOCK_PORT=
|
|
108
|
+
"_test": "cross-env PNPM_REGISTRY_MOCK_PORT=7775 pnpm run test:e2e",
|
|
109
109
|
"test": "pnpm run compile && pnpm run _test",
|
|
110
110
|
"compile": "tsc --build && pnpm run lint --fix"
|
|
111
111
|
}
|