@lwrjs/core 0.8.0-alpha.15 → 0.8.0-alpha.18

package/build/cjs/context/hooks.cjs

@@ -43,7 +43,7 @@ async function runConfigurationsHook(hookPlugins, lwrConfig, dataConfig, runtime
     (0, import_config.validateLwrAppConfig)(JSON.stringify(lwrConfig), "post");
   } catch (e) {
     if (process.env.UNSAFE_IGNORE_CONFIG_VALIDATION === "true") {
-      console.warn("ignoring config validation errors due to UNSAFE_IGNORE_CONFIG_VALIDATION flag...proceed with caution");
+      import_shared_utils.logger.warn("ignoring config validation errors due to UNSAFE_IGNORE_CONFIG_VALIDATION flag...proceed with caution");
       console.dir(e, {depth: null});
     } else {
       throw e;

package/build/cjs/index.cjs

@@ -264,7 +264,7 @@ async function generateStaticSite(config) {
   config.serverType = "fs";
   const {serverMode} = config;
   if (serverMode === "dev" || serverMode === "compat") {
-    console.warn("[WARN] static generation in `dev` or `compat` mode is currently not fully supported");
+    import_shared_utils.logger.warn("static generation in `dev` or `compat` mode is currently not fully supported");
   }
   const lwrApp = createServer(config);
   overrideConfigAsSrc(lwrApp);

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

@@ -30,8 +30,12 @@ var import_static_generation = __toModule(require("./static-generation.cjs"));
 var import_dir = __toModule(require("./utils/dir.cjs"));
 var import_network_dispatcher = __toModule(require("./utils/network-dispatcher.cjs"));
 var import_config = __toModule(require("@lwrjs/config"));
+var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 async function warmupServer(config, internalRequestKey) {
-  console.log("[Server Warmup] starting");
+  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])});
+  }
+  import_shared_utils.logger.info("[Server Warmup] starting");
   const {routes, staticSiteGenerator, port, apiVersion, basePath, lwrVersion, serverMode} = config;
   staticSiteGenerator.outputDir = import_dir.skipDirCreation;
   const urlRewriteMap = new Map();
@@ -44,5 +48,5 @@ async function warmupServer(config, internalRequestKey) {
     serverMode
   };
   await new import_static_generation.default().generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, new import_network_dispatcher.default(port, internalRequestKey), staticSiteGenerator.outputDir, urlRewriteMap);
-  console.log("[Server Warmup] complete");
+  import_shared_utils.logger.info("[Server Warmup] complete");
 }

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

@@ -37,13 +37,16 @@ var import_config = __toModule(require("@lwrjs/config"));
 var SiteGenerator = class {
   async buildStaticApplication(config, dispatcher) {
     const startTime = import_perf_hooks.performance.now();
-    console.log("[Static Generation] starting");
+    import_shared_utils.logger.info("[Static Generation] starting");
+    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])});
+    }
     const {routes, staticSiteGenerator, rootDir, assets} = config;
     if (!staticSiteGenerator.outputDir) {
       staticSiteGenerator.outputDir = "__generated_site__";
     }
     const outputDir = (0, import_path.join)(rootDir, staticSiteGenerator.outputDir);
-    console.log(`[INFO] Clear Output Location: ${outputDir}`);
+    import_shared_utils.logger.info(`Clear Output Location: ${outputDir}`);
     import_fs_extra.default.rmSync(outputDir, {recursive: true, force: true});
     const urlRewriteMap = new Map();
     const {apiVersion, basePath, lwrVersion, serverMode} = config;
@@ -60,7 +63,7 @@ var SiteGenerator = class {
     this.copyAssets(assets, outputDir);
     const endTime = import_perf_hooks.performance.now();
     const timeDiff = (endTime - startTime) / 1e3;
-    console.log(`[Static Generation] complete in ${Math.round(timeDiff)} seconds`);
+    import_shared_utils.logger.info(`[Static Generation] complete in ${Math.round(timeDiff)} seconds`);
   }
   async generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, dispatcher, outputDir, urlRewriteMap = new Map()) {
     if (!staticSiteGenerator.locales) {
@@ -90,10 +93,10 @@ var SiteGenerator = class {
   createGenerateURLFunction(dispatcher) {
     const generateRoute = async (uri, siteConfig) => {
       const locale = siteConfig.locale;
-      console.log(`[INFO] Start Generate: ${locale} ${uri}`);
+      import_shared_utils.logger.info(`Start Generate: ${locale} ${uri}`);
       await this.dispatchResourceRecursive(uri, dispatcher, {resourceType: "route"}, siteConfig);
       this.addAdditionalImportMetadataToViewConfig(siteConfig);
-      console.log(`[INFO] End Generate ${locale} ${uri}`);
+      import_shared_utils.logger.info(`End Generate ${locale} ${uri}`);
     };
     return generateRoute.bind(this);
   }
@@ -102,7 +105,7 @@ var SiteGenerator = class {
     if (!visitedUrls.has(url)) {
       visitedUrls.add(url);
       if (url.indexOf("/:") !== -1 || url.indexOf("*") !== -1) {
-        console.error("Skipped generation of url with variable path segment: " + url);
+        import_shared_utils.logger.warn("Skipped generation of url with variable path segment: " + url);
         return;
       }
       let context;
@@ -176,7 +179,7 @@ var SiteGenerator = class {
       await Promise.all(dispatchRequests);
     } else {
       const body = context.fs?.body;
-      console.warn(`[WARN] Failed to fetch ${url}: (${statusCode}) ${body}`);
+      import_shared_utils.logger.warn(`Failed to fetch ${url}: (${statusCode}) ${body}`);
     }
   }
   async handleHtmlResource(url, context, siteConfig, dispatcher) {
@@ -240,7 +243,7 @@ var SiteGenerator = class {
             siteConfig.viewConfigPath = this.getResourcePathFromUrl(siteConfig, resourceUri);
           }
         } else {
-          console.warn("Skipped inline bootstrap resource: %j", resource);
+          import_shared_utils.logger.warn("Skipped inline bootstrap resource: %j", resource);
         }
       }
     }
@@ -250,7 +253,7 @@ var SiteGenerator = class {
       if (resourceUri.startsWith("/")) {
         dispatchRequests.push(this.dispatchResourceRecursive(resourceUri, dispatcher, {resourceType: "resource"}, siteConfig));
       } else {
-        console.warn("Skipped resource: %j", resource);
+        import_shared_utils.logger.warn("Skipped resource: %j", resource);
       }
     }
     await Promise.all(dispatchRequests);
@@ -266,7 +269,7 @@ var SiteGenerator = class {
           const mappingURL = siteConfig.endpoints?.uris?.mapping + encodeURIComponent(jsUri);
           await this.dispatchResourceRecursive(mappingURL, dispatcher, {resourceType: "mapping"}, siteConfig);
         } else {
-          console.warn('[WARN] Unable to fetch mapping for bare specifier or variable dynamic import: "' + jsUri + '"');
+          import_shared_utils.logger.warn('Unable to fetch mapping for bare specifier or variable dynamic import: "' + jsUri + '"');
         }
       } else if (isAdditionalModulesRequest) {
         const uri = `${siteConfig.endpoints?.uris.legacyDefault}${encodeURIComponent(jsUri)}`;
@@ -283,7 +286,7 @@ var SiteGenerator = class {
     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 refrence => ${refUrl} from ${url}`, err);
+        import_shared_utils.logger.warn(`Failed to fetch asset reference => ${refUrl} from ${url}`, err);
       }));
     }
     return Promise.all(dispatchRequests);
@@ -320,11 +323,10 @@ var SiteGenerator = class {
         if (assetSrcDir && import_fs_extra.default.existsSync(assetSrcDir)) {
           import_fs_extra.default.copySync(assetSrcDir, assetOutputDir);
         } else {
-          console.warn("[WARN] Could not find assets to copy at path: " + assetSrcDir);
+          import_shared_utils.logger.warn("Could not find assets to copy at path: " + assetSrcDir);
         }
       } catch (e) {
-        console.error("Error occurred processing asset config: " + JSON.stringify(asset));
-        console.error(e);
+        import_shared_utils.logger.error("Error occurred processing asset config: " + JSON.stringify(asset), e);
       }
     }
   }

package/build/es/context/hooks.js

@@ -1,4 +1,4 @@
-import { DEFAULT_LWR_BOOTSTRAP_CONFIG } from '@lwrjs/shared-utils';
+import { DEFAULT_LWR_BOOTSTRAP_CONFIG, logger } from '@lwrjs/shared-utils';
 import { validateLwrAppConfig } from '@lwrjs/config';
 // Add missing bootstrap objects to routes
 function normalizeRoutesBootstrap({ routes, errorRoutes }) {
@@ -19,7 +19,7 @@ export async function runConfigurationsHook(hookPlugins, lwrConfig, dataConfig,
     catch (e) {
         // TODO: temporary workaround for https://github.com/salesforce/lwr/issues/825
         if (process.env.UNSAFE_IGNORE_CONFIG_VALIDATION === 'true') {
-            console.warn('ignoring config validation errors due to UNSAFE_IGNORE_CONFIG_VALIDATION flag...proceed with caution');
+            logger.warn('ignoring config validation errors due to UNSAFE_IGNORE_CONFIG_VALIDATION flag...proceed with caution');
             console.dir(e, { depth: null });
         }
         else {

package/build/es/index.js

@@ -1,4 +1,4 @@
-import { deepFreeze, getFeatureFlags, DEFAULT_LWR_BOOTSTRAP_CONFIG } from '@lwrjs/shared-utils';
+import { deepFreeze, getFeatureFlags, DEFAULT_LWR_BOOTSTRAP_CONFIG, logger } from '@lwrjs/shared-utils';
 import { LwrCompiler } from '@lwrjs/compiler';
 import { LwrModuleBundler } from '@lwrjs/module-bundler';
 import { LwrModuleRegistry } from '@lwrjs/module-registry';
@@ -235,7 +235,7 @@ export async function generateStaticSite(config) {
     if (serverMode === 'dev' || serverMode === 'compat') {
         // TODO: dynamic imports are not generated in dev mode
         // https://github.com/salesforce/lwr/issues/1111
-        console.warn('[WARN] static generation in `dev` or `compat` mode is currently not fully supported');
+        logger.warn('static generation in `dev` or `compat` mode is currently not fully supported');
     }
     const lwrApp = createServer(config);
     overrideConfigAsSrc(lwrApp);

package/build/es/tools/server-warmup.js

@@ -2,8 +2,13 @@ import SiteGenerator from './static-generation.js';
 import { skipDirCreation } from './utils/dir.js';
 import NetworkDispatcher from './utils/network-dispatcher.js';
 import { explodeMode } from '@lwrjs/config';
+import { logger, WARN, INFO } from '@lwrjs/shared-utils';
 export async function warmupServer(config, internalRequestKey) {
-    console.log('[Server Warmup] starting');
+    // De-duplicate warming messages if log level is warn or info
+    if (!logger.currentLevel || logger.currentLevel == WARN || logger.currentLevel == INFO) {
+        logger.setOptions({ dedupe: new Set([WARN]) });
+    }
+    logger.info('[Server Warmup] starting');
     const { routes, staticSiteGenerator, port, apiVersion, basePath, lwrVersion, serverMode } = config;
     staticSiteGenerator.outputDir = skipDirCreation;
     const urlRewriteMap = new Map();
@@ -17,6 +22,6 @@ export async function warmupServer(config, internalRequestKey) {
     };
     // For each locale, generate all the modules
     await new SiteGenerator().generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, new NetworkDispatcher(port, internalRequestKey), staticSiteGenerator.outputDir, urlRewriteMap);
-    console.log('[Server Warmup] complete');
+    logger.info('[Server Warmup] complete');
 }
 //# sourceMappingURL=server-warmup.js.map

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

@@ -1,5 +1,5 @@
 import { performance } from 'perf_hooks';
-import { getSpecifier, getFeatureFlags, hashContent, isSelfUrl, getModuleUriPrefix, getMappingUriPrefix, logger, } from '@lwrjs/shared-utils';
+import { getSpecifier, getFeatureFlags, hashContent, isSelfUrl, getModuleUriPrefix, getMappingUriPrefix, logger, WARN, INFO, } from '@lwrjs/shared-utils';
 import { join, dirname, extname } from 'path';
 import fs from 'fs-extra';
 import { writeResponse } from './utils/stream.js';
@@ -16,13 +16,17 @@ export default class SiteGenerator {
      */
     async buildStaticApplication(config, dispatcher) {
         const startTime = performance.now();
-        console.log('[Static Generation] starting');
+        logger.info('[Static Generation] starting');
+        // De-duplicate warming messages if log level is warn or info
+        if (!logger.currentLevel || logger.currentLevel == WARN || logger.currentLevel == INFO) {
+            logger.setOptions({ dedupe: new Set([WARN]) });
+        }
         const { routes, staticSiteGenerator, rootDir, assets } = config;
         if (!staticSiteGenerator.outputDir) {
             staticSiteGenerator.outputDir = '__generated_site__';
         }
         const outputDir = join(rootDir, staticSiteGenerator.outputDir);
-        console.log(`[INFO] Clear Output Location: ${outputDir}`);
+        logger.info(`Clear Output Location: ${outputDir}`);
         fs.rmSync(outputDir, { recursive: true, force: true });
         const urlRewriteMap = new Map();
         const { apiVersion, basePath, lwrVersion, serverMode } = config;
@@ -42,7 +46,7 @@ export default class SiteGenerator {
         this.copyAssets(assets, outputDir);
         const endTime = performance.now();
         const timeDiff = (endTime - startTime) / 1000;
-        console.log(`[Static Generation] complete in ${Math.round(timeDiff)} seconds`);
+        logger.info(`[Static Generation] complete in ${Math.round(timeDiff)} seconds`);
     }
     /**
      * Crawl all view routes for a site
@@ -85,12 +89,12 @@ export default class SiteGenerator {
     createGenerateURLFunction(dispatcher) {
         const generateRoute = async (uri, siteConfig) => {
             const locale = siteConfig.locale;
-            console.log(`[INFO] Start Generate: ${locale} ${uri}`);
+            logger.info(`Start Generate: ${locale} ${uri}`);
             // Kick off site generation for the current route
             await this.dispatchResourceRecursive(uri, dispatcher, { resourceType: 'route' }, siteConfig);
             // If there is a view config add any extra collected import metadata to the config
             this.addAdditionalImportMetadataToViewConfig(siteConfig);
-            console.log(`[INFO] End Generate ${locale} ${uri}`);
+            logger.info(`End Generate ${locale} ${uri}`);
         };
         return generateRoute.bind(this);
     }
@@ -109,7 +113,7 @@ export default class SiteGenerator {
             // Skip urls with path segment variables (i.e. '/custom/:bar')
             // Users can specify specific urls via the '_additionalRoutePaths' config property
             if (url.indexOf('/:') !== -1 || url.indexOf('*') !== -1) {
-                console.error('Skipped generation of url with variable path segment: ' + url);
+                logger.warn('Skipped generation of url with variable path segment: ' + url);
                 return;
             }
             // Generate resource
@@ -240,7 +244,7 @@ export default class SiteGenerator {
         }
         else {
             const body = context.fs?.body;
-            console.warn(`[WARN] Failed to fetch ${url}: (${statusCode}) ${body}`);
+            logger.warn(`Failed to fetch ${url}: (${statusCode}) ${body}`);
         }
     }
     /**
@@ -341,7 +345,7 @@ export default class SiteGenerator {
                     }
                 }
                 else {
-                    console.warn('Skipped inline bootstrap resource: %j', resource);
+                    logger.warn('Skipped inline bootstrap resource: %j', resource);
                 }
             }
         }
@@ -353,7 +357,7 @@ export default class SiteGenerator {
                 dispatchRequests.push(this.dispatchResourceRecursive(resourceUri, dispatcher, { resourceType: 'resource' }, siteConfig));
             }
             else {
-                console.warn('Skipped resource: %j', resource);
+                logger.warn('Skipped resource: %j', resource);
             }
         }
         // -- Dispatch dependencies
@@ -373,7 +377,7 @@ export default class SiteGenerator {
                     await this.dispatchResourceRecursive(mappingURL, dispatcher, { resourceType: 'mapping' }, siteConfig);
                 }
                 else {
-                    console.warn('[WARN] Unable to fetch mapping for bare specifier or variable dynamic import: "' +
+                    logger.warn('Unable to fetch mapping for bare specifier or variable dynamic import: "' +
                         jsUri +
                         '"');
                 }
@@ -405,7 +409,7 @@ export default class SiteGenerator {
             const refUrl = ref.override?.uri || ref.url;
             dispatchRequests.push(this.dispatchResourceRecursive(refUrl, dispatcher, { resourceType: 'asset', asset: metadata?.asset }, siteConfig).catch((err) => {
                 // Warn the user that the we failed to fetch a referenced asset
-                logger.warn(`Failed to fetch asset refrence => ${refUrl} from ${url}`, err);
+                logger.warn(`Failed to fetch asset reference => ${refUrl} from ${url}`, err);
             }));
         }
         return Promise.all(dispatchRequests);
@@ -463,12 +467,11 @@ export default class SiteGenerator {
                     fs.copySync(assetSrcDir, assetOutputDir);
                 }
                 else {
-                    console.warn('[WARN] Could not find assets to copy at path: ' + assetSrcDir);
+                    logger.warn('Could not find assets to copy at path: ' + assetSrcDir);
                 }
             }
             catch (e) {
-                console.error('Error occurred processing asset config: ' + JSON.stringify(asset));
-                console.error(e);
+                logger.error('Error occurred processing asset config: ' + JSON.stringify(asset), e);
             }
         }
     }

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.8.0-alpha.15",
+    "version": "0.8.0-alpha.18",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -32,32 +32,32 @@
         "package.cjs"
     ],
     "dependencies": {
-        "@lwrjs/app-service": "0.8.0-alpha.15",
-        "@lwrjs/asset-registry": "0.8.0-alpha.15",
-        "@lwrjs/asset-transformer": "0.8.0-alpha.15",
-        "@lwrjs/base-template-engine": "0.8.0-alpha.15",
-        "@lwrjs/base-view-provider": "0.8.0-alpha.15",
-        "@lwrjs/base-view-transformer": "0.8.0-alpha.15",
-        "@lwrjs/client-modules": "0.8.0-alpha.15",
-        "@lwrjs/compiler": "0.8.0-alpha.15",
-        "@lwrjs/config": "0.8.0-alpha.15",
-        "@lwrjs/diagnostics": "0.8.0-alpha.15",
-        "@lwrjs/fs-asset-provider": "0.8.0-alpha.15",
-        "@lwrjs/html-view-provider": "0.8.0-alpha.15",
-        "@lwrjs/loader": "0.8.0-alpha.15",
-        "@lwrjs/lwc-module-provider": "0.8.0-alpha.15",
-        "@lwrjs/lwc-ssr": "0.8.0-alpha.15",
-        "@lwrjs/markdown-view-provider": "0.8.0-alpha.15",
-        "@lwrjs/module-bundler": "0.8.0-alpha.15",
-        "@lwrjs/module-registry": "0.8.0-alpha.15",
-        "@lwrjs/npm-module-provider": "0.8.0-alpha.15",
-        "@lwrjs/nunjucks-view-provider": "0.8.0-alpha.15",
-        "@lwrjs/o11y": "0.8.0-alpha.15",
-        "@lwrjs/resource-registry": "0.8.0-alpha.15",
-        "@lwrjs/router": "0.8.0-alpha.15",
-        "@lwrjs/server": "0.8.0-alpha.15",
-        "@lwrjs/shared-utils": "0.8.0-alpha.15",
-        "@lwrjs/view-registry": "0.8.0-alpha.15",
+        "@lwrjs/app-service": "0.8.0-alpha.18",
+        "@lwrjs/asset-registry": "0.8.0-alpha.18",
+        "@lwrjs/asset-transformer": "0.8.0-alpha.18",
+        "@lwrjs/base-template-engine": "0.8.0-alpha.18",
+        "@lwrjs/base-view-provider": "0.8.0-alpha.18",
+        "@lwrjs/base-view-transformer": "0.8.0-alpha.18",
+        "@lwrjs/client-modules": "0.8.0-alpha.18",
+        "@lwrjs/compiler": "0.8.0-alpha.18",
+        "@lwrjs/config": "0.8.0-alpha.18",
+        "@lwrjs/diagnostics": "0.8.0-alpha.18",
+        "@lwrjs/fs-asset-provider": "0.8.0-alpha.18",
+        "@lwrjs/html-view-provider": "0.8.0-alpha.18",
+        "@lwrjs/loader": "0.8.0-alpha.18",
+        "@lwrjs/lwc-module-provider": "0.8.0-alpha.18",
+        "@lwrjs/lwc-ssr": "0.8.0-alpha.18",
+        "@lwrjs/markdown-view-provider": "0.8.0-alpha.18",
+        "@lwrjs/module-bundler": "0.8.0-alpha.18",
+        "@lwrjs/module-registry": "0.8.0-alpha.18",
+        "@lwrjs/npm-module-provider": "0.8.0-alpha.18",
+        "@lwrjs/nunjucks-view-provider": "0.8.0-alpha.18",
+        "@lwrjs/o11y": "0.8.0-alpha.18",
+        "@lwrjs/resource-registry": "0.8.0-alpha.18",
+        "@lwrjs/router": "0.8.0-alpha.18",
+        "@lwrjs/server": "0.8.0-alpha.18",
+        "@lwrjs/shared-utils": "0.8.0-alpha.18",
+        "@lwrjs/view-registry": "0.8.0-alpha.18",
         "fs-extra": "^10.1.0",
         "ms": "^2.1.3",
         "path-to-regexp": "^6.2.0",
@@ -65,7 +65,7 @@
         "ws": "^8.8.1"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.8.0-alpha.15",
+        "@lwrjs/types": "0.8.0-alpha.18",
         "@types/ws": "^8.5.3"
     },
     "peerDependencies": {
@@ -74,5 +74,5 @@
     "engines": {
         "node": ">=14.15.4 <19"
     },
-    "gitHead": "4e6550cae87627aab7d51d22a80c0012b397918d"
+    "gitHead": "a93c661c7654fb326d253690f2c0ba4269f30763"
 }