Skip to content

Working toward glimmer-vm repo integration #20908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

Working toward glimmer-vm repo integration #20908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
58e059c
starting to submodule glimmer-vm
ef4 Mar 17, 2025
959440a
committing other side
ef4 Mar 17, 2025
1442a7c
include glimmer-vm/packages in build
ef4 Mar 17, 2025
e4c26cf
working on directly loading @glimmer/compiler into node
ef4 Mar 17, 2025
49a1bb4
progress
ef4 Apr 29, 2025
8e06a94
Merge remote-tracking branch 'origin/main' into glimmervm-submodule
ef4 May 6, 2025
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
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "glimmer-vm"]
path = glimmer-vm
url = git@github.com:glimmerjs/glimmer-vm.git
2 changes: 1 addition & 1 deletion babel.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default {
{
compilerPath: resolve(
dirname(fileURLToPath(import.meta.url)),
'./broccoli/glimmer-template-compiler'
'./broccoli/glimmer-template-compiler.mjs'
),
},
],
Expand Down
4 changes: 0 additions & 4 deletions broccoli/glimmer-template-compiler.js
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions broccoli/glimmer-template-compiler.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import '@swc-node/register/esm-register';

// this needs to be async because otherwise the esm-register above hasn't taken
// effect yet.
const minimal = await import('../packages/ember-template-compiler/minimal.ts');

const { precompile, _buildCompileOptions, _preprocess, _print } = minimal;
export { precompile, _buildCompileOptions, _preprocess, _print };
1 change: 1 addition & 0 deletions glimmer-vm
Open in desktop
Submodule glimmer-vm added at 572841
35 changes: 18 additions & 17 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,22 +68,6 @@
"@babel/core": "^7.24.4",
"@ember/edition-utils": "^1.2.0",
"@embroider/addon-shim": "^1.9.0",
"@glimmer/compiler": "0.94.10",
"@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/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/util": "0.94.8",
"@glimmer/validator": "0.94.8",
"@glimmer/vm": "0.94.8",
"@glimmer/vm-babel-plugins": "0.93.4",
"@simple-dom/interface": "^1.4.0",
"backburner.js": "^2.8.0",
"broccoli-file-creator": "^2.1.1",
Expand Down Expand Up @@ -113,7 +97,24 @@
"@babel/types": "^7.22.5",
"@embroider/shared-internals": "^2.5.0",
"@eslint/js": "^9.21.0",
"@glimmer/compiler": "workspace:*",
"@glimmer/component": "workspace:^",
"@glimmer/destroyable": "workspace:*",
"@glimmer/env": "workspace:*",
"@glimmer/global-context": "workspace:*",
"@glimmer/interfaces": "workspace:*",
"@glimmer/manager": "workspace:*",
"@glimmer/node": "workspace:*",
"@glimmer/opcode-compiler": "workspace:*",
"@glimmer/owner": "workspace:*",
"@glimmer/program": "workspace:*",
"@glimmer/reference": "workspace:*",
"@glimmer/runtime": "workspace:*",
"@glimmer/syntax": "workspace:*",
"@glimmer/util": "workspace:*",
"@glimmer/validator": "workspace:*",
"@glimmer/vm": "workspace:*",
"@glimmer/vm-babel-plugins": "workspace:*",
"@rollup/plugin-babel": "^6.0.4",
"@simple-dom/document": "^1.4.0",
"@swc-node/register": "^1.6.8",
Expand All @@ -124,7 +125,7 @@
"ast-types": "^0.14.2",
"auto-dist-tag": "^2.1.1",
"babel-plugin-debug-macros": "1.0.0",
"babel-plugin-ember-template-compilation": "^2.1.1",
"babel-plugin-ember-template-compilation": "3.0.0-alpha.4",
"dag-map": "^2.0.2",
"decorator-transforms": "2.0.0",
"ember-cli": "^6.3.0",
Expand Down
34 changes: 17 additions & 17 deletions packages/@ember/-internals/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,23 +40,23 @@
"@ember/service": "workspace:*",
"@ember/template-factory": "workspace:*",
"@ember/utils": "workspace:*",
"@glimmer/compiler": "0.94.10",
"@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/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/util": "0.94.8",
"@glimmer/validator": "0.94.8",
"@glimmer/vm": "0.94.8",
"@glimmer/compiler": "workspace:*",
"@glimmer/component": "workspace:*",
"@glimmer/destroyable": "workspace:*",
"@glimmer/env": "workspace:*",
"@glimmer/global-context": "workspace:*",
"@glimmer/interfaces": "workspace:*",
"@glimmer/manager": "workspace:*",
"@glimmer/node": "workspace:*",
"@glimmer/opcode-compiler": "workspace:*",
"@glimmer/owner": "workspace:*",
"@glimmer/program": "workspace:*",
"@glimmer/reference": "workspace:*",
"@glimmer/runtime": "workspace:*",
"@glimmer/syntax": "workspace:*",
"@glimmer/util": "workspace:*",
"@glimmer/validator": "workspace:*",
"@glimmer/vm": "workspace:*",
"@simple-dom/interface": "^1.4.0",
"backburner.js": "^2.7.0",
"dag-map": "^2.0.2",
Expand Down
10 changes: 5 additions & 5 deletions packages/@ember/application/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
"@ember/runloop": "workspace:*",
"@ember/service": "workspace:*",
"@ember/utils": "workspace:*",
"@glimmer/destroyable": "0.94.8",
"@glimmer/env": "^0.1.7",
"@glimmer/owner": "0.93.4",
"@glimmer/util": "0.94.8",
"@glimmer/validator": "0.94.8",
"@glimmer/destroyable": "workspace:*",
"@glimmer/env": "workspace:*",
"@glimmer/owner": "workspace:*",
"@glimmer/util": "workspace:*",
"@glimmer/validator": "workspace:*",
"backburner.js": "^2.7.0",
"dag-map": "^2.0.2",
"ember": "workspace:*",
Expand Down
12 changes: 6 additions & 6 deletions packages/@ember/array/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
"@ember/object": "workspace:*",
"@ember/runloop": "workspace:*",
"@ember/utils": "workspace:*",
"@glimmer/destroyable": "0.94.8",
"@glimmer/env": "^0.1.7",
"@glimmer/manager": "0.94.9",
"@glimmer/owner": "0.93.4",
"@glimmer/util": "0.94.8",
"@glimmer/validator": "0.94.8",
"@glimmer/destroyable": "workspace:*",
"@glimmer/env": "workspace:*",
"@glimmer/manager": "workspace:*",
"@glimmer/owner": "workspace:*",
"@glimmer/util": "workspace:*",
"@glimmer/validator": "workspace:*",
"expect-type": "^0.15.0",
"internal-test-helpers": "workspace:*"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/@ember/component/package.json
View file
Open in desktop
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": "workspace:*",
"@glimmer/runtime": "workspace:*",
"expect-type": "^0.15.0"
}
}
10 changes: 5 additions & 5 deletions packages/@ember/controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"@ember/debug": "workspace:*",
"@ember/object": "workspace:*",
"@ember/service": "workspace:*",
"@glimmer/destroyable": "0.94.8",
"@glimmer/env": "^0.1.7",
"@glimmer/owner": "0.93.4",
"@glimmer/util": "0.94.8",
"@glimmer/validator": "0.94.8",
"@glimmer/destroyable": "workspace:*",
"@glimmer/env": "workspace:*",
"@glimmer/owner": "workspace:*",
"@glimmer/util": "workspace:*",
"@glimmer/validator":"workspace:*",
"expect-type": "^0.15.0",
"internal-test-helpers": "workspace:*"
}
Expand Down
12 changes: 6 additions & 6 deletions packages/@ember/debug/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
"@ember/routing": "workspace:*",
"@ember/runloop": "workspace:*",
"@ember/utils": "workspace:*",
"@glimmer/destroyable": "0.94.8",
"@glimmer/env": "^0.1.7",
"@glimmer/manager": "0.94.9",
"@glimmer/owner": "0.93.4",
"@glimmer/util": "0.94.8",
"@glimmer/validator": "0.94.8",
"@glimmer/destroyable": "workspace:*",
"@glimmer/env": "workspace:*",
"@glimmer/manager": "workspace:*",
"@glimmer/owner": "workspace:*",
"@glimmer/util": "workspace:*",
"@glimmer/validator": "workspace:*",
"backburner.js": "^2.7.0",
"expect-type": "^0.15.0",
"internal-test-helpers": "workspace:*"
Expand Down
2 changes: 1 addition & 1 deletion packages/@ember/destroyable/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
".": "./index.ts"
},
"dependencies": {
"@glimmer/destroyable": "0.94.8",
"@glimmer/destroyable": "workspace:*",
"expect-type": "^0.15.0"
}
}
10 changes: 5 additions & 5 deletions packages/@ember/engine/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
"@ember/runloop": "workspace:*",
"@ember/service": "workspace:*",
"@ember/utils": "workspace:*",
"@glimmer/destroyable": "0.94.8",
"@glimmer/env": "^0.1.7",
"@glimmer/owner": "0.93.4",
"@glimmer/util": "0.94.8",
"@glimmer/validator": "0.94.8",
"@glimmer/destroyable": "workspace:*",
"@glimmer/env": "workspace:*",
"@glimmer/owner": "workspace:*",
"@glimmer/util": "workspace:*",
"@glimmer/validator": "workspace:*",
"dag-map": "^2.0.2",
"expect-type": "^0.15.0",
"internal-test-helpers": "workspace:*",
Expand Down
10 changes: 5 additions & 5 deletions packages/@ember/enumerable/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"@ember/array": "workspace:*",
"@ember/debug": "workspace:*",
"@ember/object": "workspace:*",
"@glimmer/destroyable": "0.94.8",
"@glimmer/env": "^0.1.7",
"@glimmer/owner": "0.93.4",
"@glimmer/util": "0.94.8",
"@glimmer/validator": "0.94.8",
"@glimmer/destroyable": "workspace:*",
"@glimmer/env": "workspace:*",
"@glimmer/owner": "workspace:*",
"@glimmer/util": "workspace:*",
"@glimmer/validator": "workspace:*",
"internal-test-helpers": "workspace:*"
}
}
4 changes: 2 additions & 2 deletions packages/@ember/helper/package.json
View file
Open in desktop
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": "workspace:*",
"@glimmer/runtime": "workspace:*",
"expect-type": "^0.15.0"
}
}
4 changes: 2 additions & 2 deletions packages/@ember/instrumentation/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"@ember/object": "workspace:*",
"@ember/runloop": "workspace:*",
"@ember/utils": "workspace:*",
"@glimmer/env": "^0.1.7",
"@glimmer/validator": "0.94.8",
"@glimmer/env": "workspace:*",
"@glimmer/validator": "workspace:*",
"internal-test-helpers": "workspace:*"
}
}
4 changes: 2 additions & 2 deletions packages/@ember/modifier/package.json
View file
Open in desktop
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": "workspace:*",
"@glimmer/runtime": "workspace:*"
}
}
12 changes: 6 additions & 6 deletions packages/@ember/object/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
"@ember/runloop": "workspace:*",
"@ember/service": "workspace:*",
"@ember/utils": "workspace:*",
"@glimmer/destroyable": "0.94.8",
"@glimmer/env": "^0.1.7",
"@glimmer/manager": "0.94.9",
"@glimmer/owner": "0.93.4",
"@glimmer/util": "0.94.8",
"@glimmer/validator": "0.94.8",
"@glimmer/destroyable": "workspace:*",
"@glimmer/env": "workspace:*",
"@glimmer/manager": "workspace:*",
"@glimmer/owner": "workspace:*",
"@glimmer/util": "workspace:*",
"@glimmer/validator": "workspace:*",
"expect-type": "^0.15.0",
"internal-test-helpers": "workspace:*"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/@ember/owner/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"@ember/object": "workspace:*",
"@ember/routing": "workspace:*",
"@ember/runloop": "workspace:*",
"@glimmer/component": "workspace:^",
"@glimmer/env": "^0.1.7",
"@glimmer/component": "workspace:*",
"@glimmer/env": "workspace:*",
"expect-type": "^0.15.0"
}
}
12 changes: 6 additions & 6 deletions packages/@ember/routing/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
"@ember/runloop": "workspace:*",
"@ember/service": "workspace:*",
"@ember/utils": "workspace:*",
"@glimmer/destroyable": "0.94.8",
"@glimmer/env": "^0.1.7",
"@glimmer/manager": "0.94.9",
"@glimmer/owner": "0.93.4",
"@glimmer/util": "0.94.8",
"@glimmer/validator": "0.94.8",
"@glimmer/destroyable": "workspace:*",
"@glimmer/env": "workspace:*",
"@glimmer/manager": "workspace:*",
"@glimmer/owner": "workspace:*",
"@glimmer/util": "workspace:*",
"@glimmer/validator": "workspace:*",
"backburner.js": "^2.7.0",
"dag-map": "^2.0.2",
"expect-type": "^0.15.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/@ember/runloop/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"@ember/debug": "workspace:*",
"@ember/object": "workspace:*",
"@ember/utils": "workspace:*",
"@glimmer/env": "^0.1.7",
"@glimmer/validator": "0.94.8",
"@glimmer/env": "workspace:*",
"@glimmer/validator": "workspace:*",
"backburner.js": "^2.7.0",
"expect-type": "^0.15.0",
"internal-test-helpers": "workspace:*"
Expand Down
10 changes: 5 additions & 5 deletions packages/@ember/service/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
"@ember/array": "workspace:*",
"@ember/debug": "workspace:*",
"@ember/object": "workspace:*",
"@glimmer/destroyable": "0.94.8",
"@glimmer/env": "^0.1.7",
"@glimmer/owner": "0.93.4",
"@glimmer/util": "0.94.8",
"@glimmer/validator": "0.94.8",
"@glimmer/destroyable": "workspace:*",
"@glimmer/env": "workspace:*",
"@glimmer/owner": "workspace:*",
"@glimmer/util": "workspace:*",
"@glimmer/validator": "workspace:*",
"expect-type": "^0.15.0",
"internal-test-helpers": "workspace:*"
}
Expand Down
6 changes: 3 additions & 3 deletions packages/@ember/template-compilation/package.json
View file
Open in desktop
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/env": "^0.1.7",
"@glimmer/syntax": "0.94.9",
"@glimmer/compiler": "workspace:*",
"@glimmer/env": "workspace:*",
"@glimmer/syntax": "workspace:*",
"ember": "workspace:*",
"ember-template-compiler": "workspace:*"
}
Expand Down
12 changes: 6 additions & 6 deletions packages/@ember/template-compiler/package.json
View file
Open in desktop
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/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/compiler": "workspace:*",
"@glimmer/env": "workspace:*",
"@glimmer/interfaces": "workspace:*",
"@glimmer/manager": "workspace:*",
"@glimmer/opcode-compiler": "workspace:*",
"@glimmer/syntax": "workspace:*",
"expect-type": "^0.15.0"
}
}
Loading
Loading