@lwrjs/static 0.13.0-alpha.9 → 0.13.1

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

@@ -79,6 +79,7 @@ var StaticBundleProvider = class {
       version: resolvedVersion,
       specifier,
       config: this.bundleConfig,
+      integrity: metadata.integrity,
       bundleRecord: {
         includedModules,
         imports,
@@ -117,7 +118,7 @@ var StaticBundleProvider = class {
         }
         bundleSourcePath = import_path.default.join(this.siteRootDir, metadata.path);
       }
-      return (await import_fs_extra.default.readFile(bundleSourcePath)).toString("utf-8");
+      return await import_fs_extra.default.readFile(bundleSourcePath, "utf-8");
     } catch (err) {
       import_diagnostics.logger.warn({
         label: "static-bundle-provider",

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

@@ -45,10 +45,10 @@ var StaticModuleProvider = class {
   async getModule(moduleId, runtimeParams) {
     const localeId = runtimeParams?.locale || this.i18n.defaultLocale;
     const metadata = this.getBundleMetadata(moduleId, localeId, false);
-    if (metadata) {
+    if (metadata && (0, import_shared_utils.isLambdaEnv)()) {
       import_diagnostics.logger.warn({
         label: `${this.name}`,
-        message: `We should not be asking for module source we have in our site metadata ${moduleId.specifier}`
+        message: `We should not be asking for module source we have in our site metadata: ${moduleId.specifier}`
       });
       return void 0;
     }

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

@@ -41,22 +41,19 @@ var StaticResourceProvider = class {
     this.siteRootDir = context.siteMetadata.getSiteRootDir();
     this.siteMetadata = context.siteMetadata;
   }
-  async getResource(resourceIdentity, runtimeEnvironment) {
+  async getResource(resourceIdentity, runtimeEnvironment, runtimeParams) {
     const {debug} = runtimeEnvironment;
-    const metadata = this.siteMetadata.getSiteResourcesDecisionTree().find((0, import_site_metadata.getSiteResourceId)(resourceIdentity));
-    const debugMetadata = this.siteMetadata.getSiteResourcesDecisionTree().find((0, import_site_metadata.getSiteResourceId)(resourceIdentity), true);
-    if (!metadata) {
+    const {ignoreDebug} = runtimeParams;
+    const resourceMetadata = this.siteMetadata.getSiteResourcesDecisionTree().find((0, import_site_metadata.getSiteResourceId)(resourceIdentity), debug && !ignoreDebug);
+    if (!resourceMetadata) {
       import_diagnostics.logger.warn({
         label: `${this.name}`,
         message: `Did not find requested specifier ${resourceIdentity.specifier}`
       });
       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 isLambda = (0, import_shared_utils.isLambdaEnv)();
-    const useDebug = debug && !isLambda && debugResourcePath;
-    const type = metadata.mimeType || (0, import_shared_utils.mimeLookup)(resourcePath) || "application/javascript";
+    const resourcePath = import_path.default.join(this.siteRootDir, resourceMetadata.path);
+    const type = resourceMetadata.mimeType || (0, import_shared_utils.mimeLookup)(resourcePath) || "application/javascript";
     return {
       type,
       stream: () => {
@@ -64,15 +61,12 @@ var StaticResourceProvider = class {
           label: `${this.name}`,
           message: `Resource read from lambda ${resourceIdentity.specifier}`
         });
-        if (useDebug) {
-          return import_fs_extra.default.createReadStream(debugResourcePath);
-        } else {
-          return import_fs_extra.default.createReadStream(resourcePath);
-        }
+        return import_fs_extra.default.createReadStream(resourcePath);
       },
-      src: useDebug ? debugResourcePath : resourcePath,
-      inline: metadata.inline,
-      entry: import_path.default.resolve(useDebug ? debugResourcePath : resourcePath)
+      src: resourcePath,
+      inline: resourceMetadata.inline,
+      integrity: resourceMetadata.integrity,
+      entry: import_path.default.resolve(resourcePath)
     };
   }
 };

package/build/cjs/site-metadata.cjs

@@ -112,7 +112,7 @@ var SiteMetadataImpl = class {
       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});
+      await import_fs_extra.default.writeJSON(debugResourceMetadataPath, this.debugSiteResources, {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) {

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

@@ -1,4 +1,4 @@
-import type { AbstractModuleId, BundleDefinition, BundleProvider, ProviderContext, RuntimeEnvironment, RuntimeParams, SiteMetadata } from '@lwrjs/types';
+import type { AbstractModuleId, BundleDefinition, BundleProvider, ProviderContext, RuntimeEnvironment, RuntimeParams, SiteBundle, SiteMetadata } from '@lwrjs/types';
 export default class StaticBundleProvider implements BundleProvider {
     name: string;
     siteRootDir: string;
@@ -7,7 +7,7 @@ export default class StaticBundleProvider implements BundleProvider {
     siteMetadata: SiteMetadata;
     constructor(_config: {}, context: ProviderContext);
     bundle<BundleIdentifier extends AbstractModuleId, RE extends RuntimeEnvironment>(moduleId: BundleIdentifier, runtimeEnvironment: RE, runtimeParams: RuntimeParams): Promise<BundleDefinition | undefined>;
-    private getBundleMetadata;
+    getBundleMetadata(moduleId: Partial<AbstractModuleId>, localeId: string, debug: boolean): SiteBundle | undefined;
     /**
      * Takes a key from the site bundle metadata and creates an appropriate runtime BaseModuleReference to use in the LWR runtime.
      */

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

@@ -51,6 +51,7 @@ export default class StaticBundleProvider {
             version: resolvedVersion,
             specifier: specifier,
             config: this.bundleConfig,
+            integrity: metadata.integrity,
             bundleRecord: {
                 // TODO we need to solve include modules for fingerprints support
                 includedModules,
@@ -113,7 +114,7 @@ export default class StaticBundleProvider {
                 bundleSourcePath = path.join(this.siteRootDir, metadata.path);
             }
             // Read the bundle source code.
-            return (await fs.readFile(bundleSourcePath)).toString('utf-8');
+            return await fs.readFile(bundleSourcePath, 'utf-8');
         }
         catch (err) {
             // Ran it an un-expected error reading the bundle source code

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

@@ -1,5 +1,5 @@
 import { logger } from '@lwrjs/diagnostics';
-import { VERSION_SIGIL, explodeSpecifier, getSpecifier } from '@lwrjs/shared-utils';
+import { VERSION_SIGIL, explodeSpecifier, getSpecifier, isLambdaEnv } from '@lwrjs/shared-utils';
 import path from 'path';
 import { getSiteBundleId, parseSiteId, resolveStaticBundleVersion } from '../site-metadata.js';
 export default class StaticModuleProvider {
@@ -18,10 +18,10 @@ export default class StaticModuleProvider {
     async getModule(moduleId, runtimeParams) {
         const localeId = (runtimeParams?.locale || this.i18n.defaultLocale);
         const metadata = this.getBundleMetadata(moduleId, localeId, false);
-        if (metadata) {
+        if (metadata && isLambdaEnv()) {
             logger.warn({
                 label: `${this.name}`,
-                message: `We should not be asking for module source we have in our site metadata ${moduleId.specifier}`,
+                message: `We should not be asking for module source we have in our site metadata: ${moduleId.specifier}`,
             });
             // proceed to next provider
             return undefined;

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

@@ -1,10 +1,10 @@
-import type { BootstrapRuntimeEnvironment, ProviderContext, ResourceDefinition, ResourceIdentifier, ResourceProvider } from '@lwrjs/types';
+import type { BootstrapRuntimeEnvironment, ProviderContext, ResourceDefinition, ResourceIdentifier, ResourceProvider, RuntimeParams } from '@lwrjs/types';
 export default class StaticResourceProvider implements ResourceProvider {
     name: string;
     siteRootDir: string;
     siteMetadata: import("@lwrjs/types").SiteMetadata;
     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, runtimeParams: RuntimeParams): Promise<ResourceDefinition | undefined>;
 }
 //# sourceMappingURL=static-resource-provider.d.ts.map

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

@@ -1,5 +1,5 @@
 import { logger } from '@lwrjs/diagnostics';
-import { isLambdaEnv, mimeLookup } from '@lwrjs/shared-utils';
+import { mimeLookup } from '@lwrjs/shared-utils';
 import path from 'path';
 import fs from 'fs-extra';
 import { getSiteResourceId } from '../site-metadata.js';
@@ -13,49 +13,40 @@ export default class StaticResourceProvider {
         this.siteRootDir = context.siteMetadata.getSiteRootDir();
         this.siteMetadata = context.siteMetadata;
     }
-    async getResource(resourceIdentity, runtimeEnvironment) {
+    async getResource(resourceIdentity, runtimeEnvironment, runtimeParams) {
         const { debug } = runtimeEnvironment;
-        const metadata = this.siteMetadata
+        // HACK: this code is tricky because resource IDs are different between prod vs debug ("lwr-loader-shim.bundle.min.js" vs "lwr-loader-shim.bundle.js").
+        // 1. In debug mode on Lambda (during SSR), we need to ignore runtimeEnvironment.debug because we will always ask for the prod version (lwr-loader-shim.bundle.min.js)
+        // 2. But when we generate the view, we can't ignore runtimeEnvironment.debug because we need the debug version of the loader shim (lwr-loader-shim.bundle.js)
+        const { ignoreDebug } = runtimeParams;
+        const resourceMetadata = this.siteMetadata
             .getSiteResourcesDecisionTree()
-            .find(getSiteResourceId(resourceIdentity));
-        const debugMetadata = this.siteMetadata
-            .getSiteResourcesDecisionTree()
-            .find(getSiteResourceId(resourceIdentity), true);
-        if (!metadata) {
+            .find(getSiteResourceId(resourceIdentity), debug && !ignoreDebug);
+        if (!resourceMetadata) {
             logger.warn({
                 label: `${this.name}`,
                 message: `Did not find requested specifier ${resourceIdentity.specifier}`,
             });
             return undefined;
         }
-        const resourcePath = path.join(this.siteRootDir, metadata.path);
-        const debugResourcePath = debugMetadata ? path.join(this.siteRootDir, debugMetadata.path) : undefined;
-        const isLambda = isLambdaEnv();
-        const useDebug = debug && !isLambda && debugResourcePath;
+        const resourcePath = path.join(this.siteRootDir, resourceMetadata.path);
         // Figure out mime type
-        const type = metadata.mimeType || mimeLookup(resourcePath) || 'application/javascript';
+        const type = resourceMetadata.mimeType ||
+            mimeLookup(resourcePath) ||
+            'application/javascript';
         return {
             type,
-            // Have to make the loader shim code available for SSR
             stream: () => {
                 logger.debug({
                     label: `${this.name}`,
                     message: `Resource read from lambda ${resourceIdentity.specifier}`,
                 });
-                if (useDebug) {
-                    // use the debug resource if:
-                    // - debug mode is ON
-                    // - isLambda is false
-                    // - the debug version of the resource exists
-                    return fs.createReadStream(debugResourcePath);
-                }
-                else {
-                    return fs.createReadStream(resourcePath);
-                }
+                return fs.createReadStream(resourcePath);
             },
-            src: useDebug ? debugResourcePath : resourcePath,
-            inline: metadata.inline,
-            entry: path.resolve(useDebug ? debugResourcePath : resourcePath),
+            src: resourcePath,
+            inline: resourceMetadata.inline,
+            integrity: resourceMetadata.integrity,
+            entry: path.resolve(resourcePath),
         };
     }
 }

package/build/es/site-metadata.js

@@ -96,7 +96,7 @@ export class SiteMetadataImpl {
             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 });
+            await fs.writeJSON(debugResourceMetadataPath, this.debugSiteResources, { spaces: 2 });
             // Save Resource Metadata
             const assetMetadataPath = path.join(this.options.rootDir, STATIC_ASSET_METADATA_PATH);
             return fs.writeJSON(assetMetadataPath, this.siteAssets, { spaces: 2 });

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.13.0-alpha.9",
+    "version": "0.13.1",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -43,7 +43,7 @@
     },
     "scripts": {
         "build": "tsc -b",
-        "clean": "rm -rf build node_modules",
+        "clean": "rimraf build node_modules",
         "test": "jest"
     },
     "files": [
@@ -52,11 +52,11 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/diagnostics": "0.13.0-alpha.9",
-        "@lwrjs/shared-utils": "0.13.0-alpha.9"
+        "@lwrjs/diagnostics": "0.13.1",
+        "@lwrjs/shared-utils": "0.13.1"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.13.0-alpha.9",
+        "@lwrjs/types": "0.13.1",
         "@types/express": "^4.17.21",
         "jest": "^26.6.3",
         "jest-express": "^1.12.0",
@@ -69,5 +69,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "a2a9e1dbf39a7b04c7a43433e004895b6f4c51a3"
+    "gitHead": "548b27ed22f5bfba7031d6b356d64898e15bd609"
 }