@pnpm/plugin-commands-installation 13.0.8 → 13.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/import/index.js +4 -6
- package/lib/import/index.js.map +1 -1
- package/lib/installDeps.js +3 -3
- package/lib/link.js +4 -4
- package/lib/recursive.js +2 -2
- package/lib/remove.js +2 -2
- package/package.json +27 -27
package/lib/import/index.js
CHANGED
|
@@ -35,7 +35,7 @@ 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
|
|
38
|
+
const workspace_find_packages_1 = require("@pnpm/workspace.find-packages");
|
|
39
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"));
|
|
@@ -91,7 +91,7 @@ async function handler(opts, params) {
|
|
|
91
91
|
preferredVersions = getPreferredVersions(versionsByPackageNames);
|
|
92
92
|
// For a workspace with shared lockfile
|
|
93
93
|
if (opts.workspaceDir) {
|
|
94
|
-
const allProjects = opts.allProjects ?? await (0,
|
|
94
|
+
const allProjects = opts.allProjects ?? await (0, workspace_find_packages_1.findWorkspacePackages)(opts.workspaceDir, opts);
|
|
95
95
|
const selectedProjectsGraph = opts.selectedProjectsGraph ?? selectProjectByDir(allProjects, opts.dir);
|
|
96
96
|
if (selectedProjectsGraph != null) {
|
|
97
97
|
const sequencedGraph = (0, sort_packages_1.sequenceGraph)(selectedProjectsGraph);
|
|
@@ -133,10 +133,9 @@ exports.handler = handler;
|
|
|
133
133
|
async function readYarnLockFile(dir) {
|
|
134
134
|
try {
|
|
135
135
|
const yarnLockFile = await graceful_fs_1.default.readFile(path_1.default.join(dir, 'yarn.lock'), 'utf8');
|
|
136
|
-
let lockJsonFile;
|
|
137
136
|
const yarnLockFileType = getYarnLockfileType(yarnLockFile);
|
|
138
137
|
if (yarnLockFileType === YarnLockType.yarn) {
|
|
139
|
-
lockJsonFile = (0, lockfile_1.parse)(yarnLockFile);
|
|
138
|
+
const lockJsonFile = (0, lockfile_1.parse)(yarnLockFile);
|
|
140
139
|
if (lockJsonFile.type === 'success') {
|
|
141
140
|
return lockJsonFile.object;
|
|
142
141
|
}
|
|
@@ -145,7 +144,7 @@ async function readYarnLockFile(dir) {
|
|
|
145
144
|
}
|
|
146
145
|
}
|
|
147
146
|
else if (yarnLockFileType === YarnLockType.yarn2) {
|
|
148
|
-
lockJsonFile = parseYarn2Lock(yarnLockFile);
|
|
147
|
+
const lockJsonFile = parseYarn2Lock(yarnLockFile);
|
|
149
148
|
if (lockJsonFile.type === YarnLockType.yarn2) {
|
|
150
149
|
return lockJsonFile.object;
|
|
151
150
|
}
|
|
@@ -158,7 +157,6 @@ async function readYarnLockFile(dir) {
|
|
|
158
157
|
throw new error_1.PnpmError('YARN_LOCKFILE_NOT_FOUND', 'No yarn.lock found');
|
|
159
158
|
}
|
|
160
159
|
function parseYarn2Lock(lockFileContents) {
|
|
161
|
-
// eslint-disable-next-line
|
|
162
160
|
const parseYarnLock = (0, parsers_1.parseSyml)(lockFileContents);
|
|
163
161
|
delete parseYarnLock.__metadata;
|
|
164
162
|
const dependencies = {};
|
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,qCAAyD;AAEzD,2EAAqE;AAErE,yCAAqC;AACrC,uDAAmD;AACnD,6DAAoC;AACpC,oEAAyC;AACzC,wDAAqC;AACrC,8DAAoC;AACpC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/import/index.ts"],"names":[],"mappings":"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"}
|
package/lib/installDeps.js
CHANGED
|
@@ -8,7 +8,7 @@ const path_1 = __importDefault(require("path"));
|
|
|
8
8
|
const cli_utils_1 = require("@pnpm/cli-utils");
|
|
9
9
|
const error_1 = require("@pnpm/error");
|
|
10
10
|
const filter_workspace_packages_1 = require("@pnpm/filter-workspace-packages");
|
|
11
|
-
const
|
|
11
|
+
const workspace_find_packages_1 = require("@pnpm/workspace.find-packages");
|
|
12
12
|
const plugin_commands_rebuild_1 = require("@pnpm/plugin-commands-rebuild");
|
|
13
13
|
const store_connection_manager_1 = require("@pnpm/store-connection-manager");
|
|
14
14
|
const core_1 = require("@pnpm/core");
|
|
@@ -58,7 +58,7 @@ when running add/update with the --workspace option');
|
|
|
58
58
|
typeof opts.rawLocalConfig['hoist'] !== 'undefined';
|
|
59
59
|
const forcePublicHoistPattern = typeof opts.rawLocalConfig['shamefully-hoist'] !== 'undefined' ||
|
|
60
60
|
typeof opts.rawLocalConfig['public-hoist-pattern'] !== 'undefined';
|
|
61
|
-
const allProjects = opts.allProjects ?? (opts.workspaceDir ? await (0,
|
|
61
|
+
const allProjects = opts.allProjects ?? (opts.workspaceDir ? await (0, workspace_find_packages_1.findWorkspacePackages)(opts.workspaceDir, opts) : []);
|
|
62
62
|
if (opts.workspaceDir) {
|
|
63
63
|
const selectedProjectsGraph = opts.selectedProjectsGraph ?? selectProjectByDir(allProjects, opts.dir);
|
|
64
64
|
if (selectedProjectsGraph != null) {
|
|
@@ -104,7 +104,7 @@ when running add/update with the --workspace option');
|
|
|
104
104
|
const dir = opts.dir || process.cwd();
|
|
105
105
|
let workspacePackages;
|
|
106
106
|
if (opts.workspaceDir) {
|
|
107
|
-
workspacePackages = (0,
|
|
107
|
+
workspacePackages = (0, workspace_find_packages_1.arrayOfWorkspacePackagesToMap)(allProjects);
|
|
108
108
|
}
|
|
109
109
|
let { manifest, writeProjectManifest } = await (0, cli_utils_1.tryReadProjectManifest)(opts.dir, opts);
|
|
110
110
|
if (manifest === null) {
|
package/lib/link.js
CHANGED
|
@@ -33,7 +33,7 @@ const common_cli_options_help_1 = require("@pnpm/common-cli-options-help");
|
|
|
33
33
|
const config_1 = require("@pnpm/config");
|
|
34
34
|
const error_1 = require("@pnpm/error");
|
|
35
35
|
const find_workspace_dir_1 = require("@pnpm/find-workspace-dir");
|
|
36
|
-
const
|
|
36
|
+
const workspace_find_packages_1 = require("@pnpm/workspace.find-packages");
|
|
37
37
|
const store_connection_manager_1 = require("@pnpm/store-connection-manager");
|
|
38
38
|
const core_1 = require("@pnpm/core");
|
|
39
39
|
const p_limit_1 = __importDefault(require("p-limit"));
|
|
@@ -98,8 +98,8 @@ async function handler(opts, params) {
|
|
|
98
98
|
let workspacePackagesArr;
|
|
99
99
|
let workspacePackages;
|
|
100
100
|
if (opts.workspaceDir) {
|
|
101
|
-
workspacePackagesArr = await (0,
|
|
102
|
-
workspacePackages = (0,
|
|
101
|
+
workspacePackagesArr = await (0, workspace_find_packages_1.findWorkspacePackages)(opts.workspaceDir, opts);
|
|
102
|
+
workspacePackages = (0, workspace_find_packages_1.arrayOfWorkspacePackagesToMap)(workspacePackagesArr);
|
|
103
103
|
}
|
|
104
104
|
else {
|
|
105
105
|
workspacePackages = {};
|
|
@@ -146,7 +146,7 @@ async function handler(opts, params) {
|
|
|
146
146
|
if (pkgNames.length > 0) {
|
|
147
147
|
let globalPkgNames;
|
|
148
148
|
if (opts.workspaceDir) {
|
|
149
|
-
workspacePackagesArr = await (0,
|
|
149
|
+
workspacePackagesArr = await (0, workspace_find_packages_1.findWorkspacePackages)(opts.workspaceDir, opts);
|
|
150
150
|
const pkgsFoundInWorkspace = workspacePackagesArr
|
|
151
151
|
.filter(({ manifest }) => manifest.name && pkgNames.includes(manifest.name));
|
|
152
152
|
pkgsFoundInWorkspace.forEach((pkgFromWorkspace) => pkgPaths.push(pkgFromWorkspace.dir));
|
package/lib/recursive.js
CHANGED
|
@@ -9,7 +9,7 @@ const path_1 = __importDefault(require("path"));
|
|
|
9
9
|
const cli_utils_1 = require("@pnpm/cli-utils");
|
|
10
10
|
const config_1 = require("@pnpm/config");
|
|
11
11
|
const error_1 = require("@pnpm/error");
|
|
12
|
-
const
|
|
12
|
+
const workspace_find_packages_1 = require("@pnpm/workspace.find-packages");
|
|
13
13
|
const logger_1 = require("@pnpm/logger");
|
|
14
14
|
const manifest_utils_1 = require("@pnpm/manifest-utils");
|
|
15
15
|
const matcher_1 = require("@pnpm/matcher");
|
|
@@ -40,7 +40,7 @@ async function recursive(allProjects, params, opts, cmdFullName) {
|
|
|
40
40
|
const throwOnFail = cli_utils_1.throwOnCommandFail.bind(null, `pnpm recursive ${cmdFullName}`);
|
|
41
41
|
const store = await (0, store_connection_manager_1.createOrConnectStoreController)(opts);
|
|
42
42
|
const workspacePackages = cmdFullName !== 'unlink'
|
|
43
|
-
? (0,
|
|
43
|
+
? (0, workspace_find_packages_1.arrayOfWorkspacePackagesToMap)(allProjects)
|
|
44
44
|
: {};
|
|
45
45
|
const targetDependenciesField = (0, getSaveType_1.getSaveType)(opts);
|
|
46
46
|
const installOpts = Object.assign(opts, {
|
package/lib/remove.js
CHANGED
|
@@ -8,7 +8,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
10
|
const error_1 = require("@pnpm/error");
|
|
11
|
-
const
|
|
11
|
+
const workspace_find_packages_1 = require("@pnpm/workspace.find-packages");
|
|
12
12
|
const manifest_utils_1 = require("@pnpm/manifest-utils");
|
|
13
13
|
const store_connection_manager_1 = require("@pnpm/store-connection-manager");
|
|
14
14
|
const core_1 = require("@pnpm/core");
|
|
@@ -141,7 +141,7 @@ async function handler(opts, params) {
|
|
|
141
141
|
});
|
|
142
142
|
// @ts-expect-error
|
|
143
143
|
removeOpts['workspacePackages'] = opts.workspaceDir
|
|
144
|
-
? (0,
|
|
144
|
+
? (0, workspace_find_packages_1.arrayOfWorkspacePackagesToMap)(await (0, workspace_find_packages_1.findWorkspacePackages)(opts.workspaceDir, opts))
|
|
145
145
|
: undefined;
|
|
146
146
|
const targetDependenciesField = (0, getSaveType_1.getSaveType)(opts);
|
|
147
147
|
const { manifest: currentManifest, writeProjectManifest, } = await (0, cli_utils_1.readProjectManifest)(opts.dir, opts);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pnpm/plugin-commands-installation",
|
|
3
|
-
"version": "13.0.
|
|
3
|
+
"version": "13.0.10",
|
|
4
4
|
"description": "Commands for installation",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -25,35 +25,35 @@
|
|
|
25
25
|
"@pnpm/registry-mock": "3.8.0",
|
|
26
26
|
"@types/proxyquire": "^1.3.28",
|
|
27
27
|
"@types/ramda": "0.28.20",
|
|
28
|
-
"@types/sinon": "^10.0.
|
|
29
|
-
"@types/yarnpkg__lockfile": "^1.1.
|
|
28
|
+
"@types/sinon": "^10.0.15",
|
|
29
|
+
"@types/yarnpkg__lockfile": "^1.1.6",
|
|
30
30
|
"@types/zkochan__table": "npm:@types/table@6.0.0",
|
|
31
31
|
"delay": "^5.0.0",
|
|
32
32
|
"jest-diff": "^29.5.0",
|
|
33
33
|
"path-name": "^1.0.0",
|
|
34
34
|
"proxyquire": "^2.1.3",
|
|
35
35
|
"read-yaml-file": "^2.1.0",
|
|
36
|
-
"sinon": "^15.0
|
|
36
|
+
"sinon": "^15.1.0",
|
|
37
37
|
"symlink-dir": "^5.1.1",
|
|
38
38
|
"tempy": "^1.0.1",
|
|
39
39
|
"write-json-file": "^4.3.0",
|
|
40
40
|
"write-pkg": "4.0.0",
|
|
41
41
|
"write-yaml-file": "^5.0.0",
|
|
42
|
-
"@pnpm/assert-project": "2.3.
|
|
42
|
+
"@pnpm/assert-project": "2.3.26",
|
|
43
43
|
"@pnpm/modules-yaml": "12.1.1",
|
|
44
|
-
"@pnpm/plugin-commands-installation": "13.0.
|
|
45
|
-
"@pnpm/prepare": "0.0.
|
|
46
|
-
"@pnpm/test-fixtures": "0.0.
|
|
44
|
+
"@pnpm/plugin-commands-installation": "13.0.10",
|
|
45
|
+
"@pnpm/prepare": "0.0.69",
|
|
46
|
+
"@pnpm/test-fixtures": "0.0.38"
|
|
47
47
|
},
|
|
48
48
|
"dependencies": {
|
|
49
49
|
"@pnpm/colorize-semver-diff": "^1.0.1",
|
|
50
50
|
"@pnpm/semver-diff": "^1.1.0",
|
|
51
|
-
"@
|
|
51
|
+
"@pnpm/which": "^3.0.1",
|
|
52
|
+
"@yarnpkg/core": "4.0.0-rc.45",
|
|
52
53
|
"@yarnpkg/lockfile": "^1.1.0",
|
|
53
|
-
"@yarnpkg/parsers": "3.0.0-rc.
|
|
54
|
+
"@yarnpkg/parsers": "3.0.0-rc.45",
|
|
54
55
|
"@zkochan/rimraf": "^2.1.2",
|
|
55
56
|
"@zkochan/table": "^2.0.1",
|
|
56
|
-
"@pnpm/which": "^3.0.1",
|
|
57
57
|
"chalk": "^4.1.2",
|
|
58
58
|
"ci-info": "^3.8.0",
|
|
59
59
|
"enquirer": "^2.3.6",
|
|
@@ -67,31 +67,31 @@
|
|
|
67
67
|
"ramda": "npm:@pnpm/ramda@0.28.1",
|
|
68
68
|
"render-help": "^1.0.3",
|
|
69
69
|
"version-selector-type": "^3.0.0",
|
|
70
|
-
"@pnpm/cli-utils": "2.0.
|
|
70
|
+
"@pnpm/cli-utils": "2.0.10",
|
|
71
71
|
"@pnpm/command": "4.0.0",
|
|
72
72
|
"@pnpm/common-cli-options-help": "1.0.0",
|
|
73
|
-
"@pnpm/config": "18.4.
|
|
74
|
-
"@pnpm/constants": "7.1.
|
|
75
|
-
"@pnpm/core": "10.2.
|
|
76
|
-
"@pnpm/dedupe.check": "1.0.
|
|
77
|
-
"@pnpm/error": "5.0.
|
|
78
|
-
"@pnpm/filter-workspace-packages": "7.0.
|
|
79
|
-
"@pnpm/find-workspace-dir": "6.0.
|
|
80
|
-
"@pnpm/find-workspace-packages": "6.0.9",
|
|
73
|
+
"@pnpm/config": "18.4.1",
|
|
74
|
+
"@pnpm/constants": "7.1.1",
|
|
75
|
+
"@pnpm/core": "10.2.2",
|
|
76
|
+
"@pnpm/dedupe.check": "1.0.2",
|
|
77
|
+
"@pnpm/error": "5.0.2",
|
|
78
|
+
"@pnpm/filter-workspace-packages": "7.0.10",
|
|
79
|
+
"@pnpm/find-workspace-dir": "6.0.2",
|
|
81
80
|
"@pnpm/graceful-fs": "3.0.0",
|
|
82
81
|
"@pnpm/lockfile-types": "5.1.0",
|
|
83
|
-
"@pnpm/manifest-utils": "5.0.
|
|
82
|
+
"@pnpm/manifest-utils": "5.0.2",
|
|
84
83
|
"@pnpm/matcher": "5.0.0",
|
|
85
|
-
"@pnpm/outdated": "13.0.
|
|
86
|
-
"@pnpm/package-store": "16.0.
|
|
84
|
+
"@pnpm/outdated": "13.0.2",
|
|
85
|
+
"@pnpm/package-store": "16.0.5",
|
|
87
86
|
"@pnpm/parse-wanted-dependency": "5.0.0",
|
|
88
|
-
"@pnpm/plugin-commands-rebuild": "9.0.
|
|
89
|
-
"@pnpm/pnpmfile": "5.0.
|
|
90
|
-
"@pnpm/read-project-manifest": "5.0.
|
|
87
|
+
"@pnpm/plugin-commands-rebuild": "9.0.2",
|
|
88
|
+
"@pnpm/pnpmfile": "5.0.8",
|
|
89
|
+
"@pnpm/read-project-manifest": "5.0.2",
|
|
91
90
|
"@pnpm/resolver-base": "10.0.1",
|
|
92
91
|
"@pnpm/sort-packages": "5.0.3",
|
|
93
|
-
"@pnpm/store-connection-manager": "6.0.
|
|
92
|
+
"@pnpm/store-connection-manager": "6.0.12",
|
|
94
93
|
"@pnpm/types": "9.1.0",
|
|
94
|
+
"@pnpm/workspace.find-packages": "1.0.0",
|
|
95
95
|
"@pnpm/workspace.pkgs-graph": "2.0.4"
|
|
96
96
|
},
|
|
97
97
|
"peerDependencies": {
|