Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,7 @@ jobs:
needs: ['types']
strategy:
matrix:
# I removed 'next' from this list because we're seeing buggy behavior in
# the so-far unreleased 5.4. -ef4
ts-version: ['5.0', '5.1', '5.2', '5.3', '5.4', '5.5', '5.6', '5.7', '5.8', '5.9']
ts-version: ['5.2', '5.3', '5.4', '5.5', '5.6', '5.7', '5.8', '5.9']
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/setup
Expand Down
36 changes: 36 additions & 0 deletions bin/use-vm-tarballs.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/**
* Scans the root folder and sets overrides
* for the package.json
*
* This script exists temporarily while when work on merging
* the glimmer-vm repo in to this one.
*
* Once the merge happens, we should delete this file.
*/
import fs from 'node:fs/promises';
import { join } from 'node:path';
import * as glob from 'glob';

const tgzs = glob.default.sync('*.tgz', { ignore: 'node_modules/**' });

const PARSE = /glimmer-(?<name>.+)-(?<version>(\d+\.?)+)\.tgz/;

const overrides = {};

for (let file of tgzs) {
let match = file.match(PARSE);
let { name } = match.groups;

overrides[`@glimmer/${name}`] = `file:./${file}`;
}

let manifestPath = join(process.cwd(), 'package.json');
let manifestBuffer = await fs.readFile(manifestPath);
let manifest = JSON.parse(manifestBuffer.toString());

manifest.pnpm ||= {};
manifest.pnpm.overrides ||= {};

Object.assign(manifest.pnpm.overrides, overrides);

await fs.writeFile(manifestPath, JSON.stringify(manifest, null, 2));
25 changes: 13 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,22 +68,22 @@
"@babel/core": "^7.24.4",
"@ember/edition-utils": "^1.2.0",
"@embroider/addon-shim": "^1.9.0",
"@glimmer/compiler": "0.94.10",
"@glimmer/compiler": "0.94.11",
"@glimmer/destroyable": "0.94.8",
"@glimmer/global-context": "0.93.4",
"@glimmer/interfaces": "0.94.6",
"@glimmer/manager": "0.94.9",
"@glimmer/node": "0.94.9",
"@glimmer/opcode-compiler": "0.94.9",
"@glimmer/manager": "0.94.10",
"@glimmer/node": "0.94.10",
"@glimmer/opcode-compiler": "0.94.10",
"@glimmer/owner": "0.93.4",
"@glimmer/program": "0.94.9",
"@glimmer/reference": "0.94.8",
"@glimmer/runtime": "0.94.10",
"@glimmer/syntax": "0.94.9",
"@glimmer/program": "0.94.10",
"@glimmer/reference": "0.94.9",
"@glimmer/runtime": "0.94.11",
"@glimmer/syntax": "0.95.0",
"@glimmer/util": "0.94.8",
"@glimmer/validator": "0.94.8",
"@glimmer/validator": "0.95.0",
"@glimmer/vm": "0.94.8",
"@glimmer/vm-babel-plugins": "0.93.4",
"@glimmer/vm-babel-plugins": "0.93.5",
"@simple-dom/interface": "^1.4.0",
"backburner.js": "^2.8.0",
"broccoli-file-creator": "^2.1.1",
Expand Down Expand Up @@ -167,7 +167,7 @@
"terser": "^5.42.0",
"testem": "^3.10.1",
"testem-failure-only-reporter": "^1.0.0",
"typescript": "5.1",
"typescript": "5.2",
"typescript-eslint": "^8.26.0",
"vite": "^5.4.12"
},
Expand Down Expand Up @@ -281,6 +281,7 @@
"@ember/object/promise-proxy-mixin.js": "ember-source/@ember/object/promise-proxy-mixin.js",
"@ember/object/proxy.js": "ember-source/@ember/object/proxy.js",
"@ember/owner/index.js": "ember-source/@ember/owner/index.js",
"@ember/reactive/index.js": "ember-source/@ember/reactive/index.js",
"@ember/renderer/index.js": "ember-source/@ember/renderer/index.js",
"@ember/routing/-internals.js": "ember-source/@ember/routing/-internals.js",
"@ember/routing/hash-location.js": "ember-source/@ember/routing/hash-location.js",
Expand Down Expand Up @@ -402,4 +403,4 @@
}
},
"packageManager": "pnpm@10.5.0"
}
}
18 changes: 9 additions & 9 deletions packages/@ember/-internals/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,22 +40,22 @@
"@ember/service": "workspace:*",
"@ember/template-factory": "workspace:*",
"@ember/utils": "workspace:*",
"@glimmer/compiler": "0.94.10",
"@glimmer/compiler": "0.94.11",
"@glimmer/component": "workspace:^",
"@glimmer/destroyable": "0.94.8",
"@glimmer/env": "^0.1.7",
"@glimmer/global-context": "0.93.4",
"@glimmer/interfaces": "0.94.6",
"@glimmer/manager": "0.94.9",
"@glimmer/node": "0.94.9",
"@glimmer/opcode-compiler": "0.94.9",
"@glimmer/manager": "0.94.10",
"@glimmer/node": "0.94.10",
"@glimmer/opcode-compiler": "0.94.10",
"@glimmer/owner": "0.93.4",
"@glimmer/program": "0.94.9",
"@glimmer/reference": "0.94.8",
"@glimmer/runtime": "0.94.10",
"@glimmer/syntax": "0.94.9",
"@glimmer/program": "0.94.10",
"@glimmer/reference": "0.94.9",
"@glimmer/runtime": "0.94.11",
"@glimmer/syntax": "0.95.0",
"@glimmer/util": "0.94.8",
"@glimmer/validator": "0.94.8",
"@glimmer/validator": "0.95.0",
"@glimmer/vm": "0.94.8",
"@simple-dom/interface": "^1.4.0",
"backburner.js": "^2.7.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@ember/application/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@glimmer/env": "^0.1.7",
"@glimmer/owner": "0.93.4",
"@glimmer/util": "0.94.8",
"@glimmer/validator": "0.94.8",
"@glimmer/validator": "0.95.0",
"backburner.js": "^2.7.0",
"dag-map": "^2.0.2",
"ember": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/@ember/array/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
"@ember/utils": "workspace:*",
"@glimmer/destroyable": "0.94.8",
"@glimmer/env": "^0.1.7",
"@glimmer/manager": "0.94.9",
"@glimmer/manager": "0.94.10",
"@glimmer/owner": "0.93.4",
"@glimmer/util": "0.94.8",
"@glimmer/validator": "0.94.8",
"@glimmer/validator": "0.95.0",
"expect-type": "^0.15.0",
"internal-test-helpers": "workspace:*"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/@ember/component/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
},
"dependencies": {
"@ember/-internals": "workspace:*",
"@glimmer/manager": "0.94.9",
"@glimmer/runtime": "0.94.10",
"@glimmer/manager": "0.94.10",
"@glimmer/runtime": "0.94.11",
"expect-type": "^0.15.0"
}
}
2 changes: 1 addition & 1 deletion packages/@ember/controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@glimmer/env": "^0.1.7",
"@glimmer/owner": "0.93.4",
"@glimmer/util": "0.94.8",
"@glimmer/validator": "0.94.8",
"@glimmer/validator": "0.95.0",
"expect-type": "^0.15.0",
"internal-test-helpers": "workspace:*"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/@ember/debug/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
"@ember/utils": "workspace:*",
"@glimmer/destroyable": "0.94.8",
"@glimmer/env": "^0.1.7",
"@glimmer/manager": "0.94.9",
"@glimmer/manager": "0.94.10",
"@glimmer/owner": "0.93.4",
"@glimmer/util": "0.94.8",
"@glimmer/validator": "0.94.8",
"@glimmer/validator": "0.95.0",
"backburner.js": "^2.7.0",
"expect-type": "^0.15.0",
"internal-test-helpers": "workspace:*"
Expand Down
2 changes: 1 addition & 1 deletion packages/@ember/engine/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@glimmer/env": "^0.1.7",
"@glimmer/owner": "0.93.4",
"@glimmer/util": "0.94.8",
"@glimmer/validator": "0.94.8",
"@glimmer/validator": "0.95.0",
"dag-map": "^2.0.2",
"expect-type": "^0.15.0",
"internal-test-helpers": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/@ember/enumerable/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@glimmer/env": "^0.1.7",
"@glimmer/owner": "0.93.4",
"@glimmer/util": "0.94.8",
"@glimmer/validator": "0.94.8",
"@glimmer/validator": "0.95.0",
"internal-test-helpers": "workspace:*"
}
}
4 changes: 2 additions & 2 deletions packages/@ember/helper/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"dependencies": {
"@ember/-internals": "workspace:*",
"@ember/component": "workspace:*",
"@glimmer/manager": "0.94.9",
"@glimmer/runtime": "0.94.10",
"@glimmer/manager": "0.94.10",
"@glimmer/runtime": "0.94.11",
"expect-type": "^0.15.0"
}
}
2 changes: 1 addition & 1 deletion packages/@ember/instrumentation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@ember/runloop": "workspace:*",
"@ember/utils": "workspace:*",
"@glimmer/env": "^0.1.7",
"@glimmer/validator": "0.94.8",
"@glimmer/validator": "0.95.0",
"internal-test-helpers": "workspace:*"
}
}
4 changes: 2 additions & 2 deletions packages/@ember/modifier/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"dependencies": {
"@ember/-internals": "workspace:*",
"@glimmer/manager": "0.94.9",
"@glimmer/runtime": "0.94.10"
"@glimmer/manager": "0.94.10",
"@glimmer/runtime": "0.94.11"
}
}
4 changes: 2 additions & 2 deletions packages/@ember/object/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
"@ember/utils": "workspace:*",
"@glimmer/destroyable": "0.94.8",
"@glimmer/env": "^0.1.7",
"@glimmer/manager": "0.94.9",
"@glimmer/manager": "0.94.10",
"@glimmer/owner": "0.93.4",
"@glimmer/util": "0.94.8",
"@glimmer/validator": "0.94.8",
"@glimmer/validator": "0.95.0",
"expect-type": "^0.15.0",
"internal-test-helpers": "workspace:*"
}
Expand Down
8 changes: 8 additions & 0 deletions packages/@ember/reactive/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
export {
trackedArray,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

JSDoc does come through here from @glimmer/validator

trackedObject,
trackedWeakSet,
trackedSet,
trackedMap,
trackedWeakMap,
} from '@glimmer/validator';
11 changes: 11 additions & 0 deletions packages/@ember/reactive/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "@ember/reactive",
"private": true,
"type": "module",
"exports": {
".": "./index.ts"
},
"dependencies": {
"@glimmer/validator": "0.95.0"
}
}
4 changes: 2 additions & 2 deletions packages/@ember/routing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
"@ember/utils": "workspace:*",
"@glimmer/destroyable": "0.94.8",
"@glimmer/env": "^0.1.7",
"@glimmer/manager": "0.94.9",
"@glimmer/manager": "0.94.10",
"@glimmer/owner": "0.93.4",
"@glimmer/util": "0.94.8",
"@glimmer/validator": "0.94.8",
"@glimmer/validator": "0.95.0",
"backburner.js": "^2.7.0",
"dag-map": "^2.0.2",
"expect-type": "^0.15.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@ember/runloop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@ember/object": "workspace:*",
"@ember/utils": "workspace:*",
"@glimmer/env": "^0.1.7",
"@glimmer/validator": "0.94.8",
"@glimmer/validator": "0.95.0",
"backburner.js": "^2.7.0",
"expect-type": "^0.15.0",
"internal-test-helpers": "workspace:*"
Expand Down
2 changes: 1 addition & 1 deletion packages/@ember/service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@glimmer/env": "^0.1.7",
"@glimmer/owner": "0.93.4",
"@glimmer/util": "0.94.8",
"@glimmer/validator": "0.94.8",
"@glimmer/validator": "0.95.0",
"expect-type": "^0.15.0",
"internal-test-helpers": "workspace:*"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/@ember/template-compilation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"dependencies": {
"@ember/-internals": "workspace:*",
"@ember/canary-features": "workspace:*",
"@glimmer/compiler": "0.94.10",
"@glimmer/compiler": "0.94.11",
"@glimmer/env": "^0.1.7",
"@glimmer/syntax": "0.94.9",
"@glimmer/syntax": "0.95.0",
"ember": "workspace:*",
"ember-template-compiler": "workspace:*"
}
Expand Down
8 changes: 4 additions & 4 deletions packages/@ember/template-compiler/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
"@ember/-internals": "workspace:*",
"@ember/component": "workspace:*",
"@ember/debug": "workspace:*",
"@glimmer/compiler": "0.94.10",
"@glimmer/compiler": "0.94.11",
"@glimmer/env": "^0.1.7",
"@glimmer/interfaces": "0.94.6",
"@glimmer/manager": "0.94.9",
"@glimmer/opcode-compiler": "0.94.9",
"@glimmer/syntax": "0.94.9",
"@glimmer/manager": "0.94.10",
"@glimmer/opcode-compiler": "0.94.10",
"@glimmer/syntax": "0.95.0",
"expect-type": "^0.15.0"
}
}
2 changes: 1 addition & 1 deletion packages/@ember/template-factory/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
".": "./index.ts"
},
"dependencies": {
"@glimmer/opcode-compiler": "0.94.9"
"@glimmer/opcode-compiler": "0.94.10"
}
}
4 changes: 2 additions & 2 deletions packages/@ember/utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
"@ember/runloop": "workspace:*",
"@glimmer/destroyable": "0.94.8",
"@glimmer/env": "^0.1.7",
"@glimmer/manager": "0.94.9",
"@glimmer/manager": "0.94.10",
"@glimmer/owner": "0.93.4",
"@glimmer/util": "0.94.8",
"@glimmer/validator": "0.94.8",
"@glimmer/validator": "0.95.0",
"expect-type": "^0.15.0",
"internal-test-helpers": "workspace:*"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/@ember/version/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
"@ember/runloop": "workspace:*",
"@ember/service": "workspace:*",
"@ember/utils": "workspace:*",
"@glimmer/manager": "0.94.9",
"@glimmer/runtime": "0.94.10",
"@glimmer/manager": "0.94.10",
"@glimmer/runtime": "0.94.11",
"backburner.js": "^2.7.0",
"ember": "workspace:*",
"expect-type": "^0.15.0"
Expand Down
10 changes: 5 additions & 5 deletions packages/ember-template-compiler/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
"@ember/template-compilation": "workspace:*",
"@ember/template-compiler": "workspace:*",
"@ember/utils": "workspace:*",
"@glimmer/compiler": "0.94.10",
"@glimmer/compiler": "0.94.11",
"@glimmer/env": "^0.1.7",
"@glimmer/manager": "0.94.9",
"@glimmer/runtime": "0.94.10",
"@glimmer/syntax": "0.94.9",
"@glimmer/validator": "0.94.8",
"@glimmer/manager": "0.94.10",
"@glimmer/runtime": "0.94.11",
"@glimmer/syntax": "0.95.0",
"@glimmer/validator": "0.95.0",
"backburner.js": "^2.7.0",
"ember": "workspace:*",
"internal-test-helpers": "workspace:*"
Expand Down
2 changes: 1 addition & 1 deletion packages/ember-testing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@glimmer/env": "^0.1.7",
"@glimmer/owner": "0.93.4",
"@glimmer/util": "0.94.8",
"@glimmer/validator": "0.94.8",
"@glimmer/validator": "0.95.0",
"backburner.js": "^2.7.0",
"ember": "workspace:*",
"internal-test-helpers": "workspace:*",
Expand Down
Loading
Loading