@lwrjs/static 0.15.0-alpha.26 → 0.15.0-alpha.28

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

@@ -60,12 +60,12 @@ var StaticBundleProvider = class {
       i18n: {defaultLocale}
     } = runtimeEnvironment;
     const localeId = runtimeParams?.locale || defaultLocale;
-    const metadata = this.getBundleMetadata({moduleId, localeId, debug, ssr: false});
+    const ssr = runtimeParams?.ssr;
+    const metadata = this.getBundleMetadata({moduleId, localeId, debug, ssr});
     if (!metadata) {
       return void 0;
     }
     const bundlePath = import_path.default.join(this.siteRootDir, metadata.path);
-    const ssr = runtimeParams?.ssr;
     const resolvedBundlePath = this.getCodePath(bundlePath, debug, specifier, version, localeId, ssr);
     const codePromiser = this.getCodePromiser(resolvedBundlePath, specifier);
     const imports = metadata.imports.map((importSpecifier) => this.getModuleReference(importSpecifier, localeId, debug, false));
@@ -166,16 +166,6 @@ var StaticBundleProvider = class {
         return BUNDLE_SOURCE_NOT_FOUND;
       }
       bundleSourcePath = import_path.default.join(this.siteRootDir, metadata.path);
-    } else if (ssr) {
-      const metadata = this.getBundleMetadata({
-        moduleId: {specifier, version},
-        localeId,
-        debug,
-        ssr
-      });
-      if (metadata) {
-        bundleSourcePath = import_path.default.join(this.siteRootDir, metadata.path);
-      }
     }
     return bundleSourcePath;
   }

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

@@ -30,7 +30,9 @@ export default class StaticBundleProvider implements BundleProvider {
      * @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
      */
     getCodePath(bundlePath: string, debug: boolean, specifier: string, version: string | undefined, localeId: string, ssr: boolean): string;
 }

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

@@ -29,16 +29,14 @@ export default class StaticBundleProvider {
         const { specifier, name, namespace, version } = moduleId;
         const { debug, i18n: { defaultLocale }, } = runtimeEnvironment;
         const localeId = (runtimeParams?.locale || defaultLocale);
-        // For Bifurcated SSR modules we are getting the CSRed bundle def here to be used for linking (s3)
-        // When we get the code we will explicity look for ssr bifurcated cmp tp get the source.
-        const metadata = this.getBundleMetadata({ moduleId, localeId, debug, ssr: false });
+        const ssr = runtimeParams?.ssr;
+        const metadata = this.getBundleMetadata({ moduleId, localeId, debug, ssr });
         if (!metadata) {
             return undefined;
         }
         // Default bundle source path
         const bundlePath = path.join(this.siteRootDir, metadata.path);
         // Get the associated bundle source code
-        const ssr = runtimeParams?.ssr;
         const resolvedBundlePath = this.getCodePath(bundlePath, debug, specifier, version, localeId, ssr);
         const codePromiser = this.getCodePromiser(resolvedBundlePath, specifier);
         const imports = metadata.imports.map((importSpecifier) => this.getModuleReference(importSpecifier, localeId, debug, false));
@@ -135,7 +133,9 @@ export default class StaticBundleProvider {
      * @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
      */
     getCodePath(bundlePath, debug, specifier, version, localeId, ssr) {
         // Flag is used to indicate that we are running on a lambda
@@ -162,19 +162,6 @@ export default class StaticBundleProvider {
             // Overwrite the default source code path the prod source code path
             bundleSourcePath = path.join(this.siteRootDir, metadata.path);
         }
-        else if (ssr) {
-            // If this is an ssr request get the code preferring bifurcated ssr modules
-            const metadata = this.getBundleMetadata({
-                moduleId: { specifier, version },
-                localeId,
-                debug,
-                ssr,
-            });
-            if (metadata) {
-                // Overwrite the default source code path the ssr source code path
-                bundleSourcePath = path.join(this.siteRootDir, metadata.path);
-            }
-        }
         return bundleSourcePath;
     }
 }

package/build/es/site-metadata.d.ts

@@ -65,7 +65,7 @@ export declare function parseSiteId(input: string): SiteArtifactId;
  *
  * @param moduleId - Root Module Id
  * @param locale - Current locale
- * @param ssr - Component variant is preferred for SSR
+ * @param ssr - Component variant is required for SSR
  * @returns Site Bundle Identifier
  */
 export declare function getSiteBundleId({ specifier, namespace, name, version }: Partial<AbstractModuleId>, locale?: string, ssr?: boolean, i18n?: I18NConfig): string;

package/build/es/site-metadata.js

@@ -213,7 +213,7 @@ export function parseSiteId(input) {
  *
  * @param moduleId - Root Module Id
  * @param locale - Current locale
- * @param ssr - Component variant is preferred for SSR
+ * @param ssr - Component variant is required for SSR
  * @returns Site Bundle Identifier
  */
 export function getSiteBundleId({ specifier, namespace, name = '', version }, locale, ssr, i18n) {

package/build/es/utils/decision-tree.d.ts

@@ -22,6 +22,7 @@ export default class DecisionTreeImpl<Artifact extends SiteArtifact> implements
      * @param version known version or will add the choice ''
      * @param localeId preferred bundle locale or will add '' for default locale
      * @param debug flag if debug bundle is preferred
+     * @param ssr flag if server bundle is requested
      */
     private createArtifactChoices;
     /**

package/build/es/utils/decision-tree.js

@@ -127,6 +127,7 @@ export default class DecisionTreeImpl {
      * @param version known version or will add the choice ''
      * @param localeId preferred bundle locale or will add '' for default locale
      * @param debug flag if debug bundle is preferred
+     * @param ssr flag if server bundle is requested
      */
     createArtifactChoices({ specifier, version, localeId, debug, ssr }) {
         const envChoice = debug ? CHOICE_DEBUG : CHOICE_PROD;
@@ -162,6 +163,9 @@ export default class DecisionTreeImpl {
         // If there is an ssr sigil always prefer it during SSR
         const ssrChoice = match.variants[SSR_SIGIL] || CHOICE_EMPTY;
         const ssr = ssrChoice ? [ssrChoice, CHOICE_WILDCARD] : [CHOICE_WILDCARD];
+        // UPDATE WHEN FULL SERVER BUNDLE METADATA IS AVAILABLE
+        // delete the line above and enable the line below
+        // const ssr = [ssrChoice];
         const localeChoice = match.variants[LOCALE_SIGIL];
         // If there are no fallbacks, or localeChoice is not in fallbacks use the ['*'] wildcard choice
         const localeId = localeFallbacks?.[localeChoice] ?? [CHOICE_WILDCARD];

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.15.0-alpha.26",
+    "version": "0.15.0-alpha.28",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -52,12 +52,12 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/diagnostics": "0.15.0-alpha.26",
-        "@lwrjs/shared-utils": "0.15.0-alpha.26",
+        "@lwrjs/diagnostics": "0.15.0-alpha.28",
+        "@lwrjs/shared-utils": "0.15.0-alpha.28",
         "lru-cache": "^10.4.3"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.15.0-alpha.26",
+        "@lwrjs/types": "0.15.0-alpha.28",
         "@types/express": "^4.17.21",
         "jest": "^26.6.3",
         "jest-express": "^1.12.0",
@@ -71,5 +71,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "b73171fb2777cf921935959d60d51750747de343"
+    "gitHead": "b14e7aab8eee6aa8f1b2a05cad098f9ef65e9ef4"
 }