@lwrjs/static 0.11.0-alpha.1 → 0.11.0-alpha.11

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

@@ -26,6 +26,7 @@ __markAsModule(exports);
 __export(exports, {
   default: () => static_asset_provider_default
 });
+var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_path = __toModule(require("path"));
 var import_fs_extra = __toModule(require("fs-extra"));
@@ -56,7 +57,7 @@ var StaticAssetProvider = class {
     const metadata = this.siteAssets.assets[fileAssetPath];
     if (!metadata) {
       if (import_path.default.dirname(fileAssetPath) !== (this.basePath ? this.basePath : "/")) {
-        import_shared_utils.logger.warn(`[${this.name}] Did not find requested specifier ${fileAssetPath}`);
+        import_diagnostics.logger.warn(`[${this.name}] Did not find requested specifier ${fileAssetPath}`);
       }
       return void 0;
     }
@@ -70,7 +71,7 @@ var StaticAssetProvider = class {
       throw Error(`[${this.name}] Asset is not on lambda ${siteAssetPath}`);
     };
     const uri = this.assetsOnLambda ? fileAssetPath : import_path.default.join(this.siteRootDir, fileAssetPath);
-    import_shared_utils.logger.debug(`[${this.name}] uri ${assetIdentifier.specifier} -> ${uri}`);
+    import_diagnostics.logger.debug(`[${this.name}] uri ${assetIdentifier.specifier} -> ${uri}`);
     return {
       entry: siteAssetPath,
       ext,
@@ -86,7 +87,7 @@ var StaticAssetProvider = class {
     const {specifier} = assetId;
     let normalizedSpecifier = specifier;
     if (normalizedSpecifier.includes("?")) {
-      import_shared_utils.logger.debug(`[${this.name}] Removed query param from asset specifier: ${specifier}`);
+      import_diagnostics.logger.debug(`[${this.name}] Removed query param from asset specifier: ${specifier}`);
       normalizedSpecifier = normalizedSpecifier.split("?")[0];
     }
     if (normalizedSpecifier[0] === "$") {

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

@@ -26,6 +26,7 @@ __markAsModule(exports);
 __export(exports, {
   default: () => static_bundle_provider_default
 });
+var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_path = __toModule(require("path"));
 var import_fs_extra = __toModule(require("fs-extra"));
@@ -38,16 +39,20 @@ var StaticBundleProvider = class {
       throw new Error(`[${this.name}] Site metadata was not found`);
     }
     this.siteBundles = context.siteMetadata.getSiteBundles();
+    this.debugSiteBundles = context.siteMetadata.getDebugSiteBundles();
     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 {debug, defaultLocale} = runtimeEnvironment;
+    const localeId = runtimeParams?.locale || defaultLocale;
+    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_shared_utils.logger.warn(`[${this.name}] did not find requested specifier ${specifier}`);
+        import_diagnostics.logger.warn(`[${this.name}] did not find requested specifier ${specifier}`);
       }
       return void 0;
     }

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

@@ -26,6 +26,7 @@ __markAsModule(exports);
 __export(exports, {
   default: () => static_module_provider_default
 });
+var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_path = __toModule(require("path"));
 var import_static_utils = __toModule(require("../utils/static-utils.cjs"));
@@ -38,25 +39,25 @@ 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 = await (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}`);
+      import_diagnostics.logger.warn(`[${this.name}] We should not be asking for module source we have in our site metadata ${moduleId.specifier}`);
       return void 0;
     }
     return void 0;
   }
   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 = await (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}`);
+      import_diagnostics.logger.info(`[${this.name}] Module Entry request for static bundle ${specifier}`);
       const bundlePath = import_path.default.join(this.siteRootDir, metadata.path);
       const resolvedVersion = (0, import_static_utils.resolveStaticBundleVersion)(metadata.version, version);
       return {

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

@@ -26,6 +26,7 @@ __markAsModule(exports);
 __export(exports, {
   default: () => static_resource_provider_default
 });
+var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_path = __toModule(require("path"));
 var import_fs_extra = __toModule(require("fs-extra"));
@@ -37,12 +38,14 @@ var StaticResourceProvider = class {
     }
     this.resourceRegistry = context.resourceRegistry;
     this.siteResources = context.siteMetadata.getSiteResources();
+    this.debugSiteResources = context.siteMetadata.getDebugSiteResources();
     this.siteRootDir = context.siteMetadata.getSiteRootDir();
   }
-  async getResource(resourceIdentity, _runtimeEnvironment) {
-    const metadata = this.siteResources.resources[resourceIdentity.specifier];
+  async getResource(resourceIdentity, runtimeEnvironment) {
+    const {debug} = runtimeEnvironment;
+    const metadata = debug && this.debugSiteResources ? this.debugSiteResources.resources[resourceIdentity.specifier] : this.siteResources.resources[resourceIdentity.specifier];
     if (!metadata) {
-      import_shared_utils.logger.warn(`[${this.name}] Did not find requested specifier ${resourceIdentity.specifier}`);
+      import_diagnostics.logger.warn(`[${this.name}] Did not find requested specifier ${resourceIdentity.specifier}`);
       return void 0;
     }
     const resourcePath = import_path.default.join(this.siteRootDir, metadata.path);
@@ -50,7 +53,7 @@ var StaticResourceProvider = class {
     return {
       type,
       stream: () => {
-        import_shared_utils.logger.info(`[${this.name}] Resource read from lambda ${resourceIdentity.specifier}`);
+        import_diagnostics.logger.info(`[${this.name}] Resource read from lambda ${resourceIdentity.specifier}`);
         return import_fs_extra.default.createReadStream(resourcePath);
       },
       src: resourcePath,

package/build/cjs/site-metadata.cjs

@@ -28,17 +28,21 @@ __export(exports, {
 });
 var import_path = __toModule(require("path"));
 var import_fs_extra = __toModule(require("fs-extra"));
-var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
+var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var SITE_METADATA_PATH = ".metadata";
 var STATIC_BUNDLE_METADATA_PATH = import_path.default.join(SITE_METADATA_PATH, "/bundle-metadata.json");
+var DEBUG_STATIC_BUNDLE_METADATA_PATH = import_path.default.join(SITE_METADATA_PATH, "/bundle-metadata-debug.json");
 var STATIC_RESOURCE_METADATA_PATH = import_path.default.join(SITE_METADATA_PATH, "/resource-metadata.json");
+var DEBUG_STATIC_RESOURCE_METADATA_PATH = import_path.default.join(SITE_METADATA_PATH, "/resource-metadata-debug.json");
 var STATIC_ASSET_METADATA_PATH = import_path.default.join(SITE_METADATA_PATH, "/asset-metadata.json");
 var SiteMetadataImpl = class {
   constructor(options) {
     this.options = options;
-    this.siteBundles = this.readStaticBundleMetadata(options.rootDir);
-    this.siteResources = this.readStaticResourceMetadata(options.rootDir);
-    this.siteAssets = this.readStaticAssetsMetadata(options.rootDir);
+    this.siteBundles = this.readStaticBundleMetadata(options.rootDir, STATIC_BUNDLE_METADATA_PATH);
+    this.debugSiteBundles = this.readStaticBundleMetadata(options.rootDir, DEBUG_STATIC_BUNDLE_METADATA_PATH);
+    this.siteResources = this.readStaticResourceMetadata(options.rootDir, STATIC_RESOURCE_METADATA_PATH);
+    this.debugSiteResources = this.readStaticResourceMetadata(options.rootDir, DEBUG_STATIC_RESOURCE_METADATA_PATH);
+    this.siteAssets = this.readStaticAssetsMetadata(options.rootDir, STATIC_ASSET_METADATA_PATH);
   }
   getSiteRootDir() {
     return this.options.rootDir;
@@ -46,9 +50,15 @@ var SiteMetadataImpl = class {
   getSiteBundles() {
     return this.siteBundles;
   }
+  getDebugSiteBundles() {
+    return this.debugSiteBundles;
+  }
   getSiteResources() {
     return this.siteResources;
   }
+  getDebugSiteResources() {
+    return this.debugSiteResources;
+  }
   getSiteAssets() {
     return this.siteAssets;
   }
@@ -60,58 +70,62 @@ var SiteMetadataImpl = class {
       }
       const bundleMetadataPath = import_path.default.join(this.options.rootDir, STATIC_BUNDLE_METADATA_PATH);
       await import_fs_extra.default.writeJSON(bundleMetadataPath, this.siteBundles, {spaces: 2});
+      const debugBundleMetadataPath = import_path.default.join(this.options.rootDir, DEBUG_STATIC_BUNDLE_METADATA_PATH);
+      await import_fs_extra.default.writeJSON(debugBundleMetadataPath, this.debugSiteBundles, {spaces: 2});
       const resourceMetadataPath = import_path.default.join(this.options.rootDir, STATIC_RESOURCE_METADATA_PATH);
       await import_fs_extra.default.writeJSON(resourceMetadataPath, this.siteResources, {spaces: 2});
+      const debugResourceMetadataPath = import_path.default.join(this.options.rootDir, DEBUG_STATIC_RESOURCE_METADATA_PATH);
+      await import_fs_extra.default.writeJSON(debugResourceMetadataPath, this.siteResources, {spaces: 2});
       const assetMetadataPath = import_path.default.join(this.options.rootDir, STATIC_ASSET_METADATA_PATH);
       return import_fs_extra.default.writeJSON(assetMetadataPath, this.siteAssets, {spaces: 2});
     } catch (err) {
-      console.error(`[SiteMetadata] Failed to save site metadata ${siteMetadataPath}`);
-      console.error(err);
+      import_diagnostics.logger.error(`[SiteMetadata] Failed to save site metadata ${siteMetadataPath}`);
+      import_diagnostics.logger.error(err);
     }
   }
-  readStaticBundleMetadata(staticRoot) {
+  readStaticBundleMetadata(staticRoot, metadataPath) {
     let bundleMetadataPath;
     let siteBundles = {bundles: {}};
     try {
-      bundleMetadataPath = import_path.default.join(staticRoot, STATIC_BUNDLE_METADATA_PATH);
+      bundleMetadataPath = import_path.default.join(staticRoot, metadataPath);
       const savedMetadata = import_fs_extra.default.readJSONSync(bundleMetadataPath);
       siteBundles = savedMetadata;
     } catch (error) {
       if (error.code === "ENOENT") {
-        import_shared_utils.logger.debug(`[SiteMetadata] Failed to load Static Bundle Metadata: ${bundleMetadataPath}`);
+        import_diagnostics.logger.debug(`[SiteMetadata] Failed to load Static Bundle Metadata: ${bundleMetadataPath}`);
       } else {
         throw error;
       }
     }
     return siteBundles;
   }
-  readStaticResourceMetadata(staticRoot) {
+  readStaticResourceMetadata(staticRoot, metadataPath) {
     let resourceMetadataPath;
     let siteResources = {resources: {}};
     try {
-      resourceMetadataPath = import_path.default.join(staticRoot, STATIC_RESOURCE_METADATA_PATH);
+      resourceMetadataPath = import_path.default.join(staticRoot, metadataPath);
       const savedMetadata = import_fs_extra.default.readJSONSync(resourceMetadataPath);
       siteResources = savedMetadata;
     } catch (error) {
       if (error.code === "ENOENT") {
-        import_shared_utils.logger.debug(`[SiteMetadata] Failed to load Static Resource Metadata: ${resourceMetadataPath}`);
+        import_diagnostics.logger.debug(`[SiteMetadata] Failed to load Static Resource Metadata: ${resourceMetadataPath}`);
       } else {
         throw error;
       }
     }
     return siteResources;
   }
-  readStaticAssetsMetadata(staticRoot) {
+  readStaticAssetsMetadata(staticRoot, metadataPath) {
     let assetMetadataPath;
     let siteAssets = {
       assets: {}
     };
     try {
-      assetMetadataPath = import_path.default.join(staticRoot, STATIC_ASSET_METADATA_PATH);
+      assetMetadataPath = import_path.default.join(staticRoot, metadataPath);
       siteAssets = import_fs_extra.default.readJSONSync(assetMetadataPath);
     } catch (error) {
       if (error.code === "ENOENT") {
-        import_shared_utils.logger.debug(`[SiteMetadata] Failed to load Static Resource Metadata: ${assetMetadataPath}`);
+        import_diagnostics.logger.debug(`[SiteMetadata] Failed to load Static Resource Metadata: ${assetMetadataPath}`);
       } else {
         throw error;
       }

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

@@ -31,22 +31,9 @@ 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) {
-    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;
-      }
-    }
-  }
-  return siteBundles.bundles[specifier];
+async function getLocalizedBundle(specifier, siteBundles, initialLocaleId, i18n) {
+  return (0, import_shared_utils.walkLocaleFallbacks)(initialLocaleId, i18n, async (localeId) => {
+    const localizedSpecifier = localeId === i18n.defaultLocale ? specifier : `${specifier}|l/${localeId}`;
+    return siteBundles.bundles[localizedSpecifier];
+  });
 }

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

@@ -1,4 +1,5 @@
-import { hashContent, logger, mimeLookup, normalizeResourcePath } from '@lwrjs/shared-utils';
+import { logger } from '@lwrjs/diagnostics';
+import { hashContent, mimeLookup, normalizeResourcePath } from '@lwrjs/shared-utils';
 import path from 'path';
 import fs from 'fs-extra';
 export default class StaticAssetProvider {

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

@@ -2,8 +2,10 @@ import type { AbstractModuleId, BundleDefinition, BundleProvider, ProviderContex
 export default class StaticBundleProvider implements BundleProvider {
     name: string;
     siteBundles: import("@lwrjs/types").SiteBundles;
+    debugSiteBundles?: import("@lwrjs/types").SiteBundles | undefined;
     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

@@ -1,4 +1,5 @@
-import { explodeSpecifier, getSpecifier, logger } from '@lwrjs/shared-utils';
+import { logger } from '@lwrjs/diagnostics';
+import { explodeSpecifier, getSpecifier } from '@lwrjs/shared-utils';
 import path from 'path';
 import fs from 'fs-extra';
 import { getLocalizedBundle, resolveStaticBundleVersion } from '../utils/static-utils.js';
@@ -10,13 +11,17 @@ export default class StaticBundleProvider {
             throw new Error(`[${this.name}] Site metadata was not found`);
         }
         this.siteBundles = context.siteMetadata.getSiteBundles();
+        this.debugSiteBundles = context.siteMetadata.getDebugSiteBundles();
         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 { debug, defaultLocale } = runtimeEnvironment;
+        const localeId = (runtimeParams?.locale || defaultLocale);
+        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)) {

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

@@ -1,4 +1,5 @@
-import { explodeSpecifier, getSpecifier, logger } from '@lwrjs/shared-utils';
+import { logger } from '@lwrjs/diagnostics';
+import { explodeSpecifier, getSpecifier } from '@lwrjs/shared-utils';
 import path from 'path';
 import { getLocalizedBundle, resolveStaticBundleVersion } from '../utils/static-utils.js';
 export default class StaticModuleProvider {
@@ -10,14 +11,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 = await 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 +30,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 = await 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/providers/static-resource-provider.d.ts

@@ -2,9 +2,10 @@ import type { BootstrapRuntimeEnvironment, ProviderContext, ResourceDefinition,
 export default class StaticResourceProvider implements ResourceProvider {
     name: string;
     siteResources: import("@lwrjs/types").SiteResources;
+    debugSiteResources: import("@lwrjs/types").SiteResources;
     siteRootDir: string;
     resourceRegistry: import("@lwrjs/types").PublicResourceRegistry;
     constructor(_config: {}, context: ProviderContext);
-    getResource<Identifier extends ResourceIdentifier, RuntimeEnvironment extends BootstrapRuntimeEnvironment>(resourceIdentity: Identifier, _runtimeEnvironment: RuntimeEnvironment): Promise<ResourceDefinition | undefined>;
+    getResource<Identifier extends ResourceIdentifier, RuntimeEnvironment extends BootstrapRuntimeEnvironment>(resourceIdentity: Identifier, runtimeEnvironment: RuntimeEnvironment): Promise<ResourceDefinition | undefined>;
 }
 //# sourceMappingURL=static-resource-provider.d.ts.map

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

@@ -1,4 +1,5 @@
-import { logger, mimeLookup } from '@lwrjs/shared-utils';
+import { logger } from '@lwrjs/diagnostics';
+import { mimeLookup } from '@lwrjs/shared-utils';
 import path from 'path';
 import fs from 'fs-extra';
 export default class StaticResourceProvider {
@@ -9,10 +10,14 @@ export default class StaticResourceProvider {
         }
         this.resourceRegistry = context.resourceRegistry;
         this.siteResources = context.siteMetadata.getSiteResources();
+        this.debugSiteResources = context.siteMetadata.getDebugSiteResources();
         this.siteRootDir = context.siteMetadata.getSiteRootDir();
     }
-    async getResource(resourceIdentity, _runtimeEnvironment) {
-        const metadata = this.siteResources.resources[resourceIdentity.specifier];
+    async getResource(resourceIdentity, runtimeEnvironment) {
+        const { debug } = runtimeEnvironment;
+        const metadata = debug && this.debugSiteResources
+            ? this.debugSiteResources.resources[resourceIdentity.specifier]
+            : this.siteResources.resources[resourceIdentity.specifier];
         if (!metadata) {
             logger.warn(`[${this.name}] Did not find requested specifier ${resourceIdentity.specifier}`);
             return undefined;

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

@@ -5,12 +5,16 @@ type Options = {
 export declare class SiteMetadataImpl implements SiteMetadata {
     private options;
     private siteBundles;
+    private debugSiteBundles;
     private siteResources;
+    private debugSiteResources;
     private siteAssets;
     constructor(options: Options);
     getSiteRootDir(): string;
     getSiteBundles(): SiteBundles;
+    getDebugSiteBundles(): SiteBundles;
     getSiteResources(): SiteResources;
+    getDebugSiteResources(): SiteResources;
     getSiteAssets(): SiteAssets;
     persistSiteMetadata(): Promise<void>;
     private readStaticBundleMetadata;

package/build/es/site-metadata.js

@@ -1,16 +1,20 @@
 import path from 'path';
 import fs from 'fs-extra';
-import { logger } from '@lwrjs/shared-utils';
+import { logger } from '@lwrjs/diagnostics';
 const SITE_METADATA_PATH = '.metadata';
 const STATIC_BUNDLE_METADATA_PATH = path.join(SITE_METADATA_PATH, '/bundle-metadata.json');
+const DEBUG_STATIC_BUNDLE_METADATA_PATH = path.join(SITE_METADATA_PATH, '/bundle-metadata-debug.json');
 const STATIC_RESOURCE_METADATA_PATH = path.join(SITE_METADATA_PATH, '/resource-metadata.json');
+const DEBUG_STATIC_RESOURCE_METADATA_PATH = path.join(SITE_METADATA_PATH, '/resource-metadata-debug.json');
 const STATIC_ASSET_METADATA_PATH = path.join(SITE_METADATA_PATH, '/asset-metadata.json');
 export class SiteMetadataImpl {
     constructor(options) {
         this.options = options;
-        this.siteBundles = this.readStaticBundleMetadata(options.rootDir);
-        this.siteResources = this.readStaticResourceMetadata(options.rootDir);
-        this.siteAssets = this.readStaticAssetsMetadata(options.rootDir);
+        this.siteBundles = this.readStaticBundleMetadata(options.rootDir, STATIC_BUNDLE_METADATA_PATH);
+        this.debugSiteBundles = this.readStaticBundleMetadata(options.rootDir, DEBUG_STATIC_BUNDLE_METADATA_PATH);
+        this.siteResources = this.readStaticResourceMetadata(options.rootDir, STATIC_RESOURCE_METADATA_PATH);
+        this.debugSiteResources = this.readStaticResourceMetadata(options.rootDir, DEBUG_STATIC_RESOURCE_METADATA_PATH);
+        this.siteAssets = this.readStaticAssetsMetadata(options.rootDir, STATIC_ASSET_METADATA_PATH);
     }
     getSiteRootDir() {
         return this.options.rootDir;
@@ -18,9 +22,15 @@ export class SiteMetadataImpl {
     getSiteBundles() {
         return this.siteBundles;
     }
+    getDebugSiteBundles() {
+        return this.debugSiteBundles;
+    }
     getSiteResources() {
         return this.siteResources;
     }
+    getDebugSiteResources() {
+        return this.debugSiteResources;
+    }
     getSiteAssets() {
         return this.siteAssets;
     }
@@ -34,23 +44,29 @@ export class SiteMetadataImpl {
             // Save Bundle Metadata
             const bundleMetadataPath = path.join(this.options.rootDir, STATIC_BUNDLE_METADATA_PATH);
             await fs.writeJSON(bundleMetadataPath, this.siteBundles, { spaces: 2 });
+            // Save Debug Bundle Metadata
+            const debugBundleMetadataPath = path.join(this.options.rootDir, DEBUG_STATIC_BUNDLE_METADATA_PATH);
+            await fs.writeJSON(debugBundleMetadataPath, this.debugSiteBundles, { spaces: 2 });
             // Save Resource Metadata
             const resourceMetadataPath = path.join(this.options.rootDir, STATIC_RESOURCE_METADATA_PATH);
             await fs.writeJSON(resourceMetadataPath, this.siteResources, { spaces: 2 });
+            // Save Debug Resource Metadata
+            const debugResourceMetadataPath = path.join(this.options.rootDir, DEBUG_STATIC_RESOURCE_METADATA_PATH);
+            await fs.writeJSON(debugResourceMetadataPath, this.siteResources, { spaces: 2 });
             // Save Resource Metadata
             const assetMetadataPath = path.join(this.options.rootDir, STATIC_ASSET_METADATA_PATH);
             return fs.writeJSON(assetMetadataPath, this.siteAssets, { spaces: 2 });
         }
         catch (err) {
-            console.error(`[SiteMetadata] Failed to save site metadata ${siteMetadataPath}`);
-            console.error(err);
+            logger.error(`[SiteMetadata] Failed to save site metadata ${siteMetadataPath}`);
+            logger.error(err);
         }
     }
-    readStaticBundleMetadata(staticRoot) {
+    readStaticBundleMetadata(staticRoot, metadataPath) {
         let bundleMetadataPath;
         let siteBundles = { bundles: {} };
         try {
-            bundleMetadataPath = path.join(staticRoot, STATIC_BUNDLE_METADATA_PATH);
+            bundleMetadataPath = path.join(staticRoot, metadataPath);
             const savedMetadata = fs.readJSONSync(bundleMetadataPath);
             siteBundles = savedMetadata;
         }
@@ -67,11 +83,11 @@ export class SiteMetadataImpl {
     /**
      * Read the metadata about the pre-built resources of the current site.
      */
-    readStaticResourceMetadata(staticRoot) {
+    readStaticResourceMetadata(staticRoot, metadataPath) {
         let resourceMetadataPath;
         let siteResources = { resources: {} };
         try {
-            resourceMetadataPath = path.join(staticRoot, STATIC_RESOURCE_METADATA_PATH);
+            resourceMetadataPath = path.join(staticRoot, metadataPath);
             const savedMetadata = fs.readJSONSync(resourceMetadataPath);
             siteResources = savedMetadata;
         }
@@ -88,13 +104,13 @@ export class SiteMetadataImpl {
     /**
      * Read the metadata about the pre-built assets of the current site.
      */
-    readStaticAssetsMetadata(staticRoot) {
+    readStaticAssetsMetadata(staticRoot, metadataPath) {
         let assetMetadataPath;
         let siteAssets = {
             assets: {},
         };
         try {
-            assetMetadataPath = path.join(staticRoot, STATIC_ASSET_METADATA_PATH);
+            assetMetadataPath = path.join(staticRoot, metadataPath);
             siteAssets = fs.readJSONSync(assetMetadataPath);
         }
         catch (error) {

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, initialLocaleId: string, i18n: I18NConfig): Promise<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 { VERSION_NOT_PROVIDED, walkLocaleFallbacks } from '@lwrjs/shared-utils';
 /**
  * Return the version for a static module bundle.
  *
@@ -14,27 +14,10 @@ export function resolveStaticBundleVersion(metadataVersion, requestedVersion) {
 /**
  * Get the most best match for a localized bundle
  */
-export function getLocalizedBundle(specifier, siteBundles, localeId, defaultLocaleId) {
-    // check if the locale is the default or not an additional locale
-    if (localeId === defaultLocaleId) {
-        return siteBundles.bundles[specifier];
-    }
-    // Check if there was an exact match for the preferred locale
-    const localizedBundle = siteBundles.bundles[`${specifier}|l/${localeId}`];
-    if (localizedBundle) {
-        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;
-            }
-        }
-    }
-    // Else fall back to the non-localized bundle
-    return siteBundles.bundles[specifier];
+export async function getLocalizedBundle(specifier, siteBundles, initialLocaleId, i18n) {
+    return walkLocaleFallbacks(initialLocaleId, i18n, async (localeId) => {
+        const localizedSpecifier = localeId === i18n.defaultLocale ? specifier : `${specifier}|l/${localeId}`;
+        return siteBundles.bundles[localizedSpecifier];
+    });
 }
 //# sourceMappingURL=static-utils.js.map

package/package.json

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