@lwrjs/static 0.17.2-alpha.26 → 0.17.2-alpha.27

package/build/cjs/providers/static-bundle-provider.cjs

@@ -62,37 +62,23 @@ var StaticBundleProvider = class {
   async bundle(moduleId, runtimeEnvironment, runtimeParams) {
     const {specifier, name, namespace, version} = moduleId;
     const {
-      debug,
       i18n: {defaultLocale}
     } = runtimeEnvironment;
     const localeId = runtimeParams?.locale || defaultLocale;
     const ssr = runtimeParams?.ssr;
-    const metadata = this.getBundleMetadata({moduleId, localeId, debug, ssr});
+    let debug = runtimeEnvironment.debug;
+    let metadata = this.getBundleMetadata({moduleId, localeId, debug, ssr});
+    if (!metadata && debug) {
+      metadata = this.getBundleMetadata({moduleId, localeId, debug: false, ssr});
+      if (metadata)
+        debug = false;
+    }
     if (!metadata) {
-      if (moduleId?.namespace === "@lwc" && moduleId?.name === "ssr-runtime") {
-        import_diagnostics.logger.error(new Error("@lwc/ssr-runtime at..."));
-        import_diagnostics.logger.error({msg: "@lwc/ssr-runtime input", moduleId, localeId, debug, ssr});
-        try {
-          const siteBundleId = (0, import_site_metadata.getSiteBundleId)(moduleId, localeId, ssr, this.i18n);
-          const siteBundles = this.siteMetadata.getSiteBundles()?.bundles || {};
-          const keys = Object.keys(siteBundles);
-          const totalBundlesCount = keys?.length;
-          const runtimeBundles = keys.filter((key) => key.startsWith("@lwc/ssr-runtime"));
-          import_diagnostics.logger.error({
-            msg: "@lwc/ssr-runtime metadata",
-            siteBundleId,
-            runtimeBundles,
-            totalBundlesCount
-          });
-        } catch (error) {
-          import_diagnostics.logger.error("Error retrieving siteBundles", {error});
-        }
-      }
+      this.logBundleError(moduleId, localeId, debug, ssr);
       return void 0;
     }
     const bundlePath = import_path.default.join(this.siteRootDir, metadata.path);
-    const resolvedBundlePath = this.getCodePath(bundlePath, debug, specifier, version, localeId, ssr);
-    const codePromiser = this.getCodePromiser(resolvedBundlePath, {
+    const codePromiser = this.getCodePromiser(bundlePath, {
       specifier,
       version,
       locale: localeId,
@@ -198,26 +184,29 @@ var StaticBundleProvider = class {
       return code;
     };
   }
-  getCodePath(bundlePath, debug, specifier, version, localeId, ssr) {
-    const isLambda = (0, import_shared_utils.isLambdaEnv)();
-    let bundleSourcePath = bundlePath;
-    if (debug && isLambda) {
-      const metadata = this.getBundleMetadata({
-        moduleId: {specifier, version},
+  logBundleError(moduleId, localeId, debug, ssr) {
+    const moduleSpecifier = moduleId.namespace ? `${moduleId.namespace}/${moduleId.name}` : moduleId.name;
+    const siteBundleId = (0, import_site_metadata.getSiteBundleId)(moduleId, localeId, ssr, this.i18n);
+    const siteBundles = this.siteMetadata.getSiteBundles()?.bundles || {};
+    const siteDebugBundles = this.siteMetadata.getDebugSiteBundles()?.bundles || {};
+    const runtimeBundles = Object.keys(siteBundles).filter((key) => key.startsWith(moduleSpecifier));
+    const debugBundles = Object.keys(siteDebugBundles).filter((key) => key.startsWith(moduleSpecifier));
+    import_diagnostics.logger.warn({
+      message: `Static bundle`,
+      additionalInfo: {
+        moduleId,
         localeId,
-        debug: false,
-        ssr
-      });
-      if (!metadata) {
-        import_diagnostics.logger.error({
-          label: "static-bundle-provider",
-          message: `Unexpected code reference: ${specifier}`
-        });
-        return BUNDLE_SOURCE_NOT_FOUND;
-      }
-      bundleSourcePath = import_path.default.join(this.siteRootDir, metadata.path);
-    }
-    return bundleSourcePath;
+        debug,
+        ssr,
+        moduleSpecifier,
+        siteBundleId,
+        debugBundles,
+        runtimeBundles,
+        totalBundlesCount: Object.keys(siteBundles).length,
+        totalDebugBundlesCount: Object.keys(siteDebugBundles).length
+      },
+      label: "static-bundle-provider"
+    });
   }
 };
 var static_bundle_provider_default = StaticBundleProvider;

package/build/es/providers/static-bundle-provider.d.ts

@@ -30,16 +30,17 @@ export default class StaticBundleProvider implements BundleProvider {
         debug: boolean;
     }): () => Promise<string>;
     /**
-     * Get the local source code path for the a static bundle
-     * If we are running in a lambda and the mode is debug we will return the prod source code instead of the debug source code
+     * Logs an error when a bundle fails to load and provides debugging metadata.
      *
-     * @param bundlePath The default path for the bundle for prod read from .metadata/bundle-metadata.json, for debug .metadata/bundle-metadata-debug.json
-     * @param debug Is the request in debug mode?
-     * @param specifier Root specifier for the requested bundle
-     * @param version Root specifier version
-     * @param localeId Locale id (e.g. en-US) for the current request
-     * @param ssr True if this is a server bundle
+     * This function logs details about the failed bundle load attempt, including the module ID,
+     * locale, debug mode, and SSR status. It also attempts to retrieve additional metadata
+     * about the site bundles and debug bundles associated with the module.
+     *
+     * @param {Partial<AbstractModuleId>} moduleId - The module identifier, which may include a namespace and name.
+     * @param {string} localeId - The locale associated with the bundle.
+     * @param {boolean} debug - Indicates whether debug mode is enabled.
+     * @param {boolean} ssr - Indicates whether the bundle is for server-side rendering (SSR).
      */
-    getCodePath(bundlePath: string, debug: boolean, specifier: string, version: string | undefined, localeId: string, ssr: boolean): string;
+    logBundleError(moduleId: Partial<AbstractModuleId>, localeId: string, debug: boolean, ssr: boolean): void;
 }
 //# sourceMappingURL=static-bundle-provider.d.ts.map

package/build/es/providers/static-bundle-provider.js

@@ -35,39 +35,27 @@ export default class StaticBundleProvider {
     }
     async bundle(moduleId, runtimeEnvironment, runtimeParams) {
         const { specifier, name, namespace, version } = moduleId;
-        const { debug, i18n: { defaultLocale }, } = runtimeEnvironment;
+        const { i18n: { defaultLocale }, } = runtimeEnvironment;
         const localeId = (runtimeParams?.locale || defaultLocale);
         const ssr = runtimeParams?.ssr;
-        const metadata = this.getBundleMetadata({ moduleId, localeId, debug, ssr });
+        let debug = runtimeEnvironment.debug;
+        let metadata = this.getBundleMetadata({ moduleId, localeId, debug, ssr });
+        if (!metadata && debug) {
+            // Fallback to use prod bundles if the debug variant does not exist
+            // eg: debug bundles are not shipped to the Lambda
+            // eg: locally, an MRT bundle may or may not have debug metadata, depending on how it's generated
+            metadata = this.getBundleMetadata({ moduleId, localeId, debug: false, ssr });
+            if (metadata)
+                debug = false;
+        }
         if (!metadata) {
-            // Adding temporary logging to debug issue where @lwc/ssr-runtime is not found
-            if (moduleId?.namespace === '@lwc' && moduleId?.name === 'ssr-runtime') {
-                logger.error(new Error('@lwc/ssr-runtime at...'));
-                logger.error({ msg: '@lwc/ssr-runtime input', moduleId, localeId, debug, ssr });
-                try {
-                    const siteBundleId = getSiteBundleId(moduleId, localeId, ssr, this.i18n);
-                    const siteBundles = this.siteMetadata.getSiteBundles()?.bundles || {};
-                    const keys = Object.keys(siteBundles);
-                    const totalBundlesCount = keys?.length;
-                    const runtimeBundles = keys.filter((key) => key.startsWith('@lwc/ssr-runtime'));
-                    logger.error({
-                        msg: '@lwc/ssr-runtime metadata',
-                        siteBundleId,
-                        runtimeBundles,
-                        totalBundlesCount,
-                    });
-                }
-                catch (error) {
-                    logger.error('Error retrieving siteBundles', { error });
-                }
-            }
+            this.logBundleError(moduleId, localeId, debug, ssr);
             return undefined;
         }
         // Default bundle source path
         const bundlePath = path.join(this.siteRootDir, metadata.path);
         // Get the associated bundle source code
-        const resolvedBundlePath = this.getCodePath(bundlePath, debug, specifier, version, localeId, ssr);
-        const codePromiser = this.getCodePromiser(resolvedBundlePath, {
+        const codePromiser = this.getCodePromiser(bundlePath, {
             specifier,
             version,
             locale: localeId,
@@ -176,42 +164,44 @@ export default class StaticBundleProvider {
         };
     }
     /**
-     * Get the local source code path for the a static bundle
-     * If we are running in a lambda and the mode is debug we will return the prod source code instead of the debug source code
+     * Logs an error when a bundle fails to load and provides debugging metadata.
+     *
+     * This function logs details about the failed bundle load attempt, including the module ID,
+     * locale, debug mode, and SSR status. It also attempts to retrieve additional metadata
+     * about the site bundles and debug bundles associated with the module.
      *
-     * @param bundlePath The default path for the bundle for prod read from .metadata/bundle-metadata.json, for debug .metadata/bundle-metadata-debug.json
-     * @param debug Is the request in debug mode?
-     * @param specifier Root specifier for the requested bundle
-     * @param version Root specifier version
-     * @param localeId Locale id (e.g. en-US) for the current request
-     * @param ssr True if this is a server bundle
+     * @param {Partial<AbstractModuleId>} moduleId - The module identifier, which may include a namespace and name.
+     * @param {string} localeId - The locale associated with the bundle.
+     * @param {boolean} debug - Indicates whether debug mode is enabled.
+     * @param {boolean} ssr - Indicates whether the bundle is for server-side rendering (SSR).
      */
-    getCodePath(bundlePath, debug, specifier, version, localeId, ssr) {
-        // Flag is used to indicate that we are running on a lambda
-        const isLambda = isLambdaEnv();
-        // Default source code path determined from metadata based on debug mode
-        let bundleSourcePath = bundlePath;
-        // This is the special case where the request is in debug mode and we are on the lambda
-        // So we will look up the prod source code instead of the debug source code
-        if (debug && isLambda) {
-            const metadata = this.getBundleMetadata({
-                moduleId: { specifier, version },
+    logBundleError(moduleId, localeId, debug, ssr) {
+        const moduleSpecifier = moduleId.namespace
+            ? `${moduleId.namespace}/${moduleId.name}`
+            : moduleId.name;
+        const siteBundleId = getSiteBundleId(moduleId, localeId, ssr, this.i18n);
+        // Retrieve site bundles and debug bundles
+        const siteBundles = this.siteMetadata.getSiteBundles()?.bundles || {};
+        const siteDebugBundles = this.siteMetadata.getDebugSiteBundles()?.bundles || {};
+        // Extract keys and filter bundles by module specifier
+        const runtimeBundles = Object.keys(siteBundles).filter((key) => key.startsWith(moduleSpecifier));
+        const debugBundles = Object.keys(siteDebugBundles).filter((key) => key.startsWith(moduleSpecifier));
+        logger.warn({
+            message: `Static bundle`,
+            additionalInfo: {
+                moduleId,
                 localeId,
-                debug: false,
+                debug,
                 ssr,
-            });
-            if (!metadata) {
-                // We did not find the bundle prod bundle even though we did find it in the debug metadata before
-                logger.error({
-                    label: 'static-bundle-provider',
-                    message: `Unexpected code reference: ${specifier}`,
-                });
-                return BUNDLE_SOURCE_NOT_FOUND;
-            }
-            // Overwrite the default source code path the prod source code path
-            bundleSourcePath = path.join(this.siteRootDir, metadata.path);
-        }
-        return bundleSourcePath;
+                moduleSpecifier,
+                siteBundleId,
+                debugBundles,
+                runtimeBundles,
+                totalBundlesCount: Object.keys(siteBundles).length,
+                totalDebugBundlesCount: Object.keys(siteDebugBundles).length,
+            },
+            label: 'static-bundle-provider',
+        });
     }
 }
 //# sourceMappingURL=static-bundle-provider.js.map

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.17.2-alpha.26",
+    "version": "0.17.2-alpha.27",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -56,13 +56,13 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/diagnostics": "0.17.2-alpha.26",
-        "@lwrjs/instrumentation": "0.17.2-alpha.26",
-        "@lwrjs/shared-utils": "0.17.2-alpha.26",
+        "@lwrjs/diagnostics": "0.17.2-alpha.27",
+        "@lwrjs/instrumentation": "0.17.2-alpha.27",
+        "@lwrjs/shared-utils": "0.17.2-alpha.27",
         "lru-cache": "^10.4.3"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.17.2-alpha.26",
+        "@lwrjs/types": "0.17.2-alpha.27",
         "@types/express": "^4.17.21",
         "jest": "29.7.0",
         "jest-express": "^1.12.0",
@@ -76,5 +76,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "7aeb8ed681eced0cf80abc41b5adee3f3fd5160b"
+    "gitHead": "b6f4a80f77b05902c4365f1c1eb657d944d01db0"
 }