@pnpm/plugin-commands-installation 10.8.4 → 11.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/add.js +6 -6
- package/lib/add.js.map +1 -1
- package/lib/fetch.d.ts +1 -1
- package/lib/fetch.js +6 -9
- package/lib/fetch.js.map +1 -1
- package/lib/getOptionsFromRootManifest.d.ts +1 -1
- package/lib/getOptionsFromRootManifest.js +2 -1
- package/lib/getOptionsFromRootManifest.js.map +1 -1
- package/lib/getPinnedVersion.d.ts +2 -2
- package/lib/getPinnedVersion.js +2 -1
- package/lib/getPinnedVersion.js.map +1 -1
- package/lib/getSaveType.d.ts +1 -1
- package/lib/getSaveType.js +2 -1
- package/lib/getSaveType.js.map +1 -1
- package/lib/import/index.d.ts +1 -1
- package/lib/import/index.js +13 -13
- package/lib/import/index.js.map +1 -1
- package/lib/install.d.ts +1 -1
- package/lib/install.js +2 -2
- package/lib/install.js.map +1 -1
- package/lib/installDeps.d.ts +2 -2
- package/lib/installDeps.js +29 -49
- package/lib/installDeps.js.map +1 -1
- package/lib/link.js +12 -12
- package/lib/link.js.map +1 -1
- package/lib/nodeExecPath.d.ts +1 -1
- package/lib/nodeExecPath.js +3 -2
- package/lib/nodeExecPath.js.map +1 -1
- package/lib/recursive.d.ts +2 -1
- package/lib/recursive.js +48 -78
- package/lib/recursive.js.map +1 -1
- package/lib/remove.d.ts +1 -1
- package/lib/remove.js +25 -44
- package/lib/remove.js.map +1 -1
- package/lib/unlink.d.ts +2 -2
- package/lib/unlink.js +19 -18
- package/lib/unlink.js.map +1 -1
- package/lib/update/getUpdateChoices.d.ts +1 -1
- package/lib/update/getUpdateChoices.js +3 -2
- package/lib/update/getUpdateChoices.js.map +1 -1
- package/lib/update/index.js +6 -6
- package/lib/update/index.js.map +1 -1
- package/lib/updateToLatestSpecsFromManifest.d.ts +1 -1
- package/lib/updateToLatestSpecsFromManifest.js +2 -2
- package/lib/updateToLatestSpecsFromManifest.js.map +1 -1
- package/lib/updateWorkspaceDependencies.js +5 -8
- package/lib/updateWorkspaceDependencies.js.map +1 -1
- package/package.json +30 -30
package/lib/add.js
CHANGED
|
@@ -7,10 +7,10 @@ exports.handler = exports.help = exports.commandNames = exports.cliOptionsTypes
|
|
|
7
7
|
const cli_utils_1 = require("@pnpm/cli-utils");
|
|
8
8
|
const common_cli_options_help_1 = require("@pnpm/common-cli-options-help");
|
|
9
9
|
const config_1 = require("@pnpm/config");
|
|
10
|
-
const error_1 =
|
|
10
|
+
const error_1 = require("@pnpm/error");
|
|
11
11
|
const pick_1 = __importDefault(require("ramda/src/pick"));
|
|
12
12
|
const render_help_1 = __importDefault(require("render-help"));
|
|
13
|
-
const installDeps_1 =
|
|
13
|
+
const installDeps_1 = require("./installDeps");
|
|
14
14
|
function rcOptionsTypes() {
|
|
15
15
|
return (0, pick_1.default)([
|
|
16
16
|
'cache-dir',
|
|
@@ -165,16 +165,16 @@ For options that may be used with `-r`, see "pnpm help recursive"',
|
|
|
165
165
|
exports.help = help;
|
|
166
166
|
async function handler(opts, params) {
|
|
167
167
|
if (opts.cliOptions['save'] === false) {
|
|
168
|
-
throw new error_1.
|
|
168
|
+
throw new error_1.PnpmError('OPTION_NOT_SUPPORTED', 'The "add" command currently does not support the no-save option');
|
|
169
169
|
}
|
|
170
170
|
if (!params || (params.length === 0)) {
|
|
171
|
-
throw new error_1.
|
|
171
|
+
throw new error_1.PnpmError('MISSING_PACKAGE_NAME', '`pnpm add` requires the package name');
|
|
172
172
|
}
|
|
173
173
|
if (!opts.recursive &&
|
|
174
174
|
opts.workspaceDir === opts.dir &&
|
|
175
175
|
!opts.ignoreWorkspaceRootCheck &&
|
|
176
176
|
!opts.workspaceRoot) {
|
|
177
|
-
throw new error_1.
|
|
177
|
+
throw new error_1.PnpmError('ADDING_TO_ROOT', 'Running this command will add the dependency to the workspace root, ' +
|
|
178
178
|
'which might not be what you want - if you really meant it, ' +
|
|
179
179
|
'make it explicit by running this command again with the -w flag (or --workspace-root). ' +
|
|
180
180
|
'If you don\'t want to see this warning anymore, you may set the ignore-workspace-root-check setting to true.');
|
|
@@ -184,7 +184,7 @@ async function handler(opts, params) {
|
|
|
184
184
|
devDependencies: opts.dev !== false,
|
|
185
185
|
optionalDependencies: opts.optional !== false,
|
|
186
186
|
};
|
|
187
|
-
return (0, installDeps_1.
|
|
187
|
+
return (0, installDeps_1.installDeps)({
|
|
188
188
|
...opts,
|
|
189
189
|
include,
|
|
190
190
|
includeDirect: include,
|
package/lib/add.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add.js","sourceRoot":"","sources":["../src/add.ts"],"names":[],"mappings":";;;;;;AAAA,+CAAyC;AACzC,2EAAqF;AACrF,yCAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"add.js","sourceRoot":"","sources":["../src/add.ts"],"names":[],"mappings":"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"}
|
package/lib/fetch.d.ts
CHANGED
|
@@ -8,4 +8,4 @@ export declare const rcOptionsTypes: () => {
|
|
|
8
8
|
export { cliOptionsTypes };
|
|
9
9
|
export declare const commandNames: string[];
|
|
10
10
|
export declare function help(): string;
|
|
11
|
-
export declare function handler(opts: Pick<Config, 'production' | 'dev'> & CreateStoreControllerOptions): Promise<import("@pnpm/core").UpdatedProject
|
|
11
|
+
export declare function handler(opts: Pick<Config, 'production' | 'dev'> & CreateStoreControllerOptions): Promise<import("@pnpm/core").UpdatedProject>;
|
package/lib/fetch.js
CHANGED
|
@@ -45,15 +45,12 @@ async function handler(opts) {
|
|
|
45
45
|
// when including optional deps, production is also required when perform headless install
|
|
46
46
|
optionalDependencies: opts.production !== false,
|
|
47
47
|
};
|
|
48
|
-
return (0, core_1.
|
|
49
|
-
{
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
rootDir: process.cwd(),
|
|
55
|
-
},
|
|
56
|
-
], {
|
|
48
|
+
return (0, core_1.mutateModulesInSingleProject)({
|
|
49
|
+
manifest: {},
|
|
50
|
+
mutation: 'install',
|
|
51
|
+
pruneDirectDependencies: true,
|
|
52
|
+
rootDir: process.cwd(),
|
|
53
|
+
}, {
|
|
57
54
|
...opts,
|
|
58
55
|
ignorePackageManifest: true,
|
|
59
56
|
include,
|
package/lib/fetch.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":";;;;;;AAAA,+CAAyC;AACzC,2EAAiE;AAEjE,6EAA6G;AAC7G,
|
|
1
|
+
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":";;;;;;AAAA,+CAAyC;AACzC,2EAAiE;AAEjE,6EAA6G;AAC7G,qCAAyE;AACzE,8DAAoC;AACpC,uCAA2C;AAIlC,gGAJA,yBAAe,OAIA;AAFX,QAAA,cAAc,GAAG,yBAAe,CAAA;AAIhC,QAAA,YAAY,GAAG,CAAC,OAAO,CAAC,CAAA;AAErC,SAAgB,IAAI;IAClB,OAAO,IAAA,qBAAU,EAAC;QAChB,WAAW,EAAE,+LAA+L;QAC5M,gBAAgB,EAAE;YAChB;gBACE,KAAK,EAAE,SAAS;gBAEhB,IAAI,EAAE;oBACJ;wBACE,WAAW,EAAE,2CAA2C;wBACxD,IAAI,EAAE,OAAO;qBACd;oBACD;wBACE,WAAW,EAAE,0CAA0C;wBACvD,IAAI,EAAE,QAAQ;qBACf;oBACD,GAAG,2CAAiB;iBACrB;aACF;SACF;QACD,GAAG,EAAE,IAAA,mBAAO,EAAC,OAAO,CAAC;QACrB,MAAM,EAAE,CAAC,6BAA6B,CAAC;KACxC,CAAC,CAAA;AACJ,CAAC;AAvBD,oBAuBC;AAEM,KAAK,UAAU,OAAO,CAC3B,IAAuE;IAEvE,MAAM,KAAK,GAAG,MAAM,IAAA,yDAA8B,EAAC,IAAI,CAAC,CAAA;IACxD,MAAM,OAAO,GAAG;QACd,YAAY,EAAE,IAAI,CAAC,UAAU,KAAK,KAAK;QACvC,eAAe,EAAE,IAAI,CAAC,GAAG,KAAK,KAAK;QACnC,0FAA0F;QAC1F,oBAAoB,EAAE,IAAI,CAAC,UAAU,KAAK,KAAK;KAChD,CAAA;IACD,OAAO,IAAA,mCAA4B,EAAC;QAClC,QAAQ,EAAE,EAAE;QACZ,QAAQ,EAAE,SAAS;QACnB,uBAAuB,EAAE,IAAI;QAC7B,OAAO,EAAE,OAAO,CAAC,GAAG,EAAE;KACvB,EAAE;QACD,GAAG,IAAI;QACP,qBAAqB,EAAE,IAAI;QAC3B,OAAO;QACP,kBAAkB,EAAE,CAAC;QACrB,UAAU,EAAE,IAAI;QAChB,eAAe,EAAE,KAAK,CAAC,IAAI;QAC3B,QAAQ,EAAE,KAAK,CAAC,GAAG;KACF,CAAC,CAAA;AACtB,CAAC;AAxBD,0BAwBC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AllowedDeprecatedVersions, PackageExtension, PeerDependencyRules, ProjectManifest } from '@pnpm/types';
|
|
2
|
-
export
|
|
2
|
+
export declare function getOptionsFromRootManifest(manifest: ProjectManifest): {
|
|
3
3
|
allowedDeprecatedVersions?: AllowedDeprecatedVersions;
|
|
4
4
|
allowNonAppliedPatches?: boolean;
|
|
5
5
|
overrides?: Record<string, string>;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getOptionsFromRootManifest = void 0;
|
|
3
4
|
function getOptionsFromRootManifest(manifest) {
|
|
4
5
|
// We read Yarn's resolutions field for compatibility
|
|
5
6
|
// but we really replace the version specs to any other version spec, not only to exact versions,
|
|
@@ -26,5 +27,5 @@ function getOptionsFromRootManifest(manifest) {
|
|
|
26
27
|
}
|
|
27
28
|
return settings;
|
|
28
29
|
}
|
|
29
|
-
exports.
|
|
30
|
+
exports.getOptionsFromRootManifest = getOptionsFromRootManifest;
|
|
30
31
|
//# sourceMappingURL=getOptionsFromRootManifest.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getOptionsFromRootManifest.js","sourceRoot":"","sources":["../src/getOptionsFromRootManifest.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getOptionsFromRootManifest.js","sourceRoot":"","sources":["../src/getOptionsFromRootManifest.ts"],"names":[],"mappings":";;;AAOA,SAAgB,0BAA0B,CAAE,QAAyB;IAUnE,qDAAqD;IACrD,iGAAiG;IACjG,mCAAmC;IACnC,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,EAAE,SAAS,IAAI,QAAQ,CAAC,WAAW,CAAA;IAClE,MAAM,sBAAsB,GAAG,QAAQ,CAAC,IAAI,EAAE,sBAAsB,CAAA;IACpE,MAAM,qBAAqB,GAAG,QAAQ,CAAC,IAAI,EAAE,qBAAqB,CAAA;IAClE,MAAM,iBAAiB,GAAG,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAA;IAC1D,MAAM,mBAAmB,GAAG,QAAQ,CAAC,IAAI,EAAE,mBAAmB,CAAA;IAC9D,MAAM,yBAAyB,GAAG,QAAQ,CAAC,IAAI,EAAE,yBAAyB,CAAA;IAC1E,MAAM,sBAAsB,GAAG,QAAQ,CAAC,IAAI,EAAE,sBAAsB,CAAA;IACpE,MAAM,mBAAmB,GAAG,QAAQ,CAAC,IAAI,EAAE,mBAAmB,CAAA;IAC9D,MAAM,QAAQ,GAAG;QACf,yBAAyB;QACzB,sBAAsB;QACtB,SAAS;QACT,sBAAsB;QACtB,iBAAiB;QACjB,mBAAmB;QACnB,mBAAmB;KACpB,CAAA;IACD,IAAI,qBAAqB,EAAE;QACzB,QAAQ,CAAC,uBAAuB,CAAC,GAAG,qBAAqB,CAAA;KAC1D;IACD,OAAO,QAAQ,CAAA;AACjB,CAAC;AAlCD,gEAkCC"}
|
package/lib/getPinnedVersion.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getPinnedVersion = void 0;
|
|
3
4
|
function getPinnedVersion(opts) {
|
|
4
5
|
if (opts.saveExact === true || opts.savePrefix === '')
|
|
5
6
|
return 'patch';
|
|
6
7
|
return opts.savePrefix === '~' ? 'minor' : 'major';
|
|
7
8
|
}
|
|
8
|
-
exports.
|
|
9
|
+
exports.getPinnedVersion = getPinnedVersion;
|
|
9
10
|
//# sourceMappingURL=getPinnedVersion.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPinnedVersion.js","sourceRoot":"","sources":["../src/getPinnedVersion.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getPinnedVersion.js","sourceRoot":"","sources":["../src/getPinnedVersion.ts"],"names":[],"mappings":";;;AAAA,SAAgB,gBAAgB,CAAE,IAAkD;IAClF,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI,IAAI,IAAI,CAAC,UAAU,KAAK,EAAE;QAAE,OAAO,OAAO,CAAA;IACrE,OAAO,IAAI,CAAC,UAAU,KAAK,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAA;AACpD,CAAC;AAHD,4CAGC"}
|
package/lib/getSaveType.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { Config } from '@pnpm/config';
|
|
2
2
|
import { DependenciesField } from '@pnpm/types';
|
|
3
|
-
export
|
|
3
|
+
export declare function getSaveType(opts: Pick<Config, 'saveDev' | 'saveOptional' | 'saveProd' | 'savePeer'>): DependenciesField | undefined;
|
package/lib/getSaveType.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getSaveType = void 0;
|
|
3
4
|
function getSaveType(opts) {
|
|
4
5
|
if (opts.saveDev === true || opts.savePeer)
|
|
5
6
|
return 'devDependencies';
|
|
@@ -9,5 +10,5 @@ function getSaveType(opts) {
|
|
|
9
10
|
return 'dependencies';
|
|
10
11
|
return undefined;
|
|
11
12
|
}
|
|
12
|
-
exports.
|
|
13
|
+
exports.getSaveType = getSaveType;
|
|
13
14
|
//# sourceMappingURL=getSaveType.js.map
|
package/lib/getSaveType.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSaveType.js","sourceRoot":"","sources":["../src/getSaveType.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getSaveType.js","sourceRoot":"","sources":["../src/getSaveType.ts"],"names":[],"mappings":";;;AAGA,SAAgB,WAAW,CACzB,IAAwE;IAExE,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI,IAAI,IAAI,CAAC,QAAQ;QAAE,OAAO,iBAAiB,CAAA;IACpE,IAAI,IAAI,CAAC,YAAY;QAAE,OAAO,sBAAsB,CAAA;IACpD,IAAI,IAAI,CAAC,QAAQ;QAAE,OAAO,cAAc,CAAA;IACxC,OAAO,SAAS,CAAA;AAClB,CAAC;AAPD,kCAOC"}
|
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 declare type ImportCommandOptions = Pick<Config, 'allProjects' | 'selectedProjectsGraph' | 'workspaceDir'> & CreateStoreControllerOptions & Omit<InstallOptions, 'storeController' | 'lockfileOnly' | 'preferredVersions'>;
|
|
8
|
+
export declare 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
|
@@ -30,13 +30,13 @@ exports.handler = exports.commandNames = exports.help = exports.cliOptionsTypes
|
|
|
30
30
|
const path_1 = __importDefault(require("path"));
|
|
31
31
|
const cli_utils_1 = require("@pnpm/cli-utils");
|
|
32
32
|
const constants_1 = require("@pnpm/constants");
|
|
33
|
-
const error_1 =
|
|
33
|
+
const error_1 = require("@pnpm/error");
|
|
34
34
|
const read_project_manifest_1 = require("@pnpm/read-project-manifest");
|
|
35
35
|
const store_connection_manager_1 = require("@pnpm/store-connection-manager");
|
|
36
36
|
const graceful_fs_1 = __importDefault(require("@pnpm/graceful-fs"));
|
|
37
37
|
const core_1 = require("@pnpm/core");
|
|
38
|
-
const find_workspace_packages_1 =
|
|
39
|
-
const logger_1 =
|
|
38
|
+
const find_workspace_packages_1 = require("@pnpm/find-workspace-packages");
|
|
39
|
+
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"));
|
|
@@ -45,8 +45,8 @@ const lockfile_1 = require("@yarnpkg/lockfile");
|
|
|
45
45
|
const yarnCore = __importStar(require("@yarnpkg/core"));
|
|
46
46
|
const parsers_1 = require("@yarnpkg/parsers");
|
|
47
47
|
const path_exists_1 = __importDefault(require("path-exists"));
|
|
48
|
-
const getOptionsFromRootManifest_1 =
|
|
49
|
-
const recursive_1 =
|
|
48
|
+
const getOptionsFromRootManifest_1 = require("../getOptionsFromRootManifest");
|
|
49
|
+
const recursive_1 = require("../recursive");
|
|
50
50
|
const yarnUtil_1 = require("./yarnUtil");
|
|
51
51
|
var YarnLockType;
|
|
52
52
|
(function (YarnLockType) {
|
|
@@ -85,12 +85,12 @@ async function handler(opts, params) {
|
|
|
85
85
|
getAllVersionsByPackageNames(npmPackageLock, versionsByPackageNames);
|
|
86
86
|
}
|
|
87
87
|
else {
|
|
88
|
-
throw new error_1.
|
|
88
|
+
throw new error_1.PnpmError('LOCKFILE_NOT_FOUND', 'No lockfile found');
|
|
89
89
|
}
|
|
90
90
|
preferredVersions = getPreferredVersions(versionsByPackageNames);
|
|
91
91
|
// For a workspace with shared lockfile
|
|
92
92
|
if (opts.workspaceDir) {
|
|
93
|
-
const allProjects = opts.allProjects ?? await (0, find_workspace_packages_1.
|
|
93
|
+
const allProjects = opts.allProjects ?? await (0, find_workspace_packages_1.findWorkspacePackages)(opts.workspaceDir, opts);
|
|
94
94
|
const selectedProjectsGraph = opts.selectedProjectsGraph ?? selectProjectByDir(allProjects, opts.dir);
|
|
95
95
|
if (selectedProjectsGraph != null) {
|
|
96
96
|
const sequencedGraph = (0, sort_packages_1.sequenceGraph)(selectedProjectsGraph);
|
|
@@ -99,12 +99,12 @@ async function handler(opts, params) {
|
|
|
99
99
|
const cyclicDependenciesInfo = sequencedGraph.cycles.length > 0
|
|
100
100
|
? `: ${sequencedGraph.cycles.map(deps => deps.join(', ')).join('; ')}`
|
|
101
101
|
: '';
|
|
102
|
-
logger_1.
|
|
102
|
+
logger_1.logger.warn({
|
|
103
103
|
message: `There are cyclic workspace dependencies${cyclicDependenciesInfo}`,
|
|
104
104
|
prefix: opts.workspaceDir,
|
|
105
105
|
});
|
|
106
106
|
}
|
|
107
|
-
await (0, recursive_1.
|
|
107
|
+
await (0, recursive_1.recursive)(allProjects, params,
|
|
108
108
|
// @ts-expect-error
|
|
109
109
|
{
|
|
110
110
|
...opts,
|
|
@@ -120,7 +120,7 @@ async function handler(opts, params) {
|
|
|
120
120
|
const manifest = await (0, read_project_manifest_1.readProjectManifestOnly)(opts.dir);
|
|
121
121
|
const installOpts = {
|
|
122
122
|
...opts,
|
|
123
|
-
...(0, getOptionsFromRootManifest_1.
|
|
123
|
+
...(0, getOptionsFromRootManifest_1.getOptionsFromRootManifest)(manifest),
|
|
124
124
|
lockfileOnly: true,
|
|
125
125
|
preferredVersions,
|
|
126
126
|
storeController: store.ctrl,
|
|
@@ -140,7 +140,7 @@ async function readYarnLockFile(dir) {
|
|
|
140
140
|
return lockJsonFile.object;
|
|
141
141
|
}
|
|
142
142
|
else {
|
|
143
|
-
throw new error_1.
|
|
143
|
+
throw new error_1.PnpmError('YARN_LOCKFILE_PARSE_FAILED', `Yarn.lock file was ${lockJsonFile.type}`);
|
|
144
144
|
}
|
|
145
145
|
}
|
|
146
146
|
else if (yarnLockFileType === YarnLockType.yarn2) {
|
|
@@ -154,7 +154,7 @@ async function readYarnLockFile(dir) {
|
|
|
154
154
|
if (err['code'] !== 'ENOENT')
|
|
155
155
|
throw err;
|
|
156
156
|
}
|
|
157
|
-
throw new error_1.
|
|
157
|
+
throw new error_1.PnpmError('YARN_LOCKFILE_NOT_FOUND', 'No yarn.lock found');
|
|
158
158
|
}
|
|
159
159
|
function parseYarn2Lock(lockFileContents) {
|
|
160
160
|
// eslint-disable-next-line
|
|
@@ -191,7 +191,7 @@ async function readNpmLockfile(dir) {
|
|
|
191
191
|
if (err['code'] !== 'ENOENT')
|
|
192
192
|
throw err;
|
|
193
193
|
}
|
|
194
|
-
throw new error_1.
|
|
194
|
+
throw new error_1.PnpmError('NPM_LOCKFILE_NOT_FOUND', 'No package-lock.json or npm-shrinkwrap.json found');
|
|
195
195
|
}
|
|
196
196
|
function getPreferredVersions(versionsByPackageNames) {
|
|
197
197
|
const preferredVersions = {};
|
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,
|
|
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,CAC3B,sBAEC;IAED,MAAM,iBAAiB,GAAG,EAAE,CAAA;IAC5B,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,EAAE;QAC7D,iBAAiB,CAAC,WAAW,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;YACvG,GAAG,CAAC,OAAO,CAAC,GAAG,SAAS,CAAA;YACxB,OAAO,GAAG,CAAA;QACZ,CAAC,EAAE,EAAE,CAAC,CAAA;KACP;IACD,OAAO,iBAAiB,CAAA;AAC1B,CAAC;AAED,SAAS,4BAA4B,CACnC,cAA8C,EAC9C,sBAEC;IAED,IAAI,cAAc,CAAC,YAAY,IAAI,IAAI;QAAE,OAAM;IAC/C,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,EAAE;QAClE,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,EAAE;YACxC,sBAAsB,CAAC,WAAW,CAAC,GAAG,IAAI,GAAG,EAAE,CAAA;SAChD;QACD,sBAAsB,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAA;KAC1F;IACD,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,EAAE;QAClE,4BAA4B,CAAC,cAAc,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,sBAAsB,CAAC,CAAA;KAC/F;AACH,CAAC;AAED,SAAS,8BAA8B,CACrC,eAAgC,EAChC,sBAEC;IAED,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE;QACtD,MAAM,OAAO,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAA;QACtE,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,EAAE;YACpC,sBAAsB,CAAC,OAAO,CAAC,GAAG,IAAI,GAAG,EAAE,CAAA;SAC5C;QACD,sBAAsB,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAA;KAC1E;AACH,CAAC;AAED,SAAS,kBAAkB,CAAE,QAAmB,EAAE,WAAmB;IACnE,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,cAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,WAAW,CAAC,KAAK,EAAE,CAAC,CAAA;IAClF,IAAI,OAAO,IAAI,IAAI;QAAE,OAAO,SAAS,CAAA;IACrC,OAAO,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,CAAA;AAClE,CAAC;AAED,SAAS,mBAAmB,CAC1B,gBAAwB;IAExB,OAAO,gBAAgB,CAAC,QAAQ,CAAC,YAAY,CAAC;QAC5C,CAAC,CAAC,YAAY,CAAC,KAAK;QACpB,CAAC,CAAC,YAAY,CAAC,IAAI,CAAA;AACvB,CAAC"}
|
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 declare 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' | 'selectedProjectsGraph' | 'sideEffectsCache' | 'sideEffectsCacheReadonly' | 'sort' | 'sharedWorkspaceLockfile' | 'tag' | 'optional' | 'virtualStoreDir' | 'workspaceConcurrency' | 'workspaceDir' | 'extraEnv'> & CreateStoreControllerOptions & {
|
|
14
|
+
export declare 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/install.js
CHANGED
|
@@ -11,7 +11,7 @@ const constants_1 = require("@pnpm/constants");
|
|
|
11
11
|
const is_ci_1 = __importDefault(require("is-ci"));
|
|
12
12
|
const pick_1 = __importDefault(require("ramda/src/pick"));
|
|
13
13
|
const render_help_1 = __importDefault(require("render-help"));
|
|
14
|
-
const installDeps_1 =
|
|
14
|
+
const installDeps_1 = require("./installDeps");
|
|
15
15
|
function rcOptionsTypes() {
|
|
16
16
|
return (0, pick_1.default)([
|
|
17
17
|
'cache-dir',
|
|
@@ -243,7 +243,7 @@ async function handler(opts) {
|
|
|
243
243
|
devDependencies: opts.dev !== false,
|
|
244
244
|
optionalDependencies: opts.optional !== false,
|
|
245
245
|
};
|
|
246
|
-
return (0, installDeps_1.
|
|
246
|
+
return (0, installDeps_1.installDeps)({
|
|
247
247
|
...opts,
|
|
248
248
|
frozenLockfileIfExists: is_ci_1.default && !opts.lockfileOnly &&
|
|
249
249
|
typeof opts.rawLocalConfig['frozen-lockfile'] === 'undefined' &&
|
package/lib/install.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install.js","sourceRoot":"","sources":["../src/install.ts"],"names":[],"mappings":";;;;;;AAAA,+CAAyC;AACzC,2EAAqG;AACrG,yCAAwD;AACxD,+CAAiD;AAEjD,kDAAwB;AACxB,0DAAiC;AACjC,8DAAoC;AACpC
|
|
1
|
+
{"version":3,"file":"install.js","sourceRoot":"","sources":["../src/install.ts"],"names":[],"mappings":"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"}
|
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 declare type InstallDepsOptions = Pick<Config, 'allProjects' | '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 & {
|
|
4
|
+
export declare 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
|
};
|
|
@@ -17,4 +17,4 @@ export declare type InstallDepsOptions = Pick<Config, 'allProjects' | 'autoInsta
|
|
|
17
17
|
recursive?: boolean;
|
|
18
18
|
workspace?: boolean;
|
|
19
19
|
} & Partial<Pick<Config, 'pnpmHomeDir'>>;
|
|
20
|
-
export
|
|
20
|
+
export declare function installDeps(opts: InstallDepsOptions, params: string[]): Promise<void>;
|
package/lib/installDeps.js
CHANGED
|
@@ -1,64 +1,42 @@
|
|
|
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
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
4
|
};
|
|
28
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.installDeps = void 0;
|
|
29
7
|
const path_1 = __importDefault(require("path"));
|
|
30
8
|
const cli_utils_1 = require("@pnpm/cli-utils");
|
|
31
|
-
const error_1 =
|
|
9
|
+
const error_1 = require("@pnpm/error");
|
|
32
10
|
const filter_workspace_packages_1 = require("@pnpm/filter-workspace-packages");
|
|
33
|
-
const find_workspace_packages_1 =
|
|
11
|
+
const find_workspace_packages_1 = require("@pnpm/find-workspace-packages");
|
|
34
12
|
const plugin_commands_rebuild_1 = require("@pnpm/plugin-commands-rebuild");
|
|
35
13
|
const store_connection_manager_1 = require("@pnpm/store-connection-manager");
|
|
36
14
|
const core_1 = require("@pnpm/core");
|
|
37
|
-
const logger_1 =
|
|
15
|
+
const logger_1 = require("@pnpm/logger");
|
|
38
16
|
const sort_packages_1 = require("@pnpm/sort-packages");
|
|
39
17
|
const is_subdir_1 = __importDefault(require("is-subdir"));
|
|
40
|
-
const getOptionsFromRootManifest_1 =
|
|
41
|
-
const getPinnedVersion_1 =
|
|
42
|
-
const getSaveType_1 =
|
|
43
|
-
const nodeExecPath_1 =
|
|
44
|
-
const recursive_1 =
|
|
45
|
-
const updateToLatestSpecsFromManifest_1 =
|
|
18
|
+
const getOptionsFromRootManifest_1 = require("./getOptionsFromRootManifest");
|
|
19
|
+
const getPinnedVersion_1 = require("./getPinnedVersion");
|
|
20
|
+
const getSaveType_1 = require("./getSaveType");
|
|
21
|
+
const nodeExecPath_1 = require("./nodeExecPath");
|
|
22
|
+
const recursive_1 = require("./recursive");
|
|
23
|
+
const updateToLatestSpecsFromManifest_1 = require("./updateToLatestSpecsFromManifest");
|
|
46
24
|
const updateWorkspaceDependencies_1 = require("./updateWorkspaceDependencies");
|
|
47
25
|
const OVERWRITE_UPDATE_OPTIONS = {
|
|
48
26
|
allowNew: true,
|
|
49
27
|
update: false,
|
|
50
28
|
};
|
|
51
|
-
async function
|
|
29
|
+
async function installDeps(opts, params) {
|
|
52
30
|
if (opts.workspace) {
|
|
53
31
|
if (opts.latest) {
|
|
54
|
-
throw new error_1.
|
|
32
|
+
throw new error_1.PnpmError('BAD_OPTIONS', 'Cannot use --latest with --workspace simultaneously');
|
|
55
33
|
}
|
|
56
34
|
if (!opts.workspaceDir) {
|
|
57
|
-
throw new error_1.
|
|
35
|
+
throw new error_1.PnpmError('WORKSPACE_OPTION_OUTSIDE_WORKSPACE', '--workspace can only be used inside a workspace');
|
|
58
36
|
}
|
|
59
37
|
if (!opts.linkWorkspacePackages && !opts.saveWorkspaceProtocol) {
|
|
60
38
|
if (opts.rawLocalConfig['save-workspace-protocol'] === false) {
|
|
61
|
-
throw new error_1.
|
|
39
|
+
throw new error_1.PnpmError('BAD_OPTIONS', 'This workspace has link-workspace-packages turned off, \
|
|
62
40
|
so dependencies are linked from the workspace only when the workspace protocol is used. \
|
|
63
41
|
Either set link-workspace-packages to true or don\'t use the --no-save-workspace-protocol option \
|
|
64
42
|
when running add/update with the --workspace option');
|
|
@@ -78,7 +56,7 @@ when running add/update with the --workspace option');
|
|
|
78
56
|
typeof opts.rawLocalConfig['hoist'] !== 'undefined';
|
|
79
57
|
const forcePublicHoistPattern = typeof opts.rawLocalConfig['shamefully-hoist'] !== 'undefined' ||
|
|
80
58
|
typeof opts.rawLocalConfig['public-hoist-pattern'] !== 'undefined';
|
|
81
|
-
const allProjects = opts.allProjects ?? (opts.workspaceDir ? await (0, find_workspace_packages_1.
|
|
59
|
+
const allProjects = opts.allProjects ?? (opts.workspaceDir ? await (0, find_workspace_packages_1.findWorkspacePackages)(opts.workspaceDir, opts) : []);
|
|
82
60
|
if (opts.workspaceDir) {
|
|
83
61
|
const selectedProjectsGraph = opts.selectedProjectsGraph ?? selectProjectByDir(allProjects, opts.dir);
|
|
84
62
|
if (selectedProjectsGraph != null) {
|
|
@@ -88,15 +66,16 @@ when running add/update with the --workspace option');
|
|
|
88
66
|
const cyclicDependenciesInfo = sequencedGraph.cycles.length > 0
|
|
89
67
|
? `: ${sequencedGraph.cycles.map(deps => deps.join(', ')).join('; ')}`
|
|
90
68
|
: '';
|
|
91
|
-
logger_1.
|
|
69
|
+
logger_1.logger.warn({
|
|
92
70
|
message: `There are cyclic workspace dependencies${cyclicDependenciesInfo}`,
|
|
93
71
|
prefix: opts.workspaceDir,
|
|
94
72
|
});
|
|
95
73
|
}
|
|
96
|
-
await (0, recursive_1.
|
|
74
|
+
await (0, recursive_1.recursive)(allProjects, params, {
|
|
97
75
|
...opts,
|
|
98
76
|
forceHoistPattern,
|
|
99
77
|
forcePublicHoistPattern,
|
|
78
|
+
allProjectsGraph: selectedProjectsGraph,
|
|
100
79
|
selectedProjectsGraph,
|
|
101
80
|
workspaceDir: opts.workspaceDir,
|
|
102
81
|
}, opts.update ? 'update' : (params.length === 0 ? 'install' : 'add'));
|
|
@@ -113,14 +92,14 @@ when running add/update with the --workspace option');
|
|
|
113
92
|
let { manifest, writeProjectManifest } = await (0, cli_utils_1.tryReadProjectManifest)(opts.dir, opts);
|
|
114
93
|
if (manifest === null) {
|
|
115
94
|
if (opts.update === true || params.length === 0) {
|
|
116
|
-
throw new error_1.
|
|
95
|
+
throw new error_1.PnpmError('NO_PKG_MANIFEST', `No package.json found in ${opts.dir}`);
|
|
117
96
|
}
|
|
118
97
|
manifest = {};
|
|
119
98
|
}
|
|
120
99
|
const store = await (0, store_connection_manager_1.createOrConnectStoreController)(opts);
|
|
121
100
|
const installOpts = {
|
|
122
101
|
...opts,
|
|
123
|
-
...(0, getOptionsFromRootManifest_1.
|
|
102
|
+
...(0, getOptionsFromRootManifest_1.getOptionsFromRootManifest)(manifest),
|
|
124
103
|
forceHoistPattern,
|
|
125
104
|
forcePublicHoistPattern,
|
|
126
105
|
// In case installation is done in a multi-package repository
|
|
@@ -135,7 +114,7 @@ when running add/update with the --workspace option');
|
|
|
135
114
|
workspacePackages,
|
|
136
115
|
};
|
|
137
116
|
if (opts.global && opts.pnpmHomeDir != null) {
|
|
138
|
-
const nodeExecPath = await (0, nodeExecPath_1.
|
|
117
|
+
const nodeExecPath = await (0, nodeExecPath_1.getNodeExecPath)();
|
|
139
118
|
if ((0, is_subdir_1.default)(opts.pnpmHomeDir, nodeExecPath)) {
|
|
140
119
|
installOpts['nodeExecPath'] = nodeExecPath;
|
|
141
120
|
}
|
|
@@ -156,12 +135,12 @@ when running add/update with the --workspace option');
|
|
|
156
135
|
if (updateMatch != null) {
|
|
157
136
|
params = (0, recursive_1.matchDependencies)(updateMatch, manifest, includeDirect);
|
|
158
137
|
if (params.length === 0 && opts.depth === 0) {
|
|
159
|
-
throw new error_1.
|
|
138
|
+
throw new error_1.PnpmError('NO_PACKAGE_IN_DEPENDENCIES', 'None of the specified packages were found in the dependencies.');
|
|
160
139
|
}
|
|
161
140
|
}
|
|
162
141
|
if (opts.update && opts.latest) {
|
|
163
142
|
if (!params || (params.length === 0)) {
|
|
164
|
-
params = (0, updateToLatestSpecsFromManifest_1.
|
|
143
|
+
params = (0, updateToLatestSpecsFromManifest_1.updateToLatestSpecsFromManifest)(manifest, includeDirect);
|
|
165
144
|
}
|
|
166
145
|
else {
|
|
167
146
|
params = (0, updateToLatestSpecsFromManifest_1.createLatestSpecs)(params, manifest);
|
|
@@ -183,11 +162,11 @@ when running add/update with the --workspace option');
|
|
|
183
162
|
manifest,
|
|
184
163
|
mutation: 'installSome',
|
|
185
164
|
peer: opts.savePeer,
|
|
186
|
-
pinnedVersion: (0, getPinnedVersion_1.
|
|
165
|
+
pinnedVersion: (0, getPinnedVersion_1.getPinnedVersion)(opts),
|
|
187
166
|
rootDir: opts.dir,
|
|
188
|
-
targetDependenciesField: (0, getSaveType_1.
|
|
167
|
+
targetDependenciesField: (0, getSaveType_1.getSaveType)(opts),
|
|
189
168
|
};
|
|
190
|
-
const
|
|
169
|
+
const updatedImporter = await (0, core_1.mutateModulesInSingleProject)(mutatedProject, installOpts);
|
|
191
170
|
if (opts.save !== false) {
|
|
192
171
|
await writeProjectManifest(updatedImporter.manifest);
|
|
193
172
|
}
|
|
@@ -207,9 +186,10 @@ when running add/update with the --workspace option');
|
|
|
207
186
|
], {
|
|
208
187
|
workspaceDir: opts.workspaceDir,
|
|
209
188
|
});
|
|
210
|
-
await (0, recursive_1.
|
|
189
|
+
await (0, recursive_1.recursive)(allProjects, [], {
|
|
211
190
|
...opts,
|
|
212
191
|
...OVERWRITE_UPDATE_OPTIONS,
|
|
192
|
+
allProjectsGraph: opts.allProjectsGraph,
|
|
213
193
|
selectedProjectsGraph,
|
|
214
194
|
workspaceDir: opts.workspaceDir, // Otherwise TypeScript doesn't understand that is not undefined
|
|
215
195
|
}, 'install');
|
|
@@ -229,7 +209,7 @@ when running add/update with the --workspace option');
|
|
|
229
209
|
});
|
|
230
210
|
}
|
|
231
211
|
}
|
|
232
|
-
exports.
|
|
212
|
+
exports.installDeps = installDeps;
|
|
233
213
|
function selectProjectByDir(projects, searchedDir) {
|
|
234
214
|
const project = projects.find(({ dir }) => path_1.default.relative(dir, searchedDir) === '');
|
|
235
215
|
if (project == null)
|
package/lib/installDeps.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installDeps.js","sourceRoot":"","sources":["../src/installDeps.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"installDeps.js","sourceRoot":"","sources":["../src/installDeps.ts"],"names":[],"mappings":"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"}
|