@lwrjs/core 0.9.9-alpha.8 → 0.10.0-alpha.1

package/build/cjs/context/provider.cjs

@@ -29,6 +29,7 @@ __export(exports, {
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 function createProviderContext(serverContext) {
   const {
+    assets,
     cacheDir,
     lwc: {modules = []},
     routes,
@@ -40,7 +41,8 @@ function createProviderContext(serverContext) {
     amdLoader,
     esmLoader,
     environment,
-    basePath
+    basePath,
+    bundleConfig
   } = serverContext.appConfig;
   const {onModuleDefinitionChange, onModuleSourceChange} = serverContext.appObserver;
   const {
@@ -50,7 +52,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,11 +60,12 @@ 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(),
     config: (0, import_shared_utils.deepFreeze)({
+      assets,
       cacheDir,
       modules,
       routes,
@@ -75,8 +77,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,
@@ -69,7 +67,9 @@ function createServerContext(appConfig, runtimeEnvironment, globalData) {
     resourceRegistry,
     assetRegistry,
     viewRegistry,
+    watcherFactory,
     appConfig,
-    runtimeEnvironment
+    runtimeEnvironment,
+    routeHandlers: {}
   };
 }

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,71 +32,97 @@ 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_locale_middleware = __toModule(require("./middlewares/locale-middleware.cjs"));
-var import_api_middleware = __toModule(require("./middlewares/api-middleware.cjs"));
-var import_ui_middleware = __toModule(require("./middlewares/ui-middleware.cjs"));
-var import_hmr_middleware = __toModule(require("./middlewares/hmr-middleware.cjs"));
-var import_base_middleware = __toModule(require("./middlewares/base-middleware.cjs"));
-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_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_server_build = __toModule(require("./tools/server-build.cjs"));
-function initMiddlewares(app, server, serverContext) {
-  (0, import_base_middleware.default)(app, serverContext);
-  (0, import_locale_middleware.default)(app, serverContext);
-  (0, import_api_middleware.default)(app, serverContext);
-  (0, import_ui_middleware.default)(app, serverContext);
+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"));
+var import_mapping_middleware = __toModule(require("./middleware/mapping-middleware.cjs"));
+var import_asset_middleware = __toModule(require("./middleware/asset-middleware.cjs"));
+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"));
+function initMiddleware(app, server, serverContext) {
+  app.useCompression();
+  (0, import_locale_middleware.localeMiddleware)(app, serverContext);
+  (0, import_module_middleware.moduleMiddleware)(app, serverContext);
+  (0, import_bundle_middleware.bundleMiddleware)(app, 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);
+  app.initRoutes();
   if (serverContext.runtimeEnvironment.hmrEnabled) {
-    (0, import_hmr_middleware.default)(server, serverContext);
+    (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) {
+  const hooks = await (0, import_modules.loadHooks)(appConfig);
+  if (hooks.length) {
+    const skipValidation = true;
+    await (0, import_config.executeConfigHooks)(hooks, appConfig, runtimeEnvironment, globalData, skipValidation);
+    (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} = serverContext;
-  const moduleProviders = await (0, import_services.getServices)(appConfig.moduleProviders, providerContext, appConfig);
+  const {moduleRegistry, assetRegistry, resourceRegistry, viewRegistry, moduleBundler} = serverContext;
+  const moduleProviders = createServices(services.moduleProviders, providerContext);
+  const assetProviders = createServices(services.assetProviders, providerContext);
+  const assetTransformers = createServices(services.assetTransformers, providerContext);
+  const resourceProviders = createServices(services.resourceProviders, providerContext);
+  const viewProviders = createServices(services.viewProviders, providerContext);
+  const viewTransformers = createServices(services.viewTransformers, providerContext);
+  const bundleProviders = createServices(services.bundleProviders, providerContext);
   moduleRegistry.addModuleProviders(moduleProviders);
-  const resourceProviders = await (0, import_services.getServices)(appConfig.resourceProviders, providerContext, appConfig);
+  assetRegistry.addAssetProviders(assetProviders);
+  assetRegistry.addAssetTransformers(assetTransformers);
   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);
   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);
-  assetRegistry.addAssetProviders(assetProviders);
-  assetRegistry.addAssetTransformers(assetTransformers);
+  moduleBundler.addBundleProviders(bundleProviders);
+  await serverContext.viewRegistry.initializeViewProviders();
+  const routeHandlers = await (0, import_modules.loadRouteHandlers)(appConfig);
+  serverContext.routeHandlers = routeHandlers;
   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;
   }
   async init() {
-    if (!this.initialized) {
-      this.initialized = true;
-      try {
-        const context = await initContext(this.app, this.server, this.config);
-        initMiddlewares(this.app, this.server, context);
-      } catch (e) {
-        this.initialized = false;
-        throw e;
-      }
+    if (this.initialized) {
+      return;
+    }
+    this.initialized = true;
+    try {
+      const context = await initContext(this.config, this.runtimeEnvironment, this.globalData);
+      initMiddleware(this.app, this.server, context);
+    } catch (e) {
+      this.initialized = false;
+      throw e;
     }
   }
   async listen(callback) {

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

@@ -0,0 +1,70 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, {get: all[name], enumerable: true});
+};
+var __exportStar = (target, module2, desc) => {
+  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
+    for (let key of __getOwnPropNames(module2))
+      if (!__hasOwnProp.call(target, key) && key !== "default")
+        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
+  }
+  return target;
+};
+var __toModule = (module2) => {
+  return __exportStar(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
+};
+
+// packages/@lwrjs/core/src/middleware/asset-middleware.ts
+__markAsModule(exports);
+__export(exports, {
+  assetMiddleware: () => assetMiddleware
+});
+var import_path = __toModule(require("path"));
+var import_identity = __toModule(require("./utils/identity.cjs"));
+var import_error_handling = __toModule(require("./utils/error-handling.cjs"));
+function createAssetMiddleware(context) {
+  const {
+    assetRegistry,
+    runtimeEnvironment: {basePath}
+  } = context;
+  return async (req, res) => {
+    const {runtimeEnvironment} = req.getRuntimeContext(context.runtimeEnvironment);
+    const {assetId, immutable, signature} = (0, import_identity.getAssetIdentity)(req);
+    if (basePath && !assetId.specifier.startsWith(basePath)) {
+      assetId.specifier = import_path.default.join(basePath, assetId.specifier);
+    }
+    const assetUri = await assetRegistry.resolveAssetUri(assetId, runtimeEnvironment);
+    if (assetUri.external) {
+      res.set({
+        Location: assetUri.uri,
+        "cache-control": "public, max-age=60"
+      });
+      res.sendStatus(302);
+      return;
+    }
+    const asset = await assetRegistry.getAsset({...assetId, signature}, runtimeEnvironment, req.isSiteGeneration());
+    if (req.isSiteGeneration()) {
+      res.setSiteGenerationMetadata({asset});
+    }
+    if (asset.mime) {
+      res.type(asset.mime);
+    }
+    if (runtimeEnvironment.immutableAssets && immutable) {
+      res.setHeader("Cache-control", "public, max-age=12895706, immutable");
+    } else if (runtimeEnvironment.immutableAssets) {
+      res.setHeader("Cache-control", "public, max-age=60");
+    }
+    res.status(200).stream(asset.stream());
+  };
+}
+function assetMiddleware(app, context) {
+  const paths = context.appConfig.assets.map((a) => a.urlPath + app.getRegexWildcard());
+  app.get([...paths, "/:apiVersion/:assetType/:immutable?/s/:signature/" + app.getRegexWildcard()], (0, import_error_handling.handleErrors)(createAssetMiddleware(context)));
+}

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

@@ -0,0 +1,113 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, {get: all[name], enumerable: true});
+};
+var __exportStar = (target, module2, desc) => {
+  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
+    for (let key of __getOwnPropNames(module2))
+      if (!__hasOwnProp.call(target, key) && key !== "default")
+        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
+  }
+  return target;
+};
+var __toModule = (module2) => {
+  return __exportStar(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
+};
+
+// packages/@lwrjs/core/src/middleware/bundle-middleware.ts
+__markAsModule(exports);
+__export(exports, {
+  bundleMiddleware: () => bundleMiddleware
+});
+var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
+var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
+var import_request = __toModule(require("./utils/request.cjs"));
+var import_identity = __toModule(require("./utils/identity.cjs"));
+var import_metadata = __toModule(require("./utils/metadata.cjs"));
+var import_unsigned_module_redirect = __toModule(require("./redirects/unsigned-module-redirect.cjs"));
+var import_error_handling = __toModule(require("./utils/error-handling.cjs"));
+function createBundleMiddleware(context) {
+  const {moduleRegistry, moduleBundler} = context;
+  const unsignedBundleRedirect = (0, import_unsigned_module_redirect.createUnsignedBundleRedirect)(moduleBundler);
+  return async (req, res) => {
+    if (!req.validateEnvironmentRequest(context.appConfig)) {
+      res.status(400);
+      res.send(import_diagnostics.descriptions.UNRESOLVABLE.INVALID_ENVIRONMENT(req.params.environment).message);
+      return;
+    }
+    if (!req.validateJsonRequest()) {
+      res.status(400);
+      res.send(import_diagnostics.descriptions.UNRESOLVABLE.INVALID_JSON().message);
+      return;
+    }
+    const {runtimeEnvironment, runtimeParams} = req.getRuntimeContext(context.runtimeEnvironment);
+    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 unsignedBundleRedirect(req, res, moduleId, runtimeEnvironment, runtimeParams);
+      return;
+    }
+    const sourceMapUrl = req.path.replace("/bundle/", "/sourcemaps/bundle/");
+    const bundleDefinition = await moduleBundler.getModuleBundle(moduleId, {...runtimeEnvironment, bundle: true, sourceMapUrl}, runtimeParams);
+    if (req.isSiteGeneration()) {
+      res.setSiteGenerationMetadata({
+        moduleDefinition: bundleDefinition,
+        resolvedUris: await (0, import_metadata.normalizeResolvedUris)(bundleDefinition, runtimeEnvironment, runtimeParams, moduleBundler, moduleRegistry)
+      });
+    }
+    if (signature !== import_shared_utils.LATEST_SIGNATURE) {
+      res.setHeader("Cache-control", "public, max-age=31536000, immutable");
+    }
+    res.status(200).type("application/javascript").send(bundleDefinition.code);
+  };
+}
+function createSourceMapMiddleware(context) {
+  const {moduleBundler} = context;
+  return async (req, res) => {
+    if (!req.validateEnvironmentRequest(context.appConfig)) {
+      res.status(400);
+      res.send(import_diagnostics.descriptions.UNRESOLVABLE.INVALID_ENVIRONMENT(req.params.environment).message);
+      return;
+    }
+    const {runtimeEnvironment} = req.getRuntimeContext(context.runtimeEnvironment);
+    const {moduleId, signature} = (0, import_identity.getModuleIdentity)(req);
+    const bundleDef = await moduleBundler.getModuleBundle(moduleId, runtimeEnvironment);
+    if (signature !== import_shared_utils.LATEST_SIGNATURE) {
+      res.setHeader("Cache-control", "public, max-age=31536000, immutable");
+    }
+    res.status(200).type("application/json").send(bundleDef.map);
+  };
+}
+function bundleMiddleware(app, context) {
+  app.get([
+    `/:apiVersion/bundle/:format/:compat?/l/:locale/e/:environment/bi/:bundleSpecifier/module/mi/:specifier/latest/:prettyUrl?`,
+    `/:apiVersion/bundle/:format/:compat?/l/:locale/e/:environment/bi/:bundleSpecifier/module/mi/:specifier/s/:signature/:prettyUrl?`,
+    `/:apiVersion/bundle/:format/:compat?/l/:locale/bi/:bundleSpecifier/module/mi/:specifier/latest/:prettyUrl?`,
+    `/:apiVersion/bundle/:format/:compat?/l/:locale/bi/:bundleSpecifier/module/mi/:specifier/s/:signature/:prettyUrl?`,
+    `/:apiVersion/bundle/:format/:compat?/e/:environment/bi/:bundleSpecifier/module/mi/:specifier/latest/:prettyUrl?`,
+    `/:apiVersion/bundle/:format/:compat?/e/:environment/bi/:bundleSpecifier/module/mi/:specifier/s/:signature/:prettyUrl?`,
+    `/:apiVersion/bundle/:format/:compat?/bi/:bundleSpecifier/module/mi/:specifier/latest/:prettyUrl?`,
+    `/:apiVersion/bundle/:format/:compat?/bi/:bundleSpecifier/module/mi/:specifier/s/:signature/:prettyUrl?`,
+    `/:apiVersion/bundle/:format/:compat?/l/:locale/e/:environment/bi/:bundleSpecifier/module/mi/:specifier`,
+    `/:apiVersion/bundle/:format/:compat?/l/:locale/bi/:bundleSpecifier/module/mi/:specifier`,
+    `/:apiVersion/bundle/:format/:compat?/e/:environment/bi/:bundleSpecifier/module/mi/:specifier`,
+    `/:apiVersion/bundle/:format/:compat?/bi/:bundleSpecifier/module/mi/:specifier`
+  ], (0, import_error_handling.handleErrors)(createBundleMiddleware(context)));
+  app.get([
+    `/:apiVersion/sourcemaps/bundle/:format/:compat?/l/:locale/e/:environment/bi/:bundleSpecifier/module/mi/:specifier/latest/:prettyUrl?`,
+    `/:apiVersion/sourcemaps/bundle/:format/:compat?/l/:locale/e/:environment/bi/:bundleSpecifier/module/mi/:specifier/s/:signature/:prettyUrl?`,
+    `/:apiVersion/sourcemaps/bundle/:format/:compat?/l/:locale/bi/:bundleSpecifier/module/mi/:specifier/latest/:prettyUrl?`,
+    `/:apiVersion/sourcemaps/bundle/:format/:compat?/l/:locale/bi/:bundleSpecifier/module/mi/:specifier/s/:signature/:prettyUrl?`,
+    `/:apiVersion/sourcemaps/bundle/:format/:compat?/e/:environment/bi/:bundleSpecifier/module/mi/:specifier/latest/:prettyUrl?`,
+    `/:apiVersion/sourcemaps/bundle/:format/:compat?/e/:environment/bi/:bundleSpecifier/module/mi/:specifier/s/:signature/:prettyUrl?`,
+    `/:apiVersion/sourcemaps/bundle/:format/:compat?/bi/:bundleSpecifier/module/mi/:specifier/latest/:prettyUrl?`,
+    `/:apiVersion/sourcemaps/bundle/:format/:compat?/bi/:bundleSpecifier/module/mi/:specifier/s/:signature/:prettyUrl?`
+  ], (0, import_error_handling.handleErrors)(createSourceMapMiddleware(context)));
+}

package/build/cjs/{middlewares → middleware}/hmr-middleware.cjs

@@ -21,14 +21,14 @@ var __toModule = (module2) => {
   return __exportStar(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
 };
 
-// packages/@lwrjs/core/src/middlewares/hmr-middleware.ts
+// packages/@lwrjs/core/src/middleware/hmr-middleware.ts
 __markAsModule(exports);
 __export(exports, {
-  default: () => hmrMiddleware
+  hmrMiddleware: () => hmrMiddleware
 });
 var import_ws = __toModule(require("ws"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
-var import_utils = __toModule(require("./utils.cjs"));
+var import_request = __toModule(require("./utils/request.cjs"));
 var hmr;
 var Hmr = class {
   constructor(server, context) {
@@ -46,7 +46,7 @@ var Hmr = class {
     const connectedClients = new Map();
     this.connectedClients = connectedClients;
     wss.on("connection", function connection(ws, req) {
-      const request = (0, import_utils.getRequestProperties)("/:apiVersion/hmr/:format/:compat", req);
+      const request = (0, import_request.getRequestProperties)("/:apiVersion/hmr/:format/:compat", req);
       if (request) {
         const {params, query} = request;
         const {format, compat} = params;
@@ -86,8 +86,8 @@ var Hmr = class {
       version
     };
     const modulesCacheId = (0, import_shared_utils.getCacheKeyFromJson)({format, compat, debug});
-    const newUri = moduleRegistry.resolveModuleUri(moduleId, runtimeEnvironment, runtimeParams, signature);
-    const oldUri = moduleRegistry.resolveModuleUri(moduleId, runtimeEnvironment, runtimeParams, "latest");
+    const newUri = moduleRegistry.resolveModuleUriSync(moduleId, signature, runtimeEnvironment, runtimeParams);
+    const oldUri = moduleRegistry.resolveModuleUriSync(moduleId, "latest", runtimeEnvironment, runtimeParams);
     if (this.connectedClients) {
       for (const [ws, cacheId] of this.connectedClients) {
         if (cacheId === modulesCacheId) {

package/build/cjs/{middlewares → middleware}/locale-middleware.cjs

@@ -5,10 +5,10 @@ var __export = (target, all) => {
     __defProp(target, name, {get: all[name], enumerable: true});
 };
 
-// packages/@lwrjs/core/src/middlewares/locale-middleware.ts
+// packages/@lwrjs/core/src/middleware/locale-middleware.ts
 __markAsModule(exports);
 __export(exports, {
-  default: () => localeMiddleware
+  localeMiddleware: () => localeMiddleware
 });
 function localeMiddleware(app, context) {
   const {defaultLocale} = context.runtimeEnvironment;

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

@@ -0,0 +1,61 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, {get: all[name], enumerable: true});
+};
+var __exportStar = (target, module2, desc) => {
+  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
+    for (let key of __getOwnPropNames(module2))
+      if (!__hasOwnProp.call(target, key) && key !== "default")
+        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
+  }
+  return target;
+};
+var __toModule = (module2) => {
+  return __exportStar(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
+};
+
+// packages/@lwrjs/core/src/middleware/mapping-middleware.ts
+__markAsModule(exports);
+__export(exports, {
+  mappingMiddleware: () => mappingMiddleware
+});
+var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
+var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
+var import_identity = __toModule(require("./utils/identity.cjs"));
+var import_error_handling = __toModule(require("./utils/error-handling.cjs"));
+function createMappingMiddleware(context) {
+  const {moduleBundler, moduleRegistry} = context;
+  return async (req, res) => {
+    if (!req.validateEnvironmentRequest(context.appConfig)) {
+      res.status(400);
+      res.send(import_diagnostics.descriptions.UNRESOLVABLE.INVALID_ENVIRONMENT(req.params.environment).message);
+      return;
+    }
+    const {runtimeEnvironment, runtimeParams} = req.getRuntimeContext(context.runtimeEnvironment);
+    const {moduleIds} = (0, import_identity.getMappingIdentity)(req);
+    const importMetadata = await (0, import_shared_utils.getImportMetadataMappings)(moduleIds, runtimeEnvironment, runtimeParams, moduleRegistry, moduleBundler);
+    if (req.isSiteGeneration()) {
+      res.setSiteGenerationMetadata({importMetadata});
+    }
+    res.status(200).type("application/json").send(importMetadata);
+  };
+}
+function mappingMiddleware(app, context) {
+  app.get([
+    `/:apiVersion/mapping/:format/:compat/l/:locale/e/:environment/bi/:bundleSpecifier/mp/:specifiers`,
+    `/:apiVersion/mapping/:format/:compat/l/:locale/e/:environment/mp/:specifiers`,
+    `/:apiVersion/mapping/:format/:compat/l/:locale/bi/:bundleSpecifier/mp/:specifiers`,
+    `/:apiVersion/mapping/:format/:compat/e/:environment/bi/:bundleSpecifier/mp/:specifiers`,
+    `/:apiVersion/mapping/:format/:compat/l/:locale/mp/:specifiers`,
+    `/:apiVersion/mapping/:format/:compat/e/:environment/mp/:specifiers`,
+    `/:apiVersion/mapping/:format/:compat/bi/:bundleSpecifier/mp/:specifiers`,
+    `/:apiVersion/mapping/:format/:compat/mp/:specifiers`
+  ], (0, import_error_handling.handleErrors)(createMappingMiddleware(context)));
+}

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

@@ -0,0 +1,88 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, {get: all[name], enumerable: true});
+};
+var __exportStar = (target, module2, desc) => {
+  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
+    for (let key of __getOwnPropNames(module2))
+      if (!__hasOwnProp.call(target, key) && key !== "default")
+        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
+  }
+  return target;
+};
+var __toModule = (module2) => {
+  return __exportStar(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
+};
+
+// packages/@lwrjs/core/src/middleware/module-middleware.ts
+__markAsModule(exports);
+__export(exports, {
+  moduleMiddleware: () => moduleMiddleware
+});
+var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
+var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
+var import_request = __toModule(require("./utils/request.cjs"));
+var import_identity = __toModule(require("./utils/identity.cjs"));
+var import_unsigned_module_redirect = __toModule(require("./redirects/unsigned-module-redirect.cjs"));
+var import_error_handling = __toModule(require("./utils/error-handling.cjs"));
+function createModuleMiddleware(context) {
+  const {moduleRegistry} = context;
+  const unsignedRedirect = (0, import_unsigned_module_redirect.createUnsignedModuleRedirect)(moduleRegistry);
+  return async (req, res) => {
+    if (!req.validateEnvironmentRequest(context.appConfig)) {
+      res.status(400);
+      res.send(import_diagnostics.descriptions.UNRESOLVABLE.INVALID_ENVIRONMENT(req.params.environment).message);
+      return;
+    }
+    if (!req.validateJsonRequest()) {
+      res.status(400);
+      res.send(import_diagnostics.descriptions.UNRESOLVABLE.INVALID_JSON().message);
+      return;
+    }
+    const {runtimeEnvironment, runtimeParams} = req.getRuntimeContext(context.runtimeEnvironment);
+    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);
+      return;
+    }
+    const moduleDefinition = await moduleRegistry.getLinkedModule(moduleId, {...runtimeEnvironment, bundle: false}, runtimeParams);
+    const {ownHash, linkedSource} = moduleDefinition;
+    if (signature !== import_shared_utils.LATEST_SIGNATURE && ownHash !== signature) {
+      res.status(404).send(import_diagnostics.descriptions.UNRESOLVABLE.SIGNED_MODULE(moduleId.specifier, signature).message);
+      return;
+    }
+    if (req.isSiteGeneration()) {
+      res.setSiteGenerationMetadata({moduleDefinition});
+    }
+    if (req.isJsonRequest()) {
+      const json = await (0, import_shared_utils.serializeModuleToJson)(linkedSource, moduleDefinition, moduleRegistry, runtimeParams);
+      res.status(200).type("application/json").send(json);
+      return;
+    }
+    res.status(200).type("application/javascript").send(linkedSource);
+  };
+}
+function moduleMiddleware(app, context) {
+  app.get([
+    `/:apiVersion/module/:format/:compat/l/:locale/e/:environment/mi/:specifier/latest/:prettyUrl?`,
+    `/:apiVersion/module/:format/:compat/l/:locale/e/:environment/mi/:specifier/s/:signature/:prettyUrl?`,
+    `/:apiVersion/module/:format/:compat/l/:locale/mi/:specifier/latest/:prettyUrl?`,
+    `/:apiVersion/module/:format/:compat/l/:locale/mi/:specifier/s/:signature/:prettyUrl?`,
+    `/:apiVersion/module/:format/:compat/e/:environment/mi/:specifier/latest/:prettyUrl?`,
+    `/:apiVersion/module/:format/:compat/e/:environment/mi/:specifier/s/:signature/:prettyUrl?`,
+    `/:apiVersion/module/:format/:compat/mi/:specifier/latest/:prettyUrl?`,
+    `/:apiVersion/module/:format/:compat/mi/:specifier/s/:signature/:prettyUrl?`,
+    `/:apiVersion/module/:format/:compat/l/:locale/e/:environment/mi/:specifier`,
+    `/:apiVersion/module/:format/:compat/l/:locale/mi/:specifier`,
+    `/:apiVersion/module/:format/:compat/e/:environment/mi/:specifier`,
+    `/:apiVersion/module/:format/:compat/mi/:specifier`
+  ], (0, import_error_handling.handleErrors)(createModuleMiddleware(context)));
+}