Skip to content
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

test(ssr): more tests for mixed light/scoped slots #5133

Merged
merged 4 commits into from
Jan 13, 2025
Merged

test(ssr): more tests for mixed light/scoped slots #5133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ac292ce
fix: do not render mismatched scoped slotted data
jhefferman-sfdc Jan 13, 2025
d2047ad
Merge branch 'master' into jhefferman/mismatched-scoped-slots-fix
jhefferman-sfdc Jan 13, 2025
ae8c6b7
test(ssr): more tests for mixed light/scoped slots
nolanlawson Jan 13, 2025
9cfe8dd
chore: merged master
jhefferman-sfdc Jan 13, 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
Empty file added ...-server/src/__tests__/fixtures/scoped-slots/mixed-with-light-dom-slots-inside-2/error.txt
View file
Open in desktop
Empty file.
18 changes: 18 additions & 0 deletions ...ver/src/__tests__/fixtures/scoped-slots/mixed-with-light-dom-slots-inside-2/expected.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<x-parent>
<template shadowrootmode="open">
<x-child>
<div>
<!---->
<!---->
<!---->
<span>
a
</span>
<span>
b
</span>
<!---->
</div>
</x-child>
</template>
</x-parent>
3 changes: 3 additions & 0 deletions ...e-server/src/__tests__/fixtures/scoped-slots/mixed-with-light-dom-slots-inside-2/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export const tagName = 'x-parent';
export { default } from 'x/parent';
export * from 'x/parent';
6 changes: 6 additions & 0 deletions ...ts__/fixtures/scoped-slots/mixed-with-light-dom-slots-inside-2/modules/x/child/child.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<template lwc:render-mode="light">
<div>
<slot>Default fallback slot content</slot>
<slot name="foo">Named fallback slot content</slot>
</div>
</template>
6 changes: 6 additions & 0 deletions ...ests__/fixtures/scoped-slots/mixed-with-light-dom-slots-inside-2/modules/x/child/child.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { LightningElement } from 'lwc';

export default class Child extends LightningElement {
static renderMode = 'light';
item = { id: 99, name: 'ssr' };
}
9 changes: 9 additions & 0 deletions ...__/fixtures/scoped-slots/mixed-with-light-dom-slots-inside-2/modules/x/parent/parent.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<template>
<x-child>
<span slot="foo">a</span>
<template lwc:slot-data="data1">
<span>default {data1.id} - {foo}</span>
</template>
<span slot="foo">b</span>
</x-child>
</template>
5 changes: 5 additions & 0 deletions ...ts__/fixtures/scoped-slots/mixed-with-light-dom-slots-inside-2/modules/x/parent/parent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { LightningElement } from 'lwc';

export default class Parent extends LightningElement {
foo = 'bar';
}
Empty file added ...-server/src/__tests__/fixtures/scoped-slots/mixed-with-light-dom-slots-inside-3/error.txt
View file
Open in desktop
Empty file.
6 changes: 6 additions & 0 deletions ...ver/src/__tests__/fixtures/scoped-slots/mixed-with-light-dom-slots-inside-3/expected.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<x-parent>
<template shadowrootmode="open">
<x-child>
</x-child>
</template>
</x-parent>
3 changes: 3 additions & 0 deletions ...e-server/src/__tests__/fixtures/scoped-slots/mixed-with-light-dom-slots-inside-3/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export const tagName = 'x-parent';
export { default } from 'x/parent';
export * from 'x/parent';
2 changes: 2 additions & 0 deletions ...ts__/fixtures/scoped-slots/mixed-with-light-dom-slots-inside-3/modules/x/child/child.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<template lwc:render-mode="light">
</template>
6 changes: 6 additions & 0 deletions ...ests__/fixtures/scoped-slots/mixed-with-light-dom-slots-inside-3/modules/x/child/child.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { LightningElement } from 'lwc';

export default class Child extends LightningElement {
static renderMode = 'light';
item = { id: 99, name: 'ssr' };
}
9 changes: 9 additions & 0 deletions ...__/fixtures/scoped-slots/mixed-with-light-dom-slots-inside-3/modules/x/parent/parent.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<template>
<x-child>
<span slot="foo">a</span>
<template lwc:slot-data="data1">
<span>default {data1.id} - {foo}</span>
</template>
<span slot="foo">b</span>
</x-child>
</template>
5 changes: 5 additions & 0 deletions ...ts__/fixtures/scoped-slots/mixed-with-light-dom-slots-inside-3/modules/x/parent/parent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { LightningElement } from 'lwc';

export default class Parent extends LightningElement {
foo = 'bar';
}
Empty file added ...server/src/__tests__/fixtures/scoped-slots/mixed-with-light-dom-slots-outside-2/error.txt
View file
Open in desktop
Empty file.
27 changes: 27 additions & 0 deletions ...er/src/__tests__/fixtures/scoped-slots/mixed-with-light-dom-slots-outside-2/expected.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<x-parent>
<template shadowrootmode="open">
<x-child>
<div>
<!---->
<!---->
<span>
1 default 99 - bar
</span>
<!---->
<!---->
<span>
5 default 99 - bar
</span>
<!---->
<!---->
<!---->
<!---->
<!---->
<!---->
<!---->
Fallback slot content 3
<!---->
</div>
</x-child>
</template>
</x-parent>
3 changes: 3 additions & 0 deletions ...-server/src/__tests__/fixtures/scoped-slots/mixed-with-light-dom-slots-outside-2/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export const tagName = 'x-parent';
export { default } from 'x/parent';
export * from 'x/parent';
8 changes: 8 additions & 0 deletions ...s__/fixtures/scoped-slots/mixed-with-light-dom-slots-outside-2/modules/x/child/child.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<template lwc:render-mode="light">
<div>
<slot lwc:slot-bind={item}>Fallback slot content</slot>
<slot lwc:slot-bind={item} name="slot1">Fallback slot content 1</slot>
<slot lwc:slot-bind={item} name="slot2">Fallback slot content 2</slot>
<slot lwc:slot-bind={item} name="slot3">Fallback slot content 3</slot>
</div>
</template>
6 changes: 6 additions & 0 deletions ...sts__/fixtures/scoped-slots/mixed-with-light-dom-slots-outside-2/modules/x/child/child.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { LightningElement } from 'lwc';

export default class Child extends LightningElement {
static renderMode = 'light';
item = { id: 99, name: 'ssr' };
}
13 changes: 13 additions & 0 deletions ..._/fixtures/scoped-slots/mixed-with-light-dom-slots-outside-2/modules/x/parent/parent.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<template>
<x-child>
<template lwc:slot-data="data1">
<span>1 default {data1.id} - {foo}</span>
</template>
<span>2 default {data1} - {foo}</span>
<span slot="slot1">3 slot1 {data1} - {foo}</span>
<span slot="slot2">4 slot2 {data1} - {foo}</span>
<template lwc:slot-data="data1">
<span>5 default {data1.id} - {foo}</span>
</template>
</x-child>
</template>
5 changes: 5 additions & 0 deletions ...s__/fixtures/scoped-slots/mixed-with-light-dom-slots-outside-2/modules/x/parent/parent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { LightningElement } from 'lwc';

export default class Parent extends LightningElement {
foo = 'bar';
}