@sitecore-feaas/clientside 0.3.13 → 0.3.15

package/src/components/FEAASComponent.tsx

@@ -240,6 +240,7 @@ export class FEAASComponent extends FEAASElement<FEAASComponentsProps, string> {
 
   update() {
     this.alreadyRendered = true
+    if (this.getAttribute('hydrate') == 'false') return
     if (Array.from(this.children).filter((c) => c.tagName != 'BR').length > 0 && !this.needsRefresh) {
       renderDOMElement(this, this.readyData)
     } else {
@@ -287,4 +288,4 @@ declare global {
 }
 FEAASComponent.register('feaas-component')
 
-export { FEAASComponent as Component, FEAASComponentsProps as ComponentProps }
+export { FEAASComponent as Component, FEAASComponentsProps as ComponentProps }

package/src/ui/FEAASExternal.tsx

@@ -309,8 +309,15 @@ class FEAASExternalRegistration extends WebComponent {
   }
 }
 
-if (typeof window !== 'undefined' && window)
-  Object.defineProperty(window, 'FEAASExternalComponents', { get: () => FEAASExternal.registered })
+if (typeof window !== 'undefined' && window) {
+  if (!('FEAASExternalComponents' in window))
+    Object.defineProperty(window, 'FEAASExternalComponents', { get: () => FEAASExternal.registered })
+  else if (!location.hostname.startsWith('xmc-'))
+    console.error(
+      'FEAAS Clientside is loaded twice into the bundle. This can lead to unexpected problems and needs to be resolved'
+    )
+}
+
 FEAASExternal.register('feaas-external')
 FEAASExternal.setRegistrationCallback()
 FEAASExternalRegistration.register('feaas-registration')

package/src/ui/react.tsx

@@ -58,6 +58,8 @@ export const FEAASReactServerComponent = async ({ ...props }: FEAASReactComponen
 
     p.template = response.template
     p.lastModified = response.lastModified
+    //@ts-ignore
+    p.hydrate = false
   }
 
   return FEAASReactComponent({ ...p, data: fetchedData })

package/test/ServerComponent.test.tsx

@@ -27,7 +27,7 @@ describe('React Server', () => {
 
     await validate(
       <>{Component}</>,
-      `<feaas-component library="library" component="test" src="library/test" data="{&quot;data&quot;:&quot;1&quot;}" hydrate="false">{"data": "1"}</feaas-component>`
+      `<feaas-component library="library" component="test" src="library/test" hydrate="false" data="{&quot;data&quot;:&quot;1&quot;}">{"data": "1"}</feaas-component>`
     )
   })
   it('render with object data', async () => {
@@ -38,7 +38,7 @@ describe('React Server', () => {
     const Component = await ServerComponent({ src: 'library/test', data: { data: '2' } })
     await validate(
       <>{Component}</>,
-      `<feaas-component library="library" component="test" src="library/test" data="{&quot;data&quot;:&quot;2&quot;}" hydrate="false">Test</feaas-component>`
+      `<feaas-component library="library" component="test" src="library/test" hydrate="false" data="{&quot;data&quot;:&quot;2&quot;}">Test</feaas-component>`
     )
   })
   it('pre-render data', async () => {
@@ -50,7 +50,7 @@ describe('React Server', () => {
     const Component = await ServerComponent({ src: 'library/test', data: { value: 0 } })
     await validate(
       <>{Component}</>,
-      `<feaas-component library="library" component="test" src="library/test" data="{&quot;value&quot;:0}" hydrate="false">Hey: <var data-path="value">0</var>!</feaas-component>`
+      `<feaas-component library="library" component="test" src="library/test" hydrate="false" data="{&quot;value&quot;:0}">Hey: <var data-path="value">0</var>!</feaas-component>`
     )
   })
   it('pre-render data with style attribute', async () => {
@@ -64,7 +64,7 @@ describe('React Server', () => {
     const Component = await ServerComponent({ src: 'library/test', data: { value: 0 } })
     await validate(
       <>{Component}</>,
-      `<feaas-component library="library" component="test" src="library/test" data="{&quot;value&quot;:0}" hydrate="false"><p style="text-align: left; color: red;"><b style="cursor: 1;">Hey:</b> <var data-path="value">0</var>!</p></feaas-component>`
+      `<feaas-component library="library" component="test" src="library/test" hydrate="false" data="{&quot;value&quot;:0}"><p style="text-align: left; color: red;"><b style="cursor: 1;">Hey:</b> <var data-path="value">0</var>!</p></feaas-component>`
     )
   })
   it('pre-render data with whitespace', async () => {
@@ -76,7 +76,7 @@ describe('React Server', () => {
     const Component = await ServerComponent({ src: 'library/test', data: { value: 0 } })
     await validate(
       <>{Component}</>,
-      `<feaas-component library="library" component="test" src="library/test" data="{&quot;value&quot;:0}" hydrate="false"><p>Test <b>Hey:</b> <i>Dawg</i> <var data-path="value">0</var>!</p></feaas-component>`
+      `<feaas-component library="library" component="test" src="library/test" hydrate="false" data="{&quot;value&quot;:0}"><p>Test <b>Hey:</b> <i>Dawg</i> <var data-path="value">0</var>!</p></feaas-component>`
     )
   })
   it('render external component', async () => {
@@ -96,7 +96,7 @@ describe('React Server', () => {
     const Component = await ServerComponent({ src: 'library/test', data: { value: 0 } })
     await validate(
       <>{Component}</>,
-      `<feaas-component library="library" component="test" src="library/test" data="{&quot;value&quot;:0}" hydrate="false"><p>This?</p><feaas-external hydrate="false" data-external-id="test-server-external"><h1>My Component</h1></feaas-external></feaas-component>`
+      `<feaas-component library="library" component="test" src="library/test" hydrate="false" data="{&quot;value&quot;:0}"><p>This?</p><feaas-external hydrate="false" data-external-id="test-server-external"><h1>My Component</h1></feaas-external></feaas-component>`
     )
   })
   it('render external component with context', async () => {
@@ -122,7 +122,7 @@ describe('React Server', () => {
       <Context.Provider value={{ test: 'cde' }}>
         <>{Component}</>
       </Context.Provider>,
-      `<feaas-component library="library" component="test" src="library/test" data="{&quot;value&quot;:0}" hydrate="false"><p>This?</p><feaas-external hydrate="false" data-external-id="test-server-external-context"><h1>My Component: cde</h1></feaas-external></feaas-component>`
+      `<feaas-component library="library" component="test" src="library/test" hydrate="false" data="{&quot;value&quot;:0}"><p>This?</p><feaas-external hydrate="false" data-external-id="test-server-external-context"><h1>My Component: cde</h1></feaas-external></feaas-component>`
     )
   })
-})
+})

package/types/components/FEAASComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FEAASComponent.d.ts","sourceRoot":"","sources":["../../src/components/FEAASComponent.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,WAAW,EAAgB,MAAM,sBAAsB,CAAA;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAEhD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,YAAY;;;;;;;;;;;;;;EAkCzD;AAED,MAAM,MAAM,oBAAoB,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAA;AAE1E;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,qBAAa,cAAe,SAAQ,YAAY,CAAC,oBAAoB,EAAE,MAAM,CAAC;IAC5E,SAAS,EAAE,GAAG,CAAK;IACnB,aAAa,yBAGZ;IAED,MAAM,CAAC,kBAAkB,WAYxB;IAED,YAAY;;;;;;;;;;;;;;OAQsB;IAElC,YAAY,EAAE,OAAO,CAAA;IAErB,OAAO,CAAC,IAAI,EAAE,WAAW;IAIzB,QAAQ;;;;;;;;;;;;;;;IAIR,eAAe,CAAC,IAAI,EAAE,MAAM,oBAAoB;IAIhD,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAkB1E,SAAS;IAef,SAAS,IAAI,GAAG;;IAkBhB,IAAI;IASJ,WAAW;IAaX,aAAa;IAMb,MAAM,SAAU,MAAM,UAGrB;IAEK,IAAI;IAkCV,eAAe,EAAE,OAAO,CAAA;IAExB,KAAK;IAML,MAAM;CAaP;AAED,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,GAAG,CAAC;QACZ,UAAU,iBAAiB;YACzB,iBAAiB,EAAE;gBACjB,IAAI,CAAC,EAAE,GAAG,CAAA;gBACV,wBAAwB,CAAC,EAAE,OAAO,CAAA;gBAClC,QAAQ,CAAC,EAAE,MAAM,CAAA;gBACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;gBACjB,QAAQ,CAAC,EAAE,OAAO,CAAA;gBAClB,QAAQ,CAAC,EAAE,GAAG,CAAA;gBACd,uBAAuB,CAAC,EAAE;oBAAE,MAAM,EAAE,MAAM,CAAA;iBAAE,CAAA;gBAC5C,eAAe,CAAC,EAAE,MAAM,CAAA;gBACxB,OAAO,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;gBAC1B,iBAAiB,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,EAAE,CAAA;aAC1C,GAAG,CACA;gBACE;;mBAEG;gBACH,QAAQ,CAAC,EAAE,MAAM,CAAA;gBACjB,GAAG,CAAC,EAAE,MAAM,CAAA;gBACZ,OAAO,EAAE,MAAM,CAAA;gBACf,SAAS,EAAE,MAAM,CAAA;gBACjB,OAAO,CAAC,EAAE,MAAM,CAAA;gBAChB,QAAQ,CAAC,EAAE,oBAAoB,CAAC,UAAU,CAAC,CAAA;aAC5C,GACD;gBAAE,GAAG,EAAE,MAAM,CAAA;aAAE,GACf;gBAAE,QAAQ,EAAE,MAAM,CAAA;aAAE,CACvB,CAAA;SACF;KACF;CACF;AAGD,OAAO,EAAE,cAAc,IAAI,SAAS,EAAE,oBAAoB,IAAI,cAAc,EAAE,CAAA"}
+{"version":3,"file":"FEAASComponent.d.ts","sourceRoot":"","sources":["../../src/components/FEAASComponent.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,WAAW,EAAgB,MAAM,sBAAsB,CAAA;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAEhD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,YAAY;;;;;;;;;;;;;;EAkCzD;AAED,MAAM,MAAM,oBAAoB,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAA;AAE1E;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,qBAAa,cAAe,SAAQ,YAAY,CAAC,oBAAoB,EAAE,MAAM,CAAC;IAC5E,SAAS,EAAE,GAAG,CAAK;IACnB,aAAa,yBAGZ;IAED,MAAM,CAAC,kBAAkB,WAYxB;IAED,YAAY;;;;;;;;;;;;;;OAQsB;IAElC,YAAY,EAAE,OAAO,CAAA;IAErB,OAAO,CAAC,IAAI,EAAE,WAAW;IAIzB,QAAQ;;;;;;;;;;;;;;;IAIR,eAAe,CAAC,IAAI,EAAE,MAAM,oBAAoB;IAIhD,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAkB1E,SAAS;IAef,SAAS,IAAI,GAAG;;IAkBhB,IAAI;IASJ,WAAW;IAaX,aAAa;IAMb,MAAM,SAAU,MAAM,UAGrB;IAEK,IAAI;IAkCV,eAAe,EAAE,OAAO,CAAA;IAExB,KAAK;IAML,MAAM;CAcP;AAED,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,GAAG,CAAC;QACZ,UAAU,iBAAiB;YACzB,iBAAiB,EAAE;gBACjB,IAAI,CAAC,EAAE,GAAG,CAAA;gBACV,wBAAwB,CAAC,EAAE,OAAO,CAAA;gBAClC,QAAQ,CAAC,EAAE,MAAM,CAAA;gBACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;gBACjB,QAAQ,CAAC,EAAE,OAAO,CAAA;gBAClB,QAAQ,CAAC,EAAE,GAAG,CAAA;gBACd,uBAAuB,CAAC,EAAE;oBAAE,MAAM,EAAE,MAAM,CAAA;iBAAE,CAAA;gBAC5C,eAAe,CAAC,EAAE,MAAM,CAAA;gBACxB,OAAO,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;gBAC1B,iBAAiB,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,EAAE,CAAA;aAC1C,GAAG,CACA;gBACE;;mBAEG;gBACH,QAAQ,CAAC,EAAE,MAAM,CAAA;gBACjB,GAAG,CAAC,EAAE,MAAM,CAAA;gBACZ,OAAO,EAAE,MAAM,CAAA;gBACf,SAAS,EAAE,MAAM,CAAA;gBACjB,OAAO,CAAC,EAAE,MAAM,CAAA;gBAChB,QAAQ,CAAC,EAAE,oBAAoB,CAAC,UAAU,CAAC,CAAA;aAC5C,GACD;gBAAE,GAAG,EAAE,MAAM,CAAA;aAAE,GACf;gBAAE,QAAQ,EAAE,MAAM,CAAA;aAAE,CACvB,CAAA;SACF;KACF;CACF;AAGD,OAAO,EAAE,cAAc,IAAI,SAAS,EAAE,oBAAoB,IAAI,cAAc,EAAE,CAAA"}