@lwrjs/static 0.12.0-alpha.27 → 0.12.0-alpha.28

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

@@ -31,7 +31,6 @@ var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_path = __toModule(require("path"));
 var import_fs_extra = __toModule(require("fs-extra"));
 var import_static_utils = __toModule(require("../utils/static-utils.cjs"));
-var LWR_SSR_BUNDLE_PREFIX = "@lwrjs/lwc-ssr/";
 var StaticBundleProvider = class {
   constructor(_config, context) {
     this.name = "static-bundle-provider";
@@ -54,17 +53,10 @@ var StaticBundleProvider = class {
     const siteBundles = debug && this.debugSiteBundles ? this.debugSiteBundles : this.siteBundles;
     const metadata = await (0, import_static_utils.getLocalizedBundle)(specifier, siteBundles, localeId, this.i18n);
     if (!metadata) {
-      if (!specifier.startsWith(LWR_SSR_BUNDLE_PREFIX)) {
-        import_diagnostics.logger.debug({
-          label: `${this.name}`,
-          message: `did not find requested specifier ${specifier}`
-        });
-      }
       return void 0;
     }
     const bundlePath = import_path.default.join(this.siteRootDir, metadata.path);
-    const isLambda = process.env.AWS_LAMBDA_FUNCTION_NAME !== void 0;
-    const code = debug && isLambda ? 'throw new Error("Unexpected code reference");' : (await import_fs_extra.default.readFile(bundlePath)).toString("utf-8");
+    const code = await this.getCode(bundlePath, debug, specifier, localeId);
     const imports = metadata.imports.map((specifier2) => {
       const importModule = (0, import_shared_utils.explodeSpecifier)(specifier2);
       if (!importModule.version) {
@@ -105,5 +97,30 @@ var StaticBundleProvider = class {
       src: bundlePath
     };
   }
+  async getCode(bundlePath, debug, specifier, localeId) {
+    const isLambda = process.env.AWS_LAMBDA_FUNCTION_NAME !== void 0;
+    let bundleSourcePath = bundlePath;
+    try {
+      if (debug && isLambda) {
+        const siteBundles = this.siteBundles;
+        const metadata = await (0, import_static_utils.getLocalizedBundle)(specifier, siteBundles, localeId, this.i18n);
+        if (!metadata) {
+          import_diagnostics.logger.warn({
+            label: "static-bundle-provider",
+            message: `Unexpected code reference: ${specifier}`
+          });
+          return `throw new Error('Unexpected code reference: ${specifier}');`;
+        }
+        bundleSourcePath = import_path.default.join(this.siteRootDir, metadata.path);
+      }
+      return (await import_fs_extra.default.readFile(bundleSourcePath)).toString("utf-8");
+    } catch (err) {
+      import_diagnostics.logger.warn({
+        label: "static-bundle-provider",
+        message: `Unexpected code reference: ${specifier} ${bundleSourcePath}`
+      }, err);
+      return `throw new Error('Unexpected code reference: ${specifier} ${bundleSourcePath}');`;
+    }
+  }
 };
 var static_bundle_provider_default = StaticBundleProvider;

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

@@ -8,5 +8,15 @@ export default class StaticBundleProvider implements BundleProvider {
     i18n: import("@lwrjs/types").I18NConfig;
     constructor(_config: {}, context: ProviderContext);
     bundle<BundleIdentifier extends AbstractModuleId, RE extends RuntimeEnvironment>(moduleId: BundleIdentifier, runtimeEnvironment: RE, runtimeParams: RuntimeParams): Promise<BundleDefinition | undefined>;
+    /**
+     * Get the source code 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
+     *
+     * @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 localeId Locale id (e.g. en-US) for the current request
+     */
+    getCode(bundlePath: string, debug: boolean, specifier: string, localeId: string): Promise<string>;
 }
 //# sourceMappingURL=static-bundle-provider.d.ts.map

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

@@ -3,7 +3,6 @@ import { explodeSpecifier, getSpecifier } from '@lwrjs/shared-utils';
 import path from 'path';
 import fs from 'fs-extra';
 import { getLocalizedBundle, resolveStaticBundleVersion } from '../utils/static-utils.js';
-const LWR_SSR_BUNDLE_PREFIX = '@lwrjs/lwc-ssr/';
 export default class StaticBundleProvider {
     constructor(_config, context) {
         this.name = 'static-bundle-provider';
@@ -23,22 +22,12 @@ export default class StaticBundleProvider {
         const siteBundles = debug && this.debugSiteBundles ? this.debugSiteBundles : this.siteBundles;
         const metadata = await getLocalizedBundle(specifier, siteBundles, localeId, this.i18n);
         if (!metadata) {
-            // ignore ssr module requests
-            if (!specifier.startsWith(LWR_SSR_BUNDLE_PREFIX)) {
-                logger.debug({
-                    label: `${this.name}`,
-                    message: `did not find requested specifier ${specifier}`,
-                });
-            }
             return undefined;
         }
-        // Have to make the bundle code available for SSR
+        // Default bundle source path
         const bundlePath = path.join(this.siteRootDir, metadata.path);
-        const isLambda = process.env.AWS_LAMBDA_FUNCTION_NAME !== undefined;
-        // debug bundles don't exist for SSR when deployed to MRT, so skip them
-        const code = debug && isLambda
-            ? 'throw new Error("Unexpected code reference");'
-            : (await fs.readFile(bundlePath)).toString('utf-8');
+        // Get the associated bundle source code
+        const code = await this.getCode(bundlePath, debug, specifier, localeId);
         const imports = metadata.imports.map((specifier) => {
             const importModule = explodeSpecifier(specifier);
             if (!importModule.version) {
@@ -83,5 +72,50 @@ export default class StaticBundleProvider {
             src: bundlePath,
         };
     }
+    /**
+     * Get the source code 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
+     *
+     * @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 localeId Locale id (e.g. en-US) for the current request
+     */
+    async getCode(bundlePath, debug, specifier, localeId) {
+        // Flag is used to indicate that we are running on a lambda
+        const isLambda = process.env.AWS_LAMBDA_FUNCTION_NAME !== undefined;
+        // Default source code path determined from metadata based on debug mode
+        let bundleSourcePath = bundlePath;
+        try {
+            // 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 siteBundles = this.siteBundles;
+                const metadata = await getLocalizedBundle(specifier, siteBundles, localeId, this.i18n);
+                if (!metadata) {
+                    // We did not find the bundle prod bundle even though we did find it in the debug metadata before
+                    logger.warn({
+                        label: 'static-bundle-provider',
+                        message: `Unexpected code reference: ${specifier}`,
+                    });
+                    // Returning source code that throws and error is someone tries to evaluate it
+                    return `throw new Error('Unexpected code reference: ${specifier}');`;
+                }
+                // Overwrite the default source code path the prod source code path
+                bundleSourcePath = path.join(this.siteRootDir, metadata.path);
+            }
+            // Read the bundle source code.
+            return (await fs.readFile(bundleSourcePath)).toString('utf-8');
+        }
+        catch (err) {
+            // Ran it an un-expected error reading the bundle source code
+            logger.warn({
+                label: 'static-bundle-provider',
+                message: `Unexpected code reference: ${specifier} ${bundleSourcePath}`,
+            }, err);
+            // Returning source code that throws and error is someone tries to evaluate it
+            return `throw new Error('Unexpected code reference: ${specifier} ${bundleSourcePath}');`;
+        }
+    }
 }
 //# sourceMappingURL=static-bundle-provider.js.map

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.12.0-alpha.27",
+    "version": "0.12.0-alpha.28",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -48,11 +48,11 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/diagnostics": "0.12.0-alpha.27",
-        "@lwrjs/shared-utils": "0.12.0-alpha.27"
+        "@lwrjs/diagnostics": "0.12.0-alpha.28",
+        "@lwrjs/shared-utils": "0.12.0-alpha.28"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.12.0-alpha.27",
+        "@lwrjs/types": "0.12.0-alpha.28",
         "@types/express": "^4.17.21",
         "jest": "^26.6.3",
         "jest-express": "^1.12.0",
@@ -65,5 +65,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "84406699a78e2a81882df74a50467e5376a00a90"
+    "gitHead": "5228219171bb2d28a4c7b32f1f6238e396ac3cbd"
 }