@lwrjs/core 0.11.0-alpha.13 → 0.11.0-alpha.15

package/build/cjs/middleware/asset-middleware.cjs

@@ -27,17 +27,17 @@ __export(exports, {
   assetMiddleware: () => assetMiddleware
 });
 var import_path = __toModule(require("path"));
+var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
+var import_instrumentation = __toModule(require("@lwrjs/instrumentation"));
 var import_identity = __toModule(require("./utils/identity.cjs"));
 var import_error_handling = __toModule(require("./utils/error-handling.cjs"));
-var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 function createAssetMiddleware(context) {
   const {
-    appConfig: {i18n},
     assetRegistry,
     runtimeEnvironment: {basePath}
   } = context;
   return async (req, res, next) => {
-    const {runtimeEnvironment} = req.getRuntimeContext(context.runtimeEnvironment, i18n);
+    const {runtimeEnvironment} = req.getRuntimeContext(context.runtimeEnvironment);
     const {assetId, immutable, signature} = (0, import_identity.getAssetIdentity)(req);
     if (basePath && !assetId.specifier.startsWith(basePath)) {
       assetId.specifier = import_path.default.join(basePath, assetId.specifier);
@@ -52,7 +52,14 @@ function createAssetMiddleware(context) {
         res.sendStatus(302);
         return;
       }
-      const asset = await assetRegistry.getAsset({...assetId, signature}, runtimeEnvironment, req.isSiteGeneration());
+      const asset = await (0, import_instrumentation.getTracer)().trace({
+        name: import_instrumentation.RequestHandlerSpan.GetAsset,
+        attributes: {
+          specifier: assetId.specifier
+        }
+      }, () => {
+        return assetRegistry.getAsset({...assetId, signature}, runtimeEnvironment, req.isSiteGeneration());
+      });
       if (req.isSiteGeneration()) {
         res.setSiteGenerationMetadata({asset});
       }

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

@@ -28,6 +28,7 @@ __export(exports, {
 });
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
+var import_instrumentation = __toModule(require("@lwrjs/instrumentation"));
 var import_request = __toModule(require("./utils/request.cjs"));
 var import_identity = __toModule(require("./utils/identity.cjs"));
 var import_metadata = __toModule(require("./utils/metadata.cjs"));
@@ -36,7 +37,6 @@ var import_error_handling = __toModule(require("./utils/error-handling.cjs"));
 function createBundleMiddleware(context) {
   const {
     appConfig,
-    appConfig: {i18n},
     moduleRegistry,
     moduleBundler,
     runtimeEnvironment: defaultRuntimeEnvironment
@@ -53,7 +53,7 @@ function createBundleMiddleware(context) {
       res.send(import_diagnostics.descriptions.UNRESOLVABLE.INVALID_JSON().message);
       return;
     }
-    const {runtimeEnvironment, runtimeParams} = req.getRuntimeContext(defaultRuntimeEnvironment, i18n);
+    const {runtimeEnvironment, runtimeParams} = req.getRuntimeContext(defaultRuntimeEnvironment);
     const importer = req.query.importer ? await (0, import_request.getRequestImporter)(req, moduleRegistry, runtimeParams) : void 0;
     const {moduleId, signature} = (0, import_identity.getModuleIdentity)(req, importer);
     if (moduleId.importer || !signature) {
@@ -61,7 +61,14 @@ function createBundleMiddleware(context) {
       return;
     }
     const sourceMapUrl = req.path.replace("/bundle/", "/sourcemaps/bundle/");
-    const bundleDefinition = await moduleBundler.getModuleBundle(moduleId, {...runtimeEnvironment, bundle: true, sourceMapUrl}, runtimeParams);
+    const bundleDefinition = await (0, import_instrumentation.getTracer)().trace({
+      name: import_instrumentation.RequestHandlerSpan.GetBundle,
+      attributes: {
+        specifier: moduleId.specifier
+      }
+    }, () => {
+      return moduleBundler.getModuleBundle(moduleId, {...runtimeEnvironment, bundle: true, sourceMapUrl}, runtimeParams);
+    });
     if (req.isSiteGeneration()) {
       res.setSiteGenerationMetadata({
         moduleDefinition: bundleDefinition,
@@ -75,19 +82,14 @@ function createBundleMiddleware(context) {
   };
 }
 function createSourceMapMiddleware(context) {
-  const {
-    appConfig,
-    appConfig: {i18n},
-    moduleBundler,
-    runtimeEnvironment: defaultRuntimeEnvironment
-  } = context;
+  const {appConfig, moduleBundler, runtimeEnvironment: defaultRuntimeEnvironment} = context;
   return async (req, res) => {
     if (!req.validateEnvironmentRequest(appConfig)) {
       res.status(400);
       res.send(import_diagnostics.descriptions.UNRESOLVABLE.INVALID_ENVIRONMENT(req.params.environment).message);
       return;
     }
-    const {runtimeEnvironment} = req.getRuntimeContext(defaultRuntimeEnvironment, i18n);
+    const {runtimeEnvironment} = req.getRuntimeContext(defaultRuntimeEnvironment);
     const {moduleId, signature} = (0, import_identity.getModuleIdentity)(req);
     const bundleDef = await moduleBundler.getModuleBundle(moduleId, runtimeEnvironment);
     if (signature !== import_shared_utils.LATEST_SIGNATURE) {

package/build/cjs/middleware/locale-middleware.cjs

@@ -11,7 +11,9 @@ __export(exports, {
   localeMiddleware: () => localeMiddleware
 });
 function localeMiddleware(app, context) {
-  const {defaultLocale} = context.runtimeEnvironment;
+  const {
+    i18n: {defaultLocale}
+  } = context.runtimeEnvironment;
   app.use(async (req, _res, next) => {
     const langs = req.acceptsLanguages();
     req.locale = langs?.length > 0 && langs[0] != "*" ? langs[0] : defaultLocale;

package/build/cjs/middleware/mapping-middleware.cjs

@@ -28,12 +28,12 @@ __export(exports, {
 });
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
+var import_instrumentation = __toModule(require("@lwrjs/instrumentation"));
 var import_identity = __toModule(require("./utils/identity.cjs"));
 var import_error_handling = __toModule(require("./utils/error-handling.cjs"));
 function createMappingMiddleware(context) {
   const {
     appConfig,
-    appConfig: {i18n},
     moduleBundler,
     moduleRegistry,
     runtimeEnvironment: defaultRuntimeEnvironment
@@ -44,9 +44,13 @@ function createMappingMiddleware(context) {
       res.send(import_diagnostics.descriptions.UNRESOLVABLE.INVALID_ENVIRONMENT(req.params.environment).message);
       return;
     }
-    const {runtimeEnvironment, runtimeParams} = req.getRuntimeContext(defaultRuntimeEnvironment, i18n);
+    const {runtimeEnvironment, runtimeParams} = req.getRuntimeContext(defaultRuntimeEnvironment);
     const {moduleIds} = (0, import_identity.getMappingIdentity)(req);
-    const importMetadata = await (0, import_shared_utils.getImportMetadataMappings)(moduleIds, runtimeEnvironment, runtimeParams, moduleRegistry, moduleBundler);
+    const importMetadata = await (0, import_instrumentation.getTracer)().trace({
+      name: import_instrumentation.RequestHandlerSpan.GetMapping
+    }, () => {
+      return (0, import_shared_utils.getImportMetadataMappings)(moduleIds, runtimeEnvironment, runtimeParams, moduleRegistry, moduleBundler);
+    });
     if (req.isSiteGeneration()) {
       res.setSiteGenerationMetadata({importMetadata});
     }

package/build/cjs/middleware/module-middleware.cjs

@@ -28,17 +28,13 @@ __export(exports, {
 });
 var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
+var import_instrumentation = __toModule(require("@lwrjs/instrumentation"));
 var import_request = __toModule(require("./utils/request.cjs"));
 var import_identity = __toModule(require("./utils/identity.cjs"));
 var import_unsigned_module_redirect = __toModule(require("./redirects/unsigned-module-redirect.cjs"));
 var import_error_handling = __toModule(require("./utils/error-handling.cjs"));
 function createModuleMiddleware(context) {
-  const {
-    appConfig,
-    appConfig: {i18n},
-    moduleRegistry,
-    runtimeEnvironment: defaultRuntimeEnvironment
-  } = context;
+  const {appConfig, moduleRegistry, runtimeEnvironment: defaultRuntimeEnvironment} = context;
   const unsignedRedirect = (0, import_unsigned_module_redirect.createUnsignedModuleRedirect)(moduleRegistry);
   return async (req, res) => {
     if (!req.validateEnvironmentRequest(appConfig)) {
@@ -51,14 +47,21 @@ function createModuleMiddleware(context) {
       res.send(import_diagnostics.descriptions.UNRESOLVABLE.INVALID_JSON().message);
       return;
     }
-    const {runtimeEnvironment, runtimeParams} = req.getRuntimeContext(defaultRuntimeEnvironment, i18n);
+    const {runtimeEnvironment, runtimeParams} = req.getRuntimeContext(defaultRuntimeEnvironment);
     const importer = req.query.importer ? await (0, import_request.getRequestImporter)(req, moduleRegistry, runtimeParams) : void 0;
     const {moduleId, signature} = (0, import_identity.getModuleIdentity)(req, importer);
     if (moduleId.importer || !signature) {
       await unsignedRedirect(req, res, moduleId, runtimeEnvironment, runtimeParams);
       return;
     }
-    const moduleDefinition = await moduleRegistry.getLinkedModule(moduleId, {...runtimeEnvironment, bundle: false}, runtimeParams);
+    const moduleDefinition = await (0, import_instrumentation.getTracer)().trace({
+      name: import_instrumentation.RequestHandlerSpan.GetModule,
+      attributes: {
+        specifier: moduleId.specifier
+      }
+    }, () => {
+      return moduleRegistry.getLinkedModule(moduleId, {...runtimeEnvironment, bundle: false}, runtimeParams);
+    });
     const {ownHash, linkedSource} = moduleDefinition;
     if (signature !== import_shared_utils.LATEST_SIGNATURE && ownHash !== signature) {
       res.status(404).send(import_diagnostics.descriptions.UNRESOLVABLE.SIGNED_MODULE(moduleId.specifier, signature).message);

package/build/cjs/middleware/resource-middleware.cjs

@@ -30,18 +30,13 @@ var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_identity = __toModule(require("./utils/identity.cjs"));
 var import_error_handling = __toModule(require("./utils/error-handling.cjs"));
 function createResourceMiddleware(context) {
-  const {
-    appConfig,
-    appConfig: {i18n},
-    resourceRegistry,
-    runtimeEnvironment: defaultRuntimeEnvironment
-  } = context;
+  const {appConfig, resourceRegistry, runtimeEnvironment: defaultRuntimeEnvironment} = context;
   return async (req, res) => {
     if (!req.validateEnvironmentRequest(appConfig)) {
       res.status(400).send(import_diagnostics.descriptions.UNRESOLVABLE.INVALID_ENVIRONMENT(req.params.environment).message);
       return;
     }
-    const {runtimeEnvironment, runtimeParams} = req.getRuntimeContext(defaultRuntimeEnvironment, i18n);
+    const {runtimeEnvironment, runtimeParams} = req.getRuntimeContext(defaultRuntimeEnvironment);
     const {resourceId} = (0, import_identity.getResourceIdentity)(req);
     const resource = await resourceRegistry.getResource(resourceId, runtimeEnvironment, runtimeParams);
     if (req.isSiteGeneration()) {

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

@@ -29,12 +29,13 @@ __export(exports, {
 var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_router = __toModule(require("@lwrjs/router"));
 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"));
 function createViewMiddleware(route, errorRoutes, context, viewHandler) {
   const errorRoute = errorRoutes.find((route2) => route2.status === 500);
   const appConfig = context.appConfig;
-  const {environment: environmentConfig, i18n} = appConfig;
+  const {environment: environmentConfig} = appConfig;
   return async (req, res) => {
     if (!req.validateEnvironmentRequest(appConfig)) {
       res.status(400);
@@ -46,7 +47,7 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
       res.send(import_diagnostics.descriptions.UNRESOLVABLE.INVALID_JSON().message);
       return;
     }
-    const {runtimeEnvironment, runtimeParams} = req.getRuntimeContext(context.runtimeEnvironment, i18n);
+    const {runtimeEnvironment, runtimeParams} = req.getRuntimeContext(context.runtimeEnvironment);
     if (!runtimeParams.environment && environmentConfig?.default) {
       runtimeParams.environment = environmentConfig.default;
     }
@@ -60,7 +61,14 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
     let viewResponse;
     let resolvedRoute;
     try {
-      viewResponse = await resolve.call(viewHandler, viewRequest, route, runtimeEnvironment, runtimeParams);
+      viewResponse = await (0, import_instrumentation.getTracer)().trace({
+        name: import_instrumentation.RequestHandlerSpan.GetView,
+        attributes: {
+          view: route.id
+        }
+      }, () => {
+        return resolve.call(viewHandler, viewRequest, route, runtimeEnvironment, runtimeParams);
+      });
       resolvedRoute = route;
     } catch (err) {
       if (!errorRoute) {
@@ -68,7 +76,14 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
       }
       import_diagnostics.logger.error(`[view-middleware] Route Error ${req.originalUrl}`);
       import_diagnostics.logger.error(err);
-      viewResponse = await resolve.call(viewHandler, viewRequest, errorRoute, runtimeEnvironment, runtimeParams);
+      viewResponse = await (0, import_instrumentation.getTracer)().trace({
+        name: import_instrumentation.RequestHandlerSpan.GetView,
+        attributes: {
+          view: errorRoute.id
+        }
+      }, () => {
+        return resolve.call(viewHandler, viewRequest, errorRoute, runtimeEnvironment, runtimeParams);
+      });
       resolvedRoute = errorRoute;
     }
     if (req.isSiteGeneration()) {
@@ -89,7 +104,7 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
 }
 function createConfigMiddleware(routes, context, viewHandler) {
   return async (req, res) => {
-    const {runtimeEnvironment, runtimeParams} = req.getRuntimeContext(context.runtimeEnvironment, context.appConfig.i18n);
+    const {runtimeEnvironment, runtimeParams} = req.getRuntimeContext(context.runtimeEnvironment);
     const {appId, encodedViewPath} = req.params;
     const route = routes.find((route2) => route2.id === appId);
     if (!route) {
@@ -143,15 +158,28 @@ function viewMiddleware(app, context) {
       subRoutes.routes.forEach((subRoute) => subRoute.uri !== route.path && paths.push(`${prefix}${subRoute.uri}`));
     }
     if (i18n.uriPattern === "path-prefix") {
-      const supportedStr = i18n.locales.map((l) => l.id).join("|");
+      const defaultLocalePaths = paths.map((routePath) => `/${i18n.defaultLocale}${routePath}`);
+      const supportedStr = i18n.locales.map((l) => l.id).filter((id) => id !== i18n.defaultLocale).join("|");
       paths.forEach((routePath) => {
         const localizedPath = `/:locale(${supportedStr})${routePath}`;
-        import_diagnostics.logger.debug(`[view-middleware] Add localized path ${localizedPath}`);
         paths.push(localizedPath);
       });
+      addDefaultLocaleRedirects(i18n.defaultLocale, defaultLocalePaths, app);
     }
+    import_diagnostics.logger.debug(`[view-middleware] Add view paths ${paths}`);
     app.get(paths, (0, import_error_handling.handleErrors)(createViewMiddleware(route, errorRoutes, context, viewHandler)));
   }
   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) {
+  import_diagnostics.logger.debug(`[view-middleware] Add default localized paths ${defaultLocalePaths}`);
+  app.get(defaultLocalePaths, (req, res) => {
+    let modifiedPath = req.originalUrl.replace(`/${defaultLocale}`, "");
+    if (modifiedPath.indexOf("/") !== 0) {
+      modifiedPath = `/${modifiedPath}`;
+    }
+    res.setHeader("Location", modifiedPath);
+    return res.sendStatus(301);
+  });
+}

package/build/cjs/tools/server-warmup.cjs

@@ -36,10 +36,10 @@ async function warmupServer(config, internalRequestKey) {
     import_diagnostics.logger.setOptions({dedupe: new Set([import_diagnostics.WARN])});
   }
   import_diagnostics.logger.info("[Server Warmup] starting");
-  const {basePath, i18n, port, routes, staticSiteGenerator} = config;
+  const {basePath, port, routes, staticSiteGenerator} = config;
   staticSiteGenerator.outputDir = import_dir.skipDirCreation;
   const urlRewriteMap = new Map();
   const runtimeEnvironment = (0, import_config.getRuntimeEnvironment)(config);
-  await new import_static_generation.default().generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, basePath, new import_network_dispatcher.default(port, internalRequestKey), staticSiteGenerator.outputDir, i18n, urlRewriteMap);
+  await new import_static_generation.default().generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, basePath, new import_network_dispatcher.default(port, internalRequestKey), staticSiteGenerator.outputDir, urlRewriteMap);
   import_diagnostics.logger.info("[Server Warmup] complete");
 }

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

@@ -43,7 +43,7 @@ var SiteGenerator = class {
     if (!import_diagnostics.logger.currentLevel || import_diagnostics.logger.currentLevel == import_diagnostics.WARN || import_diagnostics.logger.currentLevel == import_diagnostics.INFO) {
       import_diagnostics.logger.setOptions({dedupe: new Set([import_diagnostics.WARN])});
     }
-    const {assets, basePath, i18n, rootDir, routes, staticSiteGenerator} = config;
+    const {assets, basePath, rootDir, routes, staticSiteGenerator} = config;
     if (!staticSiteGenerator.outputDir) {
       staticSiteGenerator.outputDir = "site";
     }
@@ -57,26 +57,29 @@ var SiteGenerator = class {
     const urlRewriteMap = new Map();
     const runtimeEnvironment = (0, import_config.getRuntimeEnvironment)(config);
     import_diagnostics.logger.info(`[SSG] Building routes (this may take some time to complete)`);
-    await this.generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, basePath, dispatcher, outputDir, i18n, urlRewriteMap);
+    await this.generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, basePath, dispatcher, outputDir, urlRewriteMap);
     this.writeNetlifyRedirectConfig(outputDir, urlRewriteMap);
     await this.copyAssets(assets, outputDir, config);
     const endTime = import_perf_hooks.performance.now();
     const timeDiff = (endTime - startTime) / 1e3;
     import_diagnostics.logger.info(`[SSG] Static Site Generation complete in ${Math.round(timeDiff)} seconds`);
   }
-  async generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, basePath, dispatcher, outputDir, i18n, urlRewriteMap = new Map()) {
+  async generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, basePath, dispatcher, outputDir, urlRewriteMap = new Map()) {
     const generateUrl = this.createGenerateURLFunction(dispatcher);
     const {skipBaseDocumentGeneration = false} = staticSiteGenerator;
+    const i18n = runtimeEnvironment.i18n;
     if (!i18n.uriPattern) {
-      await this.generateRoutesForLocale(routes, outputDir, {id: i18n.defaultLocale}, urlRewriteMap, skipBaseDocumentGeneration, runtimeEnvironment, i18n, basePath, generateUrl, staticSiteGenerator, dispatcher);
+      await this.generateRoutesForLocale(routes, outputDir, {id: i18n.defaultLocale}, urlRewriteMap, skipBaseDocumentGeneration, runtimeEnvironment, basePath, generateUrl, staticSiteGenerator, dispatcher);
     } else {
-      for (const locale of i18n.locales) {
+      const sortedLocales = (0, import_shared_utils.sortLocalesByFallback)(i18n);
+      for (const locale of sortedLocales) {
         import_diagnostics.logger.debug(`[SSG] Generate routes of locale: ${locale.id}`);
-        await this.generateRoutesForLocale(routes, outputDir, locale, urlRewriteMap, skipBaseDocumentGeneration, runtimeEnvironment, i18n, basePath, generateUrl, staticSiteGenerator, dispatcher);
+        await this.generateRoutesForLocale(routes, outputDir, locale, urlRewriteMap, skipBaseDocumentGeneration, runtimeEnvironment, basePath, generateUrl, staticSiteGenerator, dispatcher);
       }
     }
   }
-  async generateRoutesForLocale(routes, outputDir, locale, urlRewriteMap, skipBaseDocumentGeneration, runtimeEnvironment, i18n, basePath, generateUrl, staticSiteGenerator, dispatcher) {
+  async generateRoutesForLocale(routes, outputDir, locale, urlRewriteMap, skipBaseDocumentGeneration, runtimeEnvironment, basePath, generateUrl, staticSiteGenerator, dispatcher) {
+    const i18n = runtimeEnvironment.i18n;
     for (const route of routes) {
       const siteConfig = this.createSiteConfig(outputDir, locale.id, urlRewriteMap, skipBaseDocumentGeneration, runtimeEnvironment, i18n);
       const localizedPath = (0, import_shared_utils.getViewUri)(route.path, basePath, locale.id, i18n);

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

@@ -1,11 +1,12 @@
 import path from 'path';
+import { DiagnosticsError } from '@lwrjs/diagnostics';
+import { RequestHandlerSpan, getTracer } from '@lwrjs/instrumentation';
 import { getAssetIdentity } from './utils/identity.js';
 import { handleErrors } from './utils/error-handling.js';
-import { DiagnosticsError } from '@lwrjs/diagnostics';
 function createAssetMiddleware(context) {
-    const { appConfig: { i18n }, assetRegistry, runtimeEnvironment: { basePath }, } = context;
+    const { assetRegistry, runtimeEnvironment: { basePath }, } = context;
     return async (req, res, next) => {
-        const { runtimeEnvironment } = req.getRuntimeContext(context.runtimeEnvironment, i18n);
+        const { runtimeEnvironment } = req.getRuntimeContext(context.runtimeEnvironment);
         const { assetId, immutable, signature } = getAssetIdentity(req);
         if (basePath && !assetId.specifier.startsWith(basePath)) {
             assetId.specifier = path.join(basePath, assetId.specifier);
@@ -21,7 +22,14 @@ function createAssetMiddleware(context) {
                 res.sendStatus(302);
                 return;
             }
-            const asset = await assetRegistry.getAsset({ ...assetId, signature }, runtimeEnvironment, req.isSiteGeneration());
+            const asset = await getTracer().trace({
+                name: RequestHandlerSpan.GetAsset,
+                attributes: {
+                    specifier: assetId.specifier,
+                },
+            }, () => {
+                return assetRegistry.getAsset({ ...assetId, signature }, runtimeEnvironment, req.isSiteGeneration());
+            });
             if (req.isSiteGeneration()) {
                 res.setSiteGenerationMetadata({ asset });
             }

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

@@ -1,12 +1,13 @@
 import { LATEST_SIGNATURE } from '@lwrjs/shared-utils';
 import { descriptions } from '@lwrjs/diagnostics';
+import { RequestHandlerSpan, getTracer } from '@lwrjs/instrumentation';
 import { getRequestImporter } from './utils/request.js';
 import { getModuleIdentity } from './utils/identity.js';
 import { normalizeResolvedUris } from './utils/metadata.js';
 import { createUnsignedBundleRedirect } from './redirects/unsigned-module-redirect.js';
 import { handleErrors } from './utils/error-handling.js';
 function createBundleMiddleware(context) {
-    const { appConfig, appConfig: { i18n }, moduleRegistry, moduleBundler, runtimeEnvironment: defaultRuntimeEnvironment, } = context;
+    const { appConfig, moduleRegistry, moduleBundler, runtimeEnvironment: defaultRuntimeEnvironment, } = context;
     const unsignedBundleRedirect = createUnsignedBundleRedirect(moduleBundler);
     return async (req, res) => {
         if (!req.validateEnvironmentRequest(appConfig)) {
@@ -19,7 +20,7 @@ function createBundleMiddleware(context) {
             res.send(descriptions.UNRESOLVABLE.INVALID_JSON().message);
             return;
         }
-        const { runtimeEnvironment, runtimeParams } = req.getRuntimeContext(defaultRuntimeEnvironment, i18n);
+        const { runtimeEnvironment, runtimeParams } = req.getRuntimeContext(defaultRuntimeEnvironment);
         const importer = req.query.importer
             ? await getRequestImporter(req, moduleRegistry, runtimeParams)
             : undefined;
@@ -29,9 +30,16 @@ function createBundleMiddleware(context) {
             return;
         }
         const sourceMapUrl = req.path.replace('/bundle/', '/sourcemaps/bundle/');
-        const bundleDefinition = await moduleBundler.getModuleBundle(moduleId, 
-        // bundle must be `true` to properly resolve bundles in amd
-        { ...runtimeEnvironment, bundle: true, sourceMapUrl }, runtimeParams);
+        const bundleDefinition = await getTracer().trace({
+            name: RequestHandlerSpan.GetBundle,
+            attributes: {
+                specifier: moduleId.specifier,
+            },
+        }, () => {
+            return moduleBundler.getModuleBundle(moduleId, 
+            // bundle must be `true` to properly resolve bundles in amd
+            { ...runtimeEnvironment, bundle: true, sourceMapUrl }, runtimeParams);
+        });
         if (req.isSiteGeneration()) {
             res.setSiteGenerationMetadata({
                 moduleDefinition: bundleDefinition,
@@ -45,14 +53,14 @@ function createBundleMiddleware(context) {
     };
 }
 function createSourceMapMiddleware(context) {
-    const { appConfig, appConfig: { i18n }, moduleBundler, runtimeEnvironment: defaultRuntimeEnvironment, } = context;
+    const { appConfig, moduleBundler, runtimeEnvironment: defaultRuntimeEnvironment } = context;
     return async (req, res) => {
         if (!req.validateEnvironmentRequest(appConfig)) {
             res.status(400);
             res.send(descriptions.UNRESOLVABLE.INVALID_ENVIRONMENT(req.params.environment).message);
             return;
         }
-        const { runtimeEnvironment } = req.getRuntimeContext(defaultRuntimeEnvironment, i18n);
+        const { runtimeEnvironment } = req.getRuntimeContext(defaultRuntimeEnvironment);
         const { moduleId, signature } = getModuleIdentity(req);
         const bundleDef = await moduleBundler.getModuleBundle(moduleId, runtimeEnvironment);
         if (signature !== LATEST_SIGNATURE) {

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

@@ -1,5 +1,5 @@
 export function localeMiddleware(app, context) {
-    const { defaultLocale } = context.runtimeEnvironment;
+    const { i18n: { defaultLocale }, } = context.runtimeEnvironment;
     app.use(async (req, _res, next) => {
         const langs = req.acceptsLanguages();
         req.locale = langs?.length > 0 && langs[0] != '*' ? langs[0] : defaultLocale;

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

@@ -1,18 +1,23 @@
 import { getImportMetadataMappings } from '@lwrjs/shared-utils';
 import { descriptions } from '@lwrjs/diagnostics';
+import { RequestHandlerSpan, getTracer } from '@lwrjs/instrumentation';
 import { getMappingIdentity } from './utils/identity.js';
 import { handleErrors } from './utils/error-handling.js';
 function createMappingMiddleware(context) {
-    const { appConfig, appConfig: { i18n }, moduleBundler, moduleRegistry, runtimeEnvironment: defaultRuntimeEnvironment, } = context;
+    const { appConfig, moduleBundler, moduleRegistry, runtimeEnvironment: defaultRuntimeEnvironment, } = context;
     return async (req, res) => {
         if (!req.validateEnvironmentRequest(appConfig)) {
             res.status(400);
             res.send(descriptions.UNRESOLVABLE.INVALID_ENVIRONMENT(req.params.environment).message);
             return;
         }
-        const { runtimeEnvironment, runtimeParams } = req.getRuntimeContext(defaultRuntimeEnvironment, i18n);
+        const { runtimeEnvironment, runtimeParams } = req.getRuntimeContext(defaultRuntimeEnvironment);
         const { moduleIds } = getMappingIdentity(req);
-        const importMetadata = await getImportMetadataMappings(moduleIds, runtimeEnvironment, runtimeParams, moduleRegistry, moduleBundler);
+        const importMetadata = await getTracer().trace({
+            name: RequestHandlerSpan.GetMapping,
+        }, () => {
+            return getImportMetadataMappings(moduleIds, runtimeEnvironment, runtimeParams, moduleRegistry, moduleBundler);
+        });
         if (req.isSiteGeneration()) {
             res.setSiteGenerationMetadata({ importMetadata });
         }

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

@@ -1,11 +1,12 @@
 import { descriptions } from '@lwrjs/diagnostics';
 import { LATEST_SIGNATURE, serializeModuleToJson } from '@lwrjs/shared-utils';
+import { RequestHandlerSpan, getTracer } from '@lwrjs/instrumentation';
 import { getRequestImporter } from './utils/request.js';
 import { getModuleIdentity } from './utils/identity.js';
 import { createUnsignedModuleRedirect } from './redirects/unsigned-module-redirect.js';
 import { handleErrors } from './utils/error-handling.js';
 function createModuleMiddleware(context) {
-    const { appConfig, appConfig: { i18n }, moduleRegistry, runtimeEnvironment: defaultRuntimeEnvironment, } = context;
+    const { appConfig, moduleRegistry, runtimeEnvironment: defaultRuntimeEnvironment } = context;
     const unsignedRedirect = createUnsignedModuleRedirect(moduleRegistry);
     return async (req, res) => {
         if (!req.validateEnvironmentRequest(appConfig)) {
@@ -18,7 +19,7 @@ function createModuleMiddleware(context) {
             res.send(descriptions.UNRESOLVABLE.INVALID_JSON().message);
             return;
         }
-        const { runtimeEnvironment, runtimeParams } = req.getRuntimeContext(defaultRuntimeEnvironment, i18n);
+        const { runtimeEnvironment, runtimeParams } = req.getRuntimeContext(defaultRuntimeEnvironment);
         const importer = req.query.importer
             ? await getRequestImporter(req, moduleRegistry, runtimeParams)
             : undefined;
@@ -27,9 +28,16 @@ function createModuleMiddleware(context) {
             await unsignedRedirect(req, res, moduleId, runtimeEnvironment, runtimeParams);
             return;
         }
-        const moduleDefinition = await moduleRegistry.getLinkedModule(moduleId, 
-        // bundle must be `false` to resolve amd modules in `prod-compat` mode
-        { ...runtimeEnvironment, bundle: false }, runtimeParams);
+        const moduleDefinition = await getTracer().trace({
+            name: RequestHandlerSpan.GetModule,
+            attributes: {
+                specifier: moduleId.specifier,
+            },
+        }, () => {
+            return moduleRegistry.getLinkedModule(moduleId, 
+            // bundle must be `false` to resolve amd modules in `prod-compat` mode
+            { ...runtimeEnvironment, bundle: false }, runtimeParams);
+        });
         const { ownHash, linkedSource } = moduleDefinition;
         // validate the requested instances exists
         if (signature !== LATEST_SIGNATURE && ownHash !== signature) {

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

@@ -2,13 +2,13 @@ import { descriptions } from '@lwrjs/diagnostics';
 import { getResourceIdentity } from './utils/identity.js';
 import { handleErrors } from './utils/error-handling.js';
 function createResourceMiddleware(context) {
-    const { appConfig, appConfig: { i18n }, resourceRegistry, runtimeEnvironment: defaultRuntimeEnvironment, } = context;
+    const { appConfig, resourceRegistry, runtimeEnvironment: defaultRuntimeEnvironment } = context;
     return async (req, res) => {
         if (!req.validateEnvironmentRequest(appConfig)) {
             res.status(400).send(descriptions.UNRESOLVABLE.INVALID_ENVIRONMENT(req.params.environment).message);
             return;
         }
-        const { runtimeEnvironment, runtimeParams } = req.getRuntimeContext(defaultRuntimeEnvironment, i18n);
+        const { runtimeEnvironment, runtimeParams } = req.getRuntimeContext(defaultRuntimeEnvironment);
         const { resourceId } = getResourceIdentity(req);
         const resource = await resourceRegistry.getResource(resourceId, runtimeEnvironment, runtimeParams);
         if (req.isSiteGeneration()) {

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

@@ -1,12 +1,13 @@
 import { descriptions, logger } from '@lwrjs/diagnostics';
 import { getClientRoutes } from '@lwrjs/router';
 import { decodeViewPath, extractRequestParams, getClientBootstrapConfigurationRoutes, shortestTtl, } from '@lwrjs/shared-utils';
+import { RequestHandlerSpan, getTracer } from '@lwrjs/instrumentation';
 import { handleErrors } from './utils/error-handling.js';
 import { LwrViewHandler } from '@lwrjs/view-registry';
 function createViewMiddleware(route, errorRoutes, context, viewHandler) {
     const errorRoute = errorRoutes.find((route) => route.status === 500);
     const appConfig = context.appConfig;
-    const { environment: environmentConfig, i18n } = appConfig;
+    const { environment: environmentConfig } = appConfig;
     return async (req, res) => {
         if (!req.validateEnvironmentRequest(appConfig)) {
             res.status(400);
@@ -18,7 +19,7 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
             res.send(descriptions.UNRESOLVABLE.INVALID_JSON().message);
             return;
         }
-        const { runtimeEnvironment, runtimeParams } = req.getRuntimeContext(context.runtimeEnvironment, i18n);
+        const { runtimeEnvironment, runtimeParams } = req.getRuntimeContext(context.runtimeEnvironment);
         // set the default environment if an environment is configured in the app config
         if (!runtimeParams.environment && environmentConfig?.default) {
             runtimeParams.environment = environmentConfig.default;
@@ -33,7 +34,14 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
         let viewResponse;
         let resolvedRoute;
         try {
-            viewResponse = await resolve.call(viewHandler, viewRequest, route, runtimeEnvironment, runtimeParams);
+            viewResponse = await getTracer().trace({
+                name: RequestHandlerSpan.GetView,
+                attributes: {
+                    view: route.id,
+                },
+            }, () => {
+                return resolve.call(viewHandler, viewRequest, route, runtimeEnvironment, runtimeParams);
+            });
             resolvedRoute = route;
         }
         catch (err) {
@@ -43,7 +51,14 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
             // Log Unexpected Routing Errors
             logger.error(`[view-middleware] Route Error ${req.originalUrl}`);
             logger.error(err);
-            viewResponse = await resolve.call(viewHandler, viewRequest, errorRoute, runtimeEnvironment, runtimeParams);
+            viewResponse = await getTracer().trace({
+                name: RequestHandlerSpan.GetView,
+                attributes: {
+                    view: errorRoute.id,
+                },
+            }, () => {
+                return resolve.call(viewHandler, viewRequest, errorRoute, runtimeEnvironment, runtimeParams);
+            });
             resolvedRoute = errorRoute;
         }
         if (req.isSiteGeneration()) {
@@ -67,7 +82,7 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
 }
 function createConfigMiddleware(routes, context, viewHandler) {
     return async (req, res) => {
-        const { runtimeEnvironment, runtimeParams } = req.getRuntimeContext(context.runtimeEnvironment, context.appConfig.i18n);
+        const { runtimeEnvironment, runtimeParams } = req.getRuntimeContext(context.runtimeEnvironment);
         const { appId, encodedViewPath } = req.params;
         // match the app id to a route
         const route = routes.find((route) => route.id === appId);
@@ -126,13 +141,20 @@ export function viewMiddleware(app, context) {
         }
         // Add localized routes
         if (i18n.uriPattern === 'path-prefix') {
-            const supportedStr = i18n.locales.map((l) => l.id).join('|');
+            // Add a redirect handler for the default locale for each route  /en-US/home -> 301 /home
+            const defaultLocalePaths = paths.map((routePath) => `/${i18n.defaultLocale}${routePath}`);
+            // Map all supported locale ids into an array.  Filter out the default one.  It will be handled separately
+            const supportedStr = i18n.locales
+                .map((l) => l.id)
+                .filter((id) => id !== i18n.defaultLocale)
+                .join('|');
             paths.forEach((routePath) => {
                 const localizedPath = `/:locale(${supportedStr})${routePath}`;
-                logger.debug(`[view-middleware] Add localized path ${localizedPath}`);
                 paths.push(localizedPath);
             });
+            addDefaultLocaleRedirects(i18n.defaultLocale, defaultLocalePaths, app);
         }
+        logger.debug(`[view-middleware] Add view paths ${paths}`);
         app.get(paths, handleErrors(createViewMiddleware(route, errorRoutes, context, viewHandler)));
     }
     // create and attach middleware for bootstrap configurations
@@ -141,4 +163,21 @@ export function viewMiddleware(app, context) {
     // NOTE: a greedy `all` is used over `use` due to the way middleware is mounted in the server abstraction
     app.get('/' + app.getRegexWildcard(), handleErrors(createNotFoundMiddleware(errorRoutes, context, viewHandler)));
 }
+/**
+ * Adds a 301 redirect if attempting to route with default locale as the path prefix
+ */
+function addDefaultLocaleRedirects(defaultLocale, defaultLocalePaths, app) {
+    logger.debug(`[view-middleware] Add default localized paths ${defaultLocalePaths}`);
+    app.get(defaultLocalePaths, (req, res) => {
+        // Get the original URL path and split it into segments
+        let modifiedPath = req.originalUrl.replace(`/${defaultLocale}`, '');
+        // Make sure there is a leading slash.  Redirect to '' causes an infinite loop.
+        if (modifiedPath.indexOf('/') !== 0) {
+            modifiedPath = `/${modifiedPath}`;
+        }
+        // Perform a 301 redirect to the modified URL
+        res.setHeader('Location', modifiedPath);
+        return res.sendStatus(301);
+    });
+}
 //# sourceMappingURL=view-middleware.js.map

package/build/es/tools/server-warmup.js

@@ -9,12 +9,12 @@ export async function warmupServer(config, internalRequestKey) {
         logger.setOptions({ dedupe: new Set([WARN]) });
     }
     logger.info('[Server Warmup] starting');
-    const { basePath, i18n, port, routes, staticSiteGenerator } = config;
+    const { basePath, port, routes, staticSiteGenerator } = config;
     staticSiteGenerator.outputDir = skipDirCreation;
     const urlRewriteMap = new Map();
     const runtimeEnvironment = getRuntimeEnvironment(config);
     // For each locale, generate all the modules
-    await new SiteGenerator().generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, basePath, new NetworkDispatcher(port, internalRequestKey), staticSiteGenerator.outputDir, i18n, urlRewriteMap);
+    await new SiteGenerator().generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, basePath, new NetworkDispatcher(port, internalRequestKey), staticSiteGenerator.outputDir, urlRewriteMap);
     logger.info('[Server Warmup] complete');
 }
 //# sourceMappingURL=server-warmup.js.map

package/build/es/tools/static-generation.d.ts

@@ -1,4 +1,4 @@
-import type { ImportMetadata, LwrDispatcher, StaticSiteGenerator, LwrRoute, NormalizedLwrGlobalConfig, RuntimeEnvironment, I18NConfig } from '@lwrjs/types';
+import type { ImportMetadata, LwrDispatcher, StaticSiteGenerator, LwrRoute, NormalizedLwrGlobalConfig, RuntimeEnvironment } from '@lwrjs/types';
 import type { ResourceContextOpts, SiteConfig, ViewImportMetadata } from './types.js';
 export default class SiteGenerator {
     /**
@@ -14,7 +14,7 @@ export default class SiteGenerator {
     /**
      * Crawl all view routes for a site
      */
-    generateRoutes(runtimeEnvironment: RuntimeEnvironment, staticSiteGenerator: StaticSiteGenerator, routes: LwrRoute[], basePath: string, dispatcher: LwrDispatcher, outputDir: string, i18n: I18NConfig, urlRewriteMap?: Map<string, string>): Promise<void>;
+    generateRoutes(runtimeEnvironment: RuntimeEnvironment, staticSiteGenerator: StaticSiteGenerator, routes: LwrRoute[], basePath: string, dispatcher: LwrDispatcher, outputDir: string, urlRewriteMap?: Map<string, string>): Promise<void>;
     /**
      * Generate all routes for a given locale
      */

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

@@ -1,6 +1,6 @@
 import { performance } from 'perf_hooks';
 import { logger, WARN, INFO } from '@lwrjs/diagnostics';
-import { getSpecifier, getFeatureFlags, hashContent, isSelfUrl, getModuleUriPrefix, getMappingUriPrefix, isExternalUrl, mimeLookup, getViewUri, } from '@lwrjs/shared-utils';
+import { getSpecifier, getFeatureFlags, hashContent, isSelfUrl, getModuleUriPrefix, getMappingUriPrefix, isExternalUrl, mimeLookup, getViewUri, sortLocalesByFallback, } from '@lwrjs/shared-utils';
 import { SiteMetadataImpl } from '@lwrjs/static/site-metadata';
 import { join, dirname, extname, normalize } from 'path';
 import fs from 'fs-extra';
@@ -24,7 +24,7 @@ export default class SiteGenerator {
         if (!logger.currentLevel || logger.currentLevel == WARN || logger.currentLevel == INFO) {
             logger.setOptions({ dedupe: new Set([WARN]) });
         }
-        const { assets, basePath, i18n, rootDir, routes, staticSiteGenerator } = config;
+        const { assets, basePath, rootDir, routes, staticSiteGenerator } = config;
         if (!staticSiteGenerator.outputDir) {
             staticSiteGenerator.outputDir = 'site';
         }
@@ -40,7 +40,7 @@ export default class SiteGenerator {
         const runtimeEnvironment = getRuntimeEnvironment(config);
         // For each locale, generate all the modules
         logger.info(`[SSG] Building routes (this may take some time to complete)`);
-        await this.generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, basePath, dispatcher, outputDir, i18n, urlRewriteMap);
+        await this.generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, basePath, dispatcher, outputDir, urlRewriteMap);
         // Write redirect files
         this.writeNetlifyRedirectConfig(outputDir, urlRewriteMap);
         // Copy over assets
@@ -52,28 +52,32 @@ export default class SiteGenerator {
     /**
      * Crawl all view routes for a site
      */
-    async generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, basePath, dispatcher, outputDir, i18n, urlRewriteMap = new Map()) {
+    async generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, basePath, dispatcher, outputDir, urlRewriteMap = new Map()) {
         const generateUrl = this.createGenerateURLFunction(dispatcher);
         // Note: generateUrl can consume a lot of memory so we need to do this sequentially
         const { skipBaseDocumentGeneration = false } = staticSiteGenerator;
+        const i18n = runtimeEnvironment.i18n;
         // If there is not a know URL pattern it is expected the app is accounting with the locale in the routes
         if (!i18n.uriPattern) {
             // eslint-disable-next-line no-await-in-loop
-            await this.generateRoutesForLocale(routes, outputDir, { id: i18n.defaultLocale }, urlRewriteMap, skipBaseDocumentGeneration, runtimeEnvironment, i18n, basePath, generateUrl, staticSiteGenerator, dispatcher);
+            await this.generateRoutesForLocale(routes, outputDir, { id: i18n.defaultLocale }, urlRewriteMap, skipBaseDocumentGeneration, runtimeEnvironment, basePath, generateUrl, staticSiteGenerator, dispatcher);
         }
         else {
+            // Run through locales in fallback sorted order
+            const sortedLocales = sortLocalesByFallback(i18n);
             // Generate all the routes
-            for (const locale of i18n.locales) {
+            for (const locale of sortedLocales) {
                 logger.debug(`[SSG] Generate routes of locale: ${locale.id}`);
                 // eslint-disable-next-line no-await-in-loop
-                await this.generateRoutesForLocale(routes, outputDir, locale, urlRewriteMap, skipBaseDocumentGeneration, runtimeEnvironment, i18n, basePath, generateUrl, staticSiteGenerator, dispatcher);
+                await this.generateRoutesForLocale(routes, outputDir, locale, urlRewriteMap, skipBaseDocumentGeneration, runtimeEnvironment, basePath, generateUrl, staticSiteGenerator, dispatcher);
             }
         }
     }
     /**
      * Generate all routes for a given locale
      */
-    async generateRoutesForLocale(routes, outputDir, locale, urlRewriteMap, skipBaseDocumentGeneration, runtimeEnvironment, i18n, basePath, generateUrl, staticSiteGenerator, dispatcher) {
+    async generateRoutesForLocale(routes, outputDir, locale, urlRewriteMap, skipBaseDocumentGeneration, runtimeEnvironment, basePath, generateUrl, staticSiteGenerator, dispatcher) {
+        const i18n = runtimeEnvironment.i18n;
         for (const route of routes) {
             const siteConfig = this.createSiteConfig(outputDir, locale.id, urlRewriteMap, skipBaseDocumentGeneration, runtimeEnvironment, i18n);
             const localizedPath = getViewUri(route.path, basePath, locale.id, i18n);

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.11.0-alpha.13",
+    "version": "0.11.0-alpha.15",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -39,33 +39,33 @@
         "build": "tsc -b"
     },
     "dependencies": {
-        "@lwrjs/app-service": "0.11.0-alpha.13",
-        "@lwrjs/asset-registry": "0.11.0-alpha.13",
-        "@lwrjs/asset-transformer": "0.11.0-alpha.13",
-        "@lwrjs/base-view-provider": "0.11.0-alpha.13",
-        "@lwrjs/base-view-transformer": "0.11.0-alpha.13",
-        "@lwrjs/client-modules": "0.11.0-alpha.13",
-        "@lwrjs/config": "0.11.0-alpha.13",
-        "@lwrjs/diagnostics": "0.11.0-alpha.13",
-        "@lwrjs/esbuild": "0.11.0-alpha.13",
-        "@lwrjs/fs-asset-provider": "0.11.0-alpha.13",
-        "@lwrjs/fs-watch": "0.11.0-alpha.13",
-        "@lwrjs/html-view-provider": "0.11.0-alpha.13",
-        "@lwrjs/instrumentation": "0.11.0-alpha.13",
-        "@lwrjs/loader": "0.11.0-alpha.13",
-        "@lwrjs/lwc-module-provider": "0.11.0-alpha.13",
-        "@lwrjs/markdown-view-provider": "0.11.0-alpha.13",
-        "@lwrjs/module-bundler": "0.11.0-alpha.13",
-        "@lwrjs/module-registry": "0.11.0-alpha.13",
-        "@lwrjs/npm-module-provider": "0.11.0-alpha.13",
-        "@lwrjs/nunjucks-view-provider": "0.11.0-alpha.13",
-        "@lwrjs/o11y": "0.11.0-alpha.13",
-        "@lwrjs/resource-registry": "0.11.0-alpha.13",
-        "@lwrjs/router": "0.11.0-alpha.13",
-        "@lwrjs/server": "0.11.0-alpha.13",
-        "@lwrjs/shared-utils": "0.11.0-alpha.13",
-        "@lwrjs/static": "0.11.0-alpha.13",
-        "@lwrjs/view-registry": "0.11.0-alpha.13",
+        "@lwrjs/app-service": "0.11.0-alpha.15",
+        "@lwrjs/asset-registry": "0.11.0-alpha.15",
+        "@lwrjs/asset-transformer": "0.11.0-alpha.15",
+        "@lwrjs/base-view-provider": "0.11.0-alpha.15",
+        "@lwrjs/base-view-transformer": "0.11.0-alpha.15",
+        "@lwrjs/client-modules": "0.11.0-alpha.15",
+        "@lwrjs/config": "0.11.0-alpha.15",
+        "@lwrjs/diagnostics": "0.11.0-alpha.15",
+        "@lwrjs/esbuild": "0.11.0-alpha.15",
+        "@lwrjs/fs-asset-provider": "0.11.0-alpha.15",
+        "@lwrjs/fs-watch": "0.11.0-alpha.15",
+        "@lwrjs/html-view-provider": "0.11.0-alpha.15",
+        "@lwrjs/instrumentation": "0.11.0-alpha.15",
+        "@lwrjs/loader": "0.11.0-alpha.15",
+        "@lwrjs/lwc-module-provider": "0.11.0-alpha.15",
+        "@lwrjs/markdown-view-provider": "0.11.0-alpha.15",
+        "@lwrjs/module-bundler": "0.11.0-alpha.15",
+        "@lwrjs/module-registry": "0.11.0-alpha.15",
+        "@lwrjs/npm-module-provider": "0.11.0-alpha.15",
+        "@lwrjs/nunjucks-view-provider": "0.11.0-alpha.15",
+        "@lwrjs/o11y": "0.11.0-alpha.15",
+        "@lwrjs/resource-registry": "0.11.0-alpha.15",
+        "@lwrjs/router": "0.11.0-alpha.15",
+        "@lwrjs/server": "0.11.0-alpha.15",
+        "@lwrjs/shared-utils": "0.11.0-alpha.15",
+        "@lwrjs/static": "0.11.0-alpha.15",
+        "@lwrjs/view-registry": "0.11.0-alpha.15",
         "chokidar": "^3.5.3",
         "esbuild": "^0.9.7",
         "fs-extra": "^11.1.1",
@@ -75,7 +75,7 @@
         "ws": "^8.8.1"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.11.0-alpha.13",
+        "@lwrjs/types": "0.11.0-alpha.15",
         "@types/ws": "^8.5.3"
     },
     "peerDependencies": {
@@ -87,5 +87,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "101ac765e89de3b378b4c049cdeb0cfc635ae22a"
+    "gitHead": "3c6c6d17b2f57a5b67d32e40a1e574abb7d9afea"
 }