@pnpm/plugin-commands-installation 10.1.1 → 10.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/install.js CHANGED
@@ -37,6 +37,8 @@ function rcOptionsTypes() {
37
37
  'lockfile-directory',
38
38
  'lockfile-only',
39
39
  'lockfile',
40
+ 'merge-git-branch-lockfiles',
41
+ 'merge-git-branch-lockfiles-branch-pattern',
40
42
  'modules-dir',
41
43
  'network-concurrency',
42
44
  'node-linker',
@@ -140,6 +142,10 @@ For options that may be used with `-r`, see "pnpm help recursive"',
140
142
  description: 'Fix broken lockfile entries automatically',
141
143
  name: '--fix-lockfile',
142
144
  },
145
+ {
146
+ description: 'Merge lockfiles were generated on git branch',
147
+ name: '--merge-git-branch-lockfiles',
148
+ },
143
149
  {
144
150
  description: 'The directory in which dependencies will be installed (instead of node_modules)',
145
151
  name: '--modules-dir <dir>',
@@ -1 +1 @@
1
- {"version":3,"file":"install.js","sourceRoot":"","sources":["../src/install.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"install.js","sourceRoot":"","sources":["../src/install.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pnpm/plugin-commands-installation",
3
- "version": "10.1.1",
3
+ "version": "10.2.0",
4
4
  "description": "Commands for installation",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",
@@ -22,14 +22,14 @@
22
22
  },
23
23
  "homepage": "https://github.com/pnpm/pnpm/blob/main/packages/plugin-commands-installation#readme",
24
24
  "devDependencies": {
25
- "@pnpm/assert-project": "2.2.23",
26
- "@pnpm/lockfile-types": "4.0.2",
25
+ "@pnpm/assert-project": "2.3.0",
26
+ "@pnpm/lockfile-types": "4.0.3",
27
27
  "@pnpm/logger": "^4.0.0",
28
- "@pnpm/modules-yaml": "10.0.2",
29
- "@pnpm/plugin-commands-installation": "10.1.1",
30
- "@pnpm/prepare": "0.0.42",
31
- "@pnpm/registry-mock": "2.19.0",
32
- "@pnpm/test-fixtures": "0.0.11",
28
+ "@pnpm/modules-yaml": "10.0.3",
29
+ "@pnpm/plugin-commands-installation": "10.2.0",
30
+ "@pnpm/prepare": "0.0.43",
31
+ "@pnpm/registry-mock": "2.20.0",
32
+ "@pnpm/test-fixtures": "0.0.12",
33
33
  "@types/is-ci": "^3.0.0",
34
34
  "@types/proxyquire": "^1.3.28",
35
35
  "@types/ramda": "0.27.39",
@@ -47,31 +47,31 @@
47
47
  "write-yaml-file": "^4.2.0"
48
48
  },
49
49
  "dependencies": {
50
- "@pnpm/cli-utils": "0.7.12",
50
+ "@pnpm/cli-utils": "0.7.13",
51
51
  "@pnpm/colorize-semver-diff": "^1.0.1",
52
52
  "@pnpm/command": "3.0.0",
53
53
  "@pnpm/common-cli-options-help": "0.9.0",
54
- "@pnpm/config": "15.2.1",
54
+ "@pnpm/config": "15.3.0",
55
55
  "@pnpm/constants": "6.1.0",
56
- "@pnpm/core": "5.3.1",
56
+ "@pnpm/core": "5.4.0",
57
57
  "@pnpm/error": "3.0.1",
58
- "@pnpm/filter-workspace-packages": "5.0.12",
58
+ "@pnpm/filter-workspace-packages": "5.0.13",
59
59
  "@pnpm/find-workspace-dir": "4.0.1",
60
- "@pnpm/find-workspace-packages": "4.0.12",
60
+ "@pnpm/find-workspace-packages": "4.0.13",
61
61
  "@pnpm/graceful-fs": "2.0.0",
62
- "@pnpm/manifest-utils": "3.0.3",
62
+ "@pnpm/manifest-utils": "3.0.4",
63
63
  "@pnpm/matcher": "3.0.0",
64
- "@pnpm/outdated": "10.0.6",
65
- "@pnpm/package-store": "13.0.7",
64
+ "@pnpm/outdated": "10.0.7",
65
+ "@pnpm/package-store": "13.0.8",
66
66
  "@pnpm/parse-wanted-dependency": "3.0.0",
67
- "@pnpm/plugin-commands-rebuild": "6.1.11",
68
- "@pnpm/pnpmfile": "2.0.3",
69
- "@pnpm/read-project-manifest": "3.0.3",
70
- "@pnpm/resolver-base": "9.0.2",
67
+ "@pnpm/plugin-commands-rebuild": "6.1.12",
68
+ "@pnpm/pnpmfile": "2.0.4",
69
+ "@pnpm/read-project-manifest": "3.0.4",
70
+ "@pnpm/resolver-base": "9.0.3",
71
71
  "@pnpm/semver-diff": "^1.0.2",
72
- "@pnpm/sort-packages": "3.0.3",
73
- "@pnpm/store-connection-manager": "4.1.10",
74
- "@pnpm/types": "8.1.0",
72
+ "@pnpm/sort-packages": "3.0.4",
73
+ "@pnpm/store-connection-manager": "4.1.11",
74
+ "@pnpm/types": "8.2.0",
75
75
  "@yarnpkg/core": "3.2.0",
76
76
  "@yarnpkg/lockfile": "^1.1.0",
77
77
  "@yarnpkg/parsers": "2.5.0",