Skip to content

Commit 8119d2a

Browse files
authored
Merge branch 'main' into actions/tools-update-config.json
2 parents c00ac31 + c64b444 commit 8119d2a

File tree

4 files changed

+25
-6
lines changed

4 files changed

+25
-6
lines changed

config.json

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
]
7777
}
7878
},
79-
">=6.0.0": {
79+
"6.x || 7.x || 8.x || 9.x || 10.x": {
8080
"url": "https://registry.npmjs.org/pnpm/-/pnpm-{}.tgz",
8181
"bin": {
8282
"pnpm": "./bin/pnpm.cjs",
@@ -92,6 +92,23 @@
9292
"install"
9393
]
9494
}
95+
},
96+
">=11.0.0": {
97+
"url": "https://registry.npmjs.org/pnpm/-/pnpm-{}.tgz",
98+
"bin": {
99+
"pnpm": "./bin/pnpm.mjs",
100+
"pnpx": "./bin/pnpx.mjs"
101+
},
102+
"registry": {
103+
"type": "npm",
104+
"package": "pnpm"
105+
},
106+
"commands": {
107+
"use": [
108+
"pnpm",
109+
"install"
110+
]
111+
}
95112
}
96113
}
97114
},

tests/main.test.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,8 @@ const testedPackageManagers: Array<[string, string] | [string, string, string]>
149149
[`pnpm`, `6.6.2`],
150150
[`pnpm`, `6.6.2+sha1.7b4d6b176c1b93b5670ed94c24babb7d80c13854`],
151151
[`pnpm`, `6.6.2+sha224.eb5c0acad3b0f40ecdaa2db9aa5a73134ad256e17e22d1419a2ab073`],
152+
[`pnpm`, `11.0.0-dev.1005`],
153+
[`pnpm`, `11.0.0-dev.1005+sha1.17cdd7ae1baf19f24440422f946130fccbb4257a`],
152154
[`npm`, `6.14.2`],
153155
[`npm`, `6.14.2+sha1.f057d35cd4792c4c511bb1fa332edb43143d07b0`],
154156
[`npm`, `6.14.2+sha224.50512c1eb404900ee78586faa6d756b8d867ff46a328e6fb4cdf3a87`],

tests/nocks.db

6.87 MB
Binary file not shown.

yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2298,18 +2298,18 @@ __metadata:
22982298
linkType: hard
22992299

23002300
"glob@npm:^11.0.3":
2301-
version: 11.0.3
2302-
resolution: "glob@npm:11.0.3"
2301+
version: 11.1.0
2302+
resolution: "glob@npm:11.1.0"
23032303
dependencies:
23042304
foreground-child: "npm:^3.3.1"
23052305
jackspeak: "npm:^4.1.1"
2306-
minimatch: "npm:^10.0.3"
2306+
minimatch: "npm:^10.1.1"
23072307
minipass: "npm:^7.1.2"
23082308
package-json-from-dist: "npm:^1.0.0"
23092309
path-scurry: "npm:^2.0.0"
23102310
bin:
23112311
glob: dist/esm/bin.mjs
2312-
checksum: 10c0/7d24457549ec2903920dfa3d8e76850e7c02aa709122f0164b240c712f5455c0b457e6f2a1eee39344c6148e39895be8094ae8cfef7ccc3296ed30bce250c661
2312+
checksum: 10c0/1ceae07f23e316a6fa74581d9a74be6e8c2e590d2f7205034dd5c0435c53f5f7b712c2be00c3b65bf0a49294a1c6f4b98cd84c7637e29453b5aa13b79f1763a2
23132313
languageName: node
23142314
linkType: hard
23152315

@@ -2989,7 +2989,7 @@ __metadata:
29892989
languageName: node
29902990
linkType: hard
29912991

2992-
"minimatch@npm:^10.0.3":
2992+
"minimatch@npm:^10.1.1":
29932993
version: 10.1.1
29942994
resolution: "minimatch@npm:10.1.1"
29952995
dependencies:

0 commit comments

Comments
 (0)