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

package/build/cjs/context/provider.cjs

@@ -40,7 +40,8 @@ function createProviderContext(serverContext) {
     amdLoader,
     esmLoader,
     environment,
-    basePath
+    basePath,
+    bundleConfig
   } = serverContext.appConfig;
   const {onModuleDefinitionChange, onModuleSourceChange} = serverContext.appObserver;
   const {
@@ -50,7 +51,6 @@ function createProviderContext(serverContext) {
     notifyAssetSourceChanged
   } = serverContext.appEmitter;
   return {
-    compiler: serverContext.compiler,
     appObserver: (0, import_shared_utils.deepFreeze)({onModuleDefinitionChange, onModuleSourceChange}),
     appEmitter: {
       notifyModuleDefinitionChanged: (payload) => notifyModuleDefinitionChanged.call(serverContext.appEmitter, payload),
@@ -75,8 +75,10 @@ function createProviderContext(serverContext) {
       locker,
       amdLoader,
       esmLoader,
-      environment
+      environment,
+      bundleConfig
     }),
-    runtimeEnvironment: (0, import_shared_utils.deepFreeze)(serverContext.runtimeEnvironment)
+    runtimeEnvironment: (0, import_shared_utils.deepFreeze)(serverContext.runtimeEnvironment),
+    watcherFactory: serverContext.watcherFactory
   };
 }

package/build/cjs/context/server.cjs

@@ -27,28 +27,26 @@ __export(exports, {
   createServerContext: () => createServerContext
 });
 var import_asset_registry = __toModule(require("@lwrjs/asset-registry"));
-var import_compiler = __toModule(require("@lwrjs/compiler"));
 var import_module_bundler = __toModule(require("@lwrjs/module-bundler"));
 var import_module_registry = __toModule(require("@lwrjs/module-registry"));
 var import_resource_registry = __toModule(require("@lwrjs/resource-registry"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_view_registry = __toModule(require("@lwrjs/view-registry"));
+var import_fs_watch = __toModule(require("@lwrjs/shared-utils/fs-watch"));
 function createServerContext(appConfig, runtimeEnvironment, globalData) {
   const appObserver = new import_shared_utils.LwrApplicationObserver();
   const appEmitter = appObserver.createLwrEmitter();
-  const compiler = new import_compiler.LwrCompiler();
   const assetRegistry = new import_asset_registry.LwrAssetRegistry({
     appObserver,
     appEmitter,
     runtimeEnvironment
   }, appConfig);
   const moduleRegistry = new import_module_registry.LwrModuleRegistry({
-    compiler,
     appObserver,
     appEmitter,
     runtimeEnvironment
   }, appConfig);
-  const moduleBundler = new import_module_bundler.LwrModuleBundler({compiler, moduleRegistry, appObserver}, appConfig);
+  const moduleBundler = new import_module_bundler.LwrModuleBundler({moduleRegistry, appObserver}, appConfig);
   const resourceRegistry = new import_resource_registry.LwrResourceRegistry();
   const viewRegistry = new import_view_registry.LwrViewRegistry({
     moduleRegistry,
@@ -60,8 +58,8 @@ function createServerContext(appConfig, runtimeEnvironment, globalData) {
     globalData,
     runtimeEnvironment
   }, appConfig);
+  const watcherFactory = new import_fs_watch.WatcherFactoryImpl();
   return {
-    compiler,
     appObserver,
     appEmitter,
     moduleRegistry,
@@ -70,6 +68,7 @@ function createServerContext(appConfig, runtimeEnvironment, globalData) {
     assetRegistry,
     viewRegistry,
     appConfig,
-    runtimeEnvironment
+    runtimeEnvironment,
+    watcherFactory
   };
 }

package/build/cjs/index.cjs

@@ -25,7 +25,6 @@ var __toModule = (module2) => {
 __markAsModule(exports);
 __export(exports, {
   LwrApp: () => LwrApp,
-  buildServer: () => import_server_build.buildServer,
   createServer: () => createServer,
   generateStaticSite: () => generateStaticSite
 });
@@ -33,12 +32,10 @@ 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_services = __toModule(require("./context/services.cjs"));
-var import_configurations = __toModule(require("./context/configurations.cjs"));
-var import_provider = __toModule(require("./context/provider.cjs"));
-var import_server2 = __toModule(require("./context/server.cjs"));
 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"));
+var import_provider = __toModule(require("./context/provider.cjs"));
 var import_locale_middleware = __toModule(require("./middleware/locale-middleware.cjs"));
 var import_module_middleware = __toModule(require("./middleware/module-middleware.cjs"));
 var import_bundle_middleware = __toModule(require("./middleware/bundle-middleware.cjs"));
@@ -47,8 +44,9 @@ 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_server_build = __toModule(require("./tools/server-build.cjs"));
-function initMiddleware(app, server, serverContext) {
+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) {
   app.useCompression();
   (0, import_locale_middleware.localeMiddleware)(app, serverContext);
   (0, import_module_middleware.moduleMiddleware)(app, serverContext);
@@ -56,28 +54,34 @@ function initMiddleware(app, server, serverContext) {
   (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);
+  (0, import_view_middleware.viewMiddleware)(app, serverContext, routes, errorRoutes);
   app.initRoutes();
   if (serverContext.runtimeEnvironment.hmrEnabled) {
     (0, import_hmr_middleware.hmrMiddleware)(server, serverContext);
   }
 }
-async function initContext(app, server, rawAppConfig) {
-  const {appConfig, runtimeEnvironment, globalData} = await (0, import_configurations.resolveConfigurations)(rawAppConfig);
+function createServices(entries, providerContext) {
+  return entries.map(([ctor, providerConfig = {}]) => new ctor(providerConfig, providerContext));
+}
+async function initContext(appConfig, runtimeEnvironment, globalData, services) {
   const serverContext = (0, import_server2.createServerContext)(appConfig, runtimeEnvironment, globalData);
   const providerContext = (0, import_provider.createProviderContext)(serverContext);
-  const {moduleRegistry, resourceRegistry, viewRegistry, assetRegistry} = serverContext;
-  const moduleProviders = await (0, import_services.getServices)(appConfig.moduleProviders, providerContext, appConfig);
+  const {moduleRegistry, resourceRegistry, viewRegistry, assetRegistry, moduleBundler} = serverContext;
+  const moduleProviders = createServices(services.moduleProviders, providerContext);
   moduleRegistry.addModuleProviders(moduleProviders);
-  const resourceProviders = await (0, import_services.getServices)(appConfig.resourceProviders, providerContext, appConfig);
+  moduleBundler.addBundleProviders([
+    new import_amd_bundle_provider.default({}, {...providerContext, moduleRegistry}),
+    new import_esm_bundle_provider.default({}, {...providerContext, moduleRegistry})
+  ]);
+  const resourceProviders = createServices(services.resourceProviders, providerContext);
   resourceRegistry.addResourceProviders(resourceProviders);
-  const viewProviders = await (0, import_services.getServices)(appConfig.viewProviders, providerContext, appConfig);
-  const viewTransformers = await (0, import_services.getServices)(appConfig.viewTransformers, providerContext, rawAppConfig);
+  const viewProviders = createServices(services.viewProviders, providerContext);
+  const viewTransformers = createServices(services.viewTransformers, providerContext);
   viewRegistry.addViewProviders(viewProviders);
   viewRegistry.addViewTransformers(viewTransformers);
   await viewRegistry.initializeViewProviders();
-  const assetProviders = await (0, import_services.getServices)(appConfig.assetProviders, providerContext, appConfig);
-  const assetTransformers = await (0, import_services.getServices)(appConfig.assetTransformers, void 0, appConfig);
+  const assetProviders = createServices(services.assetProviders, providerContext);
+  const assetTransformers = createServices(services.assetTransformers, providerContext);
   assetRegistry.addAssetProviders(assetProviders);
   assetRegistry.addAssetTransformers(assetTransformers);
   return serverContext;
@@ -97,15 +101,20 @@ var LwrApp = class {
     return this.config;
   }
   async init() {
-    if (!this.initialized) {
-      this.initialized = true;
-      try {
-        const context = await initContext(this.app, this.server, this.config);
-        initMiddleware(this.app, this.server, context);
-      } catch (e) {
-        this.initialized = false;
-        throw e;
-      }
+    if (this.initialized) {
+      return;
+    }
+    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;
+    } catch (e) {
+      this.initialized = false;
+      throw e;
     }
   }
   async listen(callback) {

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);
+  const unsignedRedirect = (0, import_unsigned_module_redirect.createUnsignedModuleRedirect)(moduleRegistry, moduleBundler);
   return async (req, res) => {
     if (!req.validateEnvironmentRequest(context.appConfig)) {
       res.status(400);
@@ -59,7 +59,7 @@ function createBundleMiddleware(context) {
     if (req.isSiteGeneration()) {
       res.setSiteGenerationMetadata({
         moduleDefinition: bundleDefinition,
-        resolvedUris: await (0, import_metadata.normalizeResolvedUris)(bundleDefinition, runtimeEnvironment, runtimeParams, moduleRegistry)
+        resolvedUris: await (0, import_metadata.normalizeResolvedUris)(bundleDefinition, runtimeEnvironment, runtimeParams, moduleBundler, moduleRegistry)
       });
     }
     if (signature !== import_shared_utils.LATEST_SIGNATURE) {

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);
+  const unsignedRedirect = (0, import_unsigned_module_redirect.createUnsignedModuleRedirect)(moduleRegistry, moduleRegistry);
   return async (req, res) => {
     if (!req.validateEnvironmentRequest(context.appConfig)) {
       res.status(400);

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

@@ -10,11 +10,11 @@ __markAsModule(exports);
 __export(exports, {
   createUnsignedModuleRedirect: () => createUnsignedModuleRedirect
 });
-function createUnsignedModuleRedirect(moduleRegistry) {
+function createUnsignedModuleRedirect(moduleRegistry, defRegistry) {
   return async (req, res, moduleId, runtimeEnvironment, runtimeParams) => {
     const jsonQuery = req.isJsonRequest() ? `${runtimeEnvironment.debug ? "&" : "?"}json` : "";
     const {moduleEntry, ownHash} = await moduleRegistry.getModule(moduleId);
-    const uri = await moduleRegistry.resolveModuleUri({...moduleId, version: moduleEntry.version}, runtimeEnvironment, runtimeParams, ownHash);
+    const uri = defRegistry.resolveModuleUri({...moduleId, version: moduleEntry.version}, runtimeEnvironment, runtimeParams, ownHash);
     res.setHeader("Location", `${uri}${jsonQuery}`);
     res.sendStatus(302);
   };

package/build/cjs/middleware/utils/metadata.cjs

@@ -27,13 +27,13 @@ __export(exports, {
   normalizeResolvedUris: () => normalizeResolvedUris
 });
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
-async function normalizeResolvedUris(bundleDefinition, runtimeEnvironment, runtimeParams, moduleRegistry) {
+async function normalizeResolvedUris(bundleDefinition, runtimeEnvironment, runtimeParams, moduleBundler, moduleRegistry) {
   const resolvedUris = [];
   if (bundleDefinition.bundleRecord.imports) {
     for (const theImport of bundleDefinition.bundleRecord.imports) {
       const childSpecifier = theImport.specifier;
       const id = await (0, import_shared_utils.getVersionedModuleId)(childSpecifier, moduleRegistry);
-      const uri = await moduleRegistry.resolveModuleUri(id, runtimeEnvironment, runtimeParams);
+      const uri = await moduleBundler.resolveModuleUri(id, runtimeEnvironment, runtimeParams);
       resolvedUris.push(uri);
     }
   }
@@ -41,7 +41,7 @@ async function normalizeResolvedUris(bundleDefinition, runtimeEnvironment, runti
     for (const theImport of bundleDefinition.bundleRecord.dynamicImports) {
       const childSpecifier = theImport.specifier;
       const id = await (0, import_shared_utils.getVersionedModuleId)(childSpecifier, moduleRegistry);
-      const uri = await moduleRegistry.resolveModuleUri(id, runtimeEnvironment, runtimeParams);
+      const uri = await moduleBundler.resolveModuleUri(id, runtimeEnvironment, runtimeParams);
       resolvedUris.push(uri);
     }
   }

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

@@ -37,9 +37,8 @@ var CANONICAL_VIEW_ROUTES = [
   `/:apiVersion/application/:format/ai/:appId`,
   `/:apiVersion/application/:format/e/:environment/ai/:appId`
 ];
-function createViewMiddleware(route, context, viewHandler) {
-  const {appConfig} = context;
-  const errorRoute = appConfig.errorRoutes.find((route2) => route2.status === 500);
+function createViewMiddleware(route, errorRoutes, context, viewHandler) {
+  const errorRoute = errorRoutes.find((route2) => route2.status === 500);
   return async (req, res) => {
     if (!req.validateEnvironmentRequest(context.appConfig)) {
       res.status(400);
@@ -91,9 +90,7 @@ function createViewMiddleware(route, context, viewHandler) {
     res.send(viewResponse.body);
   };
 }
-function createConfigMiddleware(context, viewHandler) {
-  const {appConfig} = context;
-  const {routes} = appConfig;
+function createConfigMiddleware(routes, context, viewHandler) {
   return async (req, res) => {
     const {runtimeEnvironment, runtimeParams} = req.getRuntimeContext(context.runtimeEnvironment);
     const {appId, encodedViewPath} = req.params;
@@ -126,20 +123,19 @@ function createConfigMiddleware(context, viewHandler) {
     res.send(viewResponse.body);
   };
 }
-function createNotFoundMiddleware(context, viewHandler) {
-  const {errorRoutes} = context.appConfig;
-  const errorRoute = errorRoutes.find((route) => route.status === 404);
-  if (errorRoute) {
-    return createViewMiddleware(errorRoute, context, viewHandler);
+function createNotFoundMiddleware(errorRoutes, context, viewHandler) {
+  const notFoundRoute = errorRoutes.find((route) => route.status === 404);
+  if (notFoundRoute) {
+    return createViewMiddleware(notFoundRoute, errorRoutes, context, viewHandler);
   }
   return (req, res) => {
     res.status(404).send(import_diagnostics.descriptions.UNRESOLVABLE.VIEW(req.originalUrl).message);
   };
 }
-function viewMiddleware(app, context) {
+function viewMiddleware(app, context, routes, errorRoutes) {
   const {appConfig, viewRegistry, moduleRegistry} = context;
   const viewHandler = new import_view_registry.LwrViewHandler({viewRegistry, moduleRegistry}, appConfig);
-  for (const route of appConfig.routes) {
+  for (const route of routes) {
     const paths = [route.path];
     const subRoutes = route.subRoutes && (0, import_router.getClientRoutes)(route.subRoutes);
     if (subRoutes) {
@@ -147,8 +143,8 @@ function viewMiddleware(app, context) {
       subRoutes.routes.forEach((subRoute) => subRoute.uri !== route.path && paths.push(`${prefix}${subRoute.uri}`));
     }
     paths.forEach((routePath) => paths.push(...CANONICAL_VIEW_ROUTES.map((viewRoute) => viewRoute + routePath)));
-    app.get(paths, (0, import_error_handling.handleErrors)(createViewMiddleware(route, context, viewHandler)));
+    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(context, viewHandler)));
-  app.get("/" + app.getRegexWildcard(), (0, import_error_handling.handleErrors)(createNotFoundMiddleware(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)));
 }

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

@@ -36,17 +36,10 @@ async function warmupServer(config, internalRequestKey) {
     import_shared_utils.logger.setOptions({dedupe: new Set([import_shared_utils.WARN])});
   }
   import_shared_utils.logger.info("[Server Warmup] starting");
-  const {routes, staticSiteGenerator, port, apiVersion, basePath, lwrVersion, serverMode} = config;
+  const {routes, staticSiteGenerator, port, basePath} = config;
   staticSiteGenerator.outputDir = import_dir.skipDirCreation;
   const urlRewriteMap = new Map();
-  const runtimeEnvironment = {
-    ...(0, import_config.explodeMode)(serverMode),
-    apiVersion,
-    basePath,
-    lwrVersion,
-    debug: false,
-    serverMode
-  };
+  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, urlRewriteMap);
   import_shared_utils.logger.info("[Server Warmup] complete");
 }

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

@@ -37,7 +37,7 @@ var import_config = __toModule(require("@lwrjs/config"));
 var SiteGenerator = class {
   async buildStaticApplication(config, dispatcher) {
     const startTime = import_perf_hooks.performance.now();
-    import_shared_utils.logger.info("[Static Generation] starting");
+    import_shared_utils.logger.info("[SSG] Static Site Generation");
     if (!import_shared_utils.logger.currentLevel || import_shared_utils.logger.currentLevel == import_shared_utils.WARN || import_shared_utils.logger.currentLevel == import_shared_utils.INFO) {
       import_shared_utils.logger.setOptions({dedupe: new Set([import_shared_utils.WARN])});
     }
@@ -46,24 +46,21 @@ var SiteGenerator = class {
       staticSiteGenerator.outputDir = "__generated_site__";
     }
     const outputDir = (0, import_path.join)(rootDir, staticSiteGenerator.outputDir);
-    import_shared_utils.logger.info(`Clear Output Location: ${outputDir}`);
-    import_fs_extra.default.rmSync(outputDir, {recursive: true, force: true});
+    if (!staticSiteGenerator.skipCleanOutputDir) {
+      import_shared_utils.logger.info(`[SSG] Clearing output directory: ${outputDir}`);
+      import_fs_extra.default.rmSync(outputDir, {recursive: true, force: true});
+    } else {
+      import_shared_utils.logger.info(`[SSG] Reusing existing output directory: ${outputDir}`);
+    }
     const urlRewriteMap = new Map();
-    const {apiVersion, basePath, lwrVersion, serverMode} = config;
-    const runtimeEnvironment = {
-      ...(0, import_config.explodeMode)(serverMode),
-      apiVersion,
-      basePath,
-      lwrVersion,
-      debug: false,
-      serverMode
-    };
+    const {basePath} = config;
+    const runtimeEnvironment = (0, import_config.getRuntimeEnvironment)(config);
     await this.generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, basePath, dispatcher, outputDir, urlRewriteMap);
     this.writeNetlifyRedirectConfig(outputDir, urlRewriteMap);
     this.copyAssets(assets, outputDir, basePath);
     const endTime = import_perf_hooks.performance.now();
     const timeDiff = (endTime - startTime) / 1e3;
-    import_shared_utils.logger.info(`[Static Generation] complete in ${Math.round(timeDiff)} seconds`);
+    import_shared_utils.logger.info(`[SSG] Static Site Generation complete in ${Math.round(timeDiff)} seconds`);
   }
   async generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, basePath, dispatcher, outputDir, urlRewriteMap = new Map()) {
     if (!staticSiteGenerator.locales) {
@@ -85,24 +82,39 @@ var SiteGenerator = class {
       const {_additionalModules} = staticSiteGenerator;
       if (_additionalModules) {
         for (const specifier of _additionalModules) {
+          import_shared_utils.logger.debug(`[SSG] Additional Module: ${locale} ${specifier}`);
+          const startTime = import_perf_hooks.performance.now();
           const siteConfig = this.createSiteConfig(outputDir, locale, urlRewriteMap, skipBaseDocumentGeneration, runtimeEnvironment);
           await this.dispatchJSResourceRecursive(specifier, dispatcher, siteConfig, true);
+          await this.captureAdditionalRouteMetadata(siteConfig);
+          const endTime = import_perf_hooks.performance.now();
+          const timeDiff = endTime - startTime;
+          import_shared_utils.logger.info(`[SSG] Additional Module ${locale} ${specifier} in ${Math.round(timeDiff)} ms`);
         }
       }
     }
     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) => {
       const locale = siteConfig.locale;
-      import_shared_utils.logger.info(`Start Generate: ${locale} ${uri}`);
+      import_shared_utils.logger.debug(`[SSG] Start Generate: ${locale} ${uri}`);
+      const startTime = import_perf_hooks.performance.now();
       await this.dispatchResourceRecursive(uri, dispatcher, {resourceType: "route"}, siteConfig);
-      this.addAdditionalImportMetadataToViewConfig(siteConfig);
-      import_shared_utils.logger.info(`End Generate ${locale} ${uri}`);
+      await this.captureAdditionalRouteMetadata(siteConfig);
+      const endTime = import_perf_hooks.performance.now();
+      const timeDiff = endTime - startTime;
+      import_shared_utils.logger.info(`[SSG] ${locale} ${uri} in ${Math.round(timeDiff)} ms`);
     };
     return generateRoute.bind(this);
   }
@@ -110,8 +122,12 @@ var SiteGenerator = class {
     const {visitedUrls} = siteConfig;
     if (!visitedUrls.has(url)) {
       visitedUrls.add(url);
+      if ((0, import_shared_utils.isExternalUrl)(url)) {
+        import_shared_utils.logger.warn("[SSG] Skipped generation of external url: " + url);
+        return;
+      }
       if (url.indexOf("/:") !== -1 || url.indexOf("*") !== -1) {
-        import_shared_utils.logger.warn("Skipped generation of url with variable path segment: " + url);
+        import_shared_utils.logger.warn("[SSG] Skipped generation of url with variable path segment: " + url);
         return;
       }
       let context;
@@ -160,6 +176,9 @@ var SiteGenerator = class {
         const jsUri = importModule.specifier.startsWith("/") ? importModule.specifier : (0, import_shared_utils.getSpecifier)(importModule);
         dispatchRequests.push(this.dispatchJSResourceRecursive(jsUri, dispatcher, siteConfig));
       }
+      if (moduleDefinition.bundleRecord) {
+        this.addBundleToSiteMetadata(moduleDefinition, url, siteConfig);
+      }
     }
     const uris = context.fs?.metadata?.resolvedUris || [];
     for (const jsUri of uris) {
@@ -167,6 +186,52 @@ var SiteGenerator = class {
     }
     await Promise.all(dispatchRequests);
   }
+  addBundleToSiteMetadata(bundleDefinition, url, siteConfig) {
+    if (siteConfig.siteMetadata) {
+      const specifier = bundleDefinition.specifier;
+      const imports = bundleDefinition.bundleRecord.imports?.map((moduleRef) => moduleRef.specifier) || [];
+      const bundleMetadata = {
+        version: bundleDefinition.version,
+        path: decodeURIComponent(url),
+        bundleRecord: {
+          includedModules: bundleDefinition.bundleRecord.includedModules || [],
+          imports
+        }
+      };
+      const siteBundles = siteConfig.siteMetadata.getSiteBundles().bundles;
+      siteBundles[specifier] = bundleMetadata;
+    }
+  }
+  addResourceToSiteMetadata(resourceDefinition, url, siteConfig) {
+    if (siteConfig.siteMetadata) {
+      if (!resourceDefinition.specifier) {
+        import_shared_utils.logger.warn("[SSG] Could not save resource metadata.  There was no specifier.", resourceDefinition);
+      } else {
+        const specifier = resourceDefinition.specifier;
+        const resourceMetadata = {
+          path: decodeURIComponent(url),
+          mimeType: resourceDefinition.type
+        };
+        const siteResources = siteConfig.siteMetadata.getSiteResources();
+        siteResources.resources[specifier] = resourceMetadata;
+      }
+    }
+  }
+  addAssetToSiteMetadata(assetDefinition, url, siteConfig) {
+    if (siteConfig.siteMetadata) {
+      if (!assetDefinition.uri) {
+        import_shared_utils.logger.warn("[SSG] Could not save asset metadata.  There was no uri.", assetDefinition);
+      } else {
+        const specifier = assetDefinition.uri;
+        const resourceMetadata = {
+          path: decodeURIComponent(url),
+          mimeType: String(assetDefinition.mime)
+        };
+        const siteAssets = siteConfig.siteMetadata.getSiteAssets();
+        siteAssets.assets[specifier] = resourceMetadata;
+      }
+    }
+  }
   async handleMappingResource(url, context, siteConfig, dispatcher) {
     const {importMetadata: importMetatdata} = siteConfig;
     const statusCode = context.response?.status;
@@ -185,7 +250,7 @@ var SiteGenerator = class {
       await Promise.all(dispatchRequests);
     } else {
       const body = context.fs?.body;
-      import_shared_utils.logger.warn(`Failed to fetch ${url}: (${statusCode}) ${body}`);
+      import_shared_utils.logger.warn(`[SSG] Failed to fetch ${url}: (${statusCode}) ${body}`);
     }
   }
   async handleHtmlResource(url, context, siteConfig, dispatcher) {
@@ -251,7 +316,7 @@ var SiteGenerator = class {
             siteConfig.viewConfigPath = this.getResourcePathFromUrl(siteConfig, resourceUri);
           }
         } else {
-          import_shared_utils.logger.warn("Skipped inline bootstrap resource: %j", resource);
+          import_shared_utils.logger.warn("[SSG] Skipped inline bootstrap resource: %j", resource);
         }
       }
     }
@@ -261,7 +326,7 @@ var SiteGenerator = class {
       if (resourceUri.startsWith("/")) {
         dispatchRequests.push(this.dispatchResourceRecursive(resourceUri, dispatcher, {resourceType: "resource"}, siteConfig));
       } else {
-        import_shared_utils.logger.warn("Skipped resource: %j", resource);
+        import_shared_utils.logger.warn("[SSG] Skipped resource: %j", resource);
       }
     }
     await Promise.all(dispatchRequests);
@@ -277,7 +342,7 @@ var SiteGenerator = class {
           const mappingURL = siteConfig.endpoints?.uris?.mapping + encodeURIComponent(jsUri);
           await this.dispatchResourceRecursive(mappingURL, dispatcher, {resourceType: "mapping"}, siteConfig);
         } else {
-          import_shared_utils.logger.warn('Unable to fetch mapping for bare specifier or variable dynamic import: "' + jsUri + '"');
+          import_shared_utils.logger.warn('[SSG] Unable to fetch mapping for bare specifier or variable dynamic import: "' + jsUri + '"');
         }
       } else if (isAdditionalModulesRequest) {
         const uri = `${siteConfig.endpoints?.uris.legacyDefault}${encodeURIComponent(jsUri)}`;
@@ -289,12 +354,17 @@ var SiteGenerator = class {
     const metadata = context.fs?.metadata;
     const fullPath = this.getResourcePathFromUrl(siteConfig, url);
     await (0, import_stream.writeResponse)(context, fullPath);
+    if (metadata?.resource) {
+      this.addResourceToSiteMetadata(metadata?.resource, url, siteConfig);
+    } else if (metadata?.asset) {
+      this.addAssetToSiteMetadata(metadata?.asset, url, siteConfig);
+    }
     const assetReferences = metadata?.asset?.metadata?.assetReferences || [];
     const dispatchRequests = [];
     for (const ref of assetReferences) {
       const refUrl = ref.override?.uri || ref.url;
       dispatchRequests.push(this.dispatchResourceRecursive(refUrl, dispatcher, {resourceType: "asset", asset: metadata?.asset}, siteConfig).catch((err) => {
-        import_shared_utils.logger.warn(`Failed to fetch asset reference => ${refUrl} from ${url}`, err);
+        import_shared_utils.logger.warn(`[SSG] Failed to fetch asset reference => ${refUrl} from ${url}`, err);
       }));
     }
     return Promise.all(dispatchRequests);
@@ -331,10 +401,10 @@ var SiteGenerator = class {
         if (assetSrcDir && import_fs_extra.default.existsSync(assetSrcDir)) {
           import_fs_extra.default.copySync(assetSrcDir, assetOutputDir);
         } else {
-          import_shared_utils.logger.warn("Could not find assets to copy at path: " + assetSrcDir);
+          import_shared_utils.logger.warn("[SSG] Could not find assets to copy at path: " + assetSrcDir);
         }
       } catch (e) {
-        import_shared_utils.logger.error("Error occurred processing asset config: " + JSON.stringify(asset), e);
+        import_shared_utils.logger.error("[SSG] Error occurred processing asset config: " + JSON.stringify(asset), e);
       }
     }
   }
@@ -354,13 +424,20 @@ var SiteGenerator = class {
       urlRewriteMap,
       endpoints,
       skipBaseDocumentGeneration,
-      ...featureFlags
+      ...featureFlags,
+      siteMetadata: new import_shared_utils.SiteMetadataImpl({rootDir: outputDir, runtimeEnvironment})
     };
   }
   filterFeatureFlags() {
     const ffs = (0, import_shared_utils.getFeatureFlags)();
-    if (ffs.LEGACY_LOADER) {
-      return {featureFlags: {LEGACY_LOADER: true, SSR_STATIC_BUNDLES: ffs.SSR_STATIC_BUNDLES}};
+    if (ffs && Object.keys(ffs).length) {
+      const accumlator = {};
+      for (const [key, value] of Object.entries(ffs)) {
+        if (value) {
+          accumlator[key] = true;
+        }
+      }
+      return {featureFlags: accumlator};
     } else {
       return void 0;
     }
@@ -397,6 +474,10 @@ ${mergeIndex}
       });
     }
   }
+  async captureAdditionalRouteMetadata(siteConfig) {
+    this.addAdditionalImportMetadataToViewConfig(siteConfig);
+    await siteConfig.siteMetadata?.persistSiteMetadata();
+  }
 };
 var static_generation_default = SiteGenerator;
 var ViewImportMetadataImpl = class {

package/build/es/context/provider.js

@@ -1,11 +1,10 @@
 import { deepFreeze } from '@lwrjs/shared-utils';
 export function createProviderContext(serverContext) {
     // This is a subset of config to user-land code
-    const { cacheDir, lwc: { modules = [] }, routes, errorRoutes, rootDir, contentDir, layoutsDir, locker, amdLoader, esmLoader, environment, basePath, } = serverContext.appConfig;
+    const { cacheDir, lwc: { modules = [] }, routes, errorRoutes, rootDir, contentDir, layoutsDir, locker, amdLoader, esmLoader, environment, basePath, bundleConfig, } = serverContext.appConfig;
     const { onModuleDefinitionChange, onModuleSourceChange } = serverContext.appObserver;
     const { notifyModuleDefinitionChanged, notifyModuleSourceChanged, notifyViewSourceChanged, notifyAssetSourceChanged, } = serverContext.appEmitter;
     return {
-        compiler: serverContext.compiler,
         appObserver: deepFreeze({ onModuleDefinitionChange, onModuleSourceChange }),
         appEmitter: {
             notifyModuleDefinitionChanged: (payload) => notifyModuleDefinitionChanged.call(serverContext.appEmitter, payload),
@@ -31,8 +30,10 @@ export function createProviderContext(serverContext) {
             amdLoader,
             esmLoader,
             environment,
+            bundleConfig,
         }),
         runtimeEnvironment: deepFreeze(serverContext.runtimeEnvironment),
+        watcherFactory: serverContext.watcherFactory,
     };
 }
 //# sourceMappingURL=provider.js.map