Skip to content

Commit 53cabb4

Browse files
authored
Use pnpm catalog for workerd & workers-types (#10359)
* Use catalog for workerd & workers-types * fix versioning * fix versioning
1 parent 979984b commit 53cabb4

File tree

87 files changed

+192
-177
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+192
-177
lines changed

.github/changeset-version.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,15 @@ function parseVersion(version) {
2525
const rootPath = path.resolve(__dirname, "..");
2626
const miniflarePath = path.join(rootPath, "packages/miniflare");
2727
const miniflarePkgPath = path.join(miniflarePath, "package.json");
28-
const miniflareChangelogPath = path.join(miniflarePath, "CHANGELOG.md");
2928

29+
function getWorkerdVersion() {
30+
const pnpmWorkspacePath = path.join(rootPath, "pnpm-workspace.yaml");
31+
const match = /workerd: "(\d+\.\d+\.\d+)"/.exec(
32+
fs.readFileSync(pnpmWorkspacePath, "utf8")
33+
);
34+
assert(match !== null, `Expected ${match[1]} to be <major>.<minor>.<patch>`);
35+
return match[1];
36+
}
3037
/**
3138
* Gets the correct version to bump `miniflare` to, ensuring the minor versions
3239
* of `workerd` and `miniflare` match. Minor bumps in changesets will become
@@ -69,7 +76,7 @@ function main() {
6976
// 3. Force `miniflare`'s minor version to be the same as `workerd`
7077
const miniflarePkg = getPkg(miniflarePkgPath);
7178
const miniflareVersion = miniflarePkg.version;
72-
const workerdVersion = miniflarePkg.dependencies.workerd;
79+
const workerdVersion = getWorkerdVersion();
7380
const nextMiniflareVersion = getNextMiniflareVersion(
7481
workerdVersion,
7582
previousMiniflareVersion,

fixtures/additional-modules/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"devDependencies": {
1414
"@cloudflare/workers-tsconfig": "workspace:*",
15-
"@cloudflare/workers-types": "^4.20250813.0",
15+
"@cloudflare/workers-types": "catalog:default",
1616
"typescript": "catalog:default",
1717
"undici": "catalog:default",
1818
"vitest": "catalog:default",

fixtures/container-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"devDependencies": {
1414
"@cloudflare/workers-tsconfig": "workspace:*",
15-
"@cloudflare/workers-types": "^4.20250813.0",
15+
"@cloudflare/workers-types": "catalog:default",
1616
"ts-dedent": "^2.2.0",
1717
"typescript": "catalog:default",
1818
"wrangler": "workspace:*"

fixtures/d1-read-replication-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"devDependencies": {
1212
"@cloudflare/workers-tsconfig": "workspace:*",
13-
"@cloudflare/workers-types": "^4.20250813.0",
13+
"@cloudflare/workers-types": "catalog:default",
1414
"typescript": "catalog:default",
1515
"undici": "catalog:default",
1616
"vitest": "catalog:default",

fixtures/d1-worker-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"devDependencies": {
1515
"@cloudflare/workers-tsconfig": "workspace:*",
16-
"@cloudflare/workers-types": "^4.20250813.0",
16+
"@cloudflare/workers-types": "catalog:default",
1717
"typescript": "catalog:default",
1818
"undici": "catalog:default",
1919
"vitest": "catalog:default",

fixtures/dev-registry/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"devDependencies": {
1313
"@cloudflare/vite-plugin": "workspace:*",
1414
"@cloudflare/workers-tsconfig": "workspace:*",
15-
"@cloudflare/workers-types": "^4.20250813.0",
15+
"@cloudflare/workers-types": "catalog:default",
1616
"typescript": "catalog:default",
1717
"vite": "catalog:vite-plugin",
1818
"vitest": "catalog:default",

fixtures/email-worker/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"start": "wrangler dev"
77
},
88
"devDependencies": {
9-
"@cloudflare/workers-types": "^4.20250813.0",
9+
"@cloudflare/workers-types": "catalog:default",
1010
"@types/mimetext": "^2.0.4",
1111
"mimetext": "^3.0.27",
1212
"wrangler": "workspace:*"

fixtures/get-platform-proxy-remote-bindings/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"devDependencies": {
1010
"@cloudflare/workers-tsconfig": "workspace:*",
11-
"@cloudflare/workers-types": "^4.20250813.0",
11+
"@cloudflare/workers-types": "catalog:default",
1212
"miniflare": "workspace:*",
1313
"typescript": "catalog:default",
1414
"vitest": "catalog:default",

fixtures/get-platform-proxy/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"devDependencies": {
1111
"@cloudflare/workers-tsconfig": "workspace:*",
12-
"@cloudflare/workers-types": "^4.20250813.0",
12+
"@cloudflare/workers-types": "catalog:default",
1313
"@types/jest-image-snapshot": "^6.4.0",
1414
"jest-image-snapshot": "^6.4.0",
1515
"typescript": "catalog:default",

fixtures/local-mode-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
"devDependencies": {
1616
"@cloudflare/workers-tsconfig": "workspace:*",
17-
"@cloudflare/workers-types": "^4.20250813.0",
17+
"@cloudflare/workers-types": "catalog:default",
1818
"@types/node": "catalog:default",
1919
"buffer": "^6.0.3",
2020
"typescript": "catalog:default",

0 commit comments

Comments
 (0)