@lwrjs/static 0.21.8 → 0.22.2

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

@@ -64,14 +64,14 @@ var StaticAssetProvider = class {
       }
       return void 0;
     }
-    const siteAssetPath = import_path.default.join(this.siteRootDir, metadata.path);
+    const siteAssetPath = (0, import_shared_utils.joinUrlPath)(this.siteRootDir, metadata.path);
     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 = function(encoding) {
       return import_fs_extra.default.readFileSync(siteAssetPath, encoding);
     };
-    const uri = this.assetsOnLambda ? fileAssetPath : import_path.default.join(this.siteRootDir, fileAssetPath);
+    const uri = this.assetsOnLambda ? fileAssetPath : (0, import_shared_utils.joinUrlPath)(this.siteRootDir, fileAssetPath);
     import_diagnostics.logger.debug({label: `${this.name}`, message: `uri ${assetIdentifier.specifier} -> ${uri}`});
     return {
       entry: siteAssetPath,

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

@@ -85,7 +85,7 @@ var StaticBundleProvider = class {
       this.logBundleError(moduleId, localeId, debug, ssr);
       return void 0;
     }
-    const bundlePath = import_path.default.join(this.siteRootDir, metadata.path);
+    const bundlePath = (0, import_shared_utils.joinUrlPath)(this.siteRootDir, metadata.path);
     const resolvedBundlePath = this.getCodePath(bundlePath, debug, specifier, version, localeId, ssr);
     const codePromiser = this.getCodePromiser(resolvedBundlePath, {
       specifier,
@@ -238,7 +238,7 @@ var StaticBundleProvider = class {
         });
         return BUNDLE_SOURCE_NOT_FOUND;
       }
-      bundleSourcePath = import_path.default.join(this.siteRootDir, metadata.path);
+      bundleSourcePath = (0, import_shared_utils.joinUrlPath)(this.siteRootDir, metadata.path);
     }
     return bundleSourcePath;
   }

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

@@ -28,7 +28,6 @@ __export(exports, {
 });
 var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
-var import_path = __toModule(require("path"));
 var import_site_metadata = __toModule(require("../site-metadata.cjs"));
 var StaticModuleProvider = class {
   constructor(_config, context) {
@@ -65,7 +64,7 @@ var StaticModuleProvider = class {
         label: `${this.name}`,
         message: `Module Entry request for static bundle ${specifier}`
       });
-      const bundlePath = import_path.default.join(this.siteRootDir, metadata.path);
+      const bundlePath = (0, import_shared_utils.joinUrlPath)(this.siteRootDir, metadata.path);
       const resolvedVersion = (0, import_site_metadata.resolveStaticBundleVersion)(metadata.version, version);
       return {
         id: (0, import_shared_utils.getSpecifier)({...moduleId, version: resolvedVersion}),
@@ -105,7 +104,7 @@ function buildFingerprintsIndex(context) {
   if (!context.runtimeEnvironment.featureFlags.LEGACY_LOADER) {
     const bundles = context.siteMetadata?.getSiteBundles().bundles || {};
     for (const bundle of Object.values(bundles)) {
-      const bundlePath = import_path.default.join(String(context.siteMetadata?.getSiteRootDir()), bundle.path);
+      const bundlePath = (0, import_shared_utils.joinUrlPath)(String(context.siteMetadata?.getSiteRootDir()), bundle.path);
       const includedModules = bundle.includedModules || [];
       for (const includedModule of includedModules) {
         const versionedSpecifier = convertSiteIdToVersionedSpecifier(includedModule);

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

@@ -52,7 +52,7 @@ var StaticResourceProvider = class {
       });
       return void 0;
     }
-    const resourcePath = import_path.default.join(this.siteRootDir, resourceMetadata.path);
+    const resourcePath = (0, import_shared_utils.joinUrlPath)(this.siteRootDir, resourceMetadata.path);
     const type = resourceMetadata.mimeType || (0, import_shared_utils.mimeLookup)(resourcePath) || "application/javascript";
     return {
       type,

package/build/cjs/tools/dedupe-bundles.cjs

@@ -48,7 +48,7 @@ async function dedupeBundles(rootDir, i18n) {
     if (!localeId || localeId === i18n.defaultLocale) {
       continue;
     }
-    const currentPath = import_path.default.join(rootDir, metadata.path);
+    const currentPath = (0, import_shared_utils.joinUrlPath)(rootDir, metadata.path);
     const currentSrc = import_fs_extra.default.readFileSync(currentPath);
     import_diagnostics.logger.debug({
       label: `dedupeBundles`,
@@ -58,7 +58,7 @@ async function dedupeBundles(rootDir, i18n) {
     const fallBackLocale = locale?.fallback ?? i18n.defaultLocale;
     const fallbackMetadata = decisionTree.find(siteIdStr, false, false, fallBackLocale);
     if (fallbackMetadata) {
-      const fallbackSrc = import_fs_extra.default.readFileSync(import_path.default.join(rootDir, fallbackMetadata.path));
+      const fallbackSrc = import_fs_extra.default.readFileSync((0, import_shared_utils.joinUrlPath)(rootDir, fallbackMetadata.path));
       import_diagnostics.logger.debug({
         label: `dedupeBundles`,
         message: `fallback ${siteIdStr},${fallBackLocale} -> ${(0, import_shared_utils.hashContent)(fallbackSrc)}`

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

@@ -1,15 +1,10 @@
 import { logger } from '@lwrjs/diagnostics';
-import { hashContent, mimeLookup, normalizeResourcePath } from '@lwrjs/shared-utils';
+import { hashContent, joinUrlPath, mimeLookup, normalizeResourcePath } from '@lwrjs/shared-utils';
 import path from 'path';
 import fs from 'fs-extra';
 export default class StaticAssetProvider {
-    name = 'static-asset-provider';
-    siteAssets;
-    resourcePaths;
-    siteRootDir;
-    basePath;
-    assetsOnLambda;
     constructor(_config, context) {
+        this.name = 'static-asset-provider';
         if (!context.siteMetadata) {
             throw new Error(`[${this.name}] Site metadata was not found`);
         }
@@ -46,7 +41,7 @@ export default class StaticAssetProvider {
             return undefined;
         }
         // FS path including ssg root
-        const siteAssetPath = path.join(this.siteRootDir, metadata.path);
+        const siteAssetPath = joinUrlPath(this.siteRootDir, metadata.path);
         // Figure out mime type
         const mime = metadata.mimeType || mimeLookup(siteAssetPath);
         // Normalize extension
@@ -57,7 +52,7 @@ export default class StaticAssetProvider {
             return fs.readFileSync(siteAssetPath, encoding);
         };
         // Create URI
-        const uri = this.assetsOnLambda ? fileAssetPath : path.join(this.siteRootDir, fileAssetPath);
+        const uri = this.assetsOnLambda ? fileAssetPath : joinUrlPath(this.siteRootDir, fileAssetPath);
         logger.debug({ label: `${this.name}`, message: `uri ${assetIdentifier.specifier} -> ${uri}` });
         return {
             entry: siteAssetPath,

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

@@ -1,5 +1,5 @@
 import { logger } from '@lwrjs/diagnostics';
-import { VERSION_SIGIL, explodeSpecifier, getSpecifier, isExternalSpecifier, isLambdaEnv, normalizeFromFileURL, } from '@lwrjs/shared-utils';
+import { VERSION_SIGIL, explodeSpecifier, getSpecifier, isExternalSpecifier, isLambdaEnv, joinUrlPath, normalizeFromFileURL, } from '@lwrjs/shared-utils';
 import path from 'path';
 import fs from 'fs-extra';
 import { LRUCache } from 'lru-cache';
@@ -8,14 +8,8 @@ import { cacheCountStore } from '@lwrjs/instrumentation';
 import { getTracer, BundleSpan } from '@lwrjs/instrumentation';
 const BUNDLE_SOURCE_NOT_FOUND = 'Bundle Source Path Not Found';
 export default class StaticBundleProvider {
-    name = 'static-bundle-provider';
-    codeCache;
-    siteRootDir;
-    bundleConfig;
-    i18n;
-    siteMetadata;
-    bundleCacheSize;
     constructor(config, context) {
+        this.name = 'static-bundle-provider';
         if (!context.siteMetadata) {
             throw new Error(`[${this.name}] Site metadata was not found`);
         }
@@ -66,7 +60,7 @@ export default class StaticBundleProvider {
             return undefined;
         }
         // Default bundle source path
-        const bundlePath = path.join(this.siteRootDir, metadata.path);
+        const bundlePath = joinUrlPath(this.siteRootDir, metadata.path);
         // Get the associated bundle source code
         const resolvedBundlePath = this.getCodePath(bundlePath, debug, specifier, version, localeId, ssr);
         const codePromiser = this.getCodePromiser(resolvedBundlePath, {
@@ -255,7 +249,7 @@ export default class StaticBundleProvider {
                 return BUNDLE_SOURCE_NOT_FOUND;
             }
             // Overwrite the default source code path the prod source code path
-            bundleSourcePath = path.join(this.siteRootDir, metadata.path);
+            bundleSourcePath = joinUrlPath(this.siteRootDir, metadata.path);
         }
         return bundleSourcePath;
     }

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

@@ -1,15 +1,9 @@
 import { logger } from '@lwrjs/diagnostics';
-import { VERSION_SIGIL, explodeSpecifier, getSpecifier, isLambdaEnv } from '@lwrjs/shared-utils';
-import path from 'path';
+import { VERSION_SIGIL, explodeSpecifier, getSpecifier, isLambdaEnv, joinUrlPath } from '@lwrjs/shared-utils';
 import { getSiteBundleId, parseSiteId, resolveStaticBundleVersion } from '../site-metadata.js';
 export default class StaticModuleProvider {
-    name = 'static-module-provider';
-    siteRootDir;
-    externals;
-    fingerprintIndex;
-    i18n;
-    siteMetadata;
     constructor(_config, context) {
+        this.name = 'static-module-provider';
         if (!context.siteMetadata) {
             throw new Error(`[${this.name}] Site metadata was not found`);
         }
@@ -47,7 +41,7 @@ export default class StaticModuleProvider {
                 message: `Module Entry request for static bundle ${specifier}`,
             });
             // Have to make the bundle code available for SSR
-            const bundlePath = path.join(this.siteRootDir, metadata.path);
+            const bundlePath = joinUrlPath(this.siteRootDir, metadata.path);
             const resolvedVersion = resolveStaticBundleVersion(metadata.version, version);
             return {
                 id: getSpecifier({ ...moduleId, version: resolvedVersion }),
@@ -88,7 +82,7 @@ function buildFingerprintsIndex(context) {
     if (!context.runtimeEnvironment.featureFlags.LEGACY_LOADER) {
         const bundles = context.siteMetadata?.getSiteBundles().bundles || {};
         for (const bundle of Object.values(bundles)) {
-            const bundlePath = path.join(String(context.siteMetadata?.getSiteRootDir()), bundle.path);
+            const bundlePath = joinUrlPath(String(context.siteMetadata?.getSiteRootDir()), bundle.path);
             const includedModules = bundle.includedModules || [];
             for (const includedModule of includedModules) {
                 const versionedSpecifier = convertSiteIdToVersionedSpecifier(includedModule);

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

@@ -1,14 +1,11 @@
 import { logger } from '@lwrjs/diagnostics';
-import { mimeLookup } from '@lwrjs/shared-utils';
+import { joinUrlPath, mimeLookup } from '@lwrjs/shared-utils';
 import path from 'path';
 import fs from 'fs-extra';
 import { getSiteResourceId } from '../site-metadata.js';
 export default class StaticResourceProvider {
-    name = 'static-resource-provider';
-    siteRootDir;
-    siteMetadata;
-    resourceRegistry;
     constructor(_config, context) {
+        this.name = 'static-resource-provider';
         if (!context.siteMetadata) {
             throw new Error(`[${this.name}] Site metadata was not found`);
         }
@@ -32,7 +29,7 @@ export default class StaticResourceProvider {
             });
             return undefined;
         }
-        const resourcePath = path.join(this.siteRootDir, resourceMetadata.path);
+        const resourcePath = joinUrlPath(this.siteRootDir, resourceMetadata.path);
         // Figure out mime type
         const type = resourceMetadata.mimeType ||
             mimeLookup(resourcePath) ||

package/build/es/site-metadata.js

@@ -13,14 +13,6 @@ export const SITE_VERSION_PREFIX = `|${VERSION_SIGIL}/`;
 export const SITE_LOCALE_PREFIX = `|${LOCALE_SIGIL}/`;
 export const SITE_SSR_PREFIX = `|${SSR_SIGIL}`;
 export class SiteMetadataImpl {
-    options;
-    siteBundles;
-    debugSiteBundles;
-    siteResources;
-    debugSiteResources;
-    siteAssets;
-    bundleDecisionTree;
-    resourceDecisionTree;
     constructor(options) {
         this.options = options;
         this.siteBundles = this.readStaticBundleMetadata(options.rootDir, STATIC_BUNDLE_METADATA_PATH);

package/build/es/tools/dedupe-bundles.js

@@ -2,7 +2,7 @@ import fs from 'fs-extra';
 import path from 'path';
 import { logger } from '@lwrjs/diagnostics';
 import { SiteMetadataImpl, parseSiteId } from '../site-metadata.js';
-import { LOCALE_SIGIL, hashContent } from '@lwrjs/shared-utils';
+import { LOCALE_SIGIL, hashContent, joinUrlPath } from '@lwrjs/shared-utils';
 export async function dedupeBundles(rootDir, i18n) {
     const siteMetadata = new SiteMetadataImpl({
         rootDir,
@@ -22,7 +22,7 @@ export async function dedupeBundles(rootDir, i18n) {
             continue;
         }
         // Read the content from the current metadata
-        const currentPath = path.join(rootDir, metadata.path);
+        const currentPath = joinUrlPath(rootDir, metadata.path);
         const currentSrc = fs.readFileSync(currentPath);
         logger.debug({
             label: `dedupeBundles`,
@@ -34,7 +34,7 @@ export async function dedupeBundles(rootDir, i18n) {
         const fallbackMetadata = decisionTree.find(siteIdStr, false, false, fallBackLocale);
         if (fallbackMetadata) {
             // Read the content of the fallback metadata
-            const fallbackSrc = fs.readFileSync(path.join(rootDir, fallbackMetadata.path));
+            const fallbackSrc = fs.readFileSync(joinUrlPath(rootDir, fallbackMetadata.path));
             logger.debug({
                 label: `dedupeBundles`,
                 message: `fallback ${siteIdStr},${fallBackLocale} -> ${hashContent(fallbackSrc)}`,

package/build/es/utils/decision-tree.js

@@ -33,7 +33,9 @@ const CHOICE_PROD = 'prod';
 const CHOICE_DEBUG = 'debug';
 // Tree of decisions to lead you to the right artifact
 export default class DecisionTreeImpl {
-    root = new TreeNode(); // Root node does not hold any decision value
+    constructor() {
+        this.root = new TreeNode(); // Root node does not hold any decision value
+    }
     // Insert an artifact into the tree based on a path of decisions
     insert(siteArtifactId, artifact, debug, localeFallbacks) {
         // The decision path is the set of choices needed to get to the right metadata
@@ -178,12 +180,9 @@ export default class DecisionTreeImpl {
  * It maintains the rank of all choices at this node, allowing a later node with a higher rank to replace the current one as the best option.
  */
 class TreeNode {
-    decisionValue; // The decision value at this node (version ['1_0' or WILDCARD etc], localeId ['en-MX' or WILDCARD etc], etc.)
-    children = new Map(); // Maps a decision key to the next TreeNode
-    artifact = undefined; // Final artifact at a leaf node
-    parentPath; // parent path  (i.e. foo/bar|DEBUG|1_0|WILD_CARD) just used for debugging
-    rank; // choice rank to prioritize lower ranked choices
     constructor(value = '', parentPath = '') {
+        this.children = new Map(); // Maps a decision key to the next TreeNode
+        this.artifact = undefined; // Final artifact at a leaf node
         this.decisionValue = value;
         this.parentPath = parentPath;
     }

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.21.8",
+    "version": "0.22.2",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -56,13 +56,13 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/diagnostics": "0.21.8",
-        "@lwrjs/instrumentation": "0.21.8",
-        "@lwrjs/shared-utils": "0.21.8",
+        "@lwrjs/diagnostics": "0.22.2",
+        "@lwrjs/instrumentation": "0.22.2",
+        "@lwrjs/shared-utils": "0.22.2",
         "lru-cache": "^10.4.3"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.21.8",
+        "@lwrjs/types": "0.22.2",
         "@types/express": "^4.17.21",
         "jest": "29.7.0",
         "jest-express": "^1.12.0",
@@ -71,10 +71,10 @@
         "ts-jest": "^29.2.6"
     },
     "engines": {
-        "node": ">=20.0.0"
+        "node": ">=22.0.0"
     },
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "3665b85aad9402b59812e67570c0c6e3be093c00"
+    "gitHead": "30870e466e15e6691d238e75836e9266a45203e3"
 }