Skip to content

Commit 593d7fc

Browse files
kategenglerkategengler
authored
Merge pull request #20950 from NullVoxPopuli/nvp/upgrade-vm-main
2 parents d4d0659 + 88f55c9 commit 593d7fc

File tree

31 files changed

+428
-327
lines changed

31 files changed

+428
-327
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,7 @@ jobs:
5454
needs: ['types']
5555
strategy:
5656
matrix:
57-
# I removed 'next' from this list because we're seeing buggy behavior in
58-
# the so-far unreleased 5.4. -ef4
59-
ts-version: ['5.0', '5.1', '5.2', '5.3', '5.4', '5.5', '5.6', '5.7', '5.8', '5.9']
57+
ts-version: ['5.2', '5.3', '5.4', '5.5', '5.6', '5.7', '5.8', '5.9']
6058
steps:
6159
- uses: actions/checkout@v4
6260
- uses: ./.github/actions/setup

‎bin/use-vm-tarballs.mjs‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
/**
2+
* Scans the root folder and sets overrides
3+
* for the package.json
4+
*
5+
* This script exists temporarily while when work on merging
6+
* the glimmer-vm repo in to this one.
7+
*
8+
* Once the merge happens, we should delete this file.
9+
*/
10+
import fs from 'node:fs/promises';
11+
import { join } from 'node:path';
12+
import * as glob from 'glob';
13+
14+
const tgzs = glob.default.sync('*.tgz', { ignore: 'node_modules/**' });
15+
16+
const PARSE = /glimmer-(?<name>.+)-(?<version>(\d+\.?)+)\.tgz/;
17+
18+
const overrides = {};
19+
20+
for (let file of tgzs) {
21+
let match = file.match(PARSE);
22+
let { name } = match.groups;
23+
24+
overrides[`@glimmer/${name}`] = `file:./${file}`;
25+
}
26+
27+
let manifestPath = join(process.cwd(), 'package.json');
28+
let manifestBuffer = await fs.readFile(manifestPath);
29+
let manifest = JSON.parse(manifestBuffer.toString());
30+
31+
manifest.pnpm ||= {};
32+
manifest.pnpm.overrides ||= {};
33+
34+
Object.assign(manifest.pnpm.overrides, overrides);
35+
36+
await fs.writeFile(manifestPath, JSON.stringify(manifest, null, 2));

‎package.json‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,22 +68,22 @@
6868
"@babel/core": "^7.24.4",
6969
"@ember/edition-utils": "^1.2.0",
7070
"@embroider/addon-shim": "^1.9.0",
71-
"@glimmer/compiler": "0.94.10",
71+
"@glimmer/compiler": "0.94.11",
7272
"@glimmer/destroyable": "0.94.8",
7373
"@glimmer/global-context": "0.93.4",
7474
"@glimmer/interfaces": "0.94.6",
75-
"@glimmer/manager": "0.94.9",
76-
"@glimmer/node": "0.94.9",
77-
"@glimmer/opcode-compiler": "0.94.9",
75+
"@glimmer/manager": "0.94.10",
76+
"@glimmer/node": "0.94.10",
77+
"@glimmer/opcode-compiler": "0.94.10",
7878
"@glimmer/owner": "0.93.4",
79-
"@glimmer/program": "0.94.9",
80-
"@glimmer/reference": "0.94.8",
81-
"@glimmer/runtime": "0.94.10",
82-
"@glimmer/syntax": "0.94.9",
79+
"@glimmer/program": "0.94.10",
80+
"@glimmer/reference": "0.94.9",
81+
"@glimmer/runtime": "0.94.11",
82+
"@glimmer/syntax": "0.95.0",
8383
"@glimmer/util": "0.94.8",
84-
"@glimmer/validator": "0.94.8",
84+
"@glimmer/validator": "0.95.0",
8585
"@glimmer/vm": "0.94.8",
86-
"@glimmer/vm-babel-plugins": "0.93.4",
86+
"@glimmer/vm-babel-plugins": "0.93.5",
8787
"@simple-dom/interface": "^1.4.0",
8888
"backburner.js": "^2.8.0",
8989
"broccoli-file-creator": "^2.1.1",
@@ -167,7 +167,7 @@
167167
"terser": "^5.42.0",
168168
"testem": "^3.10.1",
169169
"testem-failure-only-reporter": "^1.0.0",
170-
"typescript": "5.1",
170+
"typescript": "5.2",
171171
"typescript-eslint": "^8.26.0",
172172
"vite": "^5.4.12"
173173
},
@@ -281,6 +281,7 @@
281281
"@ember/object/promise-proxy-mixin.js": "ember-source/@ember/object/promise-proxy-mixin.js",
282282
"@ember/object/proxy.js": "ember-source/@ember/object/proxy.js",
283283
"@ember/owner/index.js": "ember-source/@ember/owner/index.js",
284+
"@ember/reactive/index.js": "ember-source/@ember/reactive/index.js",
284285
"@ember/renderer/index.js": "ember-source/@ember/renderer/index.js",
285286
"@ember/routing/-internals.js": "ember-source/@ember/routing/-internals.js",
286287
"@ember/routing/hash-location.js": "ember-source/@ember/routing/hash-location.js",
@@ -402,4 +403,4 @@
402403
}
403404
},
404405
"packageManager": "pnpm@10.5.0"
405-
}
406+
}

‎packages/@ember/-internals/package.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,22 @@
4040
"@ember/service": "workspace:*",
4141
"@ember/template-factory": "workspace:*",
4242
"@ember/utils": "workspace:*",
43-
"@glimmer/compiler": "0.94.10",
43+
"@glimmer/compiler": "0.94.11",
4444
"@glimmer/component": "workspace:^",
4545
"@glimmer/destroyable": "0.94.8",
4646
"@glimmer/env": "^0.1.7",
4747
"@glimmer/global-context": "0.93.4",
4848
"@glimmer/interfaces": "0.94.6",
49-
"@glimmer/manager": "0.94.9",
50-
"@glimmer/node": "0.94.9",
51-
"@glimmer/opcode-compiler": "0.94.9",
49+
"@glimmer/manager": "0.94.10",
50+
"@glimmer/node": "0.94.10",
51+
"@glimmer/opcode-compiler": "0.94.10",
5252
"@glimmer/owner": "0.93.4",
53-
"@glimmer/program": "0.94.9",
54-
"@glimmer/reference": "0.94.8",
55-
"@glimmer/runtime": "0.94.10",
56-
"@glimmer/syntax": "0.94.9",
53+
"@glimmer/program": "0.94.10",
54+
"@glimmer/reference": "0.94.9",
55+
"@glimmer/runtime": "0.94.11",
56+
"@glimmer/syntax": "0.95.0",
5757
"@glimmer/util": "0.94.8",
58-
"@glimmer/validator": "0.94.8",
58+
"@glimmer/validator": "0.95.0",
5959
"@glimmer/vm": "0.94.8",
6060
"@simple-dom/interface": "^1.4.0",
6161
"backburner.js": "^2.7.0",

‎packages/@ember/application/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"@glimmer/env": "^0.1.7",
2424
"@glimmer/owner": "0.93.4",
2525
"@glimmer/util": "0.94.8",
26-
"@glimmer/validator": "0.94.8",
26+
"@glimmer/validator": "0.95.0",
2727
"backburner.js": "^2.7.0",
2828
"dag-map": "^2.0.2",
2929
"ember": "workspace:*",

‎packages/@ember/array/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
"@ember/utils": "workspace:*",
2020
"@glimmer/destroyable": "0.94.8",
2121
"@glimmer/env": "^0.1.7",
22-
"@glimmer/manager": "0.94.9",
22+
"@glimmer/manager": "0.94.10",
2323
"@glimmer/owner": "0.93.4",
2424
"@glimmer/util": "0.94.8",
25-
"@glimmer/validator": "0.94.8",
25+
"@glimmer/validator": "0.95.0",
2626
"expect-type": "^0.15.0",
2727
"internal-test-helpers": "workspace:*"
2828
}

‎packages/@ember/component/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
},
1010
"dependencies": {
1111
"@ember/-internals": "workspace:*",
12-
"@glimmer/manager": "0.94.9",
13-
"@glimmer/runtime": "0.94.10",
12+
"@glimmer/manager": "0.94.10",
13+
"@glimmer/runtime": "0.94.11",
1414
"expect-type": "^0.15.0"
1515
}
1616
}

‎packages/@ember/controller/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@glimmer/env": "^0.1.7",
1616
"@glimmer/owner": "0.93.4",
1717
"@glimmer/util": "0.94.8",
18-
"@glimmer/validator": "0.94.8",
18+
"@glimmer/validator": "0.95.0",
1919
"expect-type": "^0.15.0",
2020
"internal-test-helpers": "workspace:*"
2121
}

‎packages/@ember/debug/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
"@ember/utils": "workspace:*",
2121
"@glimmer/destroyable": "0.94.8",
2222
"@glimmer/env": "^0.1.7",
23-
"@glimmer/manager": "0.94.9",
23+
"@glimmer/manager": "0.94.10",
2424
"@glimmer/owner": "0.93.4",
2525
"@glimmer/util": "0.94.8",
26-
"@glimmer/validator": "0.94.8",
26+
"@glimmer/validator": "0.95.0",
2727
"backburner.js": "^2.7.0",
2828
"expect-type": "^0.15.0",
2929
"internal-test-helpers": "workspace:*"

‎packages/@ember/engine/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"@glimmer/env": "^0.1.7",
2424
"@glimmer/owner": "0.93.4",
2525
"@glimmer/util": "0.94.8",
26-
"@glimmer/validator": "0.94.8",
26+
"@glimmer/validator": "0.95.0",
2727
"dag-map": "^2.0.2",
2828
"expect-type": "^0.15.0",
2929
"internal-test-helpers": "workspace:*",

0 commit comments

Comments
 (0)