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

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),
@@ -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(),
@@ -75,7 +75,8 @@ function createProviderContext(serverContext) {
       locker,
       amdLoader,
       esmLoader,
-      environment
+      environment,
+      bundleConfig
     }),
     runtimeEnvironment: (0, import_shared_utils.deepFreeze)(serverContext.runtimeEnvironment),
     watcherFactory: serverContext.watcherFactory

package/build/cjs/context/server.cjs

@@ -27,7 +27,6 @@ __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"));
@@ -37,19 +36,17 @@ 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,
@@ -63,7 +60,6 @@ function createServerContext(appConfig, runtimeEnvironment, globalData) {
   }, appConfig);
   const watcherFactory = new import_fs_watch.WatcherFactoryImpl();
   return {
-    compiler,
     appObserver,
     appEmitter,
     moduleRegistry,

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
 });
@@ -45,7 +44,6 @@ 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, routes, errorRoutes) {
   app.useCompression();
   (0, import_locale_middleware.localeMiddleware)(app, serverContext);
@@ -66,18 +64,20 @@ function createServices(entries, 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 {moduleRegistry, resourceRegistry, viewRegistry, assetRegistry, moduleBundler} = serverContext;
   const moduleProviders = createServices(services.moduleProviders, providerContext);
   moduleRegistry.addModuleProviders(moduleProviders);
-  const resourceProviders = await createServices(services.resourceProviders, providerContext);
+  const bundleProviders = createServices(services.bundleProviders, providerContext);
+  moduleBundler.addBundleProviders(bundleProviders);
+  const resourceProviders = createServices(services.resourceProviders, providerContext);
   resourceRegistry.addResourceProviders(resourceProviders);
-  const viewProviders = await createServices(services.viewProviders, providerContext);
-  const viewTransformers = await createServices(services.viewTransformers, providerContext);
+  const viewProviders = createServices(services.viewProviders, providerContext);
+  const viewTransformers = createServices(services.viewTransformers, providerContext);
   viewRegistry.addViewProviders(viewProviders);
   viewRegistry.addViewTransformers(viewTransformers);
   await viewRegistry.initializeViewProviders();
-  const assetProviders = await createServices(services.assetProviders, providerContext);
-  const assetTransformers = await createServices(services.assetTransformers, providerContext);
+  const assetProviders = createServices(services.assetProviders, providerContext);
+  const assetTransformers = createServices(services.assetTransformers, providerContext);
   assetRegistry.addAssetProviders(assetProviders);
   assetRegistry.addAssetTransformers(assetTransformers);
   return serverContext;

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/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])});
     }
@@ -47,10 +47,10 @@ var SiteGenerator = class {
     }
     const outputDir = (0, import_path.join)(rootDir, staticSiteGenerator.outputDir);
     if (!staticSiteGenerator.skipCleanOutputDir) {
-      import_shared_utils.logger.info(`Clearing output directory: ${outputDir}`);
+      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(`Reusing existing output directory: ${outputDir}`);
+      import_shared_utils.logger.info(`[SSG] Reusing existing output directory: ${outputDir}`);
     }
     const urlRewriteMap = new Map();
     const {basePath} = config;
@@ -60,7 +60,7 @@ var SiteGenerator = class {
     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) {
@@ -82,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);
   }
@@ -107,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;
@@ -157,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) {
@@ -164,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;
@@ -182,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) {
@@ -248,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);
         }
       }
     }
@@ -258,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);
@@ -274,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)}`;
@@ -286,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);
@@ -328,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);
       }
     }
   }
@@ -351,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;
     }
@@ -394,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),
@@ -14,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(),
@@ -31,6 +30,7 @@ export function createProviderContext(serverContext) {
             amdLoader,
             esmLoader,
             environment,
+            bundleConfig,
         }),
         runtimeEnvironment: deepFreeze(serverContext.runtimeEnvironment),
         watcherFactory: serverContext.watcherFactory,

package/build/es/context/server.js

@@ -1,5 +1,4 @@
 import { LwrAssetRegistry } from '@lwrjs/asset-registry';
-import { LwrCompiler } from '@lwrjs/compiler';
 import { LwrModuleBundler } from '@lwrjs/module-bundler';
 import { LwrModuleRegistry } from '@lwrjs/module-registry';
 import { LwrResourceRegistry } from '@lwrjs/resource-registry';
@@ -10,19 +9,17 @@ import { WatcherFactoryImpl } from '@lwrjs/shared-utils/fs-watch';
 export function createServerContext(appConfig, runtimeEnvironment, globalData) {
     const appObserver = new LwrApplicationObserver();
     const appEmitter = appObserver.createLwrEmitter();
-    const compiler = new LwrCompiler();
     const assetRegistry = new LwrAssetRegistry({
         appObserver,
         appEmitter,
         runtimeEnvironment,
     }, appConfig);
     const moduleRegistry = new LwrModuleRegistry({
-        compiler,
         appObserver,
         appEmitter,
         runtimeEnvironment,
     }, appConfig);
-    const moduleBundler = new LwrModuleBundler({ compiler, moduleRegistry, appObserver }, appConfig);
+    const moduleBundler = new LwrModuleBundler({ moduleRegistry, appObserver }, appConfig);
     const resourceRegistry = new LwrResourceRegistry();
     const viewRegistry = new LwrViewRegistry({
         moduleRegistry,
@@ -36,7 +33,6 @@ export function createServerContext(appConfig, runtimeEnvironment, globalData) {
     }, appConfig);
     const watcherFactory = new WatcherFactoryImpl();
     return {
-        compiler,
         appObserver,
         appEmitter,
         moduleRegistry,

package/build/es/index.d.ts

@@ -21,5 +21,4 @@ export declare class LwrApp {
 }
 export declare function createServer(config?: LwrGlobalConfig): LwrApp;
 export declare function generateStaticSite(config?: LwrGlobalConfig): Promise<NormalizedLwrGlobalConfig>;
-export { buildServer } from './tools/server-build.js';
 //# sourceMappingURL=index.d.ts.map

package/build/es/index.js

@@ -40,23 +40,26 @@ async function initContext(appConfig, runtimeEnvironment, globalData, services)
     // Initialized PRIVATE server-side context, passed to middleware
     const serverContext = createServerContext(appConfig, runtimeEnvironment, globalData);
     const providerContext = createProviderContext(serverContext);
-    const { moduleRegistry, resourceRegistry, viewRegistry, assetRegistry } = serverContext;
+    const { moduleRegistry, resourceRegistry, viewRegistry, assetRegistry, moduleBundler } = serverContext;
     // Module Providers
     const moduleProviders = createServices(services.moduleProviders, providerContext);
     moduleRegistry.addModuleProviders(moduleProviders);
+    // Bundle Providers
+    const bundleProviders = createServices(services.bundleProviders, providerContext);
+    moduleBundler.addBundleProviders(bundleProviders);
     // Resource Providers
-    const resourceProviders = await createServices(services.resourceProviders, providerContext);
+    const resourceProviders = createServices(services.resourceProviders, providerContext);
     resourceRegistry.addResourceProviders(resourceProviders);
     // View Providers
-    const viewProviders = await createServices(services.viewProviders, providerContext);
+    const viewProviders = createServices(services.viewProviders, providerContext);
     // View Transformers
-    const viewTransformers = await createServices(services.viewTransformers, providerContext);
+    const viewTransformers = createServices(services.viewTransformers, providerContext);
     viewRegistry.addViewProviders(viewProviders);
     viewRegistry.addViewTransformers(viewTransformers);
     await viewRegistry.initializeViewProviders();
     // Asset Providers
-    const assetProviders = await createServices(services.assetProviders, providerContext);
-    const assetTransformers = await createServices(services.assetTransformers, providerContext);
+    const assetProviders = createServices(services.assetProviders, providerContext);
+    const assetTransformers = createServices(services.assetTransformers, providerContext);
     assetRegistry.addAssetProviders(assetProviders);
     assetRegistry.addAssetTransformers(assetTransformers);
     return serverContext;
@@ -168,7 +171,6 @@ export async function generateStaticSite(config) {
     await new SiteGenerator().buildStaticApplication(lwrApp.getConfig(), dispatcher);
     return lwrApp.getConfig();
 }
-export { buildServer } from './tools/server-build.js';
 /**
  * Create normalized config for static generation forcing the app config to come as src
  */

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

@@ -7,7 +7,7 @@ import { createUnsignedModuleRedirect } from './redirects/unsigned-module-redire
 import { handleErrors } from './utils/error-handling.js';
 function createBundleMiddleware(context) {
     const { moduleRegistry, moduleBundler } = context;
-    const unsignedRedirect = createUnsignedModuleRedirect(moduleRegistry);
+    const unsignedRedirect = createUnsignedModuleRedirect(moduleRegistry, moduleBundler);
     return async (req, res) => {
         if (!req.validateEnvironmentRequest(context.appConfig)) {
             res.status(400);
@@ -33,7 +33,7 @@ function createBundleMiddleware(context) {
         if (req.isSiteGeneration()) {
             res.setSiteGenerationMetadata({
                 moduleDefinition: bundleDefinition,
-                resolvedUris: await normalizeResolvedUris(bundleDefinition, runtimeEnvironment, runtimeParams, moduleRegistry),
+                resolvedUris: await normalizeResolvedUris(bundleDefinition, runtimeEnvironment, runtimeParams, moduleBundler, moduleRegistry),
             });
         }
         if (signature !== LATEST_SIGNATURE) {

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);
+    const unsignedRedirect = createUnsignedModuleRedirect(moduleRegistry, 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,5 @@
-import type { AbstractModuleId, MiddlewareRequest, MiddlewareResponse, ModuleRegistry, RuntimeEnvironment, RuntimeParams } from '@lwrjs/types';
+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): UnsignedRedirect;
+export declare function createUnsignedModuleRedirect(moduleRegistry: ModuleRegistry, defRegistry: ModuleRegistry | ModuleBundler): UnsignedRedirect;
 export {};
 //# sourceMappingURL=unsigned-module-redirect.d.ts.map

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

@@ -1,8 +1,8 @@
-export function createUnsignedModuleRedirect(moduleRegistry) {
+export 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/es/middleware/utils/metadata.d.ts

@@ -1,3 +1,3 @@
-import { BundleDefinition, ModuleRegistry, RuntimeEnvironment, RuntimeParams } from '@lwrjs/types';
-export declare function normalizeResolvedUris(bundleDefinition: BundleDefinition, runtimeEnvironment: RuntimeEnvironment, runtimeParams: RuntimeParams, moduleRegistry: ModuleRegistry): Promise<string[]>;
+import type { BundleDefinition, ModuleBundler, ModuleRegistry, RuntimeEnvironment, RuntimeParams } from '@lwrjs/types';
+export declare function normalizeResolvedUris(bundleDefinition: BundleDefinition, runtimeEnvironment: RuntimeEnvironment, runtimeParams: RuntimeParams, moduleBundler: ModuleBundler, moduleRegistry: ModuleRegistry): Promise<string[]>;
 //# sourceMappingURL=metadata.d.ts.map

package/build/es/middleware/utils/metadata.js

@@ -1,25 +1,21 @@
 import { getVersionedModuleId } from '@lwrjs/shared-utils';
-export async function normalizeResolvedUris(bundleDefinition, runtimeEnvironment, runtimeParams, moduleRegistry) {
+export async function normalizeResolvedUris(bundleDefinition, runtimeEnvironment, runtimeParams, moduleBundler, moduleRegistry) {
     const resolvedUris = [];
     // TODO might be able to remove this in the future but not sure how to properly send
     // back bundleRecord imports with absolute uris (lwc is the main one)
     if (bundleDefinition.bundleRecord.imports) {
         for (const theImport of bundleDefinition.bundleRecord.imports) {
             const childSpecifier = theImport.specifier;
-            // eslint-disable-next-line no-await-in-loop
             const id = await getVersionedModuleId(childSpecifier, moduleRegistry);
-            // eslint-disable-next-line no-await-in-loop
-            const uri = await moduleRegistry.resolveModuleUri(id, runtimeEnvironment, runtimeParams);
+            const uri = await moduleBundler.resolveModuleUri(id, runtimeEnvironment, runtimeParams);
             resolvedUris.push(uri);
         }
     }
     if (bundleDefinition.bundleRecord.dynamicImports) {
         for (const theImport of bundleDefinition.bundleRecord.dynamicImports) {
             const childSpecifier = theImport.specifier;
-            // eslint-disable-next-line no-await-in-loop
             const id = await getVersionedModuleId(childSpecifier, moduleRegistry);
-            // eslint-disable-next-line no-await-in-loop
-            const uri = await moduleRegistry.resolveModuleUri(id, runtimeEnvironment, runtimeParams);
+            const uri = await moduleBundler.resolveModuleUri(id, runtimeEnvironment, runtimeParams);
             resolvedUris.push(uri);
         }
     }