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

Jump to bottom

fix(dist-custom-elements): add ssr checks #3131

Merged
merged 7 commits into from
Nov 9, 2021
Merged

fix(dist-custom-elements): add ssr checks #3131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9e2ac47
feat(dist-custom-elements): add SSR checks
willmartian Nov 3, 2021
78312ec
fix: remove additional class declaration
willmartian Nov 3, 2021
3178d7f
style: run prettier
willmartian Nov 5, 2021
f106fcf
Merge branch 'main' into fix-187
willmartian Nov 5, 2021
f0b9936
add import statement, remove conditional heritage clause
rwaskiewicz Nov 9, 2021
b7001e3
style: run prettier
willmartian Nov 9, 2021
da58d2a
Merge branch 'main' into fix-187
rwaskiewicz Nov 9, 2021
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
10 changes: 10 additions & 0 deletions src/compiler/transformers/component-native/add-define-custom-element-function.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,9 @@ const createCustomElementsDefineCase = (tagName: string, actionExpression: ts.Ex
* Add the main `defineCustomElement` function e.g.
* ```javascript
* function defineCustomElement() {
* if (typeof customElements === 'undefined') {
* return;
* }
* const components = ['my-component'];
* components.forEach(tagName => {
* switch (tagName) {
Expand Down Expand Up @@ -176,6 +179,13 @@ const addDefineCustomElementFunction = (
undefined,
ts.factory.createBlock(
[
ts.factory.createIfStatement(
ts.factory.createStrictEquality(
ts.factory.createTypeOfExpression(ts.factory.createIdentifier('customElements')),
ts.factory.createStringLiteral('undefined')
),
ts.factory.createBlock([ts.factory.createReturnStatement()])
),
ts.factory.createVariableStatement(
undefined,
ts.factory.createVariableDeclarationList(
Expand Down
6 changes: 3 additions & 3 deletions src/compiler/transformers/component-native/native-component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ const updateNativeHostComponentHeritageClauses = (classNode: ts.ClassDeclaration
return classNode.heritageClauses;
}

if (moduleFile.cmps.length > 1) {
if (moduleFile.cmps.length >= 1) {
addCoreRuntimeApi(moduleFile, RUNTIME_APIS.HTMLElement);
}

const heritageClause = ts.createHeritageClause(ts.SyntaxKind.ExtendsKeyword, [
ts.createExpressionWithTypeArguments([], ts.createIdentifier(HTML_ELEMENT)),
const heritageClause = ts.factory.createHeritageClause(ts.SyntaxKind.ExtendsKeyword, [
ts.factory.createExpressionWithTypeArguments(ts.factory.createIdentifier(HTML_ELEMENT), []),
]);

return [heritageClause];
Expand Down
4 changes: 2 additions & 2 deletions src/compiler/transformers/test/native-constructor.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ describe('nativeComponentTransform', () => {
const transpiledModule = transpileModule(code, null, compilerCtx, null, [], [transformer]);

expect(transpiledModule.outputText).toContain(
`import { attachShadow as __stencil_attachShadow, defineCustomElement as __stencil_defineCustomElement } from "@stencil/core";`
`import { HTMLElement, attachShadow as __stencil_attachShadow, defineCustomElement as __stencil_defineCustomElement } from "@stencil/core";`
);
expect(transpiledModule.outputText).toContain(`this.__attachShadow()`);
});
Expand All @@ -62,7 +62,7 @@ describe('nativeComponentTransform', () => {
const transpiledModule = transpileModule(code, null, compilerCtx, null, [], [transformer]);

expect(transpiledModule.outputText).toContain(
`import { attachShadow as __stencil_attachShadow, defineCustomElement as __stencil_defineCustomElement } from "@stencil/core";`
`import { HTMLElement, attachShadow as __stencil_attachShadow, defineCustomElement as __stencil_defineCustomElement } from "@stencil/core";`
);
expect(transpiledModule.outputText).toContain(`this.__attachShadow()`);
});
Expand Down