Skip to content

Commit f65635c

Browse files
NullVoxPopuliNullVoxPopuli
authored
Merge pull request #1714 from glimmerjs/dep-upgrades
Dep upgrades from #1690
2 parents 93f5787 + 04ab5fb commit f65635c

File tree

39 files changed

+1598
-2566
lines changed

39 files changed

+1598
-2566
lines changed

‎.meta-updater/catalog/package.json

+5
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

+10-2
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

+8-8
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
}

‎.prototools

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
node = "22"
1+
node = "lts"
22
pnpm = "latest-10"

‎bin/package.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@
1616
"scripts": {},
1717
"dependencies": {
1818
"@glimmer-workspace/repo-metadata": "workspace:*",
19-
"@pnpm/workspace.find-packages": "^1000.0.5",
19+
"@pnpm/workspace.find-packages": "^1000.0.10",
2020
"@types/glob": "^8.1.0",
2121
"@types/js-yaml": "^4.0.9",
22-
"@types/node": "^20.9.4",
22+
"@types/node": "^22.13.4",
2323
"@types/puppeteer-chromium-resolver": "workspace:*",
24-
"@types/tar": "^6.1.10",
25-
"chalk": "^5.2.0",
24+
"@types/tar": "^6.1.13",
25+
"chalk": "^5.4.1",
2626
"execa": "^7.1.1",
27-
"fs-extra": "^11.2.0",
27+
"fs-extra": "^11.3.0",
2828
"glob": "^10.2.3",
29-
"globby": "^14.0.2",
29+
"globby": "^14.1.0",
3030
"js-yaml": "^4.1.0",
3131
"mkdirp": "^3.0.1",
3232
"p-map": "^7.0.3",
@@ -36,14 +36,14 @@
3636
"spex": "^3.4.0",
3737
"tar": "^6.2.0",
3838
"which": "^5.0.0",
39-
"zx": "^8.3.0"
39+
"zx": "^8.3.2"
4040
},
4141
"devDependencies": {
42-
"@pnpm/types": "^1000.1.0",
42+
"@pnpm/types": "^1000.1.1",
4343
"@types/fs-extra": "^11.0.4",
44-
"eslint": "^9.18.0",
44+
"eslint": "^9.20.1",
4545
"esno": "^0.16.3",
46-
"type-fest": "^4.32.0"
46+
"type-fest": "^4.35.0"
4747
},
4848
"engines": {
4949
"node": ">=18.0.0"

‎package.json

+27-27
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@
4646
"devDependencies": {
4747
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
4848
"@babel/plugin-transform-modules-commonjs": "^7.26.3",
49-
"@babel/plugin-transform-runtime": "^7.25.9",
50-
"@babel/preset-env": "^7.26.0",
49+
"@babel/plugin-transform-runtime": "^7.26.9",
50+
"@babel/preset-env": "^7.26.9",
5151
"@babel/preset-typescript": "^7.26.0",
52-
"@babel/runtime": "^7.26.0",
53-
"@babel/traverse": "^7.26.4",
54-
"@babel/types": "^7.26.3",
52+
"@babel/runtime": "^7.26.9",
53+
"@babel/traverse": "^7.26.9",
54+
"@babel/types": "^7.26.9",
5555
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.1",
56-
"@eslint/config-inspector": "^0.7.1",
57-
"@eslint/js": "9.17.0",
56+
"@eslint/config-inspector": "^1.0.0",
57+
"@eslint/js": "9.20.0",
5858
"@glimmer-workspace/benchmark-env": "workspace:*",
5959
"@glimmer-workspace/build-support": "workspace:*",
6060
"@glimmer-workspace/eslint-plugin": "workspace:*",
@@ -63,7 +63,7 @@
6363
"@glimmer-workspace/repo-metadata": "workspace:*",
6464
"@glimmer/env": "0.1.7",
6565
"@pnpm/meta-updater": "^2.0.3",
66-
"@pnpm/workspace.find-packages": "^1000.0.3",
66+
"@pnpm/workspace.find-packages": "^1000.0.10",
6767
"@rollup/plugin-sucrase": "^5.0.2",
6868
"@rollup/plugin-terser": "^0.4.4",
6969
"@tsconfig/strictest": "^2.0.5",
@@ -74,11 +74,11 @@
7474
"@types/eslint-community__eslint-plugin-eslint-comments": "workspace:*",
7575
"@types/eslint-plugin-qunit": "workspace:*",
7676
"@types/eslint__eslintrc": "^2.1.2",
77-
"@types/node": "^20.17.10",
77+
"@types/node": "^22.13.4",
7878
"@types/preval.macro": "^3.0.2",
7979
"@types/qunit": "^2.19.12",
80-
"@typescript-eslint/parser": "^8.20.0",
81-
"@typescript-eslint/utils": "^8.20.0",
80+
"@typescript-eslint/parser": "^8.24.1",
81+
"@typescript-eslint/utils": "^8.24.1",
8282
"amd-name-resolver": "^1.3.1",
8383
"auto-dist-tag": "^2.1.1",
8484
"babel-plugin-macros": "^3.1.0",
@@ -89,48 +89,48 @@
8989
"ember-cli": "~4.12.3",
9090
"ember-cli-browserstack": "^2.1.0",
9191
"ensure-posix-path": "^1.1.1",
92-
"eslint": "^9.18.0",
92+
"eslint": "^9.20.1",
9393
"eslint-config-flat-gitignore": "^1.0.0",
9494
"eslint-config-prettier": "10.0.1",
95-
"eslint-import-resolver-typescript": "^3.7.0",
95+
"eslint-import-resolver-typescript": "^3.8.2",
9696
"eslint-interactive": "^11.1.0",
9797
"eslint-plugin-import": "^2.31.0",
9898
"eslint-plugin-import-x": "^4.6.1",
99-
"eslint-plugin-jsonc": "^2.18.2",
99+
"eslint-plugin-jsonc": "^2.19.1",
100100
"eslint-plugin-n": "17.15.1",
101101
"eslint-plugin-qunit": "^8.1.2",
102102
"eslint-plugin-regexp": "^2.7.0",
103103
"eslint-plugin-simple-import-sort": "12.1.1",
104104
"eslint-plugin-unused-imports": "4.1.4",
105105
"esyes": "^1.0.3",
106106
"execa": "^7.2.0",
107-
"fast-glob": "^3.3.2",
107+
"fast-glob": "^3.3.3",
108108
"glob": "^10.4.5",
109-
"globals": "^15.14.0",
109+
"globals": "^15.15.0",
110110
"js-yaml": "^4.1.0",
111-
"knip": "^5.41.1",
111+
"knip": "^5.44.4",
112112
"loader.js": "^4.7.0",
113113
"mkdirp": "^3.0.1",
114114
"npm-run-all": "^4.1.5",
115-
"prettier": "^3.4.2",
115+
"prettier": "^3.5.1",
116116
"preval.macro": "^5.0.0",
117117
"puppeteer": "23.11.1",
118118
"puppeteer-chromium-resolver": "^23.0.0",
119-
"qunit": "^2.23.1",
119+
"qunit": "^2.24.1",
120120
"release-plan": "0.11.0",
121121
"rimraf": "^5.0.10",
122-
"rollup": "^4.31.0-0",
123-
"semver": "^7.6.3",
122+
"rollup": "^4.34.8",
123+
"semver": "^7.7.1",
124124
"testem-failure-only-reporter": "^1.0.0",
125125
"toml": "^3.0.0",
126126
"tracerbench": "^8.0.1",
127127
"ts-node": "^10.9.2",
128-
"turbo": "^2.3.3",
128+
"turbo": "^2.4.2",
129129
"typescript": "^5.7.3",
130-
"typescript-eslint": "^8.19.0",
131-
"vite": "^6.0.10",
132-
"vitest": "^3.0.4",
133-
"zx": "^8.3.0"
130+
"typescript-eslint": "^8.24.1",
131+
"vite": "^6.1.1",
132+
"vitest": "^3.0.6",
133+
"zx": "^8.3.2"
134134
},
135135
"changelog": {
136136
"repo": "glimmerjs/glimmer-vm",
@@ -148,7 +148,7 @@
148148
"packageManager": "pnpm@10.0.0",
149149
"pnpm": {
150150
"notes": {
151-
"override:@glimemr/syntax": "when we run prettier, we want to use our local copy of prettier, not the one it declared in its package.json. This ensures that we don't accidentally break prettier as we make changes to @glimmer/syntax"
151+
"override:@glimmer/syntax": "when we run prettier, we want to use our local copy of prettier, not the one it declared in its package.json. This ensures that we don't accidentally break prettier as we make changes to @glimmer/syntax"
152152
},
153153
"overrides": {
154154
"@glimmer/syntax": "workspace:*",

‎packages/@glimmer-workspace/benchmark-env/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@
4444
"@glimmer-workspace/env": "workspace:*",
4545
"@glimmer/debug-util": "workspace:*",
4646
"@glimmer/interfaces": "workspace:*",
47-
"eslint": "^9.18.0",
47+
"eslint": "^9.20.1",
4848
"publint": "^0.3.2",
49-
"rollup": "^4.31.0-0",
50-
"typescript": "*"
49+
"rollup": "^4.34.8",
50+
"typescript": "^5.7.3"
5151
},
5252
"engines": {
5353
"node": ">=20.9.0"

‎packages/@glimmer-workspace/build/package.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,28 @@
1717
"scripts": {},
1818
"dependencies": {
1919
"@glimmer/local-debug-babel-plugin": "workspace:*",
20-
"@rollup/plugin-commonjs": "^25.0.7",
21-
"@rollup/plugin-node-resolve": "^15.2.3",
22-
"@rollup/plugin-replace": "^5.0.5",
20+
"@rollup/plugin-commonjs": "^28.0.2",
21+
"@rollup/plugin-node-resolve": "^16.0.0",
22+
"@rollup/plugin-replace": "^6.0.2",
2323
"@rollup/plugin-swc": "^0.4.0",
2424
"@rollup/plugin-terser": "^0.4.4",
25-
"@rollup/plugin-typescript": "^12.1.1",
25+
"@rollup/plugin-typescript": "^12.1.2",
2626
"magic-string": "^0.30.0",
27-
"postcss": "^8.4.31",
28-
"rollup": "^4.31.0-0",
27+
"postcss": "^8.5.3",
28+
"rollup": "^4.34.8",
2929
"rollup-plugin-dts": "^6.1.1",
3030
"rollup-plugin-insert": "^1.3.2",
3131
"rollup-plugin-polyfill-node": "^0.13.0",
3232
"rollup-plugin-postcss": "^4.0.2",
3333
"tslib": "^2.8.1",
34-
"unplugin-fonts": "^1.0.3",
35-
"vite": "^5.4.10",
36-
"zx": "^8.2.2"
34+
"unplugin-fonts": "^1.3.1",
35+
"vite": "^6.1.1",
36+
"zx": "^8.3.2"
3737
},
3838
"devDependencies": {
39-
"@types/node": "^20.9.4",
40-
"eslint": "^9.18.0",
41-
"typescript": "*"
39+
"@types/node": "^22.13.4",
40+
"eslint": "^9.20.1",
41+
"typescript": "^5.7.3"
4242
},
4343
"engines": {
4444
"node": ">=20.9.0"

‎packages/@glimmer-workspace/eslint-plugin/package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,28 @@
77
"scripts": {},
88
"dependencies": {
99
"@eslint/eslintrc": "^3.2.0",
10-
"@eslint/js": "^9.18.0",
10+
"@eslint/js": "^9.20.0",
1111
"@glimmer-workspace/repo-metadata": "workspace:*",
12-
"@pnpm/workspace.find-packages": "^1000.0.5",
13-
"@typescript-eslint/parser": "^8.20.0",
12+
"@pnpm/workspace.find-packages": "^1000.0.10",
13+
"@typescript-eslint/parser": "^8.24.1",
1414
"eslint-config-prettier": "10.0.1",
1515
"eslint-plugin-import-x": "^4.6.1",
16-
"eslint-plugin-jsonc": "^2.18.2",
16+
"eslint-plugin-jsonc": "^2.19.1",
1717
"eslint-plugin-n": "^17.15.1",
1818
"eslint-plugin-qunit": "^8.1.2",
1919
"eslint-plugin-regexp": "^2.7.0",
2020
"eslint-plugin-simple-import-sort": "^12.1.1",
2121
"eslint-plugin-unused-imports": "^4.1.4",
2222
"eslint-utils": "^3.0.0",
23-
"typescript-eslint": "^8.20.0"
23+
"typescript-eslint": "^8.24.1"
2424
},
2525
"peerDependencies": {
2626
"eslint": ">=9.18.0"
2727
},
2828
"devDependencies": {
2929
"@types/eslint": "9.6.1",
3030
"@types/eslint-utils": "^3.0.5",
31-
"@types/node": "22.10.2",
32-
"eslint": "^9.18.0"
31+
"@types/node": "^22.13.4",
32+
"eslint": "^9.20.1"
3333
}
3434
}

‎packages/@glimmer-workspace/integration-node-tests/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
"dependencies": {
1313
"@glimmer/syntax": "workspace:*",
1414
"execa": "^9.5.2",
15-
"prettier": "^3.4.2"
15+
"prettier": "^3.5.1"
1616
},
1717
"devDependencies": {
1818
"@glimmer-workspace/repo-metadata": "workspace:*",
19-
"vitest": "^3.0.4"
19+
"vitest": "^3.0.6"
2020
}
2121
}

‎packages/@glimmer-workspace/integration-tests/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@
3535
"@simple-dom/serializer": "^1.4.0",
3636
"@simple-dom/void-map": "^1.4.0",
3737
"js-reporters": "^2.1.0",
38-
"qunit": "^2.19.4",
38+
"qunit": "^2.24.1",
3939
"simple-html-tokenizer": "^0.5.11"
4040
},
4141
"devDependencies": {
4242
"@glimmer/constants": "workspace:*",
4343
"@glimmer/debug-util": "workspace:*",
4444
"@glimmer/local-debug-flags": "workspace:*",
4545
"@types/js-reporters": "workspace:*",
46-
"@types/qunit": "^2.19.9",
46+
"@types/qunit": "^2.19.12",
4747
"dom-types": "^1.1.2"
4848
}
4949
}

‎packages/@glimmer-workspace/test-utils/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
},
1212
"devDependencies": {
1313
"@glimmer/debug-util": "workspace:*",
14-
"eslint": "^9.18.0"
14+
"eslint": "^9.20.1"
1515
}
1616
}

‎packages/@glimmer/compiler/lib/compiler.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ interface Crypto {
3030
export const defaultId: TemplateIdFn = (() => {
3131
const req = (
3232
typeof module === 'object' && typeof module.require === 'function'
33-
? module.require
33+
? // eslint-disable-next-line @typescript-eslint/unbound-method
34+
module.require
3435
: globalThis.require
3536
) as typeof require | undefined;
3637

‎packages/@glimmer/compiler/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@
5050
"@glimmer/debug": "workspace:*",
5151
"@glimmer/debug-util": "workspace:*",
5252
"@glimmer/local-debug-flags": "workspace:*",
53-
"@types/node": "^20.9.4",
54-
"eslint": "^9.18.0",
53+
"@types/node": "^22.13.4",
54+
"eslint": "^9.20.1",
5555
"publint": "^0.3.2",
56-
"rollup": "^4.31.0-0",
57-
"typescript": "*"
56+
"rollup": "^4.34.8",
57+
"typescript": "^5.7.3"
5858
},
5959
"engines": {
6060
"node": ">= 18.0.0"

0 commit comments

Comments
 (0)