@lwrjs/static 0.11.0-alpha.4 → 0.11.0-alpha.6

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

@@ -40,11 +40,12 @@ var StaticBundleProvider = class {
     this.siteBundles = context.siteMetadata.getSiteBundles();
     this.siteRootDir = context.siteMetadata.getSiteRootDir();
     this.bundleConfig = context.config.bundleConfig;
+    this.i18n = context.config.i18n;
   }
   async bundle(moduleId, runtimeEnvironment, runtimeParams) {
     const {specifier, name, namespace, version} = moduleId;
     const localeId = runtimeParams?.locale || runtimeEnvironment.defaultLocale;
-    const metadata = (0, import_static_utils.getLocalizedBundle)(specifier, this.siteBundles, localeId, runtimeEnvironment.defaultLocale);
+    const metadata = (0, import_static_utils.getLocalizedBundle)(specifier, this.siteBundles, localeId, this.i18n);
     if (!metadata) {
       if (!specifier.startsWith(LWR_SSR_BUNDLE_PREFIX)) {
         import_shared_utils.logger.warn(`[${this.name}] did not find requested specifier ${specifier}`);

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

@@ -38,13 +38,13 @@ var StaticModuleProvider = class {
     this.externals = Object.keys(context.config.bundleConfig.external || {});
     this.siteBundles = context.siteMetadata.getSiteBundles();
     this.siteRootDir = context.siteMetadata.getSiteRootDir();
-    this.runtimeEnvironment = context.runtimeEnvironment;
+    this.i18n = context.config.i18n;
     this.fingerprintIndex = buildFingerprintsIndex(context);
   }
   async getModule(moduleId, runtimeParams) {
     const {specifier} = moduleId;
-    const localeId = runtimeParams?.locale || this.runtimeEnvironment.defaultLocale;
-    const metadata = (0, import_static_utils.getLocalizedBundle)(specifier, this.siteBundles, localeId, this.runtimeEnvironment.defaultLocale);
+    const localeId = runtimeParams?.locale || this.i18n.defaultLocale;
+    const metadata = (0, import_static_utils.getLocalizedBundle)(specifier, this.siteBundles, localeId, this.i18n);
     if (metadata) {
       import_shared_utils.logger.warn(`[${this.name}] We should not be asking for module source we have in our site metadata ${moduleId.specifier}`);
       return void 0;
@@ -53,8 +53,8 @@ var StaticModuleProvider = class {
   }
   async getModuleEntry(moduleId, runtimeParams) {
     const {specifier, version} = moduleId;
-    const localeId = runtimeParams?.locale || this.runtimeEnvironment.defaultLocale;
-    const metadata = (0, import_static_utils.getLocalizedBundle)(specifier, this.siteBundles, localeId, this.runtimeEnvironment.defaultLocale);
+    const localeId = runtimeParams?.locale || this.i18n.defaultLocale;
+    const metadata = (0, import_static_utils.getLocalizedBundle)(specifier, this.siteBundles, localeId, this.i18n);
     if (metadata) {
       import_shared_utils.logger.info(`[${this.name}] Module Entry request for static bundle ${specifier}`);
       const bundlePath = import_path.default.join(this.siteRootDir, metadata.path);

package/build/cjs/utils/static-utils.cjs

@@ -31,21 +31,19 @@ var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 function resolveStaticBundleVersion(metadataVersion, requestedVersion) {
   return metadataVersion || requestedVersion || import_shared_utils.VERSION_NOT_PROVIDED;
 }
-function getLocalizedBundle(specifier, siteBundles, localeId, defaultLocaleId) {
-  if (localeId === defaultLocaleId) {
+function getLocalizedBundle(specifier, siteBundles, localeId, i18n) {
+  if (localeId === i18n.defaultLocale) {
     return siteBundles.bundles[specifier];
   }
   const localizedBundle = siteBundles.bundles[`${specifier}|l/${localeId}`];
   if (localizedBundle) {
     return localizedBundle;
   }
-  if ((0, import_shared_utils.hasCountryCode)(localeId)) {
-    const stripedCode = (0, import_shared_utils.stripCountryCode)(localeId);
-    if (stripedCode) {
-      const localizedBundle2 = siteBundles.bundles[`${specifier}|l/${stripedCode}`];
-      if (localizedBundle2) {
-        return localizedBundle2;
-      }
+  const fallbackId = (0, import_shared_utils.getFallbackLocale)(localeId, i18n);
+  if (fallbackId) {
+    const localizedBundle2 = siteBundles.bundles[`${specifier}|l/${fallbackId}`];
+    if (localizedBundle2) {
+      return localizedBundle2;
     }
   }
   return siteBundles.bundles[specifier];

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

@@ -4,6 +4,7 @@ export default class StaticBundleProvider implements BundleProvider {
     siteBundles: import("@lwrjs/types").SiteBundles;
     siteRootDir: string;
     bundleConfig: import("@lwrjs/types").BundleConfig;
+    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>;
 }

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

@@ -12,11 +12,12 @@ export default class StaticBundleProvider {
         this.siteBundles = context.siteMetadata.getSiteBundles();
         this.siteRootDir = context.siteMetadata.getSiteRootDir();
         this.bundleConfig = context.config.bundleConfig;
+        this.i18n = context.config.i18n;
     }
     async bundle(moduleId, runtimeEnvironment, runtimeParams) {
         const { specifier, name, namespace, version } = moduleId;
         const localeId = (runtimeParams?.locale || runtimeEnvironment.defaultLocale);
-        const metadata = getLocalizedBundle(specifier, this.siteBundles, localeId, runtimeEnvironment.defaultLocale);
+        const metadata = getLocalizedBundle(specifier, this.siteBundles, localeId, this.i18n);
         if (!metadata) {
             // ignore ssr module requests
             if (!specifier.startsWith(LWR_SSR_BUNDLE_PREFIX)) {

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

@@ -1,11 +1,11 @@
-import type { AbstractModuleId, ModuleCompiled, ModuleEntry, ModuleProvider, ProviderContext, RuntimeEnvironment, RuntimeParams } from '@lwrjs/types';
+import type { AbstractModuleId, I18NConfig, ModuleCompiled, ModuleEntry, ModuleProvider, ProviderContext, RuntimeParams } from '@lwrjs/types';
 export default class StaticModuleProvider implements ModuleProvider {
     name: string;
     siteBundles: import("@lwrjs/types").SiteBundles;
     siteRootDir: string;
     externals: string[];
     fingerprintIndex: Record<string, ModuleEntry>;
-    runtimeEnvironment: RuntimeEnvironment;
+    i18n: I18NConfig;
     constructor(_config: {}, context: ProviderContext);
     getModule<T extends AbstractModuleId>(moduleId: T, runtimeParams: RuntimeParams): Promise<ModuleCompiled | undefined>;
     getModuleEntry<T extends AbstractModuleId>(moduleId: T, runtimeParams: RuntimeParams): Promise<ModuleEntry | undefined>;

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

@@ -10,14 +10,14 @@ export default class StaticModuleProvider {
         this.externals = Object.keys(context.config.bundleConfig.external || {});
         this.siteBundles = context.siteMetadata.getSiteBundles();
         this.siteRootDir = context.siteMetadata.getSiteRootDir();
-        this.runtimeEnvironment = context.runtimeEnvironment;
+        this.i18n = context.config.i18n;
         // If we are using fingerprints collect all the specifiers in the bundles and add them to an index for creating the mapping identities
         this.fingerprintIndex = buildFingerprintsIndex(context);
     }
     async getModule(moduleId, runtimeParams) {
         const { specifier } = moduleId;
-        const localeId = (runtimeParams?.locale || this.runtimeEnvironment.defaultLocale);
-        const metadata = getLocalizedBundle(specifier, this.siteBundles, localeId, this.runtimeEnvironment.defaultLocale);
+        const localeId = (runtimeParams?.locale || this.i18n.defaultLocale);
+        const metadata = getLocalizedBundle(specifier, this.siteBundles, localeId, this.i18n);
         if (metadata) {
             logger.warn(`[${this.name}] We should not be asking for module source we have in our site metadata ${moduleId.specifier}`);
             // proceed to next provider
@@ -29,8 +29,8 @@ export default class StaticModuleProvider {
     async getModuleEntry(moduleId, runtimeParams) {
         // TODO shouldn't we be passing the runtime environment here to test?
         const { specifier, version } = moduleId;
-        const localeId = (runtimeParams?.locale || this.runtimeEnvironment.defaultLocale);
-        const metadata = getLocalizedBundle(specifier, this.siteBundles, localeId, this.runtimeEnvironment.defaultLocale);
+        const localeId = (runtimeParams?.locale || this.i18n.defaultLocale);
+        const metadata = getLocalizedBundle(specifier, this.siteBundles, localeId, this.i18n);
         if (metadata) {
             logger.info(`[${this.name}] Module Entry request for static bundle ${specifier}`);
             // Have to make the bundle code available for SSR

package/build/es/utils/static-utils.d.ts

@@ -1,4 +1,4 @@
-import type { SiteBundle, SiteBundles } from '@lwrjs/types';
+import type { I18NConfig, SiteBundle, SiteBundles } from '@lwrjs/types';
 /**
  * Return the version for a static module bundle.
  *
@@ -8,5 +8,5 @@ export declare function resolveStaticBundleVersion(metadataVersion?: string, req
 /**
  * Get the most best match for a localized bundle
  */
-export declare function getLocalizedBundle(specifier: string, siteBundles: SiteBundles, localeId: string, defaultLocaleId: string): SiteBundle | undefined;
+export declare function getLocalizedBundle(specifier: string, siteBundles: SiteBundles, localeId: string, i18n: I18NConfig): SiteBundle | undefined;
 //# sourceMappingURL=static-utils.d.ts.map

package/build/es/utils/static-utils.js

@@ -2,7 +2,7 @@
  * Try to add any code that is mrt specific here so that we can isolate details that would have to be refactored to run lambdas
  * on a different platform
  */
-import { hasCountryCode, stripCountryCode, VERSION_NOT_PROVIDED } from '@lwrjs/shared-utils';
+import { getFallbackLocale, VERSION_NOT_PROVIDED } from '@lwrjs/shared-utils';
 /**
  * Return the version for a static module bundle.
  *
@@ -14,9 +14,9 @@ export function resolveStaticBundleVersion(metadataVersion, requestedVersion) {
 /**
  * Get the most best match for a localized bundle
  */
-export function getLocalizedBundle(specifier, siteBundles, localeId, defaultLocaleId) {
+export function getLocalizedBundle(specifier, siteBundles, localeId, i18n) {
     // check if the locale is the default or not an additional locale
-    if (localeId === defaultLocaleId) {
+    if (localeId === i18n.defaultLocale) {
         return siteBundles.bundles[specifier];
     }
     // Check if there was an exact match for the preferred locale
@@ -25,13 +25,11 @@ export function getLocalizedBundle(specifier, siteBundles, localeId, defaultLoca
         return localizedBundle;
     }
     // Else check if there is a match without the county code
-    if (hasCountryCode(localeId)) {
-        const stripedCode = stripCountryCode(localeId);
-        if (stripedCode) {
-            const localizedBundle = siteBundles.bundles[`${specifier}|l/${stripedCode}`];
-            if (localizedBundle) {
-                return localizedBundle;
-            }
+    const fallbackId = getFallbackLocale(localeId, i18n);
+    if (fallbackId) {
+        const localizedBundle = siteBundles.bundles[`${specifier}|l/${fallbackId}`];
+        if (localizedBundle) {
+            return localizedBundle;
         }
     }
     // Else fall back to the non-localized bundle

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.11.0-alpha.4",
+    "version": "0.11.0-alpha.6",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -48,10 +48,10 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/shared-utils": "0.11.0-alpha.4"
+        "@lwrjs/shared-utils": "0.11.0-alpha.6"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.11.0-alpha.4",
+        "@lwrjs/types": "0.11.0-alpha.6",
         "@types/express": "^4.17.17",
         "jest": "^26.6.3",
         "jest-express": "^1.12.0",
@@ -64,5 +64,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "89a7e9815e0e381d9fd67212f0471d9a11f73985"
+    "gitHead": "571d4bac5650765aa818bcb9d5ed752a8cf041af"
 }