@lwrjs/view-registry 0.11.0-alpha.9 → 0.11.1

package/build/cjs/index.cjs

@@ -181,7 +181,7 @@ var LwrViewRegistry = class {
     }
     const pendingViewDefCacheKey = viewDefCacheKey + viewParamKey;
     const viewDefinition = await this.pendingViewDefinitions.execute(pendingViewDefCacheKey, () => (0, import_instrumentation.getTracer)().trace({
-      name: import_instrumentation.ViewSpan.Render,
+      name: import_instrumentation.ViewSpan.RenderView,
       attributes: {
         view: view.id,
         ssr: view.bootstrap?.ssr === true
@@ -243,6 +243,10 @@ var LwrViewRegistry = class {
         serverData: {
           ...renderedContent.metadata.serverData,
           ...renderedLayout.metadata.serverData
+        },
+        serverDebug: {
+          ...renderedContent.metadata.serverDebug,
+          ...renderedLayout.metadata.serverDebug
         }
       }
     }, {
@@ -291,7 +295,7 @@ var LwrViewRegistry = class {
       metadata: renderedViewMetadata,
       compiledView: {immutable = true}
     } = renderedView;
-    const linkedMetadata = skipMetadataCollection ? renderedViewMetadata : await (0, import_shared_utils.extractMetadataFromHtml)(renderedViewContent, renderedViewMetadata);
+    const linkedMetadata = skipMetadataCollection ? renderedViewMetadata : await (0, import_shared_utils.extractMetadataFromHtml)(renderedViewContent, renderedViewMetadata, this.globalConfig);
     const mergedViewContext = {
       ...viewContext,
       runtimeEnvironment,

package/build/cjs/linkers/legacy_view_bootstrap.cjs

@@ -26,6 +26,7 @@ __markAsModule(exports);
 __export(exports, {
   getHtmlResources: () => getHtmlResources
 });
+var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_identity = __toModule(require("@lwrjs/app-service/identity"));
 var import_utils = __toModule(require("../utils.cjs"));
@@ -142,7 +143,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
         if (uri2) {
           imports[dynamicDep] = uri2;
         } else {
-          import_shared_utils.logger.warn("Skipping unknown dynamic import " + dynamicDep);
+          import_diagnostics.logger.warn("Skipping unknown dynamic import " + dynamicDep);
         }
       }
     }

package/build/cjs/linkers/link-lwr-resources.cjs

@@ -26,12 +26,20 @@ __markAsModule(exports);
 __export(exports, {
   linkLwrResources: () => linkLwrResources
 });
+var import_instrumentation = __toModule(require("@lwrjs/instrumentation"));
 var import_view_bootstrap = __toModule(require("./view_bootstrap.cjs"));
 var import_legacy_view_bootstrap = __toModule(require("./legacy_view_bootstrap.cjs"));
 async function linkLwrResources(source, view, viewParams, cxt) {
   const {lwrResourcesId, ...resourceContext} = cxt;
-  const LEGACY_LOADER = resourceContext.runtimeEnvironment?.featureFlags?.LEGACY_LOADER;
-  const {partial, viewRecord} = LEGACY_LOADER ? await (0, import_legacy_view_bootstrap.getHtmlResources)(view, viewParams, resourceContext) : await (0, import_view_bootstrap.getHtmlResources)(view, viewParams, resourceContext);
+  const LEGACY_LOADER = !!resourceContext.runtimeEnvironment.featureFlags.LEGACY_LOADER;
+  const {partial, viewRecord} = await (0, import_instrumentation.getTracer)().trace({
+    name: import_instrumentation.ViewSpan.Generate,
+    attributes: {
+      legacyLoader: LEGACY_LOADER
+    }
+  }, () => {
+    return LEGACY_LOADER ? (0, import_legacy_view_bootstrap.getHtmlResources)(view, viewParams, resourceContext) : (0, import_view_bootstrap.getHtmlResources)(view, viewParams, resourceContext);
+  });
   return {
     renderedView: source.replace(lwrResourcesId, partial),
     viewRecord

package/build/cjs/linkers/preload-utils.cjs

@@ -27,6 +27,7 @@ __export(exports, {
   getPreloadModulesMeta: () => getPreloadModulesMeta,
   setPreloadModulesMeta: () => setPreloadModulesMeta
 });
+var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 function setPreloadModulesMeta(specifier, uri, groups, preloads) {
   const [removedVersion, version] = specifier.split("/v/");
@@ -54,7 +55,7 @@ async function getPreloadModulesMeta(specifier, viewPreloads, bundleConfig, modu
     return exclude.includes(specifier2);
   };
   if (isExternal(specifier)) {
-    import_shared_utils.logger.warn(`"${specifier}" is configured in both bundleConfig.externals and bootstrap.preloadModules. We are treating it as external.`);
+    import_diagnostics.logger.warn(`"${specifier}" is configured in both bundleConfig.externals and bootstrap.preloadModules. We are treating it as external.`);
   } else {
     const versionedModuleId = await (0, import_shared_utils.getVersionedModuleId)(specifier, moduleRegistry, runtimeParams);
     const versionedModuleSpecifier = (0, import_shared_utils.getSpecifier)({

package/build/cjs/linkers/utils.cjs

@@ -45,6 +45,11 @@ function getViewBootstrapConfigurationResource(viewInfo, config, runtimeEnvironm
     },
     ...debug && {modifiers: {debug: "true"}}
   };
+  const environment = {
+    NODE_ENV: runtimeEnvironment.serverMode,
+    SSR: false,
+    ...(0, import_shared_utils.buildEnvironmentContext)(runtimeParams)
+  };
   const configString = [
     "/* This script is generated */",
     "/* Client Bootstrap configuration */",
@@ -53,7 +58,7 @@ function getViewBootstrapConfigurationResource(viewInfo, config, runtimeEnvironm
       ...config,
       endpoints
     })});`,
-    `globalThis.process = { env: { NODE_ENV: "${runtimeEnvironment.serverMode}", SSR: false } };`,
+    `globalThis.process = { env: ${JSON.stringify(environment)} };`,
     `globalThis.lwcRuntimeFlags = { ENABLE_MIXED_SHADOW_MODE: ${viewInfo.mixedMode} };`,
     debug && debugMessage && `console.warn(${JSON.stringify(debugMessage)});`
   ].filter(Boolean).join("\n");

package/build/cjs/linkers/view_bootstrap.cjs

@@ -26,6 +26,7 @@ __markAsModule(exports);
 __export(exports, {
   getHtmlResources: () => getHtmlResources
 });
+var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_identity = __toModule(require("@lwrjs/app-service/identity"));
 var import_utils = __toModule(require("../utils.cjs"));
@@ -133,7 +134,7 @@ async function getHtmlResources(view, viewParams, resourceContext) {
         if (uri2) {
           imports[dynamicDep] = uri2;
         } else {
-          import_shared_utils.logger.warn("Skipping unknown dynamic import " + dynamicDep);
+          import_diagnostics.logger.warn("Skipping unknown dynamic import " + dynamicDep);
         }
       }
     }

package/build/cjs/utils.cjs

@@ -94,7 +94,8 @@ function normalizeRenderedResult({
     metadata: {
       customElements: metadata ? metadata.customElements : [],
       assetReferences: metadata ? metadata.assetReferences : [],
-      serverData: metadata ? metadata.serverData : {}
+      serverData: metadata ? metadata.serverData : {},
+      serverDebug: metadata ? metadata.serverDebug : {}
     },
     options: {
       skipMetadataCollection: options ? options.skipMetadataCollection : false

package/build/es/index.js

@@ -181,7 +181,7 @@ export class LwrViewRegistry {
         }
         const pendingViewDefCacheKey = viewDefCacheKey + viewParamKey;
         const viewDefinition = await this.pendingViewDefinitions.execute(pendingViewDefCacheKey, () => getTracer().trace({
-            name: ViewSpan.Render,
+            name: ViewSpan.RenderView,
             attributes: {
                 view: view.id,
                 ssr: view.bootstrap?.ssr === true,
@@ -253,6 +253,10 @@ export class LwrViewRegistry {
                     ...renderedContent.metadata.serverData,
                     ...renderedLayout.metadata.serverData,
                 },
+                serverDebug: {
+                    ...renderedContent.metadata.serverDebug,
+                    ...renderedLayout.metadata.serverDebug,
+                },
             },
         }, 
         // Render Content now contains a layout
@@ -305,7 +309,7 @@ export class LwrViewRegistry {
         const { renderedView: renderedViewContent, metadata: renderedViewMetadata, compiledView: { immutable = true }, } = renderedView;
         const linkedMetadata = skipMetadataCollection
             ? renderedViewMetadata
-            : await extractMetadataFromHtml(renderedViewContent, renderedViewMetadata);
+            : await extractMetadataFromHtml(renderedViewContent, renderedViewMetadata, this.globalConfig);
         const mergedViewContext = {
             ...viewContext,
             runtimeEnvironment,

package/build/es/linkers/legacy_view_bootstrap.js

@@ -1,4 +1,5 @@
-import { kebabCaseToModuleSpecifier, getModuleGraphs, GraphDepth, getModuleUriPrefix, logger, explodeSpecifier, isBundler, getHydrateDirective, } from '@lwrjs/shared-utils';
+import { logger } from '@lwrjs/diagnostics';
+import { kebabCaseToModuleSpecifier, getModuleGraphs, GraphDepth, getModuleUriPrefix, explodeSpecifier, isBundler, getHydrateDirective, } from '@lwrjs/shared-utils';
 import { AppResourceEnum, getAppSpecifier } from '@lwrjs/app-service/identity';
 import { generateHtmlTag, getModuleResourceByUri } from '../utils.js';
 import { flattenCustomElements, getViewBootstrapConfigurationResource, getViewHmrConfigurationResource, } from './utils.js';

package/build/es/linkers/link-lwr-resources.js

@@ -1,11 +1,19 @@
+import { ViewSpan, getTracer } from '@lwrjs/instrumentation';
 import { getHtmlResources } from './view_bootstrap.js';
 import { getHtmlResources as getLegacyHtmlResource } from './legacy_view_bootstrap.js';
 export async function linkLwrResources(source, view, viewParams, cxt) {
     const { lwrResourcesId, ...resourceContext } = cxt;
-    const LEGACY_LOADER = resourceContext.runtimeEnvironment?.featureFlags?.LEGACY_LOADER;
-    const { partial, viewRecord } = LEGACY_LOADER
-        ? await getLegacyHtmlResource(view, viewParams, resourceContext)
-        : await getHtmlResources(view, viewParams, resourceContext);
+    const LEGACY_LOADER = !!resourceContext.runtimeEnvironment.featureFlags.LEGACY_LOADER;
+    const { partial, viewRecord } = await getTracer().trace({
+        name: ViewSpan.Generate,
+        attributes: {
+            legacyLoader: LEGACY_LOADER,
+        },
+    }, () => {
+        return LEGACY_LOADER
+            ? getLegacyHtmlResource(view, viewParams, resourceContext)
+            : getHtmlResources(view, viewParams, resourceContext);
+    });
     // Finally replace the token with the real resources
     return {
         renderedView: source.replace(lwrResourcesId, partial),

package/build/es/linkers/preload-utils.js

@@ -1,4 +1,5 @@
-import { explodeSpecifier, getGroupName, getVersionedModuleId, normalizeVersionToUri, logger, VERSION_NOT_PROVIDED, getSpecifier, isGroupie, } from '@lwrjs/shared-utils';
+import { logger } from '@lwrjs/diagnostics';
+import { explodeSpecifier, getGroupName, getVersionedModuleId, normalizeVersionToUri, VERSION_NOT_PROVIDED, getSpecifier, isGroupie, } from '@lwrjs/shared-utils';
 /**
  * keeps track of preloadModules metadata
  */

package/build/es/linkers/utils.d.ts

@@ -1,5 +1,5 @@
 import type { ClientBootstrapConfig, RuntimeEnvironment, RuntimeParams, ResourceDefinition, RenderedViewMetadata, CustomElementReference, View, ViewInfo } from '@lwrjs/types';
-export declare function getViewBootstrapConfigurationResource(viewInfo: ViewInfo, config: ClientBootstrapConfig, runtimeEnvironment: RuntimeEnvironment, runtimeParams?: RuntimeParams, debugMessage?: string): ResourceDefinition;
+export declare function getViewBootstrapConfigurationResource(viewInfo: ViewInfo, config: ClientBootstrapConfig, runtimeEnvironment: RuntimeEnvironment, runtimeParams: RuntimeParams, debugMessage?: string): ResourceDefinition;
 export declare function getViewHmrConfigurationResource(view: View, viewMetadata: RenderedViewMetadata): ResourceDefinition;
 export declare function flattenCustomElements(arr: CustomElementReference[], isSSR?: boolean): CustomElementReference[];
 //# sourceMappingURL=utils.d.ts.map

package/build/es/linkers/utils.js

@@ -1,4 +1,4 @@
-import { getMappingUriPrefix, getModuleUriPrefix, getClientBootstrapConfigurationUri, hashContent, } from '@lwrjs/shared-utils';
+import { buildEnvironmentContext, getMappingUriPrefix, getModuleUriPrefix, getClientBootstrapConfigurationUri, hashContent, } from '@lwrjs/shared-utils';
 const CONTENT_TYPE = 'application/javascript';
 export function getViewBootstrapConfigurationResource(viewInfo, config, runtimeEnvironment, runtimeParams, debugMessage) {
     const { compat, debug, hmrEnabled, apiVersion, format } = runtimeEnvironment;
@@ -17,6 +17,14 @@ export function getViewBootstrapConfigurationResource(viewInfo, config, runtimeE
         },
         ...(debug && { modifiers: { debug: 'true' } }),
     };
+    const environment = {
+        // TODO: W-12639529 change NODE_ENV after addressing downstream customers
+        NODE_ENV: runtimeEnvironment.serverMode,
+        // Note: SSR is always false because this script is executed on the client
+        SSR: false,
+        // Used by `lwr/environment`
+        ...buildEnvironmentContext(runtimeParams),
+    };
     const configString = [
         '/* This script is generated */',
         '/* Client Bootstrap configuration */',
@@ -25,9 +33,7 @@ export function getViewBootstrapConfigurationResource(viewInfo, config, runtimeE
             ...config,
             endpoints,
         })});`,
-        // TODO: W-12639529 change NODE_ENV after addressing downstream customers
-        // Note: SSR is always false because this script is executed on the client
-        `globalThis.process = { env: { NODE_ENV: "${runtimeEnvironment.serverMode}", SSR: false } };`,
+        `globalThis.process = { env: ${JSON.stringify(environment)} };`,
         `globalThis.lwcRuntimeFlags = { ENABLE_MIXED_SHADOW_MODE: ${viewInfo.mixedMode} };`,
         debug && debugMessage && `console.warn(${JSON.stringify(debugMessage)});`,
     ]

package/build/es/linkers/view_bootstrap.js

@@ -1,4 +1,5 @@
-import { kebabCaseToModuleSpecifier, toImportMetadata, getModuleGraphs, getMappingUriPrefix, GraphDepth, logger, explodeSpecifier, isBundler, getHydrateDirective, } from '@lwrjs/shared-utils';
+import { logger } from '@lwrjs/diagnostics';
+import { kebabCaseToModuleSpecifier, toImportMetadata, getModuleGraphs, getMappingUriPrefix, GraphDepth, explodeSpecifier, isBundler, getHydrateDirective, } from '@lwrjs/shared-utils';
 import { AppResourceEnum, getAppSpecifier } from '@lwrjs/app-service/identity';
 import { generateHtmlTag, getModuleResourceByUri } from '../utils.js';
 import { flattenCustomElements, getViewBootstrapConfigurationResource, getViewHmrConfigurationResource, } from './utils.js';

package/build/es/utils.js

@@ -59,6 +59,7 @@ export function normalizeRenderedResult({ renderedView, metadata, options, }) {
             customElements: metadata ? metadata.customElements : [],
             assetReferences: metadata ? metadata.assetReferences : [],
             serverData: metadata ? metadata.serverData : {},
+            serverDebug: metadata ? metadata.serverDebug : {},
         },
         options: {
             skipMetadataCollection: options ? options.skipMetadataCollection : false,

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.11.0-alpha.9",
+    "version": "0.11.1",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -30,17 +30,17 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/app-service": "0.11.0-alpha.9",
-        "@lwrjs/diagnostics": "0.11.0-alpha.9",
-        "@lwrjs/instrumentation": "0.11.0-alpha.9",
-        "@lwrjs/shared-utils": "0.11.0-alpha.9",
+        "@lwrjs/app-service": "0.11.1",
+        "@lwrjs/diagnostics": "0.11.1",
+        "@lwrjs/instrumentation": "0.11.1",
+        "@lwrjs/shared-utils": "0.11.1",
         "lru-cache": "^10.0.0"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.11.0-alpha.9"
+        "@lwrjs/types": "0.11.1"
     },
     "engines": {
         "node": ">=16.0.0"
     },
-    "gitHead": "bc50e3f828be56ebdd2f8206cafe8158ab722470"
+    "gitHead": "b7c40fdcd86635dd4e368c0a2e91c5d3374c0fcf"
 }