@lwrjs/static 0.12.0-alpha.2 → 0.12.0-alpha.20

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

@@ -68,10 +68,8 @@ var StaticAssetProvider = class {
     const mime = metadata.mimeType || (0, import_shared_utils.mimeLookup)(siteAssetPath);
     const ext = import_path.default.extname(`x.${siteAssetPath}`).toLowerCase().substring(1);
     const type = this.assetsOnLambda ? "asset" : "external";
-    const content = this.assetsOnLambda ? function(encoding) {
+    const content = function(encoding) {
       return import_fs_extra.default.readFileSync(siteAssetPath, encoding);
-    } : () => {
-      throw Error(`[${this.name}] Asset is not on lambda ${siteAssetPath}`);
     };
     const uri = this.assetsOnLambda ? fileAssetPath : import_path.default.join(this.siteRootDir, fileAssetPath);
     import_diagnostics.logger.debug({label: `${this.name}`, message: `uri ${assetIdentifier.specifier} -> ${uri}`});

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

@@ -55,7 +55,7 @@ var StaticBundleProvider = class {
     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.warn({
+        import_diagnostics.logger.debug({
           label: `${this.name}`,
           message: `did not find requested specifier ${specifier}`
         });

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

@@ -60,7 +60,7 @@ var StaticModuleProvider = class {
     const localeId = runtimeParams?.locale || this.i18n.defaultLocale;
     const metadata = await (0, import_static_utils.getLocalizedBundle)(specifier, this.siteBundles, localeId, this.i18n);
     if (metadata) {
-      import_diagnostics.logger.info({
+      import_diagnostics.logger.debug({
         label: `${this.name}`,
         message: `Module Entry request for static bundle ${specifier}`
       });

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

@@ -43,8 +43,9 @@ var StaticResourceProvider = class {
   }
   async getResource(resourceIdentity, runtimeEnvironment) {
     const {debug} = runtimeEnvironment;
-    const metadata = debug && this.debugSiteResources ? this.debugSiteResources.resources[resourceIdentity.specifier] : this.siteResources.resources[resourceIdentity.specifier];
-    if (!metadata) {
+    const metadata = this.siteResources.resources[resourceIdentity.specifier];
+    const debugMetadata = this.debugSiteResources ? this.debugSiteResources.resources[resourceIdentity.specifier] : void 0;
+    if (!metadata && !debugMetadata) {
       import_diagnostics.logger.warn({
         label: `${this.name}`,
         message: `Did not find requested specifier ${resourceIdentity.specifier}`
@@ -52,17 +53,23 @@ var StaticResourceProvider = class {
       return void 0;
     }
     const resourcePath = import_path.default.join(this.siteRootDir, metadata.path);
+    const debugResourcePath = debugMetadata ? import_path.default.join(this.siteRootDir, debugMetadata.path) : void 0;
+    const useDebug = debug && !(0, import_shared_utils.getFeatureFlags)().SSR_STATIC_BUNDLES && debugResourcePath;
     const type = metadata.mimeType || (0, import_shared_utils.mimeLookup)(resourcePath) || "application/javascript";
     return {
       type,
       stream: () => {
-        import_diagnostics.logger.info({
+        import_diagnostics.logger.debug({
           label: `${this.name}`,
           message: `Resource read from lambda ${resourceIdentity.specifier}`
         });
-        return import_fs_extra.default.createReadStream(resourcePath);
+        if (useDebug) {
+          return import_fs_extra.default.createReadStream(debugResourcePath);
+        } else {
+          return import_fs_extra.default.createReadStream(resourcePath);
+        }
       },
-      src: resourcePath,
+      src: useDebug ? debugResourcePath : resourcePath,
       inline: metadata.inline
     };
   }

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

@@ -48,13 +48,10 @@ export default class StaticAssetProvider {
         const ext = path.extname(`x.${siteAssetPath}`).toLowerCase().substring(1);
         // Unless assets on lambda feature flag is set indicate the asset source is external
         const type = this.assetsOnLambda ? 'asset' : 'external';
-        const content = this.assetsOnLambda
-            ? function (encoding) {
-                return fs.readFileSync(siteAssetPath, encoding);
-            }
-            : () => {
-                throw Error(`[${this.name}] Asset is not on lambda ${siteAssetPath}`);
-            };
+        const content = function (encoding) {
+            return fs.readFileSync(siteAssetPath, encoding);
+        };
+        // Create URI
         const uri = this.assetsOnLambda ? fileAssetPath : path.join(this.siteRootDir, fileAssetPath);
         logger.debug({ label: `${this.name}`, message: `uri ${assetIdentifier.specifier} -> ${uri}` });
         return {

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

@@ -25,7 +25,7 @@ export default class StaticBundleProvider {
         if (!metadata) {
             // ignore ssr module requests
             if (!specifier.startsWith(LWR_SSR_BUNDLE_PREFIX)) {
-                logger.warn({
+                logger.debug({
                     label: `${this.name}`,
                     message: `did not find requested specifier ${specifier}`,
                 });

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

@@ -36,7 +36,7 @@ export default class StaticModuleProvider {
         const localeId = (runtimeParams?.locale || this.i18n.defaultLocale);
         const metadata = await getLocalizedBundle(specifier, this.siteBundles, localeId, this.i18n);
         if (metadata) {
-            logger.info({
+            logger.debug({
                 label: `${this.name}`,
                 message: `Module Entry request for static bundle ${specifier}`,
             });

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

@@ -1,5 +1,5 @@
 import { logger } from '@lwrjs/diagnostics';
-import { mimeLookup } from '@lwrjs/shared-utils';
+import { mimeLookup, getFeatureFlags } from '@lwrjs/shared-utils';
 import path from 'path';
 import fs from 'fs-extra';
 export default class StaticResourceProvider {
@@ -15,10 +15,11 @@ export default class StaticResourceProvider {
     }
     async getResource(resourceIdentity, runtimeEnvironment) {
         const { debug } = runtimeEnvironment;
-        const metadata = debug && this.debugSiteResources
+        const metadata = this.siteResources.resources[resourceIdentity.specifier];
+        const debugMetadata = this.debugSiteResources
             ? this.debugSiteResources.resources[resourceIdentity.specifier]
-            : this.siteResources.resources[resourceIdentity.specifier];
-        if (!metadata) {
+            : undefined;
+        if (!metadata && !debugMetadata) {
             logger.warn({
                 label: `${this.name}`,
                 message: `Did not find requested specifier ${resourceIdentity.specifier}`,
@@ -26,19 +27,30 @@ export default class StaticResourceProvider {
             return undefined;
         }
         const resourcePath = path.join(this.siteRootDir, metadata.path);
+        const debugResourcePath = debugMetadata ? path.join(this.siteRootDir, debugMetadata.path) : undefined;
+        const useDebug = debug && !getFeatureFlags().SSR_STATIC_BUNDLES && debugResourcePath;
         // Figure out mime type
         const type = metadata.mimeType || mimeLookup(resourcePath) || 'application/javascript';
         return {
             type,
             // Have to make the loader shim code available for SSR
             stream: () => {
-                logger.info({
+                logger.debug({
                     label: `${this.name}`,
                     message: `Resource read from lambda ${resourceIdentity.specifier}`,
                 });
-                return fs.createReadStream(resourcePath);
+                if (useDebug) {
+                    // use the debug resource if:
+                    // - debug mode is ON
+                    // - SSR_STATIC_BUNDLES is OFF
+                    // - the debug version of the resource exists
+                    return fs.createReadStream(debugResourcePath);
+                }
+                else {
+                    return fs.createReadStream(resourcePath);
+                }
             },
-            src: resourcePath,
+            src: useDebug ? debugResourcePath : resourcePath,
             inline: metadata.inline,
         };
     }

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.12.0-alpha.2",
+    "version": "0.12.0-alpha.20",
     "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.2",
-        "@lwrjs/shared-utils": "0.12.0-alpha.2"
+        "@lwrjs/diagnostics": "0.12.0-alpha.20",
+        "@lwrjs/shared-utils": "0.12.0-alpha.20"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.12.0-alpha.2",
+        "@lwrjs/types": "0.12.0-alpha.20",
         "@types/express": "^4.17.21",
         "jest": "^26.6.3",
         "jest-express": "^1.12.0",
@@ -65,5 +65,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "586a2aa659882483af9249dc3db7fe07bc842a25"
+    "gitHead": "ae1793e34eaf4e9b97996d7aea9031908b23a13a"
 }