@lwrjs/core 0.15.0-alpha.3 → 0.15.0-alpha.31

package/build/cjs/__mocks__/undici.cjs

@@ -0,0 +1,25 @@
+var __defProp = Object.defineProperty;
+var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, {get: all[name], enumerable: true});
+};
+
+// packages/@lwrjs/core/src/__mocks__/undici.ts
+__markAsModule(exports);
+__export(exports, {
+  Pool: () => Pool
+});
+var Pool = class {
+  async request() {
+    return Promise.resolve({
+      statusCode: 200,
+      body: {
+        text: () => Promise.resolve('{"one":1}'),
+        json: () => Promise.resolve({one: 1})
+      }
+    });
+  }
+  close() {
+  }
+};

package/build/cjs/context/provider.cjs

@@ -46,7 +46,8 @@ function createProviderContext(serverContext) {
     environment,
     basePath,
     bundleConfig,
-    staticSiteGenerator
+    staticSiteGenerator,
+    _isSsrCompilerEnabled
   } = serverContext.appConfig;
   const {onModuleDefinitionChange, onModuleSourceChange} = serverContext.appObserver;
   const {
@@ -84,7 +85,8 @@ function createProviderContext(serverContext) {
       amdLoader,
       esmLoader,
       environment,
-      bundleConfig
+      bundleConfig,
+      _isSsrCompilerEnabled
     }),
     runtimeEnvironment: (0, import_shared_utils.deepFreeze)(serverContext.runtimeEnvironment),
     watcherFactory: serverContext.watcherFactory,

package/build/cjs/index.cjs

@@ -109,9 +109,9 @@ var LwrApp = class {
     this.config = appConfig;
     this.runtimeEnvironment = runtimeEnvironment;
     this.globalData = globalData;
-    const {basePath, serverType} = this.config;
+    const {basePath, serverType, caseSensitiveRoutes} = this.config;
     this.serverType = serverType;
-    this.app = (0, import_server.createInternalServer)(serverType, {basePath});
+    this.app = (0, import_server.createInternalServer)(serverType, {basePath, caseSensitiveRoutes});
     this.server = this.app.createHttpServer();
     this.use = this.app.use.bind(this.app);
     this.all = this.app.all.bind(this.app);

package/build/cjs/middleware/bundle-middleware.cjs

@@ -84,7 +84,7 @@ function createBundleMiddleware(context) {
     if (signature !== import_shared_utils.LATEST_SIGNATURE) {
       res.setHeader("Cache-control", "public, max-age=31536000, immutable");
     }
-    res.status(200).type("application/javascript").send(bundleDefinition.code);
+    res.status(200).type("application/javascript").send(await bundleDefinition.getCode());
   };
 }
 function createSourceMapMiddleware(context) {

package/build/cjs/middleware/request-processor-middleware.cjs

@@ -45,7 +45,7 @@ function requestProcessorMiddleware(app, context) {
         }
       }
       requestClass = req.headers[MRT_REQUEST_CLASS_KEY];
-      requestDepth = (0, import_shared_utils.parseRequestDepthHeader)(req.headers);
+      requestDepth = (0, import_shared_utils.parseRequestDepth)(req.headers, req.query);
       const forwarded = req.headers["forwarded"];
       const host = req.headers["host"];
       const forwardedProto = req.headers["x-forwarded-proto"];
@@ -57,14 +57,14 @@ function requestProcessorMiddleware(app, context) {
         });
       }
     }
-    if (requestDepth && requestDepth > 0) {
+    if (requestDepth && requestDepth > 1) {
       import_diagnostics.logger.error({
         label: "request-processor-middleware",
         message: `Lambda SSR request cycle detected: ${req.originalUrl}`
       });
       return res.status(400).send("Request depth limit reached");
     }
-    if (req.headers && typeof requestClass === "string") {
+    if (req.headers && requestClass && typeof requestClass === "string") {
       const parsedRequestClass = parseRequestClass(requestClass);
       import_diagnostics.logger.debug({
         label: `request-processor-middleware`,
@@ -72,6 +72,20 @@ function requestProcessorMiddleware(app, context) {
       });
       const pathValue = parsedRequestClass?.basePath || basePath || "";
       req.basePath = pathValue === "" || pathValue.indexOf("/") === 0 ? pathValue : `/${pathValue}`;
+      const expressRequest = req.req;
+      if (expressRequest?.url && parsedRequestClass?.basePath) {
+        const {pathname, search} = new URL(expressRequest.url, "http://localhost");
+        if (pathname.startsWith(parsedRequestClass.basePath)) {
+          const newPath = pathname.slice(parsedRequestClass.basePath.length) || "/";
+          expressRequest.url = newPath + search;
+          expressRequest.originalUrl = newPath + search;
+        } else {
+          import_diagnostics.logger.warn({
+            label: `request-processor-middleware`,
+            message: `The URL requested for doesn't start with the Base path`
+          });
+        }
+      }
     } else {
       import_diagnostics.logger.debug({
         label: `request-processor-middleware`,
@@ -83,6 +97,9 @@ function requestProcessorMiddleware(app, context) {
   });
 }
 function parseRequestClass(requestClass) {
+  if (!requestClass) {
+    return {};
+  }
   const keyValuePairs = requestClass.split(";");
   const parsed = {};
   for (const pair of keyValuePairs) {

package/build/cjs/middleware/view-middleware.cjs

@@ -32,6 +32,7 @@ var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_instrumentation = __toModule(require("@lwrjs/instrumentation"));
 var import_error_handling = __toModule(require("./utils/error-handling.cjs"));
 var import_view_registry = __toModule(require("@lwrjs/view-registry"));
+var import_instrumentation2 = __toModule(require("@lwrjs/instrumentation"));
 function createViewMiddleware(route, errorRoutes, context, viewHandler) {
   const errorRoute = errorRoutes.find((route2) => route2.status === 500);
   const appConfig = context.appConfig;
@@ -61,7 +62,10 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
       ...defaultRuntimeParams,
       url: viewRequest.url,
       params: viewRequest.params,
-      query: viewRequest.query
+      query: viewRequest.query,
+      cookie: req.headers?.cookie,
+      trueClientIP: req.headers && req.headers["True-Client-IP"],
+      coreProxy: req.getCoreProxy(appConfig.coreProxy ?? void 0, route.bootstrap?.proxyForSSR)
     };
     const resolve = req.isJsonRequest() ? viewHandler.getViewJson : viewHandler.getViewContent;
     let viewResponse;
@@ -97,6 +101,14 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
         return resolve.call(viewHandler, viewRequest, errorRoute, runtimeEnvironment, runtimeParams);
       });
       resolvedRoute = errorRoute;
+    } finally {
+      if (traceId?.length) {
+        res.setHeader("x-trace-id", traceId);
+        res.set({
+          "Server-Timing": (0, import_instrumentation2.getTraceCollector)().getSpansInTrace(traceId)
+        });
+        (0, import_instrumentation2.getTraceCollector)().dropTrace(traceId);
+      }
     }
     if (req.isSiteGeneration()) {
       res.setSiteGenerationMetadata(viewResponse.metadata);
@@ -111,10 +123,20 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
         res.setHeader("cache-control", `public, max-age=${cacheTtl}`);
       }
     }
-    if (traceId?.length) {
-      res.setHeader("x-trace-id", traceId);
+    let status = resolvedRoute.status || viewResponse.status || 200;
+    const redirect = viewResponse.metadata?.viewDefinition?.redirect;
+    if (viewResponse.status === 301 || viewResponse.status === 302) {
+      status = viewResponse.status;
+    } else if (redirect) {
+      if ((0, import_shared_utils.isURL)(redirect.location) || redirect.location.startsWith("/")) {
+        status = redirect.status || 302;
+        res.set({
+          Location: addRedirectQueryParam(redirect.location, (0, import_shared_utils.parseRequestDepth)(req.headers, req.query))
+        });
+      } else {
+        import_diagnostics.logger.warn(`[view-middleware] Redirect failed because the URL is invalid: "${redirect.location}"`);
+      }
     }
-    const status = resolvedRoute.status || viewResponse.status || 200;
     res.status(status);
     res.send(viewResponse.body);
   };
@@ -199,7 +221,7 @@ function viewMiddleware(app, context) {
           const localizedPath = `/:locale(${supportedStr})${routePath}`;
           paths.push(localizedPath);
         });
-        addDefaultLocaleRedirects(i18n.defaultLocale, defaultLocalePaths, app);
+        addDefaultLocaleRedirects(i18n.defaultLocale, defaultLocalePaths, i18n.defaultRedirectParams, app);
       }
     }
     import_diagnostics.logger.debug({label: `view-middleware`, message: `Add view paths ${paths}`});
@@ -208,14 +230,25 @@ function viewMiddleware(app, context) {
   app.get((0, import_shared_utils.getClientBootstrapConfigurationRoutes)(), (0, import_error_handling.handleErrors)(createConfigMiddleware(routes, context, viewHandler)));
   app.get("/" + app.getRegexWildcard(), (0, import_error_handling.handleErrors)(createNotFoundMiddleware(errorRoutes, context, viewHandler)));
 }
-function addDefaultLocaleRedirects(defaultLocale, defaultLocalePaths, app) {
+function addDefaultLocaleRedirects(defaultLocale, defaultLocalePaths, defaultRedirectParams, app) {
   import_diagnostics.logger.debug({label: `view-middleware`, message: `Add default localized paths ${defaultLocalePaths}`});
   app.get(defaultLocalePaths, (req, res) => {
     let modifiedPath = req.originalUrl.replace(`/${defaultLocale}`, "");
     if (modifiedPath.indexOf("/") !== 0) {
       modifiedPath = `/${modifiedPath}`;
     }
+    if (defaultRedirectParams) {
+      Object.entries(defaultRedirectParams).forEach(([key, value]) => {
+        modifiedPath += `${modifiedPath.includes("?") ? "&" : "?"}${key}=${value}`;
+      });
+    }
     res.setHeader("Location", modifiedPath);
     return res.sendStatus(301);
   });
 }
+function addRedirectQueryParam(redirectUrl, depth) {
+  const fakeOrigin = "http://parse.com";
+  const url = (0, import_shared_utils.isURL)(redirectUrl) ? new URL(redirectUrl) : new URL(`${fakeOrigin}${redirectUrl}`);
+  url.searchParams.set(import_shared_utils.REQUEST_DEPTH_KEY, String(depth + 1));
+  return url.toString().replace(fakeOrigin, "");
+}

package/build/cjs/tools/static-generation.cjs

@@ -232,12 +232,12 @@ var SiteGenerator = class {
   addBundleToSiteMetadata(bundleDefinition, url, siteConfig) {
     if (siteConfig.siteMetadata) {
       const locale = siteConfig.locale;
-      const specifier = (0, import_site_metadata.getSiteBundleId)(bundleDefinition, locale, siteConfig.i18n);
-      const imports = bundleDefinition.bundleRecord.imports?.map((moduleRef) => (0, import_site_metadata.getSiteBundleId)(moduleRef, locale, siteConfig.i18n)) || [];
-      const dynamicImports = bundleDefinition.bundleRecord.dynamicImports?.map((moduleRef) => (0, import_site_metadata.getSiteBundleId)(moduleRef, locale, siteConfig.i18n));
+      const specifier = (0, import_site_metadata.getSiteBundleId)(bundleDefinition, locale, false, siteConfig.i18n);
+      const imports = bundleDefinition.bundleRecord.imports?.map((moduleRef) => (0, import_site_metadata.getSiteBundleId)(moduleRef, locale, false, siteConfig.i18n)) || [];
+      const dynamicImports = bundleDefinition.bundleRecord.dynamicImports?.map((moduleRef) => (0, import_site_metadata.getSiteBundleId)(moduleRef, locale, false, siteConfig.i18n));
       const includedModules = bundleDefinition.bundleRecord.includedModules?.map((moduleRef) => {
         const moduleId = (0, import_shared_utils.explodeSpecifier)(moduleRef);
-        return (0, import_site_metadata.getSiteBundleId)(moduleId, locale, siteConfig.i18n);
+        return (0, import_site_metadata.getSiteBundleId)(moduleId, locale, false, siteConfig.i18n);
       }) || [];
       const version = bundleDefinition.version === import_shared_utils.VERSION_NOT_PROVIDED ? void 0 : bundleDefinition.version;
       const bundleMetadata = {

package/build/es/context/provider.js

@@ -3,7 +3,7 @@ import { deepFreeze } from '@lwrjs/shared-utils';
 import { SiteMetadataImpl } from '@lwrjs/static/site-metadata';
 export function createProviderContext(serverContext) {
     // This is a subset of config to user-land code
-    const { assets, cacheDir, i18n, lwc: { modules = [] }, routes, errorRoutes, rootDir, contentDir, layoutsDir, locker, amdLoader, esmLoader, environment, basePath, bundleConfig, staticSiteGenerator, } = serverContext.appConfig;
+    const { assets, cacheDir, i18n, lwc: { modules = [] }, routes, errorRoutes, rootDir, contentDir, layoutsDir, locker, amdLoader, esmLoader, environment, basePath, bundleConfig, staticSiteGenerator, _isSsrCompilerEnabled, } = serverContext.appConfig;
     const { onModuleDefinitionChange, onModuleSourceChange } = serverContext.appObserver;
     const { notifyModuleDefinitionChanged, notifyModuleSourceChanged, notifyViewSourceChanged, notifyAssetSourceChanged, } = serverContext.appEmitter;
     const siteMetadata = staticSiteGenerator.outputDir && fs.existsSync(staticSiteGenerator.outputDir)
@@ -38,6 +38,7 @@ export function createProviderContext(serverContext) {
             esmLoader,
             environment,
             bundleConfig,
+            _isSsrCompilerEnabled,
         }),
         runtimeEnvironment: deepFreeze(serverContext.runtimeEnvironment),
         watcherFactory: serverContext.watcherFactory,

package/build/es/index.js

@@ -98,9 +98,9 @@ export class LwrApp {
         this.config = appConfig;
         this.runtimeEnvironment = runtimeEnvironment;
         this.globalData = globalData;
-        const { basePath, serverType } = this.config;
+        const { basePath, serverType, caseSensitiveRoutes } = this.config;
         this.serverType = serverType;
-        this.app = createInternalServer(serverType, { basePath });
+        this.app = createInternalServer(serverType, { basePath, caseSensitiveRoutes });
         this.server = this.app.createHttpServer();
         this.use = this.app.use.bind(this.app);
         this.all = this.app.all.bind(this.app);

package/build/es/middleware/bundle-middleware.js

@@ -56,7 +56,9 @@ function createBundleMiddleware(context) {
         if (signature !== LATEST_SIGNATURE) {
             res.setHeader('Cache-control', 'public, max-age=31536000, immutable');
         }
-        res.status(200).type('application/javascript').send(bundleDefinition.code);
+        res.status(200)
+            .type('application/javascript')
+            .send(await bundleDefinition.getCode());
     };
 }
 function createSourceMapMiddleware(context) {

package/build/es/middleware/request-processor-middleware.js

@@ -7,7 +7,7 @@
  *
  */
 import { logger } from '@lwrjs/diagnostics';
-import { REQUEST_DEPTH_HEADER, isLambdaEnv, parseRequestDepthHeader } from '@lwrjs/shared-utils';
+import { REQUEST_DEPTH_HEADER, isLambdaEnv, parseRequestDepth } from '@lwrjs/shared-utils';
 const MRT_REQUEST_CLASS = 'X-Mobify-Request-Class';
 const MRT_REQUEST_CLASS_KEY = MRT_REQUEST_CLASS.toLowerCase();
 export function requestProcessorMiddleware(app, context) {
@@ -27,7 +27,7 @@ export function requestProcessorMiddleware(app, context) {
                 }
             }
             requestClass = req.headers[MRT_REQUEST_CLASS_KEY];
-            requestDepth = parseRequestDepthHeader(req.headers);
+            requestDepth = parseRequestDepth(req.headers, req.query);
             const forwarded = req.headers['forwarded'];
             const host = req.headers['host'];
             const forwardedProto = req.headers['x-forwarded-proto'];
@@ -40,8 +40,7 @@ export function requestProcessorMiddleware(app, context) {
                 });
             }
         }
-        // TODO Clean up once we have a long term solution
-        if (requestDepth && requestDepth > 0) {
+        if (requestDepth && requestDepth > 1) {
             logger.error({
                 label: 'request-processor-middleware',
                 message: `Lambda SSR request cycle detected: ${req.originalUrl}`,
@@ -49,7 +48,7 @@ export function requestProcessorMiddleware(app, context) {
             // Return 400 Too Many Requests status
             return res.status(400).send('Request depth limit reached');
         }
-        if (req.headers && typeof requestClass === 'string') {
+        if (req.headers && requestClass && typeof requestClass === 'string') {
             const parsedRequestClass = parseRequestClass(requestClass);
             logger.debug({
                 label: `request-processor-middleware`,
@@ -58,6 +57,26 @@ export function requestProcessorMiddleware(app, context) {
             const pathValue = parsedRequestClass?.basePath || basePath || '';
             // If base path is '' or starts with / leave it alone
             req.basePath = pathValue === '' || pathValue.indexOf('/') === 0 ? pathValue : `/${pathValue}`;
+            const expressRequest = req.req;
+            // This section is code added for the 103 hints support.  If CDN passes us a basePath in the header
+            // If the basePath is at the start of the URL we need to remove it so we can match the expected route.
+            if (expressRequest?.url && parsedRequestClass?.basePath) {
+                // Separate the path and the query param using dummy local host here since we do not use it
+                const { pathname, search } = new URL(expressRequest.url, 'http://localhost');
+                if (pathname.startsWith(parsedRequestClass.basePath)) {
+                    // Remove the basePath from the pathname
+                    const newPath = pathname.slice(parsedRequestClass.basePath.length) || '/';
+                    // Reconstruct the URL with the modified path and original query string
+                    expressRequest.url = newPath + search;
+                    expressRequest.originalUrl = newPath + search;
+                }
+                else {
+                    logger.warn({
+                        label: `request-processor-middleware`,
+                        message: `The URL requested for doesn't start with the Base path`,
+                    });
+                }
+            }
         }
         else {
             logger.debug({
@@ -71,6 +90,10 @@ export function requestProcessorMiddleware(app, context) {
     });
 }
 function parseRequestClass(requestClass) {
+    // If there is no requestClass do not bother parsing
+    if (!requestClass) {
+        return {};
+    }
     // Split the Forwarded header into individual key-value pairs
     const keyValuePairs = requestClass.split(';');
     // Create an object to store the parsed values

package/build/es/middleware/view-middleware.js

@@ -1,9 +1,10 @@
 import { descriptions, logger } from '@lwrjs/diagnostics';
 import { getClientRoutes } from '@lwrjs/router';
-import { decodeViewPath, extractRequestParams, getClientBootstrapConfigurationRoutes, shortestTtl, } from '@lwrjs/shared-utils';
+import { decodeViewPath, extractRequestParams, getClientBootstrapConfigurationRoutes, isURL, parseRequestDepth, REQUEST_DEPTH_KEY, shortestTtl, } from '@lwrjs/shared-utils';
 import { RequestHandlerSpan, getTracer } from '@lwrjs/instrumentation';
 import { handleErrors } from './utils/error-handling.js';
 import { LwrViewHandler } from '@lwrjs/view-registry';
+import { getTraceCollector } from '@lwrjs/instrumentation';
 function createViewMiddleware(route, errorRoutes, context, viewHandler) {
     const errorRoute = errorRoutes.find((route) => route.status === 500);
     const appConfig = context.appConfig;
@@ -36,6 +37,9 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
             url: viewRequest.url,
             params: viewRequest.params,
             query: viewRequest.query,
+            cookie: req.headers?.cookie,
+            trueClientIP: req.headers && req.headers['True-Client-IP'],
+            coreProxy: req.getCoreProxy(appConfig.coreProxy ?? undefined, route.bootstrap?.proxyForSSR),
         };
         const resolve = req.isJsonRequest() ? viewHandler.getViewJson : viewHandler.getViewContent;
         let viewResponse;
@@ -74,6 +78,15 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
             });
             resolvedRoute = errorRoute;
         }
+        finally {
+            if (traceId?.length) {
+                res.setHeader('x-trace-id', traceId);
+                res.set({
+                    'Server-Timing': getTraceCollector().getSpansInTrace(traceId),
+                });
+                getTraceCollector().dropTrace(traceId);
+            }
+        }
         if (req.isSiteGeneration()) {
             res.setSiteGenerationMetadata(viewResponse.metadata);
         }
@@ -90,10 +103,23 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
                 res.setHeader('cache-control', `public, max-age=${cacheTtl}`);
             }
         }
-        if (traceId?.length) {
-            res.setHeader('x-trace-id', traceId);
+        let status = resolvedRoute.status || viewResponse.status || 200;
+        const redirect = viewResponse.metadata?.viewDefinition?.redirect;
+        if (viewResponse.status === 301 || viewResponse.status === 302) {
+            // route handle redirect status takes precedence
+            status = viewResponse.status;
+        }
+        else if (redirect) {
+            if (isURL(redirect.location) || redirect.location.startsWith('/')) {
+                status = redirect.status || 302;
+                res.set({
+                    Location: addRedirectQueryParam(redirect.location, parseRequestDepth(req.headers, req.query)),
+                });
+            }
+            else {
+                logger.warn(`[view-middleware] Redirect failed because the URL is invalid: "${redirect.location}"`);
+            }
         }
-        const status = resolvedRoute.status || viewResponse.status || 200;
         res.status(status);
         res.send(viewResponse.body);
     };
@@ -193,7 +219,7 @@ export function viewMiddleware(app, context) {
                     const localizedPath = `/:locale(${supportedStr})${routePath}`;
                     paths.push(localizedPath);
                 });
-                addDefaultLocaleRedirects(i18n.defaultLocale, defaultLocalePaths, app);
+                addDefaultLocaleRedirects(i18n.defaultLocale, defaultLocalePaths, i18n.defaultRedirectParams, app);
             }
         }
         logger.debug({ label: `view-middleware`, message: `Add view paths ${paths}` });
@@ -208,7 +234,7 @@ export function viewMiddleware(app, context) {
 /**
  * Adds a 301 redirect if attempting to route with default locale as the path prefix
  */
-function addDefaultLocaleRedirects(defaultLocale, defaultLocalePaths, app) {
+function addDefaultLocaleRedirects(defaultLocale, defaultLocalePaths, defaultRedirectParams, app) {
     logger.debug({ label: `view-middleware`, message: `Add default localized paths ${defaultLocalePaths}` });
     app.get(defaultLocalePaths, (req, res) => {
         // Get the original URL path and split it into segments
@@ -217,9 +243,22 @@ function addDefaultLocaleRedirects(defaultLocale, defaultLocalePaths, app) {
         if (modifiedPath.indexOf('/') !== 0) {
             modifiedPath = `/${modifiedPath}`;
         }
+        if (defaultRedirectParams) {
+            Object.entries(defaultRedirectParams).forEach(([key, value]) => {
+                modifiedPath += `${modifiedPath.includes('?') ? '&' : '?'}${key}=${value}`;
+            });
+        }
         // Perform a 301 redirect to the modified URL
         res.setHeader('Location', modifiedPath);
         return res.sendStatus(301);
     });
 }
+function addRedirectQueryParam(redirectUrl, depth) {
+    // add a request depth query param to the URL
+    // the depth header cannot be used since headers cannot be added to a redirect
+    const fakeOrigin = 'http://parse.com';
+    const url = isURL(redirectUrl) ? new URL(redirectUrl) : new URL(`${fakeOrigin}${redirectUrl}`);
+    url.searchParams.set(REQUEST_DEPTH_KEY, String(depth + 1));
+    return url.toString().replace(fakeOrigin, '');
+}
 //# sourceMappingURL=view-middleware.js.map

package/build/es/tools/static-generation.js

@@ -299,12 +299,12 @@ export default class SiteGenerator {
     addBundleToSiteMetadata(bundleDefinition, url, siteConfig) {
         if (siteConfig.siteMetadata) {
             const locale = siteConfig.locale;
-            const specifier = getSiteBundleId(bundleDefinition, locale, siteConfig.i18n);
-            const imports = bundleDefinition.bundleRecord.imports?.map((moduleRef) => getSiteBundleId(moduleRef, locale, siteConfig.i18n)) || [];
-            const dynamicImports = bundleDefinition.bundleRecord.dynamicImports?.map((moduleRef) => getSiteBundleId(moduleRef, locale, siteConfig.i18n));
+            const specifier = getSiteBundleId(bundleDefinition, locale, false, siteConfig.i18n);
+            const imports = bundleDefinition.bundleRecord.imports?.map((moduleRef) => getSiteBundleId(moduleRef, locale, false, siteConfig.i18n)) || [];
+            const dynamicImports = bundleDefinition.bundleRecord.dynamicImports?.map((moduleRef) => getSiteBundleId(moduleRef, locale, false, siteConfig.i18n));
             const includedModules = bundleDefinition.bundleRecord.includedModules?.map((moduleRef) => {
                 const moduleId = explodeSpecifier(moduleRef);
-                return getSiteBundleId(moduleId, locale, siteConfig.i18n);
+                return getSiteBundleId(moduleId, locale, false, siteConfig.i18n);
             }) || [];
             const version = bundleDefinition.version === VERSION_NOT_PROVIDED ? undefined : bundleDefinition.version;
             const bundleMetadata = {

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.15.0-alpha.3",
+    "version": "0.15.0-alpha.31",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -43,46 +43,46 @@
         "build": "tsc -b"
     },
     "dependencies": {
-        "@lwrjs/app-service": "0.15.0-alpha.3",
-        "@lwrjs/asset-registry": "0.15.0-alpha.3",
-        "@lwrjs/asset-transformer": "0.15.0-alpha.3",
-        "@lwrjs/base-view-provider": "0.15.0-alpha.3",
-        "@lwrjs/base-view-transformer": "0.15.0-alpha.3",
-        "@lwrjs/client-modules": "0.15.0-alpha.3",
-        "@lwrjs/config": "0.15.0-alpha.3",
-        "@lwrjs/diagnostics": "0.15.0-alpha.3",
-        "@lwrjs/esbuild": "0.15.0-alpha.3",
-        "@lwrjs/fs-asset-provider": "0.15.0-alpha.3",
-        "@lwrjs/fs-watch": "0.15.0-alpha.3",
-        "@lwrjs/html-view-provider": "0.15.0-alpha.3",
-        "@lwrjs/instrumentation": "0.15.0-alpha.3",
-        "@lwrjs/loader": "0.15.0-alpha.3",
-        "@lwrjs/lwc-module-provider": "0.15.0-alpha.3",
-        "@lwrjs/lwc-ssr": "0.15.0-alpha.3",
-        "@lwrjs/markdown-view-provider": "0.15.0-alpha.3",
-        "@lwrjs/module-bundler": "0.15.0-alpha.3",
-        "@lwrjs/module-registry": "0.15.0-alpha.3",
-        "@lwrjs/npm-module-provider": "0.15.0-alpha.3",
-        "@lwrjs/nunjucks-view-provider": "0.15.0-alpha.3",
-        "@lwrjs/o11y": "0.15.0-alpha.3",
-        "@lwrjs/resource-registry": "0.15.0-alpha.3",
-        "@lwrjs/router": "0.15.0-alpha.3",
-        "@lwrjs/server": "0.15.0-alpha.3",
-        "@lwrjs/shared-utils": "0.15.0-alpha.3",
-        "@lwrjs/static": "0.15.0-alpha.3",
-        "@lwrjs/view-registry": "0.15.0-alpha.3",
+        "@lwrjs/app-service": "0.15.0-alpha.31",
+        "@lwrjs/asset-registry": "0.15.0-alpha.31",
+        "@lwrjs/asset-transformer": "0.15.0-alpha.31",
+        "@lwrjs/base-view-provider": "0.15.0-alpha.31",
+        "@lwrjs/base-view-transformer": "0.15.0-alpha.31",
+        "@lwrjs/client-modules": "0.15.0-alpha.31",
+        "@lwrjs/config": "0.15.0-alpha.31",
+        "@lwrjs/diagnostics": "0.15.0-alpha.31",
+        "@lwrjs/esbuild": "0.15.0-alpha.31",
+        "@lwrjs/fs-asset-provider": "0.15.0-alpha.31",
+        "@lwrjs/fs-watch": "0.15.0-alpha.31",
+        "@lwrjs/html-view-provider": "0.15.0-alpha.31",
+        "@lwrjs/instrumentation": "0.15.0-alpha.31",
+        "@lwrjs/loader": "0.15.0-alpha.31",
+        "@lwrjs/lwc-module-provider": "0.15.0-alpha.31",
+        "@lwrjs/lwc-ssr": "0.15.0-alpha.31",
+        "@lwrjs/markdown-view-provider": "0.15.0-alpha.31",
+        "@lwrjs/module-bundler": "0.15.0-alpha.31",
+        "@lwrjs/module-registry": "0.15.0-alpha.31",
+        "@lwrjs/npm-module-provider": "0.15.0-alpha.31",
+        "@lwrjs/nunjucks-view-provider": "0.15.0-alpha.31",
+        "@lwrjs/o11y": "0.15.0-alpha.31",
+        "@lwrjs/resource-registry": "0.15.0-alpha.31",
+        "@lwrjs/router": "0.15.0-alpha.31",
+        "@lwrjs/server": "0.15.0-alpha.31",
+        "@lwrjs/shared-utils": "0.15.0-alpha.31",
+        "@lwrjs/static": "0.15.0-alpha.31",
+        "@lwrjs/view-registry": "0.15.0-alpha.31",
         "chokidar": "^3.6.0",
         "esbuild": "^0.9.7",
         "fs-extra": "^11.2.0",
         "path-to-regexp": "^6.2.2",
-        "qs": "^6.12.3",
-        "rollup": "^2.78.0",
+        "qs": "^6.13.0",
+        "rollup": "^2.79.2",
         "ws": "^8.18.0"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.15.0-alpha.3",
-        "@types/ws": "^8.5.10",
-        "memfs": "^4.9.3"
+        "@lwrjs/types": "0.15.0-alpha.31",
+        "@types/ws": "^8.5.12",
+        "memfs": "^4.13.0"
     },
     "peerDependencies": {
         "lwc": ">= 2.x"
@@ -93,5 +93,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "6dfe76aa313a8ee1cedcf33b466df48a8f1a62eb"
+    "gitHead": "8c5aba2a4b02d510a896a0a564ea044d885e7f4b"
 }