@lwrjs/core 0.5.11-alpha.1 → 0.6.0-alpha.10

package/build/cjs/env-config.cjs

@@ -53,6 +53,7 @@ var DEFAULT_LAYOUTS_DIR = "$rootDir/src/layouts";
 var DEFAULT_DATA_DIR = "$rootDir/src/data";
 var DEFAULT_MODULE_PROVIDERS = [
   "@lwrjs/app-service/moduleProvider",
+  "@lwrjs/lwc-ssr/moduleProvider",
   "@lwrjs/lwc-module-provider",
   "@lwrjs/npm-module-provider"
 ];
@@ -63,7 +64,9 @@ var DEFAULT_VIEW_PROVIDERS = [
   "@lwrjs/markdown-view-provider",
   "@lwrjs/base-view-provider"
 ];
+var DEFAULT_VIEW_TRANFORM_PLUGINS = ["@lwrjs/base-view-transformer", "@lwrjs/lwc-ssr/viewTransformer"];
 var DEFAULT_ASSET_PROVIDERS = ["@lwrjs/fs-asset-provider"];
+var DEFAULT_ASSET_TRANFORM_PLUGINS = ["@lwrjs/asset-transformer"];
 var DEFAULT_TEMPLATE_ENGINE = "@lwrjs/base-template-engine";
 var DEFAULT_AMD_LOADER = "lwr/loader";
 var DEFAULT_AMD_LOADER_LEGACY = "lwr/loaderLegacy";
@@ -73,9 +76,11 @@ var DEFAULT_LWR_MODULES = [
   {npm: getLWCEngineSpecifier()},
   {npm: "@lwrjs/client-modules"},
   {npm: "@lwrjs/loader"},
+  {npm: "@lwrjs/o11y"},
   {npm: "@lwrjs/router"},
   {npm: "@lwc/synthetic-shadow"}
 ];
+var DEFAULT_BUNDLE_EXCLUSIONS = ["lwc", "@lwc/synthetic-shadow", "lwr/navigation", "lwr/esmLoader"];
 var DEFAULT_LWR_CONFIG = {
   port: PORT,
   ignoreLwrConfigFile: false,
@@ -85,6 +90,8 @@ var DEFAULT_LWR_CONFIG = {
   serverMode: MODE,
   apiVersion: DEFAULT_API_VERSION,
   assets: DEFAULT_ASSETS_DIR,
+  assetProviders: DEFAULT_ASSET_PROVIDERS,
+  assetTransformers: DEFAULT_ASSET_TRANFORM_PLUGINS,
   contentDir: DEFAULT_CONTENT_DIR,
   layoutsDir: DEFAULT_LAYOUTS_DIR,
   staticSiteGenerator: DEFAULT_GENERATOR_CONFIG,
@@ -94,12 +101,13 @@ var DEFAULT_LWR_CONFIG = {
   moduleProviders: DEFAULT_MODULE_PROVIDERS,
   resourceProviders: DEFAULT_RESOURCE_PROVIDERS,
   viewProviders: DEFAULT_VIEW_PROVIDERS,
+  viewTransformers: DEFAULT_VIEW_TRANFORM_PLUGINS,
   templateEngine: DEFAULT_TEMPLATE_ENGINE,
   environment: {},
   lwc: {modules: []},
   routes: [],
   errorRoutes: [],
-  bundleConfig: {},
+  bundleConfig: {exclude: DEFAULT_BUNDLE_EXCLUSIONS},
   serverType: DEFAULT_SERVER_TYPE,
   locker: import_shared_utils.DEFAULT_LWR_LOCKER_CONFIG
 };
@@ -208,6 +216,15 @@ function mergeLWCConfigs(config1, config2) {
     interchangeableModules: mergedInterchangeableModules.length ? mergedInterchangeableModules : void 0
   };
 }
+function mergeBundleConfig(jsonConfig, config) {
+  const defaultExclusions = DEFAULT_BUNDLE_EXCLUSIONS;
+  const configExclusions = config?.bundleConfig?.exclude || jsonConfig?.bundleConfig?.exclude || [];
+  return {
+    ...jsonConfig?.bundleConfig,
+    ...config?.bundleConfig,
+    exclude: [...new Set([...defaultExclusions, ...configExclusions])]
+  };
+}
 function mergeLockerConfig(jsonConfig, config) {
   const defaultNamespaces = import_shared_utils.DEFAULT_LOCKER_TRUSTED_CMP;
   const configNamespaces = config?.locker?.trustedComponents || jsonConfig?.locker?.trustedComponents || [];
@@ -232,8 +249,16 @@ function normalizeLwcConfig(config) {
     interchangeableModulesMap: config.interchangeableModules ? (0, import_shared_utils.normalizeInterchangeableModuleConfig)(config.interchangeableModules) : void 0
   };
 }
+function trimLwrConfig(config) {
+  Object.keys(config).forEach((k) => {
+    if (config[k] === void 0)
+      delete config[k];
+  });
+  return config;
+}
 function normalizeConfig(config) {
-  if (config) {
+  if (config !== void 0) {
+    config = trimLwrConfig(config);
     (0, import_app_config.validateLwrAppConfig)(JSON.stringify(config), "pre");
   }
   const rootDir = import_path.default.resolve(config?.rootDir || DEFAULT_ROOT_DIR);
@@ -243,6 +268,7 @@ function normalizeConfig(config) {
     ...lwrJsonConfig,
     ...config,
     lwc: normalizeLwcConfig(mergeLWCConfigs(lwrJsonConfig, config)),
+    bundleConfig: mergeBundleConfig(lwrJsonConfig, config),
     locker: mergeLockerConfig(lwrJsonConfig, config),
     rootDir
   };
@@ -264,9 +290,11 @@ function normalizeConfig(config) {
       interchangeableModulesMap: mergedLwrGlobalConfig.lwc.interchangeableModulesMap
     },
     moduleProviders: normalizeServices(mergedLwrGlobalConfig.moduleProviders, rootDir),
-    assetProviders: normalizeServices(DEFAULT_ASSET_PROVIDERS, rootDir),
+    assetProviders: normalizeServices(mergedLwrGlobalConfig.assetProviders, rootDir),
+    assetTransformers: normalizeServices(mergedLwrGlobalConfig.assetTransformers, rootDir),
     resourceProviders: normalizeServices(mergedLwrGlobalConfig.resourceProviders, rootDir),
     viewProviders: normalizeServices(mergedLwrGlobalConfig.viewProviders, rootDir),
+    viewTransformers: normalizeServices(mergedLwrGlobalConfig.viewTransformers, rootDir),
     routes: normalizeRoutes(mergedLwrGlobalConfig.routes, {rootDir, assets, contentDir, layoutsDir}),
     errorRoutes: normalizeRoutes(mergedLwrGlobalConfig.errorRoutes, {
       rootDir,

package/build/cjs/index.cjs

@@ -35,6 +35,7 @@ var import_module_registry = __toModule(require("@lwrjs/module-registry"));
 var import_resource_registry = __toModule(require("@lwrjs/resource-registry"));
 var import_asset_registry = __toModule(require("@lwrjs/asset-registry"));
 var import_view_registry = __toModule(require("@lwrjs/view-registry"));
+var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_env_config = __toModule(require("./env-config.cjs"));
 var import_lwr_app_observer = __toModule(require("./lwr-app-observer.cjs"));
 var import_locale_middleware = __toModule(require("./middlewares/locale-middleware.cjs"));
@@ -77,10 +78,12 @@ async function initContext(app, server, rawLwrConfig) {
   };
   const hookProviders = await getServices(rawLwrConfig.hooks, void 0, rawLwrConfig);
   const {lwrConfig, dataConfig, runtimeConfig} = await (0, import_hooks.runConfigurationsHook)(hookProviders, rawLwrConfig, rawDataConfig, rawRuntimeEnvConfig);
+  const assetTransformers = await getServices(rawLwrConfig.assetTransformers, void 0, rawLwrConfig);
   const appObserver = new import_lwr_app_observer.LwrApplicationObserver();
   const appEmitter = appObserver.createLwrEmitter();
   const compiler = new import_compiler.LwrCompiler();
   const assetRegistry = new import_asset_registry.LwrAssetRegistry({
+    assetTransformers,
     appObserver,
     appEmitter,
     runtimeEnvironment: runtimeConfig
@@ -136,9 +139,9 @@ async function initContext(app, server, rawLwrConfig) {
     notifyViewSourceChanged,
     notifyAssetSourceChanged
   } = appEmitter;
-  const providerContext = (0, import_shared_utils.deepFreeze)({
+  const providerContext = {
     compiler,
-    appObserver: {onModuleDefinitionChange, onModuleSourceChange},
+    appObserver: (0, import_shared_utils.deepFreeze)({onModuleDefinitionChange, onModuleSourceChange}),
     appEmitter: {
       notifyModuleDefinitionChanged: (payload) => notifyModuleDefinitionChanged.call(appEmitter, payload),
       notifyModuleSourceChanged: (payload) => notifyModuleSourceChanged.call(appEmitter, payload),
@@ -146,10 +149,11 @@ async function initContext(app, server, rawLwrConfig) {
       notifyAssetSourceChanged: (payload) => notifyAssetSourceChanged.call(appEmitter, payload)
     },
     moduleRegistry: moduleRegistry.getPublicApi(),
+    moduleBundler,
     resourceRegistry: resourceRegistry.getPublicApi(),
     viewRegistry: viewRegistry.getPublicApi(),
     assetRegistry: assetRegistry.getPublicApi(),
-    config: {
+    config: (0, import_shared_utils.deepFreeze)({
       cacheDir,
       modules,
       routes,
@@ -161,15 +165,17 @@ async function initContext(app, server, rawLwrConfig) {
       amdLoader,
       esmLoader,
       environment
-    },
-    runtimeEnvironment: runtimeConfig
-  });
+    }),
+    runtimeEnvironment: (0, import_shared_utils.deepFreeze)(runtimeConfig)
+  };
   const moduleProviders = await getServices(lwrConfig.moduleProviders, providerContext, lwrConfig);
   moduleRegistry.addModuleProviders(moduleProviders);
   const resourceProviders = await getServices(lwrConfig.resourceProviders, providerContext, lwrConfig);
   resourceRegistry.addResourceProviders(resourceProviders);
   const viewProviders = await getServices(lwrConfig.viewProviders, providerContext, lwrConfig);
+  const viewTransformers = await getServices(rawLwrConfig.viewTransformers, providerContext, rawLwrConfig);
   viewRegistry.addViewProviders(viewProviders);
+  viewRegistry.addViewTransformers(viewTransformers);
   await viewRegistry.initializeViewProviders();
   const assetProviders = await getServices(lwrConfig.assetProviders, providerContext, lwrConfig);
   assetRegistry.addAssetProviders(assetProviders);
@@ -190,9 +196,14 @@ var LwrApp = class {
   }
   async init() {
     if (!this.initialized) {
-      const context = await initContext(this.app, this.server, this.config);
-      initMiddlewares(this.app, this.server, context);
       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;
+      }
     }
   }
   async listen(callback) {
@@ -201,13 +212,19 @@ var LwrApp = class {
     const {serverMode, port} = config;
     server.listen(port || config.port, async () => {
       if (process.env.WARMUP?.toLowerCase() === "true") {
-        await (0, import_server_warmup.warmupServer)(config, app.getInternalRequestKey());
+        try {
+          await (0, import_server_warmup.warmupServer)(config, app.getInternalRequestKey());
+        } catch (err) {
+          throw (0, import_diagnostics.createSingleDiagnosticError)({
+            description: import_diagnostics.descriptions.SERVER.WARMUP_ERROR(err.message)
+          }, import_diagnostics.LwrServerError);
+        }
       }
       callback?.({serverMode, port});
     });
   }
   async close() {
-    await this.server.close();
+    this.server?.close && await this.server.close();
   }
   getInternalServer() {
     return this.app.getImpl();
@@ -220,7 +237,21 @@ async function generateStaticSite(config) {
   config = config || {};
   config.serverType = "fs";
   const lwrApp = createServer(config);
+  overrideConfigAsSrc(lwrApp);
   await lwrApp.init();
   const dispatcher = lwrApp.getInternalServer();
   await new import_static_generation.default().buildStaticApplication(lwrApp.getConfig(), dispatcher);
 }
+function overrideConfigAsSrc(lwrApp) {
+  if ((0, import_shared_utils.getExperimentalFeatures)().ENABLE_FINGERPRINTS) {
+    const normalizedConfig = lwrApp.getConfig();
+    const routes = normalizedConfig.routes || [];
+    for (const route of routes) {
+      route.bootstrap = {
+        ...import_shared_utils.DEFAULT_LWR_BOOTSTRAP_CONFIG,
+        ...route.bootstrap,
+        configAsSrc: true
+      };
+    }
+  }
+}

package/build/cjs/middlewares/api-middleware.cjs

@@ -82,17 +82,17 @@ function apiMiddleware(app, context) {
       const resolvedUris = [];
       if (req.isSiteGeneration()) {
         if (bundleDef.bundleRecord.imports) {
-          for (let index = 0; index < bundleDef.bundleRecord.imports.length; index++) {
-            const theImport = bundleDef.bundleRecord.imports[index];
-            const id = await (0, import_shared_utils.getVersionedModuleId)(theImport.specifier, moduleRegistry);
+          for (const theImport of bundleDef.bundleRecord.imports) {
+            const childSpecifier = theImport.specifier;
+            const id = await (0, import_shared_utils.getVersionedModuleId)(childSpecifier, moduleRegistry);
             const uri = await moduleRegistry.resolveModuleUri(id, runtimeEnvironment, runtimeParams);
             resolvedUris.push(uri);
           }
         }
         if (bundleDef.bundleRecord.dynamicImports) {
-          for (let index = 0; index < bundleDef.bundleRecord.dynamicImports.length; index++) {
-            const theImport = bundleDef.bundleRecord.dynamicImports[index];
-            const id = await (0, import_shared_utils.getVersionedModuleId)(theImport.specifier, moduleRegistry);
+          for (const theImport of bundleDef.bundleRecord.dynamicImports) {
+            const childSpecifier = theImport.specifier;
+            const id = await (0, import_shared_utils.getVersionedModuleId)(childSpecifier, moduleRegistry);
             const uri = await moduleRegistry.resolveModuleUri(id, runtimeEnvironment, runtimeParams);
             resolvedUris.push(uri);
           }
@@ -278,7 +278,8 @@ function apiMiddleware(app, context) {
       ({moduleIds} = (0, import_shared_utils.getMappingIdentity)(req));
       const {runtimeEnvironment, runtimeParams} = requestContext;
       const importMetadata = await (0, import_shared_utils.getImportMetadataMappings)(moduleIds, runtimeEnvironment, runtimeParams, moduleRegistry, moduleBundler);
-      res.type("application/json").send(importMetadata);
+      res.setMetadata({importMetadata});
+      res.status(200).type("application/json").send(importMetadata);
     } catch (e) {
       console.log(e);
       const error = (0, import_utils.createReturnStatus)(`mappings for "${JSON.stringify(moduleIds || req.params?.specifiers)}"`, e);

package/build/cjs/middlewares/ui-middleware.cjs

@@ -30,13 +30,14 @@ var import_ms = __toModule(require("ms"));
 var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_view_registry = __toModule(require("@lwrjs/view-registry"));
 var import_utils = __toModule(require("./utils.cjs"));
+var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 function uiMiddleware(app, context) {
   const {viewRegistry, moduleRegistry, runtimeEnvironment: defaultRuntimeEnvironment} = context;
   const {environment: environmentConfig, routes, errorRoutes} = context.appConfig;
   const route404 = errorRoutes.find((r) => r.status === 404);
   const route500 = errorRoutes.find((r) => r.status === 500);
   const viewHandler = new import_view_registry.LwrViewHandler({viewRegistry, moduleRegistry}, context.appConfig);
-  async function sendResponse(req, res, route, defaultStatus = 200) {
+  async function sendViewResponse(req, res, route, defaultStatus = 200) {
     if (!req.validateJsonRequest()) {
       res.status(400).send({error: "Accept header and json query parameter are incompatible"});
       return;
@@ -81,23 +82,27 @@ function uiMiddleware(app, context) {
         console.error(error);
       }
       if (route500 && defaultStatus !== 500) {
-        await sendResponse(req, res, route500, 500);
+        await sendViewResponse(req, res, route500, 500);
       } else {
         res.status(500).send(`500 - Error retrieving view for route "${route.id}"`);
       }
     }
   }
-  async function sendConfigurationResponse(req, res, route, defaultStatus = 200) {
+  async function sendConfigurationResponse(req, res, defaultStatus = 200) {
     const {runtimeEnvironment, runtimeParams} = req.getRuntimeContext(defaultRuntimeEnvironment);
-    const {originalUrl, path} = req;
-    const {apiVersion, format, appId, locale} = req.params;
-    const rootCfgPath = `/${apiVersion}/application/${format}/l/${locale}/ai/${appId}/configuration/ci`;
-    const url = originalUrl.replace(rootCfgPath, "");
-    const requestPath = path.replace(rootCfgPath, "");
+    const {appId, encodedViewPath} = req.params;
+    const route = routes.find((route2) => route2.id === appId);
+    if (!route) {
+      res.status(404).send({error: `LWR configuration for "${appId} is not available"`});
+      return;
+    }
     try {
+      const url = decodeURIComponent(encodedViewPath);
+      const requestPath = route.path;
+      const params = (0, import_shared_utils.extractRequestParams)(requestPath, url, req.params);
       const viewRequest = {
         url,
-        params: req.params,
+        params,
         query: req.query,
         requestPath
       };
@@ -126,7 +131,7 @@ function uiMiddleware(app, context) {
         console.error(error);
       }
       if (route500 && defaultStatus !== 500) {
-        await sendResponse(req, res, route500, 500);
+        await sendViewResponse(req, res, route500, 500);
       } else {
         res.status(500).send(`500 - Error retrieving route "${route.id}"`);
       }
@@ -135,30 +140,30 @@ function uiMiddleware(app, context) {
   routes.forEach((route) => {
     if (route.method === "post") {
       app.post(route.path, async (req, res) => {
-        await sendResponse(req, res, route);
+        await sendViewResponse(req, res, route);
       });
     } else {
       app.get(route.path, async (req, res) => {
-        await sendResponse(req, res, route);
+        await sendViewResponse(req, res, route);
       });
       app.get([
         `/:apiVersion/application/:format/l/:locale/ai/:appId${route.path}`,
-        `/:apiVersion/application/:format/l/:locale/e/:environment/ai/:appId${route.path}`
+        `/:apiVersion/application/:format/l/:locale/e/:environment/ai/:appId${route.path}`,
+        `/:apiVersion/application/:format/ai/:appId${route.path}`,
+        `/:apiVersion/application/:format/e/:environment/ai/:appId${route.path}`
       ], async (req, res) => {
-        await sendResponse(req, res, route);
-      });
-      app.get([
-        `/:apiVersion/application/:format/l/:locale/ai/:appId/configuration/ci${route.path}`,
-        `/:apiVersion/application/:format/l/:locale/e/:environment/ai/:appId/configuration/ci${route.path}`
-      ], async (req, res) => {
-        await sendConfigurationResponse(req, res, route);
+        await sendViewResponse(req, res, route);
       });
     }
   });
+  const clientBootstrapConfigurationRoutes = (0, import_shared_utils.getClientBootstrapConfigurationRoutes)();
+  app.get(clientBootstrapConfigurationRoutes, async (req, res) => {
+    await sendConfigurationResponse(req, res);
+  });
   app.initRoutes();
   app.use(async (req, res) => {
     if (route404) {
-      await sendResponse(req, res, route404, 404);
+      await sendViewResponse(req, res, route404, 404);
     } else {
       res.status(404).send("404 - This page does not exist");
     }

package/build/cjs/middlewares/utils.cjs

@@ -37,7 +37,7 @@ var window = new import_jsdom.JSDOM("").window;
 var DOMPurify = (0, import_dompurify.default)(window);
 function createReturnStatus(name, error) {
   let returnStatus = {status: 501, message: ""};
-  if (error.code === "NO_LWC_MODULE_FOUND") {
+  if ((0, import_diagnostics.isNodeError)(error) && error.code === "NO_LWC_MODULE_FOUND") {
     returnStatus = {status: 404, message: import_diagnostics.descriptions.UNRESOLVABLE.LWC_MODULE(name).message};
   } else if (error instanceof import_diagnostics.LwrUnresolvableError && error.diagnostics[0].description.category === "lwrUnresolvable/invalid") {
     returnStatus = {status: 400, message: error.message};