@lwrjs/config 0.22.8 → 0.22.10

package/build/cjs/defaults.cjs

@@ -67,6 +67,7 @@ var DEFAULT_LAYOUTS_DIR = "$rootDir/src/layouts";
 var DEFAULT_DATA_DIR = "$rootDir/src/data";
 var DEFAULT_MODULE_PROVIDERS = [
   "@lwrjs/app-service/moduleProvider",
+  "@lwrjs/gate-module-provider",
   "@lwrjs/router/module-provider",
   "@lwrjs/lwc-module-provider",
   "@lwrjs/npm-module-provider",

package/build/cjs/global-config.cjs

@@ -46,7 +46,7 @@ var import_runtime_config = __toModule(require("./runtime-config.cjs"));
 var import_global_data = __toModule(require("./utils/global-data.cjs"));
 var import_instrumentation = __toModule(require("@lwrjs/instrumentation"));
 function getLwrConfigFromFile(rootDir, lwrConfigPath = import_defaults.DEFAULT_LWR_CONFIG_JSON) {
-  const resolvedLwrConfigPath = import_path.default.resolve((0, import_shared_utils.normalizeDirectory)(lwrConfigPath, rootDir));
+  const resolvedLwrConfigPath = (0, import_shared_utils.toForwardSlash)(import_path.default.resolve((0, import_shared_utils.normalizeDirectory)(lwrConfigPath, rootDir)));
   if (!import_fs.default.existsSync(resolvedLwrConfigPath)) {
     import_diagnostics.logger.warn({label: `config`, message: `LWR Config not found on "${resolvedLwrConfigPath}"`});
     return void 0;
@@ -61,8 +61,8 @@ function getLwrConfigFromFile(rootDir, lwrConfigPath = import_defaults.DEFAULT_L
 }
 function createCacheFolder(cache, rootDir) {
   const cacheDir = (0, import_shared_utils.normalizeDirectory)(cache, rootDir);
-  const absPath = import_path.default.resolve(cacheDir);
-  import_fs.default.mkdirSync(import_path.default.join(absPath, import_shared_utils.ASSETS_CACHE_DIR), {recursive: true});
+  const absPath = (0, import_shared_utils.toForwardSlash)(import_path.default.resolve(cacheDir));
+  import_fs.default.mkdirSync((0, import_shared_utils.toForwardSlash)(import_path.default.join(absPath, import_shared_utils.ASSETS_CACHE_DIR)), {recursive: true});
   return absPath;
 }
 function mergeConfig(configArg) {
@@ -70,7 +70,8 @@ function mergeConfig(configArg) {
     configArg = (0, import_merge.trimLwrConfig)(configArg);
     (0, import_app_config.validateLwrAppConfig)(configArg, "pre");
   }
-  const rootDir = import_path.default.resolve(configArg?.rootDir || import_defaults.DEFAULT_ROOT_DIR);
+  const rawRootDir = configArg?.rootDir || import_defaults.DEFAULT_ROOT_DIR;
+  const rootDir = import_path.default.isAbsolute(rawRootDir) ? (0, import_shared_utils.toForwardSlash)(rawRootDir) : (0, import_shared_utils.toForwardSlash)(import_path.default.resolve(rawRootDir));
   const configFile = !configArg?.ignoreLwrConfigFile ? getLwrConfigFromFile(rootDir, configArg?.lwrConfigFile) : void 0;
   if (configFile) {
     configFile.routes = [...import_defaults.DEFAULT_LWR_CONFIG.routes, ...configFile?.routes ?? []];

package/build/cjs/utils/lwc.cjs

@@ -39,11 +39,11 @@ function normalizeModulePaths(modules, rootDir) {
   return modules.map((m) => {
     const dirRecord = m;
     if (dirRecord.dir) {
-      dirRecord.dir = import_path.default.resolve((0, import_shared_utils.normalizeDirectory)(dirRecord.dir, rootDir));
+      dirRecord.dir = (0, import_shared_utils.toForwardSlash)(import_path.default.resolve((0, import_shared_utils.normalizeDirectory)(dirRecord.dir, rootDir)));
     }
     const aliasRecord = m;
     if (aliasRecord.path) {
-      aliasRecord.path = import_path.default.resolve((0, import_shared_utils.normalizeDirectory)(aliasRecord.path, rootDir));
+      aliasRecord.path = (0, import_shared_utils.toForwardSlash)(import_path.default.resolve((0, import_shared_utils.normalizeDirectory)(aliasRecord.path, rootDir)));
     }
     return m;
   });

package/build/cjs/utils/routes.cjs

@@ -65,13 +65,13 @@ function normalizeRoutePaths(routes = [], resourcePaths) {
   return routes.map((route) => {
     const {contentTemplate, layoutTemplate, subRoutes} = route;
     if (contentTemplate) {
-      route.contentTemplate = typeof contentTemplate === "string" ? import_path.default.resolve((0, import_shared_utils.normalizeResourcePath)(contentTemplate, resourcePaths)) : contentTemplate;
+      route.contentTemplate = typeof contentTemplate === "string" ? (0, import_shared_utils.toForwardSlash)(import_path.default.resolve((0, import_shared_utils.normalizeResourcePath)(contentTemplate, resourcePaths))) : contentTemplate;
     }
     if (layoutTemplate) {
-      route.layoutTemplate = import_path.default.resolve((0, import_shared_utils.normalizeResourcePath)(layoutTemplate, resourcePaths));
+      route.layoutTemplate = (0, import_shared_utils.toForwardSlash)(import_path.default.resolve((0, import_shared_utils.normalizeResourcePath)(layoutTemplate, resourcePaths)));
     }
     if (subRoutes) {
-      route.subRoutes = import_path.default.resolve((0, import_shared_utils.normalizeResourcePath)(subRoutes, resourcePaths));
+      route.subRoutes = (0, import_shared_utils.toForwardSlash)(import_path.default.resolve((0, import_shared_utils.normalizeResourcePath)(subRoutes, resourcePaths)));
     }
     return route;
   });
@@ -86,7 +86,7 @@ function normalizeRouteHandlers(routeHandlers) {
 }
 function normalizeRouteHandlerPaths(routeHandlers, resourcePaths) {
   for (const [id, handler] of Object.entries(routeHandlers)) {
-    const normalizedPath = import_path.default.resolve((0, import_shared_utils.normalizeDirectory)(handler || id, resourcePaths.rootDir));
+    const normalizedPath = (0, import_shared_utils.toForwardSlash)(import_path.default.resolve((0, import_shared_utils.normalizeDirectory)(handler || id, resourcePaths.rootDir)));
     if (import_fs.default.existsSync(normalizedPath)) {
       routeHandlers[id] = normalizedPath;
     }

package/build/cjs/utils/services.cjs

@@ -38,7 +38,7 @@ function normalizeServicePaths(services, rootDir) {
     const [rawServiceName, serviceConfig = void 0] = service;
     let serviceName = (0, import_shared_utils.normalizeDirectory)(rawServiceName, rootDir);
     if (!rawServiceName.startsWith("@") && !import_defaults.DEFAULT_SERVICE_PACKAGE_NAME.test(rawServiceName)) {
-      serviceName = import_path.default.resolve(serviceName);
+      serviceName = (0, import_shared_utils.toForwardSlash)(import_path.default.resolve(serviceName));
     }
     return [serviceName, serviceConfig];
   });

package/build/es/defaults.js

@@ -38,6 +38,7 @@ const DEFAULT_DATA_DIR = '$rootDir/src/data';
 // Providers
 const DEFAULT_MODULE_PROVIDERS = [
     '@lwrjs/app-service/moduleProvider',
+    '@lwrjs/gate-module-provider',
     '@lwrjs/router/module-provider',
     '@lwrjs/lwc-module-provider',
     '@lwrjs/npm-module-provider',

package/build/es/global-config.js

@@ -2,7 +2,7 @@ import fs from 'fs';
 import path from 'path';
 import { parse } from 'jsonc-parser';
 import { logger } from '@lwrjs/diagnostics';
-import { readFile, normalizeDirectory, getFeatureFlags, ASSETS_CACHE_DIR, isLocalPath, normalizeToFileUrl } from '@lwrjs/shared-utils';
+import { readFile, normalizeDirectory, getFeatureFlags, ASSETS_CACHE_DIR, isLocalPath, normalizeToFileUrl, toForwardSlash } from '@lwrjs/shared-utils';
 import { DEFAULT_AMD_LOADER, DEFAULT_AMD_LOADER_LEGACY, DEFAULT_ESM_LOADER, DEFAULT_LWR_CONFIG, DEFAULT_LWR_CONFIG_JSON, DEFAULT_ROOT_DIR, } from './defaults.js';
 import { lwrVersion as LWR_VERSION } from '@lwrjs/config/package';
 import { validateLwrAppConfig } from './validation/app-config.js';
@@ -29,7 +29,7 @@ import { getTracer, ConfigSpan } from '@lwrjs/instrumentation';
  * @returns {LwrGlobalConfig | undefined} the validated config file contents if it exists
  */
 export function getLwrConfigFromFile(rootDir, lwrConfigPath = DEFAULT_LWR_CONFIG_JSON) {
-    const resolvedLwrConfigPath = path.resolve(normalizeDirectory(lwrConfigPath, rootDir));
+    const resolvedLwrConfigPath = toForwardSlash(path.resolve(normalizeDirectory(lwrConfigPath, rootDir)));
     if (!fs.existsSync(resolvedLwrConfigPath)) {
         logger.warn({ label: `config`, message: `LWR Config not found on "${resolvedLwrConfigPath}"` });
         return undefined;
@@ -51,8 +51,8 @@ export function getLwrConfigFromFile(rootDir, lwrConfigPath = DEFAULT_LWR_CONFIG
  */
 function createCacheFolder(cache, rootDir) {
     const cacheDir = normalizeDirectory(cache, rootDir);
-    const absPath = path.resolve(cacheDir);
-    fs.mkdirSync(path.join(absPath, ASSETS_CACHE_DIR), { recursive: true });
+    const absPath = toForwardSlash(path.resolve(cacheDir));
+    fs.mkdirSync(toForwardSlash(path.join(absPath, ASSETS_CACHE_DIR)), { recursive: true });
     return absPath;
 }
 /**
@@ -77,7 +77,8 @@ function mergeConfig(configArg) {
         validateLwrAppConfig(configArg, 'pre');
     }
     // resolve the current root dir
-    const rootDir = path.resolve(configArg?.rootDir || DEFAULT_ROOT_DIR);
+    const rawRootDir = configArg?.rootDir || DEFAULT_ROOT_DIR;
+    const rootDir = path.isAbsolute(rawRootDir) ? toForwardSlash(rawRootDir) : toForwardSlash(path.resolve(rawRootDir));
     // attempt to load the config file if it isn't ignored
     const configFile = !configArg?.ignoreLwrConfigFile
         ? getLwrConfigFromFile(rootDir, configArg?.lwrConfigFile)

package/build/es/utils/lwc.js

@@ -1,5 +1,5 @@
 import path from 'path';
-import { normalizeDirectory, normalizeInterchangeableModuleConfig } from '@lwrjs/shared-utils';
+import { normalizeDirectory, normalizeInterchangeableModuleConfig, toForwardSlash } from '@lwrjs/shared-utils';
 export function normalizeLwcConfig(config) {
     return {
         ...config,
@@ -12,11 +12,11 @@ export function normalizeModulePaths(modules, rootDir) {
     return modules.map((m) => {
         const dirRecord = m;
         if (dirRecord.dir) {
-            dirRecord.dir = path.resolve(normalizeDirectory(dirRecord.dir, rootDir));
+            dirRecord.dir = toForwardSlash(path.resolve(normalizeDirectory(dirRecord.dir, rootDir)));
         }
         const aliasRecord = m;
         if (aliasRecord.path) {
-            aliasRecord.path = path.resolve(normalizeDirectory(aliasRecord.path, rootDir));
+            aliasRecord.path = toForwardSlash(path.resolve(normalizeDirectory(aliasRecord.path, rootDir)));
         }
         return m;
     });

package/build/es/utils/routes.js

@@ -1,6 +1,6 @@
 import fs from 'fs';
 import path from 'path';
-import { normalizeDirectory, normalizeResourcePath } from '@lwrjs/shared-utils';
+import { normalizeDirectory, normalizeResourcePath, toForwardSlash } from '@lwrjs/shared-utils';
 import { DEFAULT_LWR_BOOTSTRAP_CONFIG } from '../defaults.js';
 export function normalizeRoutes(routes, routeHandlers) {
     return routes.map((route) => {
@@ -46,14 +46,14 @@ export function normalizeRoutePaths(routes = [], resourcePaths) {
         if (contentTemplate) {
             route.contentTemplate =
                 typeof contentTemplate === 'string'
-                    ? path.resolve(normalizeResourcePath(contentTemplate, resourcePaths))
+                    ? toForwardSlash(path.resolve(normalizeResourcePath(contentTemplate, resourcePaths)))
                     : contentTemplate;
         }
         if (layoutTemplate) {
-            route.layoutTemplate = path.resolve(normalizeResourcePath(layoutTemplate, resourcePaths));
+            route.layoutTemplate = toForwardSlash(path.resolve(normalizeResourcePath(layoutTemplate, resourcePaths)));
         }
         if (subRoutes) {
-            route.subRoutes = path.resolve(normalizeResourcePath(subRoutes, resourcePaths));
+            route.subRoutes = toForwardSlash(path.resolve(normalizeResourcePath(subRoutes, resourcePaths)));
         }
         return route;
     });
@@ -68,7 +68,7 @@ export function normalizeRouteHandlers(routeHandlers) {
 }
 export function normalizeRouteHandlerPaths(routeHandlers, resourcePaths) {
     for (const [id, handler] of Object.entries(routeHandlers)) {
-        const normalizedPath = path.resolve(normalizeDirectory(handler || id, resourcePaths.rootDir));
+        const normalizedPath = toForwardSlash(path.resolve(normalizeDirectory(handler || id, resourcePaths.rootDir)));
         // use the normalized path if it exists; otherwise the handler is module specifier
         if (fs.existsSync(normalizedPath)) {
             routeHandlers[id] = normalizedPath;

package/build/es/utils/services.js

@@ -1,5 +1,5 @@
 import path from 'path';
-import { normalizeDirectory } from '@lwrjs/shared-utils';
+import { normalizeDirectory, toForwardSlash } from '@lwrjs/shared-utils';
 import { DEFAULT_SERVICE_PACKAGE_NAME } from '../defaults.js';
 export function normalizeServices(services = []) {
     return services.map((service) => (Array.isArray(service) ? service : [service, undefined]));
@@ -11,7 +11,7 @@ export function normalizeServicePaths(services, rootDir) {
         // We consider it an npm module if it starts with @ or if is of the form lwr-[servicename]-service
         // Otherwise resolve it as a relative path
         if (!rawServiceName.startsWith('@') && !DEFAULT_SERVICE_PACKAGE_NAME.test(rawServiceName)) {
-            serviceName = path.resolve(serviceName);
+            serviceName = toForwardSlash(path.resolve(serviceName));
         }
         return [serviceName, serviceConfig];
     });

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.22.8",
+    "version": "0.22.10",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -42,14 +42,14 @@
         "test": "jest"
     },
     "dependencies": {
-        "@lwrjs/diagnostics": "0.22.8",
-        "@lwrjs/instrumentation": "0.22.8",
-        "@lwrjs/shared-utils": "0.22.8",
+        "@lwrjs/diagnostics": "0.22.10",
+        "@lwrjs/instrumentation": "0.22.10",
+        "@lwrjs/shared-utils": "0.22.10",
         "fs-extra": "^11.2.0",
         "jsonc-parser": "^3.3.1"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.22.8",
+        "@lwrjs/types": "0.22.10",
         "jest": "29.7.0",
         "memfs": "^4.13.0",
         "ts-jest": "^29.2.6"
@@ -71,5 +71,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "66f71f33f5b12fa4e7c7969f0a6239a590c999d1"
+    "gitHead": "52b77087a10567ad62b48bde04607c627580105d"
 }