1.0.16

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartssr",
-  "version": "1.0.13",
+  "version": "1.0.16",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartssr",
-  "version": "1.0.13",
+  "version": "1.0.16",
   "private": false,
   "description": "a smart server side renderer supporting shadow dom",
   "main": "dist_ts/index.js",

test/test.ts

@@ -13,13 +13,13 @@ tap.test('should start the smartssr instance', async () => {
   await testSSRInstance.start();
 });
 
-tap.test('should render central.eu', async (tools) => {
+tap.skip.test('should render central.eu', async (tools) => {
   await testSSRInstance.renderPage(
     'https://central.eu/article/5e76873b9cf69b7bf6bc78bc/Introducing%3A%20central.eu'
   );
 });
 
-tap.skip.test('should render lossless.com', async () => {
+tap.test('should render lossless.com', async () => {
   await testSSRInstance.renderPage('https://lossless.com');
 });
 

ts/smartssr.classes.smartssr.ts

@@ -46,34 +46,26 @@ export class SmartSSR {
       console.log(`${urlArg}: ${msg.text()}`);
     });
 
-    page.on('load', async (...args) => {
-      await plugins.smartdelay.delayFor(5000);
-      let screenshotBuffer: Buffer;
-
-      if (this.options.debug) {
-        screenshotBuffer = await page.screenshot({
-          encoding: 'binary',
-        });
-      }
-
-      await page.$eval('body', serializeFunction);
-      const pageContent = await page.content();
-      const renderedPageString = pageContent;
-      resultDeferred.resolve(renderedPageString);
-
-      if (this.options.debug) {
-        plugins.smartfile.memory.toFsSync(
-          renderedPageString,
-          plugins.path.join(paths.noGitDir, 'test.html')
-        );
-        const fs = await import('fs');
-        fs.writeFileSync(plugins.path.join(paths.noGitDir, 'test.png'), screenshotBuffer);
-      }
-    });
-
     const renderTimeMeasurement = new plugins.smarttime.HrtMeasurement();
     renderTimeMeasurement.start();
-    await page.goto(urlArg);
+    await page.goto(urlArg, {
+      waitUntil: 'networkidle2',
+    });
+
+    let screenshotBuffer: Buffer;
+
+    if (this.options.debug) {
+      screenshotBuffer = await page.screenshot({
+        encoding: 'binary',
+      });
+    }
+
+    await page.$eval('body', serializeFunction);
+    const pageContent = await page.content();
+    const renderedPageString = pageContent;
+    resultDeferred.resolve(renderedPageString);
+
+
     const result = await resultDeferred.promise;
     renderTimeMeasurement.stop();
 
@@ -87,6 +79,17 @@ export class SmartSSR {
     console.log(
       `The rendering alone took ${renderTimeMeasurement.milliSeconds} milliseconds for ${urlArg}`
     );
+
+    // debug
+    if (this.options.debug) {
+      plugins.smartfile.memory.toFsSync(
+        renderedPageString,
+        plugins.path.join(paths.noGitDir, 'test.html')
+      );
+      const fs = await import('fs');
+      fs.writeFileSync(plugins.path.join(paths.noGitDir, 'test.png'), screenshotBuffer);
+    }
+
     return result;
   }
 }

ts/smartssr.function.serialize.ts

@@ -42,11 +42,18 @@ export function serializeFunction(rootNode) {
       const slots = nodeArg.shadowRoot.querySelectorAll('slot');
 
       // handle slot element
+      const slotsForMove: HTMLSlotElement[] = [];
       slots.forEach((slot) => {
-        nodeArg.childNodes.forEach((lightNode) => slot.parentNode.insertBefore(lightNode, slot));
-        slot.parentNode.removeChild(slot);
+        slotsForMove.push(slot);
       });
 
+      
+      for (const slot of slotsForMove) {
+        const slottedLightNodesForMove = [];
+        slot.assignedNodes().forEach((lightNode) => slottedLightNodesForMove.push(lightNode));
+        slottedLightNodesForMove.forEach((lightNode) => slot.parentNode.insertBefore(lightNode, slot));
+      }
+
       // lets modify the css
       const childNodes = nodeArg.shadowRoot.childNodes;
       // tslint:disable-next-line: prefer-for-of
@@ -56,9 +63,6 @@ export function serializeFunction(rootNode) {
           if (childNode.tagName === 'STYLE') {
             childNode.textContent = prependCss(nodeUUID, childNode.textContent);
           } else {
-            if (nodeArg.tagName?.includes('ARTICLEGRID')) {
-              console.log('hello ' + childNode.id);
-            }
             serializeNode(childNode, logThis);
           }
           noteForAppending.push(childNode);