@lwrjs/core 0.9.0-alpha.14 → 0.9.0-alpha.16

package/build/cjs/context/provider.cjs

@@ -59,7 +59,7 @@ function createProviderContext(serverContext) {
       notifyAssetSourceChanged: (payload) => notifyAssetSourceChanged.call(serverContext.appEmitter, payload)
     },
     moduleRegistry: serverContext.moduleRegistry.getPublicApi(),
-    moduleBundler: serverContext.moduleBundler,
+    moduleBundler: serverContext.moduleBundler.getPublicApi(),
     resourceRegistry: serverContext.resourceRegistry.getPublicApi(),
     viewRegistry: serverContext.viewRegistry.getPublicApi(),
     assetRegistry: serverContext.assetRegistry.getPublicApi(),

package/build/cjs/context/server.cjs

@@ -67,8 +67,10 @@ function createServerContext(appConfig, runtimeEnvironment, globalData) {
     resourceRegistry,
     assetRegistry,
     viewRegistry,
+    watcherFactory,
     appConfig,
     runtimeEnvironment,
-    watcherFactory
+    routes: [],
+    errorRoutes: []
   };
 }

package/build/cjs/index.cjs

@@ -32,6 +32,7 @@ var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_server = __toModule(require("@lwrjs/server"));
 var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_config = __toModule(require("@lwrjs/config"));
+var import_modules = __toModule(require("@lwrjs/config/modules"));
 var import_static_generation = __toModule(require("./tools/static-generation.cjs"));
 var import_server_warmup = __toModule(require("./tools/server-warmup.cjs"));
 var import_server2 = __toModule(require("./context/server.cjs"));
@@ -44,9 +45,7 @@ var import_asset_middleware = __toModule(require("./middleware/asset-middleware.
 var import_view_middleware = __toModule(require("./middleware/view-middleware.cjs"));
 var import_resource_middleware = __toModule(require("./middleware/resource-middleware.cjs"));
 var import_hmr_middleware = __toModule(require("./middleware/hmr-middleware.cjs"));
-var import_amd_bundle_provider = __toModule(require("@lwrjs/module-bundler/amd-bundle-provider"));
-var import_esm_bundle_provider = __toModule(require("@lwrjs/module-bundler/esm-bundle-provider"));
-function initMiddleware(app, server, serverContext, routes, errorRoutes) {
+function initMiddleware(app, server, serverContext) {
   app.useCompression();
   (0, import_locale_middleware.localeMiddleware)(app, serverContext);
   (0, import_module_middleware.moduleMiddleware)(app, serverContext);
@@ -54,7 +53,7 @@ function initMiddleware(app, server, serverContext, routes, errorRoutes) {
   (0, import_mapping_middleware.mappingMiddleware)(app, serverContext);
   (0, import_asset_middleware.assetMiddleware)(app, serverContext);
   (0, import_resource_middleware.resourceMiddleware)(app, serverContext);
-  (0, import_view_middleware.viewMiddleware)(app, serverContext, routes, errorRoutes);
+  (0, import_view_middleware.viewMiddleware)(app, serverContext);
   app.initRoutes();
   if (serverContext.runtimeEnvironment.hmrEnabled) {
     (0, import_hmr_middleware.hmrMiddleware)(server, serverContext);
@@ -63,39 +62,52 @@ function initMiddleware(app, server, serverContext, routes, errorRoutes) {
 function createServices(entries, providerContext) {
   return entries.map(([ctor, providerConfig = {}]) => new ctor(providerConfig, providerContext));
 }
-async function initContext(appConfig, runtimeEnvironment, globalData, services) {
+async function initContext(appConfig, runtimeEnvironment, globalData) {
+  const hooks = await (0, import_modules.loadHooks)(appConfig);
+  if (hooks.length) {
+    await (0, import_config.executeConfigHooks)(hooks, appConfig, runtimeEnvironment, globalData);
+    (0, import_config.executeStartHooks)(hooks, appConfig);
+  }
+  const services = await (0, import_modules.loadServices)(appConfig);
   const serverContext = (0, import_server2.createServerContext)(appConfig, runtimeEnvironment, globalData);
   const providerContext = (0, import_provider.createProviderContext)(serverContext);
-  const {moduleRegistry, resourceRegistry, viewRegistry, assetRegistry, moduleBundler} = serverContext;
+  const {moduleRegistry, assetRegistry, resourceRegistry, viewRegistry, moduleBundler} = serverContext;
   const moduleProviders = createServices(services.moduleProviders, providerContext);
-  moduleRegistry.addModuleProviders(moduleProviders);
-  moduleBundler.addBundleProviders([
-    new import_amd_bundle_provider.default({}, {...providerContext, moduleRegistry}),
-    new import_esm_bundle_provider.default({}, {...providerContext, moduleRegistry})
-  ]);
+  const assetProviders = createServices(services.assetProviders, providerContext);
+  const assetTransformers = createServices(services.assetTransformers, providerContext);
   const resourceProviders = createServices(services.resourceProviders, providerContext);
-  resourceRegistry.addResourceProviders(resourceProviders);
   const viewProviders = createServices(services.viewProviders, providerContext);
   const viewTransformers = createServices(services.viewTransformers, providerContext);
-  viewRegistry.addViewProviders(viewProviders);
-  viewRegistry.addViewTransformers(viewTransformers);
-  await viewRegistry.initializeViewProviders();
-  const assetProviders = createServices(services.assetProviders, providerContext);
-  const assetTransformers = createServices(services.assetTransformers, providerContext);
+  const bundleProviders = createServices(services.bundleProviders, providerContext);
+  moduleRegistry.addModuleProviders(moduleProviders);
   assetRegistry.addAssetProviders(assetProviders);
   assetRegistry.addAssetTransformers(assetTransformers);
+  resourceRegistry.addResourceProviders(resourceProviders);
+  viewRegistry.addViewProviders(viewProviders);
+  viewRegistry.addViewTransformers(viewTransformers);
+  moduleBundler.addBundleProviders(bundleProviders);
+  await serverContext.viewRegistry.initializeViewProviders();
+  const {routes, errorRoutes} = await (0, import_modules.loadRoutes)(appConfig);
+  serverContext.routes = routes;
+  serverContext.errorRoutes = errorRoutes;
   return serverContext;
 }
 var LwrApp = class {
-  constructor(config) {
+  constructor(config = {}) {
     this.initialized = false;
-    this.config = (0, import_config.normalizeConfig)(config);
+    const {appConfig, runtimeEnvironment, globalData} = (0, import_config.loadConfig)(config);
+    this.config = appConfig;
+    this.runtimeEnvironment = runtimeEnvironment;
+    this.globalData = globalData;
     const {basePath} = this.config;
     this.app = (0, import_server.createInternalServer)(this.config.serverType, {basePath});
     this.server = this.app.createHttpServer();
   }
   setConfig(config) {
-    this.config = (0, import_config.normalizeConfig)(config);
+    const {appConfig, runtimeEnvironment, globalData} = (0, import_config.loadConfig)(config);
+    this.config = appConfig;
+    this.runtimeEnvironment = runtimeEnvironment;
+    this.globalData = globalData;
   }
   getConfig() {
     return this.config;
@@ -106,12 +118,8 @@ var LwrApp = class {
     }
     this.initialized = true;
     try {
-      const {appConfig, runtimeEnvironment, globalData} = await (0, import_config.loadConfig)(this.config);
-      const services = await (0, import_config.loadServices)(appConfig);
-      const {routes, errorRoutes} = await (0, import_config.loadRoutes)(appConfig);
-      const context = await initContext(appConfig, runtimeEnvironment, globalData, services);
-      initMiddleware(this.app, this.server, context, routes, errorRoutes);
-      this.config = appConfig;
+      const context = await initContext(this.config, this.runtimeEnvironment, this.globalData);
+      initMiddleware(this.app, this.server, context);
     } catch (e) {
       this.initialized = false;
       throw e;

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

@@ -35,7 +35,7 @@ var import_unsigned_module_redirect = __toModule(require("./redirects/unsigned-m
 var import_error_handling = __toModule(require("./utils/error-handling.cjs"));
 function createBundleMiddleware(context) {
   const {moduleRegistry, moduleBundler} = context;
-  const unsignedRedirect = (0, import_unsigned_module_redirect.createUnsignedModuleRedirect)(moduleRegistry, moduleBundler);
+  const unsignedBundleRedirect = (0, import_unsigned_module_redirect.createUnsignedBundleRedirect)(moduleBundler);
   return async (req, res) => {
     if (!req.validateEnvironmentRequest(context.appConfig)) {
       res.status(400);
@@ -51,7 +51,7 @@ function createBundleMiddleware(context) {
     const importer = req.query.importer ? await (0, import_request.getRequestImporter)(req, moduleRegistry) : void 0;
     const {moduleId, signature} = (0, import_identity.getModuleIdentity)(req, importer);
     if (moduleId.importer || !signature) {
-      await unsignedRedirect(req, res, moduleId, runtimeEnvironment, runtimeParams);
+      await unsignedBundleRedirect(req, res, moduleId, runtimeEnvironment, runtimeParams);
       return;
     }
     const sourceMapUrl = req.path.replace("/bundle/", "/sourcemaps/bundle/");

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

@@ -34,7 +34,7 @@ var import_unsigned_module_redirect = __toModule(require("./redirects/unsigned-m
 var import_error_handling = __toModule(require("./utils/error-handling.cjs"));
 function createModuleMiddleware(context) {
   const {moduleRegistry} = context;
-  const unsignedRedirect = (0, import_unsigned_module_redirect.createUnsignedModuleRedirect)(moduleRegistry, moduleRegistry);
+  const unsignedRedirect = (0, import_unsigned_module_redirect.createUnsignedModuleRedirect)(moduleRegistry);
   return async (req, res) => {
     if (!req.validateEnvironmentRequest(context.appConfig)) {
       res.status(400);

package/build/cjs/middleware/redirects/unsigned-module-redirect.cjs

@@ -8,14 +8,30 @@ var __export = (target, all) => {
 // packages/@lwrjs/core/src/middleware/redirects/unsigned-module-redirect.ts
 __markAsModule(exports);
 __export(exports, {
+  createUnsignedBundleRedirect: () => createUnsignedBundleRedirect,
   createUnsignedModuleRedirect: () => createUnsignedModuleRedirect
 });
-function createUnsignedModuleRedirect(moduleRegistry, defRegistry) {
+var HEADER_LOCATION = "Location";
+var STATUS_FOUND = 302;
+function createUnsignedModuleRedirect(moduleRegistry) {
   return async (req, res, moduleId, runtimeEnvironment, runtimeParams) => {
-    const jsonQuery = req.isJsonRequest() ? `${runtimeEnvironment.debug ? "&" : "?"}json` : "";
+    const jsonQuery = getJsonQualifier(req, runtimeEnvironment);
     const {moduleEntry, ownHash} = await moduleRegistry.getModule(moduleId);
-    const uri = defRegistry.resolveModuleUri({...moduleId, version: moduleEntry.version}, runtimeEnvironment, runtimeParams, ownHash);
-    res.setHeader("Location", `${uri}${jsonQuery}`);
-    res.sendStatus(302);
+    const uri = await moduleRegistry.resolveModuleUri({...moduleId, version: moduleEntry.version}, runtimeEnvironment, runtimeParams, ownHash);
+    sendRedirect(res, `${uri}${jsonQuery}`);
   };
 }
+function createUnsignedBundleRedirect(moduleBundler) {
+  return async (req, res, moduleId, runtimeEnvironment, runtimeParams) => {
+    const jsonQuery = getJsonQualifier(req, runtimeEnvironment);
+    const uri = await moduleBundler.resolveModuleUri(moduleId, runtimeEnvironment, runtimeParams);
+    sendRedirect(res, `${uri}${jsonQuery}`);
+  };
+}
+function getJsonQualifier(req, runtimeEnvironment) {
+  return req.isJsonRequest() ? `${runtimeEnvironment.debug ? "&" : "?"}json` : "";
+}
+function sendRedirect(res, url) {
+  res.setHeader(HEADER_LOCATION, url);
+  res.sendStatus(STATUS_FOUND);
+}

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

@@ -48,7 +48,7 @@ function createResourceMiddleware(context) {
       return;
     }
     if (resource && resource.stream) {
-      res.status(200).type(resource.type).stream(resource.stream);
+      res.status(200).type(resource.type).stream(resource.stream());
       return;
     }
     res.status(404).send(import_diagnostics.descriptions.UNRESOLVABLE.RESOURCE(resourceId.specifier).message);
@@ -56,9 +56,9 @@ function createResourceMiddleware(context) {
 }
 function resourceMiddleware(app, context) {
   app.get([
-    `/:apiVersion/resource/:format/l/:locale/e/:environment/:specifier`,
-    `/:apiVersion/resource/:format/l/:locale/:specifier`,
-    `/:apiVersion/resource/:format/e/:environment/:specifier`,
-    `/:apiVersion/resource/:format/:specifier`
+    `/:apiVersion/resource/:format/l/:locale/e/:environment/:specifier/:prettyUrl?`,
+    `/:apiVersion/resource/:format/l/:locale/:specifier/:prettyUrl?`,
+    `/:apiVersion/resource/:format/e/:environment/:specifier/:prettyUrl?`,
+    `/:apiVersion/resource/:format/:specifier/:prettyUrl?`
   ], (0, import_error_handling.handleErrors)(createResourceMiddleware(context)));
 }

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

@@ -132,8 +132,8 @@ function createNotFoundMiddleware(errorRoutes, context, viewHandler) {
     res.status(404).send(import_diagnostics.descriptions.UNRESOLVABLE.VIEW(req.originalUrl).message);
   };
 }
-function viewMiddleware(app, context, routes, errorRoutes) {
-  const {appConfig, viewRegistry, moduleRegistry} = context;
+function viewMiddleware(app, context) {
+  const {appConfig, routes, errorRoutes, viewRegistry, moduleRegistry} = context;
   const viewHandler = new import_view_registry.LwrViewHandler({viewRegistry, moduleRegistry}, appConfig);
   for (const route of routes) {
     const paths = [route.path];

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

@@ -93,17 +93,6 @@ var SiteGenerator = class {
         }
       }
     }
-    const willSSR = routes.some((r) => r.bootstrap?.ssr);
-    if (willSSR) {
-      import_shared_utils.logger.debug(`[SSG] Fetch SSR Placeholder`);
-      const startTime = import_perf_hooks.performance.now();
-      const siteConfig = this.createSiteConfig(outputDir, staticSiteGenerator.locales[0], urlRewriteMap, skipBaseDocumentGeneration, runtimeEnvironment);
-      await this.dispatchJSResourceRecursive("@lwrjs/lwc-ssr/lwc_ssr_placeholder", dispatcher, siteConfig, true);
-      await this.captureAdditionalRouteMetadata(siteConfig);
-      const endTime = import_perf_hooks.performance.now();
-      const timeDiff = endTime - startTime;
-      import_shared_utils.logger.info(`[SSG] SSR Placeholder in ${Math.round(timeDiff)} ms`);
-    }
   }
   createGenerateURLFunction(dispatcher) {
     const generateRoute = async (uri, siteConfig) => {

package/build/es/context/provider.js

@@ -13,7 +13,7 @@ export function createProviderContext(serverContext) {
             notifyAssetSourceChanged: (payload) => notifyAssetSourceChanged.call(serverContext.appEmitter, payload),
         },
         moduleRegistry: serverContext.moduleRegistry.getPublicApi(),
-        moduleBundler: serverContext.moduleBundler,
+        moduleBundler: serverContext.moduleBundler.getPublicApi(),
         resourceRegistry: serverContext.resourceRegistry.getPublicApi(),
         viewRegistry: serverContext.viewRegistry.getPublicApi(),
         assetRegistry: serverContext.assetRegistry.getPublicApi(),

package/build/es/context/server.js

@@ -40,9 +40,11 @@ export function createServerContext(appConfig, runtimeEnvironment, globalData) {
         resourceRegistry,
         assetRegistry,
         viewRegistry,
+        watcherFactory,
         appConfig,
         runtimeEnvironment,
-        watcherFactory,
+        routes: [],
+        errorRoutes: [],
     };
 }
 //# sourceMappingURL=server.js.map

package/build/es/index.d.ts

@@ -4,6 +4,8 @@ export declare class LwrApp {
     private server;
     private initialized;
     private config;
+    private runtimeEnvironment;
+    private globalData;
     constructor(config?: LwrGlobalConfig);
     setConfig(config: LwrGlobalConfig): void;
     getConfig(): NormalizedLwrGlobalConfig;

package/build/es/index.js

@@ -1,7 +1,8 @@
 import { getFeatureFlags, DEFAULT_LWR_BOOTSTRAP_CONFIG, logger } from '@lwrjs/shared-utils';
 import { createInternalServer } from '@lwrjs/server';
 import { LwrServerError, createSingleDiagnosticError, descriptions } from '@lwrjs/diagnostics';
-import { loadConfig, normalizeConfig, loadServices, loadRoutes } from '@lwrjs/config';
+import { loadConfig, executeConfigHooks, executeStartHooks } from '@lwrjs/config';
+import { loadHooks, loadServices, loadRoutes } from '@lwrjs/config/modules';
 import SiteGenerator from './tools/static-generation.js';
 import { warmupServer } from './tools/server-warmup.js';
 import { createServerContext } from './context/server.js';
@@ -14,10 +15,7 @@ import { assetMiddleware } from './middleware/asset-middleware.js';
 import { viewMiddleware } from './middleware/view-middleware.js';
 import { resourceMiddleware } from './middleware/resource-middleware.js';
 import { hmrMiddleware } from './middleware/hmr-middleware.js';
-import AmdBundlerProvider from '@lwrjs/module-bundler/amd-bundle-provider';
-// dependency esbuild in this package.json is to satisfy the optional dependency in module-bundler for ESM bundle minification
-import EsmBundlerProvider from '@lwrjs/module-bundler/esm-bundle-provider';
-function initMiddleware(app, server, serverContext, routes, errorRoutes) {
+function initMiddleware(app, server, serverContext) {
     // all middleware attached AFTER compression will have compressed responses
     app.useCompression();
     localeMiddleware(app, serverContext);
@@ -28,7 +26,7 @@ function initMiddleware(app, server, serverContext, routes, errorRoutes) {
     resourceMiddleware(app, serverContext);
     // view middleware MUST be attached last because it contains a greedy middleware
     // to handle unsupported routes
-    viewMiddleware(app, serverContext, routes, errorRoutes);
+    viewMiddleware(app, serverContext);
     // initialize routes MUST be called when using koa
     app.initRoutes();
     // hmr uses web sockets, so it doesn't matter when this is attached
@@ -39,46 +37,61 @@ function initMiddleware(app, server, serverContext, routes, errorRoutes) {
 function createServices(entries, providerContext) {
     return entries.map(([ctor, providerConfig = {}]) => new ctor(providerConfig, providerContext));
 }
-async function initContext(appConfig, runtimeEnvironment, globalData, services) {
-    // Initialized PRIVATE server-side context, passed to middleware
+async function initContext(appConfig, runtimeEnvironment, globalData) {
+    // load all hooks
+    const hooks = await loadHooks(appConfig);
+    // apply both config and on start hooks
+    if (hooks.length) {
+        await executeConfigHooks(hooks, appConfig, runtimeEnvironment, globalData);
+        executeStartHooks(hooks, appConfig);
+    }
+    // load all configurable modules
+    const services = await loadServices(appConfig);
+    // create all framework components(ie. registries)
     const serverContext = createServerContext(appConfig, runtimeEnvironment, globalData);
+    // create public subset of configurations
     const providerContext = createProviderContext(serverContext);
-    const { moduleRegistry, resourceRegistry, viewRegistry, assetRegistry, moduleBundler } = serverContext;
-    // Module Providers
+    const { moduleRegistry, assetRegistry, resourceRegistry, viewRegistry, moduleBundler } = serverContext;
+    // instantiate each service
     const moduleProviders = createServices(services.moduleProviders, providerContext);
-    moduleRegistry.addModuleProviders(moduleProviders);
-    // Bundle Providers
-    moduleBundler.addBundleProviders([
-        new AmdBundlerProvider({}, { ...providerContext, moduleRegistry }),
-        new EsmBundlerProvider({}, { ...providerContext, moduleRegistry }),
-    ]);
-    // Resource Providers
+    const assetProviders = createServices(services.assetProviders, providerContext);
+    const assetTransformers = createServices(services.assetTransformers, providerContext);
     const resourceProviders = createServices(services.resourceProviders, providerContext);
-    resourceRegistry.addResourceProviders(resourceProviders);
-    // View Providers
     const viewProviders = createServices(services.viewProviders, providerContext);
-    // View Transformers
     const viewTransformers = createServices(services.viewTransformers, providerContext);
-    viewRegistry.addViewProviders(viewProviders);
-    viewRegistry.addViewTransformers(viewTransformers);
-    await viewRegistry.initializeViewProviders();
-    // Asset Providers
-    const assetProviders = createServices(services.assetProviders, providerContext);
-    const assetTransformers = createServices(services.assetTransformers, providerContext);
+    const bundleProviders = createServices(services.bundleProviders, providerContext);
+    // add services to their corresponding registry
+    moduleRegistry.addModuleProviders(moduleProviders);
     assetRegistry.addAssetProviders(assetProviders);
     assetRegistry.addAssetTransformers(assetTransformers);
+    resourceRegistry.addResourceProviders(resourceProviders);
+    viewRegistry.addViewProviders(viewProviders);
+    viewRegistry.addViewTransformers(viewTransformers);
+    moduleBundler.addBundleProviders(bundleProviders);
+    // invoke async initialization
+    await serverContext.viewRegistry.initializeViewProviders();
+    // set routes on server context
+    const { routes, errorRoutes } = await loadRoutes(appConfig);
+    serverContext.routes = routes;
+    serverContext.errorRoutes = errorRoutes;
     return serverContext;
 }
 export class LwrApp {
-    constructor(config) {
+    constructor(config = {}) {
         this.initialized = false;
-        this.config = normalizeConfig(config);
+        const { appConfig, runtimeEnvironment, globalData } = loadConfig(config);
+        this.config = appConfig;
+        this.runtimeEnvironment = runtimeEnvironment;
+        this.globalData = globalData;
         const { basePath } = this.config;
         this.app = createInternalServer(this.config.serverType, { basePath });
         this.server = this.app.createHttpServer();
     }
     setConfig(config) {
-        this.config = normalizeConfig(config);
+        const { appConfig, runtimeEnvironment, globalData } = loadConfig(config);
+        this.config = appConfig;
+        this.runtimeEnvironment = runtimeEnvironment;
+        this.globalData = globalData;
     }
     getConfig() {
         return this.config;
@@ -90,16 +103,10 @@ export class LwrApp {
         // preemptively mark the server as initialized
         this.initialized = true;
         try {
-            // load and process all application configurations, services, and routes
-            const { appConfig, runtimeEnvironment, globalData } = await loadConfig(this.config);
-            const services = await loadServices(appConfig);
-            const { routes, errorRoutes } = await loadRoutes(appConfig);
             // create the application server context
-            const context = await initContext(appConfig, runtimeEnvironment, globalData, services);
+            const context = await initContext(this.config, this.runtimeEnvironment, this.globalData);
             // attach framework middleware to the server
-            initMiddleware(this.app, this.server, context, routes, errorRoutes);
-            // expose the normalized config after config hooks are applied
-            this.config = appConfig;
+            initMiddleware(this.app, this.server, context);
         }
         catch (e) {
             // reset the initialized property if the server fails to initialize
@@ -166,7 +173,7 @@ export async function generateStaticSite(config) {
     const { serverMode } = config;
     if (serverMode === 'dev' || serverMode === 'compat') {
         // TODO: dynamic imports are not generated in dev mode
-        // https://github.com/salesforce/lwr/issues/1111
+        // https://github.com/salesforce-experience-platform-emu/lwr/issues/1111
         logger.warn('static generation in `dev` or `compat` mode is currently not fully supported');
     }
     const lwrApp = createServer(config);

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

@@ -3,11 +3,11 @@ import { descriptions } from '@lwrjs/diagnostics';
 import { getRequestImporter } from './utils/request.js';
 import { getModuleIdentity } from './utils/identity.js';
 import { normalizeResolvedUris } from './utils/metadata.js';
-import { createUnsignedModuleRedirect } from './redirects/unsigned-module-redirect.js';
+import { createUnsignedBundleRedirect } from './redirects/unsigned-module-redirect.js';
 import { handleErrors } from './utils/error-handling.js';
 function createBundleMiddleware(context) {
     const { moduleRegistry, moduleBundler } = context;
-    const unsignedRedirect = createUnsignedModuleRedirect(moduleRegistry, moduleBundler);
+    const unsignedBundleRedirect = createUnsignedBundleRedirect(moduleBundler);
     return async (req, res) => {
         if (!req.validateEnvironmentRequest(context.appConfig)) {
             res.status(400);
@@ -23,7 +23,7 @@ function createBundleMiddleware(context) {
         const importer = req.query.importer ? await getRequestImporter(req, moduleRegistry) : undefined;
         const { moduleId, signature } = getModuleIdentity(req, importer);
         if (moduleId.importer || !signature) {
-            await unsignedRedirect(req, res, moduleId, runtimeEnvironment, runtimeParams);
+            await unsignedBundleRedirect(req, res, moduleId, runtimeEnvironment, runtimeParams);
             return;
         }
         const sourceMapUrl = req.path.replace('/bundle/', '/sourcemaps/bundle/');

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

@@ -6,7 +6,7 @@ import { createUnsignedModuleRedirect } from './redirects/unsigned-module-redire
 import { handleErrors } from './utils/error-handling.js';
 function createModuleMiddleware(context) {
     const { moduleRegistry } = context;
-    const unsignedRedirect = createUnsignedModuleRedirect(moduleRegistry, moduleRegistry);
+    const unsignedRedirect = createUnsignedModuleRedirect(moduleRegistry);
     return async (req, res) => {
         if (!req.validateEnvironmentRequest(context.appConfig)) {
             res.status(400);

package/build/es/middleware/redirects/unsigned-module-redirect.d.ts

@@ -1,5 +1,6 @@
 import type { AbstractModuleId, MiddlewareRequest, MiddlewareResponse, ModuleBundler, ModuleRegistry, RuntimeEnvironment, RuntimeParams } from '@lwrjs/types';
 declare type UnsignedRedirect = (req: MiddlewareRequest, res: MiddlewareResponse, moduleId: AbstractModuleId, runtimeEnvironment: RuntimeEnvironment, runtimeParams: RuntimeParams) => Promise<void>;
-export declare function createUnsignedModuleRedirect(moduleRegistry: ModuleRegistry, defRegistry: ModuleRegistry | ModuleBundler): UnsignedRedirect;
+export declare function createUnsignedModuleRedirect(moduleRegistry: ModuleRegistry): UnsignedRedirect;
+export declare function createUnsignedBundleRedirect(moduleBundler: ModuleBundler): UnsignedRedirect;
 export {};
 //# sourceMappingURL=unsigned-module-redirect.d.ts.map

package/build/es/middleware/redirects/unsigned-module-redirect.js

@@ -1,10 +1,25 @@
-export function createUnsignedModuleRedirect(moduleRegistry, defRegistry) {
+const HEADER_LOCATION = 'Location';
+const STATUS_FOUND = 302;
+export function createUnsignedModuleRedirect(moduleRegistry) {
     return async (req, res, moduleId, runtimeEnvironment, runtimeParams) => {
-        const jsonQuery = req.isJsonRequest() ? `${runtimeEnvironment.debug ? '&' : '?'}json` : '';
+        const jsonQuery = getJsonQualifier(req, runtimeEnvironment);
         const { moduleEntry, ownHash } = await moduleRegistry.getModule(moduleId);
-        const uri = defRegistry.resolveModuleUri({ ...moduleId, version: moduleEntry.version }, runtimeEnvironment, runtimeParams, ownHash);
-        res.setHeader('Location', `${uri}${jsonQuery}`);
-        res.sendStatus(302);
+        const uri = await moduleRegistry.resolveModuleUri({ ...moduleId, version: moduleEntry.version }, runtimeEnvironment, runtimeParams, ownHash);
+        sendRedirect(res, `${uri}${jsonQuery}`);
     };
 }
+export function createUnsignedBundleRedirect(moduleBundler) {
+    return async (req, res, moduleId, runtimeEnvironment, runtimeParams) => {
+        const jsonQuery = getJsonQualifier(req, runtimeEnvironment);
+        const uri = await moduleBundler.resolveModuleUri(moduleId, runtimeEnvironment, runtimeParams);
+        sendRedirect(res, `${uri}${jsonQuery}`);
+    };
+}
+function getJsonQualifier(req, runtimeEnvironment) {
+    return req.isJsonRequest() ? `${runtimeEnvironment.debug ? '&' : '?'}json` : '';
+}
+function sendRedirect(res, url) {
+    res.setHeader(HEADER_LOCATION, url);
+    res.sendStatus(STATUS_FOUND);
+}
 //# sourceMappingURL=unsigned-module-redirect.js.map

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

@@ -20,7 +20,7 @@ function createResourceMiddleware(context) {
             return;
         }
         if (resource && resource.stream) {
-            res.status(200).type(resource.type).stream(resource.stream);
+            res.status(200).type(resource.type).stream(resource.stream());
             return;
         }
         res.status(404).send(descriptions.UNRESOLVABLE.RESOURCE(resourceId.specifier).message);
@@ -28,10 +28,10 @@ function createResourceMiddleware(context) {
 }
 export function resourceMiddleware(app, context) {
     app.get([
-        `/:apiVersion/resource/:format/l/:locale/e/:environment/:specifier`,
-        `/:apiVersion/resource/:format/l/:locale/:specifier`,
-        `/:apiVersion/resource/:format/e/:environment/:specifier`,
-        `/:apiVersion/resource/:format/:specifier`,
+        `/:apiVersion/resource/:format/l/:locale/e/:environment/:specifier/:prettyUrl?`,
+        `/:apiVersion/resource/:format/l/:locale/:specifier/:prettyUrl?`,
+        `/:apiVersion/resource/:format/e/:environment/:specifier/:prettyUrl?`,
+        `/:apiVersion/resource/:format/:specifier/:prettyUrl?`,
     ], handleErrors(createResourceMiddleware(context)));
 }
 //# sourceMappingURL=resource-middleware.js.map

package/build/es/middleware/view-middleware.d.ts

@@ -1,3 +1,3 @@
-import type { InternalAppServer, LwrErrorRoute, LwrRoute, Route, ServerContext, ServerTypes } from '@lwrjs/types';
-export declare function viewMiddleware<T extends ServerTypes>(app: InternalAppServer<T>, context: ServerContext, routes: Route<LwrRoute>[], errorRoutes: Route<LwrErrorRoute>[]): void;
+import type { InternalAppServer, ServerContext, ServerTypes } from '@lwrjs/types';
+export declare function viewMiddleware<T extends ServerTypes>(app: InternalAppServer<T>, context: ServerContext): void;
 //# sourceMappingURL=view-middleware.d.ts.map

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

@@ -112,8 +112,8 @@ function createNotFoundMiddleware(errorRoutes, context, viewHandler) {
         res.status(404).send(descriptions.UNRESOLVABLE.VIEW(req.originalUrl).message);
     };
 }
-export function viewMiddleware(app, context, routes, errorRoutes) {
-    const { appConfig, viewRegistry, moduleRegistry } = context;
+export function viewMiddleware(app, context) {
+    const { appConfig, routes, errorRoutes, viewRegistry, moduleRegistry } = context;
     const viewHandler = new LwrViewHandler({ viewRegistry, moduleRegistry }, appConfig);
     // create and attach middleware for each route
     for (const route of routes) {

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

@@ -89,24 +89,6 @@ export default class SiteGenerator {
                 }
             }
         }
-        // Generate a generic SSR bundle if there are any routes with bootstrap.ssr = true
-        // This bundle will be used by the lwc-ssr view transformer, it includes definitions for:
-        //      - "@lwrjs/lwc-ssr/lwc_ssr_placeholder"
-        //      - "@lwc/engine-server"
-        // The lwc_ssr_placeholder will be replaced with a root component specifier at SSR time
-        const willSSR = routes.some((r) => r.bootstrap?.ssr);
-        if (willSSR) {
-            logger.debug(`[SSG] Fetch SSR Placeholder`);
-            const startTime = performance.now();
-            const siteConfig = this.createSiteConfig(outputDir, staticSiteGenerator.locales[0], // locale is unused in this bundle
-            urlRewriteMap, skipBaseDocumentGeneration, runtimeEnvironment);
-            await this.dispatchJSResourceRecursive('@lwrjs/lwc-ssr/lwc_ssr_placeholder', dispatcher, siteConfig, true);
-            // Capture any additional collected metadata
-            await this.captureAdditionalRouteMetadata(siteConfig);
-            const endTime = performance.now();
-            const timeDiff = endTime - startTime;
-            logger.info(`[SSG] SSR Placeholder in ${Math.round(timeDiff)} ms`);
-        }
     }
     /**
      * Creates a function to dispatch the root requests for a given view url

package/package.json

@@ -4,15 +4,15 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.9.0-alpha.14",
+    "version": "0.9.0-alpha.16",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
-        "url": "https://github.com/salesforce/lwr.git",
+        "url": "https://github.com/salesforce-experience-platform-emu/lwr.git",
         "directory": "packages/@lwrjs/core"
     },
     "bugs": {
-        "url": "https://github.com/salesforce/lwr/issues"
+        "url": "https://github.com/salesforce-experience-platform-emu/lwr/issues"
     },
     "type": "module",
     "types": "build/es/index.d.ts",
@@ -37,29 +37,29 @@
     ],
     "dependencies": {
         "@locker/compiler": "0.18.2",
-        "@lwrjs/app-service": "0.9.0-alpha.14",
-        "@lwrjs/asset-registry": "0.9.0-alpha.14",
-        "@lwrjs/asset-transformer": "0.9.0-alpha.14",
-        "@lwrjs/base-view-provider": "0.9.0-alpha.14",
-        "@lwrjs/base-view-transformer": "0.9.0-alpha.14",
-        "@lwrjs/client-modules": "0.9.0-alpha.14",
-        "@lwrjs/config": "0.9.0-alpha.14",
-        "@lwrjs/diagnostics": "0.9.0-alpha.14",
-        "@lwrjs/fs-asset-provider": "0.9.0-alpha.14",
-        "@lwrjs/html-view-provider": "0.9.0-alpha.14",
-        "@lwrjs/loader": "0.9.0-alpha.14",
-        "@lwrjs/lwc-module-provider": "0.9.0-alpha.14",
-        "@lwrjs/markdown-view-provider": "0.9.0-alpha.14",
-        "@lwrjs/module-bundler": "0.9.0-alpha.14",
-        "@lwrjs/module-registry": "0.9.0-alpha.14",
-        "@lwrjs/npm-module-provider": "0.9.0-alpha.14",
-        "@lwrjs/nunjucks-view-provider": "0.9.0-alpha.14",
-        "@lwrjs/o11y": "0.9.0-alpha.14",
-        "@lwrjs/resource-registry": "0.9.0-alpha.14",
-        "@lwrjs/router": "0.9.0-alpha.14",
-        "@lwrjs/server": "0.9.0-alpha.14",
-        "@lwrjs/shared-utils": "0.9.0-alpha.14",
-        "@lwrjs/view-registry": "0.9.0-alpha.14",
+        "@lwrjs/app-service": "0.9.0-alpha.16",
+        "@lwrjs/asset-registry": "0.9.0-alpha.16",
+        "@lwrjs/asset-transformer": "0.9.0-alpha.16",
+        "@lwrjs/base-view-provider": "0.9.0-alpha.16",
+        "@lwrjs/base-view-transformer": "0.9.0-alpha.16",
+        "@lwrjs/client-modules": "0.9.0-alpha.16",
+        "@lwrjs/config": "0.9.0-alpha.16",
+        "@lwrjs/diagnostics": "0.9.0-alpha.16",
+        "@lwrjs/fs-asset-provider": "0.9.0-alpha.16",
+        "@lwrjs/html-view-provider": "0.9.0-alpha.16",
+        "@lwrjs/loader": "0.9.0-alpha.16",
+        "@lwrjs/lwc-module-provider": "0.9.0-alpha.16",
+        "@lwrjs/markdown-view-provider": "0.9.0-alpha.16",
+        "@lwrjs/module-bundler": "0.9.0-alpha.16",
+        "@lwrjs/module-registry": "0.9.0-alpha.16",
+        "@lwrjs/npm-module-provider": "0.9.0-alpha.16",
+        "@lwrjs/nunjucks-view-provider": "0.9.0-alpha.16",
+        "@lwrjs/o11y": "0.9.0-alpha.16",
+        "@lwrjs/resource-registry": "0.9.0-alpha.16",
+        "@lwrjs/router": "0.9.0-alpha.16",
+        "@lwrjs/server": "0.9.0-alpha.16",
+        "@lwrjs/shared-utils": "0.9.0-alpha.16",
+        "@lwrjs/view-registry": "0.9.0-alpha.16",
         "chokidar": "^3.5.3",
         "esbuild": "^0.9.7",
         "fs-extra": "^10.1.0",
@@ -69,7 +69,7 @@
         "ws": "^8.8.1"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.9.0-alpha.14",
+        "@lwrjs/types": "0.9.0-alpha.16",
         "@types/ws": "^8.5.3"
     },
     "peerDependencies": {
@@ -78,5 +78,5 @@
     "engines": {
         "node": ">=14.15.4 <19"
     },
-    "gitHead": "64e0ba617151429da6e09f1a9686628f64183d25"
+    "gitHead": "03fe3982780e7c63b96ef0733b58529057db61fa"
 }