Skip to content
Draft
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
8 changes: 4 additions & 4 deletions addon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,17 @@
"dom-element-descriptors": "^0.5.0"
},
"devDependencies": {
"@babel/core": "^7.25.2",
"@babel/plugin-transform-typescript": "^7.25.2",
"@babel/runtime": "^7.24.4",
"@babel/core": "7.28.4",
"@babel/plugin-transform-typescript": "7.28.0",
"@babel/runtime": "7.28.4",
"@embroider/addon-dev": "^5.0.0",
"@glint/template": "^1.4.0",
"@rollup/plugin-babel": "^6.0.4",
"@tsconfig/ember": "^3.0.6",
"@types/rsvp": "^4.0.9",
"@typescript-eslint/eslint-plugin": "^8.2.0",
"@typescript-eslint/parser": "^8.2.0",
"babel-plugin-ember-template-compilation": "^2.2.5",
"babel-plugin-ember-template-compilation": "3.0.1",
"concurrently": "^8.2.2",
"documentation": "^14.0.3",
"ember-source": "^5.11.0",
Expand Down
1,269 changes: 799 additions & 470 deletions addon/pnpm-lock.yaml

Large diffs are not rendered by default.

21 changes: 20 additions & 1 deletion addon/src/setup-rendering-context.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import { run } from '@ember/runloop';
import { EventDispatcher } from '@ember/-internals/views';
import { createComputeRef } from '@glimmer/reference';
import { createCapturedArgs, curry, EMPTY_POSITIONAL } from '@glimmer/runtime';
import { dict } from '@glimmer/util';

import {
type BaseContext,
type TestContext,
Expand Down Expand Up @@ -130,8 +134,23 @@ export function render(
const ownerToRenderFrom = options?.owner || owner;

if (isComponent(templateFactoryOrComponent)) {
const { owner: _owner, ...namedArgs } = options ?? {};
const namedDict = dict();

for (const key of Object.keys(namedArgs)) {
// @ts-expect-error TODO: fix this
namedDict[key] = createComputeRef(() => namedArgs[key]);
}

context = {
ProvidedComponent: templateFactoryOrComponent,
ProvidedComponent: curry(
0,
templateFactoryOrComponent,
// @ts-expect-error TODO: fix this
createCapturedArgs(namedDict, EMPTY_POSITIONAL),
null,
true,
),
};
templateFactoryOrComponent = INVOKE_PROVIDED_COMPONENT;
}
Expand Down
11 changes: 9 additions & 2 deletions test-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,15 @@
"injected": true
}
},
"resolutions": {
"@glimmer/validator": "0.95.0",
"@glimmer/runtime": "0.94.11",
"@glimmer/util": "0.94.8"
},
"devDependencies": {
"@babel/eslint-parser": "^7.21.3",
"@babel/plugin-proposal-decorators": "^7.21.0",
"babel-plugin-ember-template-compilation": "3.0.1",
"@ember/jquery": "^2.0.0",
"@ember/optional-features": "^2.0.0",
"@ember/string": "^3.0.1",
Expand All @@ -39,15 +45,16 @@
"@embroider/test-setup": "^4.0.0",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"@glimmer/runtime": "^1.1.2",
"@glimmer/util": "^1.1.2",
"concurrently": "^8.0.1",
"ember-auto-import": "^2.6.3",
"ember-auto-import": "2.10.1",
"ember-cli": "~4.12.2",
"ember-cli-app-version": "^6.0.0",
"ember-cli-babel": "^8.2.0",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli-htmlbars": "^6.2.0",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-data": "~4.11.3",
"ember-fetch": "^8.1.2",
"ember-load-initializers": "^2.1.2",
"ember-modifier": "^4.1.0",
Expand Down
Loading