Skip to content

Commit 2730ea8

Browse files
Merge pull request emberjs#1714 from glimmerjs/dep-upgrades
Dep upgrades from glimmerjs/glimmer-vm#1690
2 parents 7dd9ab9 + 0496eab commit 2730ea8

File tree

4 files changed

+26
-13
lines changed

4 files changed

+26
-13
lines changed

.meta-updater/catalog/package.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"devDependencies": {
3+
"rollup": "^4.34.8"
4+
}
5+
}

.meta-updater/main.mjs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { createUpdateOptions } from '@pnpm/meta-updater';
33
import repo, { getPackageInfo, WORKSPACE_ROOT } from '@glimmer-workspace/repo-metadata';
44
import { json, packageJson } from './formats/json.mjs';
55
import { code } from './formats/code.mjs';
6+
import catalog from './catalog/package.json' with { type: 'json' };
67

78
/**
89
* @import { PackageInfo } from '@glimmer-workspace/repo-metadata';
@@ -67,11 +68,17 @@ export default () =>
6768

6869
update(scripts, 'test:publint', 'publint');
6970

71+
const devDependencies = /** @type { JsonObject } */ (actual.devDependencies ??= {});
72+
73+
for (const [name, version] of Object.entries(catalog.devDependencies)) {
74+
if (name in devDependencies) {
75+
update(devDependencies, name, version);
76+
}
77+
}
78+
7079
// Packages are built if they're published and have at least one `.ts` entry point that is
7180
// not a `.d.ts` file **or** if they are explicitly marked as built via `repo-meta.built`.
7281
if (pkg['repo-meta']?.built) {
73-
const devDependencies = /** @type { JsonObject } */ (actual.devDependencies ??= {});
74-
7582
update(devDependencies, '@glimmer-workspace/env', 'workspace:*');
7683

7784
update(scripts, 'prepack', 'rollup -c rollup.config.mjs');
@@ -124,6 +131,7 @@ export default () =>
124131
}
125132

126133
cleanup(actual, 'publishConfig');
134+
cleanup(actual, 'devDependencies');
127135
return actual;
128136
},
129137

.meta-updater/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@
88
],
99
"scripts": {},
1010
"dependencies": {
11-
"@pnpm/find-workspace-dir": "^1000.0.1",
11+
"@pnpm/find-workspace-dir": "^1000.0.2",
1212
"@pnpm/meta-updater": "^2.0.3",
13-
"@pnpm/read-package-json": "^1000.0.2",
14-
"globby": "^14.0.2",
13+
"@pnpm/read-package-json": "^1000.0.3",
14+
"globby": "^14.1.0",
1515
"load-json-file": "^7.0.1",
1616
"minimatch": "^10.0.1",
1717
"ramda": "^0.30.1",
1818
"write-json-file": "^6.0.0",
19-
"zx": "^8.3.0"
19+
"zx": "^8.3.2"
2020
},
2121
"devDependencies": {
2222
"@glimmer-workspace/env": "workspace:*",
2323
"@glimmer-workspace/repo-metadata": "workspace:*",
24-
"@pnpm/types": "^1000.0.0",
25-
"@pnpm/workspace.find-packages": "^1000.0.1",
26-
"@types/node": "catalog:",
24+
"@pnpm/types": "^1000.1.1",
25+
"@pnpm/workspace.find-packages": "^1000.0.10",
26+
"@types/node": "^22.13.4",
2727
"@types/ramda": "^0.30.2",
28-
"type-fest": "^4.32.0"
28+
"type-fest": "^4.35.0"
2929
}
3030
}

repo-metadata/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
"yaml": "^2.7.0"
1818
},
1919
"devDependencies": {
20-
"@pnpm/types": "^1000.1.0",
21-
"@pnpm/workspace.find-packages": "^1000.0.5",
22-
"@types/node": "^22.10.6",
20+
"@pnpm/types": "^1000.1.1",
21+
"@pnpm/workspace.find-packages": "^1000.0.10",
22+
"@types/node": "^22.13.4",
2323
"pkg-entry-points": "^1.1.1"
2424
}
2525
}

0 commit comments

Comments
 (0)