@lwrjs/static 0.11.0-alpha.9 → 0.11.1

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"));
@@ -45,18 +46,22 @@ var StaticBundleProvider = class {
   }
   async bundle(moduleId, runtimeEnvironment, runtimeParams) {
     const {specifier, name, namespace, version} = moduleId;
-    const {debug, defaultLocale} = runtimeEnvironment;
+    const {
+      debug,
+      i18n: {defaultLocale}
+    } = runtimeEnvironment;
     const localeId = runtimeParams?.locale || defaultLocale;
     const siteBundles = debug && this.debugSiteBundles ? this.debugSiteBundles : this.siteBundles;
-    const metadata = (0, import_static_utils.getLocalizedBundle)(specifier, siteBundles, localeId, this.i18n);
+    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;
     }
     const bundlePath = import_path.default.join(this.siteRootDir, metadata.path);
-    const code = (await import_fs_extra.default.readFile(bundlePath)).toString("utf-8");
+    const skipDebugModeCode = debug && (0, import_shared_utils.getFeatureFlags)().SSR_STATIC_BUNDLES;
+    const code = skipDebugModeCode ? 'throw new Error("Unexpected code reference");' : (await import_fs_extra.default.readFile(bundlePath)).toString("utf-8");
     const imports = metadata.imports.map((specifier2) => {
       const importModule = (0, import_shared_utils.explodeSpecifier)(specifier2);
       if (!importModule.version) {
@@ -64,6 +69,13 @@ var StaticBundleProvider = class {
       }
       return importModule;
     });
+    const dynamicImports = metadata.dynamicImports?.map((specifier2) => {
+      const dynamicImportModule = (0, import_shared_utils.explodeSpecifier)(specifier2);
+      if (!dynamicImportModule.version) {
+        dynamicImportModule.version = (0, import_static_utils.resolveStaticBundleVersion)(this.siteBundles.bundles[specifier2]?.version);
+      }
+      return dynamicImportModule;
+    });
     const id = (0, import_shared_utils.getSpecifier)(moduleId);
     const exploded = (0, import_shared_utils.explodeSpecifier)(id);
     const resolvedName = name || exploded.name;
@@ -84,7 +96,8 @@ var StaticBundleProvider = class {
       config: this.bundleConfig,
       bundleRecord: {
         includedModules: metadata.includedModules || [],
-        imports
+        imports,
+        dynamicImports
       },
       src: bundlePath
     };

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"));
@@ -44,9 +45,9 @@ var StaticModuleProvider = class {
   async getModule(moduleId, runtimeParams) {
     const {specifier} = moduleId;
     const localeId = runtimeParams?.locale || this.i18n.defaultLocale;
-    const metadata = (0, import_static_utils.getLocalizedBundle)(specifier, this.siteBundles, localeId, this.i18n);
+    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;
@@ -54,9 +55,9 @@ var StaticModuleProvider = class {
   async getModuleEntry(moduleId, runtimeParams) {
     const {specifier, version} = moduleId;
     const localeId = runtimeParams?.locale || this.i18n.defaultLocale;
-    const metadata = (0, import_static_utils.getLocalizedBundle)(specifier, this.siteBundles, localeId, this.i18n);
+    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"));
@@ -44,7 +45,7 @@ var StaticResourceProvider = class {
     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);
@@ -52,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,7 +28,7 @@ __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");
@@ -79,8 +79,8 @@ var SiteMetadataImpl = class {
       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, metadataPath) {
@@ -92,7 +92,7 @@ var SiteMetadataImpl = class {
       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;
       }
@@ -108,7 +108,7 @@ var SiteMetadataImpl = class {
       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;
       }
@@ -125,7 +125,7 @@ var SiteMetadataImpl = class {
       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,20 +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, i18n) {
-  if (localeId === i18n.defaultLocale) {
-    return siteBundles.bundles[specifier];
-  }
-  const localizedBundle = siteBundles.bundles[`${specifier}|l/${localeId}`];
-  if (localizedBundle) {
-    return localizedBundle;
-  }
-  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];
+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.js

@@ -1,4 +1,5 @@
-import { explodeSpecifier, getSpecifier, logger } from '@lwrjs/shared-utils';
+import { logger } from '@lwrjs/diagnostics';
+import { explodeSpecifier, getSpecifier, getFeatureFlags } from '@lwrjs/shared-utils';
 import path from 'path';
 import fs from 'fs-extra';
 import { getLocalizedBundle, resolveStaticBundleVersion } from '../utils/static-utils.js';
@@ -17,10 +18,10 @@ export default class StaticBundleProvider {
     }
     async bundle(moduleId, runtimeEnvironment, runtimeParams) {
         const { specifier, name, namespace, version } = moduleId;
-        const { debug, defaultLocale } = runtimeEnvironment;
+        const { debug, i18n: { defaultLocale }, } = runtimeEnvironment;
         const localeId = (runtimeParams?.locale || defaultLocale);
         const siteBundles = debug && this.debugSiteBundles ? this.debugSiteBundles : this.siteBundles;
-        const metadata = getLocalizedBundle(specifier, siteBundles, localeId, this.i18n);
+        const metadata = await getLocalizedBundle(specifier, siteBundles, localeId, this.i18n);
         if (!metadata) {
             // ignore ssr module requests
             if (!specifier.startsWith(LWR_SSR_BUNDLE_PREFIX)) {
@@ -30,7 +31,11 @@ export default class StaticBundleProvider {
         }
         // Have to make the bundle code available for SSR
         const bundlePath = path.join(this.siteRootDir, metadata.path);
-        const code = (await fs.readFile(bundlePath)).toString('utf-8');
+        // workaround: debug bundles don't exist for SSR in this scenario since it's never actually used
+        const skipDebugModeCode = debug && getFeatureFlags().SSR_STATIC_BUNDLES;
+        const code = skipDebugModeCode
+            ? 'throw new Error("Unexpected code reference");'
+            : (await fs.readFile(bundlePath)).toString('utf-8');
         const imports = metadata.imports.map((specifier) => {
             const importModule = explodeSpecifier(specifier);
             if (!importModule.version) {
@@ -39,6 +44,14 @@ export default class StaticBundleProvider {
             }
             return importModule;
         });
+        const dynamicImports = metadata.dynamicImports?.map((specifier) => {
+            const dynamicImportModule = explodeSpecifier(specifier);
+            if (!dynamicImportModule.version) {
+                // Get version from metadata for un-versioned imports
+                dynamicImportModule.version = resolveStaticBundleVersion(this.siteBundles.bundles[specifier]?.version);
+            }
+            return dynamicImportModule;
+        });
         const id = getSpecifier(moduleId);
         const exploded = explodeSpecifier(id);
         // Seem unlikely name was not in the moduleId but just incase set it form the exploded id
@@ -62,6 +75,7 @@ export default class StaticBundleProvider {
                 // TODO we need to solve include modules for fingerprints support
                 includedModules: metadata.includedModules || [],
                 imports,
+                dynamicImports,
             },
             src: bundlePath,
         };

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 {
@@ -17,7 +18,7 @@ export default class StaticModuleProvider {
     async getModule(moduleId, runtimeParams) {
         const { specifier } = moduleId;
         const localeId = (runtimeParams?.locale || this.i18n.defaultLocale);
-        const metadata = getLocalizedBundle(specifier, this.siteBundles, localeId, this.i18n);
+        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
@@ -30,7 +31,7 @@ export default class StaticModuleProvider {
         // TODO shouldn't we be passing the runtime environment here to test?
         const { specifier, version } = moduleId;
         const localeId = (runtimeParams?.locale || this.i18n.defaultLocale);
-        const metadata = getLocalizedBundle(specifier, this.siteBundles, localeId, this.i18n);
+        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.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 {

package/build/es/site-metadata.js

@@ -1,6 +1,6 @@
 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');
@@ -58,8 +58,8 @@ export class SiteMetadataImpl {
             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, metadataPath) {

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

@@ -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, i18n: I18NConfig): 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 { getFallbackLocale, 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,25 +14,10 @@ export function resolveStaticBundleVersion(metadataVersion, requestedVersion) {
 /**
  * Get the most best match for a localized bundle
  */
-export function getLocalizedBundle(specifier, siteBundles, localeId, i18n) {
-    // check if the locale is the default or not an additional locale
-    if (localeId === i18n.defaultLocale) {
-        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
-    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
-    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.9",
+    "version": "0.11.1",
     "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.9"
+        "@lwrjs/diagnostics": "0.11.1",
+        "@lwrjs/shared-utils": "0.11.1"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.11.0-alpha.9",
+        "@lwrjs/types": "0.11.1",
         "@types/express": "^4.17.17",
         "jest": "^26.6.3",
         "jest-express": "^1.12.0",
@@ -64,5 +65,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "bc50e3f828be56ebdd2f8206cafe8158ab722470"
+    "gitHead": "b7c40fdcd86635dd4e368c0a2e91c5d3374c0fcf"
 }