@lwrjs/lwc-ssr 0.11.4 → 0.11.6

package/build/cjs/utils/ssr-element.cjs

@@ -79,7 +79,10 @@ async function ssrElement({
     ], context, host) : await (0, import_sandbox.default)([EMIT_WIRES, environmentCode, code], context, host);
     const endTime = import_perf_hooks.performance.now();
     const timeDiff = endTime - startTime;
-    import_diagnostics.logger.info(`[Server-side Rendering] ${specifier} in ${Math.round(timeDiff)} ms`);
+    import_diagnostics.logger.info({
+      label: `Server-side Rendering`,
+      message: `${specifier} in ${Math.round(timeDiff)} ms`
+    });
     if (error)
       throw new Error(error);
     return {html: result, props, markup, cache};

package/build/cjs/utils/utils.cjs

@@ -30,6 +30,7 @@ __export(exports, {
   startWatchdogTimer: () => startWatchdogTimer,
   stopWatchdogTimer: () => stopWatchdogTimer
 });
+var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_node_fetch = __toModule(require("node-fetch"));
 var DEFAULT_SSR_TIMEOUT = 5e3;
 function getWatchdogTime() {
@@ -55,5 +56,5 @@ function createFetchEndowment(host) {
   };
 }
 function createSsrErrorMessage(specifier, e) {
-  return `Server-side rendering for "${specifier}" failed. Falling back to client-side rendering. Reason: ${e.message || e}`;
+  return `Server-side rendering for "${specifier}" failed. Falling back to client-side rendering. Reason: ${e.message || (0, import_diagnostics.stringifyError)(e)}`;
 }

package/build/cjs/viewTransformer/index.cjs

@@ -43,8 +43,12 @@ function lwcSsrViewTransformer(options, {config, moduleBundler, resourceRegistry
       if (!viewContext.view.bootstrap?.ssr) {
         return {};
       }
-      import_diagnostics.logger.debug("[lwcSsrViewTransformer] link");
-      import_diagnostics.logger.verbose("[lwcSsrViewTransformer] link input", stringBuilder);
+      import_diagnostics.logger.debug({label: "lwcSsrViewTransformer", message: "link"});
+      import_diagnostics.logger.verbose({
+        label: "lwcSsrViewTransformer",
+        message: "link input",
+        additionalInfo: stringBuilder
+      });
       if (!metadata.serverData) {
         metadata.serverData = {};
       }
@@ -136,7 +140,11 @@ function lwcSsrViewTransformer(options, {config, moduleBundler, resourceRegistry
           import_diagnostics.logger.error("Adding links during server-side rendering failed. Could not find the </head> tag.");
         }
       }
-      import_diagnostics.logger.verbose("lwcSsrViewTransformer response", stringBuilder);
+      import_diagnostics.logger.verbose({
+        label: "lwcSsrViewTransformer",
+        message: "response",
+        additionalInfo: stringBuilder
+      });
       return {cache: {ttl: pageTtl}};
     }
   };

package/build/es/utils/ssr-element.js

@@ -64,7 +64,10 @@ export async function ssrElement({ specifier, props: templateProps, serverData =
             : await runCode([EMIT_WIRES, environmentCode, code], context, host);
         const endTime = performance.now();
         const timeDiff = endTime - startTime;
-        logger.info(`[Server-side Rendering] ${specifier} in ${Math.round(timeDiff)} ms`);
+        logger.info({
+            label: `Server-side Rendering`,
+            message: `${specifier} in ${Math.round(timeDiff)} ms`,
+        });
         if (error)
             throw new Error(error);
         return { html: result, props, markup, cache };

package/build/es/utils/utils.js

@@ -1,3 +1,4 @@
+import { stringifyError } from '@lwrjs/diagnostics';
 import fetch from 'node-fetch';
 const DEFAULT_SSR_TIMEOUT = 5000; // 5 seconds, override with process.env.SSR_TIMEOUT
 export function getWatchdogTime() {
@@ -27,6 +28,6 @@ export function createFetchEndowment(host) {
     };
 }
 export function createSsrErrorMessage(specifier, e) {
-    return `Server-side rendering for "${specifier}" failed. Falling back to client-side rendering. Reason: ${e.message || e}`;
+    return `Server-side rendering for "${specifier}" failed. Falling back to client-side rendering. Reason: ${e.message || stringifyError(e)}`;
 }
 //# sourceMappingURL=utils.js.map

package/build/es/viewProvider/index.js

@@ -54,7 +54,7 @@ export default class LwcViewProvider extends BaseViewProvider {
                         if (debug || getFeatureFlags().SSR_WITH_CSR_FALLBACK) {
                             // fallback to CSR
                             const message = createSsrErrorMessage(specifier, e);
-                            logger.warn(message, e.stack);
+                            logger.warn(message, e.stack); // TODO specific metadata for errors
                             return {
                                 renderedView: `<${element} ${HYDRATE_DIRECTIVE}="${HYDRATE_CLIENT_VALUE}"></${element}>`,
                                 // send an error message to the client if debug mode is on

package/build/es/viewTransformer/index.js

@@ -32,8 +32,12 @@ export default function lwcSsrViewTransformer(options, { config, moduleBundler,
             if (!viewContext.view.bootstrap?.ssr) {
                 return {}; // no SSR
             }
-            logger.debug('[lwcSsrViewTransformer] link');
-            logger.verbose('[lwcSsrViewTransformer] link input', stringBuilder);
+            logger.debug({ label: 'lwcSsrViewTransformer', message: 'link' });
+            logger.verbose({
+                label: 'lwcSsrViewTransformer',
+                message: 'link input',
+                additionalInfo: stringBuilder,
+            });
             if (!metadata.serverData) {
                 metadata.serverData = {};
             }
@@ -115,7 +119,7 @@ export default function lwcSsrViewTransformer(options, { config, moduleBundler,
                                         HYDRATE_CLIENT_VALUE);
                             const errMessage = createSsrErrorMessage(specifier, err);
                             // log message w/ stack details
-                            logger.warn(errMessage, err.stack);
+                            logger.warn(errMessage, err.stack); // TODO specific metadata for errors
                             // Inform the client of the failing modules w/o exposing any additional
                             // details (such as callstack) for security reasons
                             if (debug) {
@@ -139,7 +143,11 @@ export default function lwcSsrViewTransformer(options, { config, moduleBundler,
                     logger.error('Adding links during server-side rendering failed. Could not find the </head> tag.');
                 }
             }
-            logger.verbose('lwcSsrViewTransformer response', stringBuilder);
+            logger.verbose({
+                label: 'lwcSsrViewTransformer',
+                message: 'response',
+                additionalInfo: stringBuilder,
+            });
             return { cache: { ttl: pageTtl } };
         },
     };

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.11.4",
+    "version": "0.11.6",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -43,13 +43,13 @@
     ],
     "dependencies": {
         "@locker/near-membrane-node": "^0.13.3",
-        "@lwrjs/diagnostics": "0.11.4",
-        "@lwrjs/instrumentation": "0.11.4",
-        "@lwrjs/shared-utils": "0.11.4",
+        "@lwrjs/diagnostics": "0.11.6",
+        "@lwrjs/instrumentation": "0.11.6",
+        "@lwrjs/shared-utils": "0.11.6",
         "node-fetch": "^2.6.8"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.11.4",
+        "@lwrjs/types": "0.11.6",
         "jest": "^26.6.3",
         "ts-jest": "^26.5.6"
     },
@@ -59,5 +59,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "5528cfc12174d4800ff42db1691d14c5d194f7d6"
+    "gitHead": "415e25c05b4b1a0356fb89801f1242e8f73143e3"
 }