Skip to content

Commit b25c563

Browse files
NullVoxPopuliNullVoxPopuli
authored
Merge pull request #1638 from NullVoxPopuli/upgrade-more-more-deps-2
Upgrade deps
2 parents 4fbbf0c + 2560383 commit b25c563

File tree

13 files changed

+512
-372
lines changed

13 files changed

+512
-372
lines changed

‎apps/repl/app/components/shadowed.gts

+27-21
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,52 @@
1+
import Component from '@glimmer/component';
2+
import { tracked } from '@glimmer/tracking';
3+
14
import { modifier } from 'ember-modifier';
2-
import { cell } from 'ember-resources';
35

4-
import type { TOC } from '@ember/component/template-only';
6+
const attachShadow = modifier((element: Element, [set]: [(shadowRoot: HTMLDivElement) => void]) => {
7+
let shadow = element.attachShadow({ mode: 'open' });
8+
let div = document.createElement('div');
59

6-
type SetShadow = ReturnType<typeof cell<ShadowRoot>>['set'];
10+
shadow.appendChild(div);
711

8-
const attachShadow = modifier((element: Element, [setShadow]: [SetShadow]) => {
9-
setShadow(element.attachShadow({ mode: 'open' }));
12+
set(div);
1013
});
1114

1215
// index.html has the production-fingerprinted references to these links
1316
// Ideally, we'd have some pre-processor scan everything for references to
1417
// assets in public, but idk how to set that up
1518
const getStyles = () => [...document.head.querySelectorAll('link')].map((link) => link.href);
1619

17-
const shadowRoot = () => cell<ShadowRoot>();
18-
19-
export const Shadowed: TOC<{
20+
export class Shadowed extends Component<{
2021
Element: HTMLDivElement;
2122
Args: {
2223
omitStyles?: boolean;
2324
};
2425
Blocks: { default: [] };
25-
}> = <template>
26-
{{#let (shadowRoot) as |shadow|}}
27-
{{! @glint-ignore }}
28-
<div data-shadow {{attachShadow shadow.set}} ...attributes></div>
26+
}> {
27+
@tracked shadow: HTMLDivElement | undefined;
28+
29+
setShadow = async (shadowRoot: HTMLDivElement) => {
30+
await Promise.resolve();
31+
32+
this.shadow = shadowRoot;
33+
};
34+
35+
<template>
36+
<div data-shadow {{attachShadow this.setShadow}} ...attributes></div>
2937

30-
{{#if shadow.current}}
31-
{{#in-element shadow.current}}
38+
{{#if this.shadow}}
39+
{{#in-element this.shadow}}
3240
{{#unless @omitStyles}}
33-
{{#let (getStyles) as |styles|}}
34-
{{#each styles as |styleHref|}}
35-
<link rel="stylesheet" href={{styleHref}} />
36-
{{/each}}
37-
{{/let}}
41+
{{#each (getStyles) as |styleHref|}}
42+
<link rel="stylesheet" href={{styleHref}} />
43+
{{/each}}
3844
{{/unless}}
3945

4046
{{yield}}
4147
{{/in-element}}
4248
{{/if}}
43-
{{/let}}
44-
</template>;
49+
</template>
50+
}
4551

4652
export default Shadowed;

‎apps/repl/ember-cli-build.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,7 @@ module.exports = async function (defaults) {
6969
staticHelpers: true,
7070
staticModifiers: true,
7171
staticComponents: true,
72-
staticEmberSource: true,
73-
splitControllers: true,
74-
splitRouteClasses: true,
72+
staticEmberSource: false,
7573
staticAppPaths: ['utils'],
7674
// splitAtRoutes: [],
7775
implicitModulesStrategy: 'packageNames',

‎apps/repl/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
"ember-async-data": "1.0.3",
9090
"ember-cli": "~5.6.0",
9191
"ember-cli-babel": "^8.2.0",
92-
"ember-cli-browserstack": "^2.0.1",
92+
"ember-cli-browserstack": "^3.0.0",
9393
"ember-cli-htmlbars": "^6.3.0",
9494
"ember-cli-inject-live-reload": "^2.1.0",
9595
"ember-cli-sri": "^2.1.1",
@@ -102,7 +102,7 @@
102102
"ember-qunit": "^8.0.2",
103103
"ember-resolver": "^11.0.1",
104104
"ember-route-template": "^1.0.3",
105-
"ember-source": "^5.5.0",
105+
"ember-source": "~5.5.0",
106106
"ember-template-imports": "^3.4.2",
107107
"ember-template-lint": "^5.13.0",
108108
"ember-template-lint-plugin-prettier": "^5.0.0",

‎apps/repl/tests/rendering/components/shadowed-test.gts

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import { find, render } from '@ember/test-helpers';
2+
import { module, test } from 'qunit';
3+
import { setupRenderingTest } from 'ember-qunit';
4+
5+
import { Shadowed } from 'limber/components/shadowed';
6+
7+
module('Rendering | <Shadowed>', function (hooks) {
8+
setupRenderingTest(hooks);
9+
10+
test('it works', async function (assert) {
11+
await render(
12+
<template>
13+
out of shadow
14+
15+
<Shadowed>
16+
in shadow
17+
</Shadowed>
18+
</template>
19+
);
20+
21+
assert.dom().hasText('out of shadow');
22+
assert.dom().doesNotContainText('in shadow');
23+
// assort.dom forgot that ShadowDom is a thing
24+
// assert.dom(find('[data-shadow]')?.shadowRoot).hasText('in shadow');
25+
assert.ok(find('[data-shadow]')?.shadowRoot?.textContent?.includes('in shadow'));
26+
});
27+
});

‎apps/tutorial/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
"ember-page-title": "^8.2.1",
9191
"ember-qunit": "^8.0.2",
9292
"ember-resolver": "^11.0.1",
93-
"ember-source": "^5.5.0",
93+
"ember-source": "^5.6.0",
9494
"ember-template-imports": "^3.4.2",
9595
"ember-template-lint": "^5.13.0",
9696
"eslint": "^8.55.0",

‎dev/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
},
1212
"dependencies": {
1313
"chalk": "^5.3.0",
14-
"ember-apply": "^2.10.3",
14+
"ember-apply": "^2.12.0",
1515
"execa": "^8.0.1",
1616
"fs-extra": "^11.2.0",
1717
"latest-version": "^7.0.0",

‎packages/app-support/limber-ui/addon/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"ember-modifier": "^4.1.0",
7878
"ember-primitives": "^0.11.1",
7979
"ember-resources": "^7.0.0",
80-
"ember-source": "^5.5.0",
80+
"ember-source": "^5.6.0",
8181
"ember-template-imports": "^3.4.2",
8282
"ember-template-lint": "^5.13.0",
8383
"eslint": "^8.55.0",

‎packages/app-support/limber-ui/test-app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"ember-page-title": "^8.2.1",
6464
"ember-qunit": "^8.0.2",
6565
"ember-resolver": "^11.0.1",
66-
"ember-source": "^5.5.0",
66+
"ember-source": "^5.6.0",
6767
"ember-source-channel-url": "^3.0.0",
6868
"ember-template-lint": "^5.13.0",
6969
"ember-try": "^3.0.0",

‎packages/app-support/transpilation/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"@typescript-eslint/eslint-plugin": "^6.20.0",
5151
"@typescript-eslint/parser": "^6.20.0",
5252
"babel-loader": "^9.1.3",
53-
"ember-source": "^5.5.0",
53+
"ember-source": "^5.6.0",
5454
"esbuild": "0.20.0",
5555
"eslint": "^8.55.0",
5656
"prettier": "^3.2.5",

‎packages/ember-repl/addon/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
"@typescript-eslint/parser": "^6.20.0",
134134
"concurrently": "^8.2.2",
135135
"ember-resources": "^7.0.0",
136-
"ember-source": "^5.5.0",
136+
"ember-source": "^5.6.0",
137137
"ember-template-imports": "^3.4.2",
138138
"ember-template-lint": "^5.13.0",
139139
"eslint": "^8.55.0",

‎packages/ember-repl/test-app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"ember-page-title": "^8.2.1",
7474
"ember-qunit": "^8.0.2",
7575
"ember-resolver": "^11.0.1",
76-
"ember-source": "^5.5.0",
76+
"ember-source": "^5.6.0",
7777
"ember-source-channel-url": "^3.0.0",
7878
"ember-template-imports": "^3.4.2",
7979
"ember-template-lint": "^5.13.0",

0 commit comments

Comments
 (0)