@lwrjs/core 0.6.0-alpha.13 → 0.6.0-alpha.14

package/build/cjs/context/hooks.cjs

@@ -39,7 +39,16 @@ async function runConfigurationsHook(hookPlugins, lwrConfig, dataConfig, runtime
   for (const hookPlugin of hookPlugins) {
     await hookPlugin.initConfigs(lwrConfig, dataConfig, runtimeConfig);
   }
-  (0, import_app_config.validateLwrAppConfig)(JSON.stringify(lwrConfig), "post");
+  try {
+    (0, import_app_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");
+      console.dir(e, {depth: null});
+    } else {
+      throw e;
+    }
+  }
   normalizeRoutesBootstrap(lwrConfig);
   return {
     lwrConfig,

package/build/cjs/env-config.cjs

@@ -126,11 +126,18 @@ function createCacheFolder(cache, rootDir) {
 function getLwrConfigFromFile(rootDir, customDir = DEFAULT_LWR_CONFIG_JSON) {
   const lwrConfigPath = import_path.default.resolve((0, import_shared_utils.normalizeDirectory)(customDir, rootDir));
   if (import_fs.default.existsSync(lwrConfigPath)) {
+    const configAsString = (0, import_shared_utils.readFile)(lwrConfigPath);
     try {
-      return (0, import_app_config.validateLwrAppConfig)((0, import_shared_utils.readFile)(lwrConfigPath), "file");
+      return (0, import_app_config.validateLwrAppConfig)(configAsString, "file");
     } catch (e) {
       if (e instanceof import_diagnostics.LwrConfigValidationError) {
-        throw 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");
+          console.dir(e, {depth: null});
+          return JSON.parse(configAsString);
+        } else {
+          throw e;
+        }
       }
       return void 0;
     }
@@ -265,7 +272,16 @@ function trimLwrConfig(config) {
 function normalizeConfig(config) {
   if (config !== void 0) {
     config = trimLwrConfig(config);
-    (0, import_app_config.validateLwrAppConfig)(JSON.stringify(config), "pre");
+    try {
+      (0, import_app_config.validateLwrAppConfig)(JSON.stringify(config), "pre");
+    } 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");
+        console.dir(e, {depth: null});
+      } else {
+        throw e;
+      }
+    }
   }
   const rootDir = import_path.default.resolve(config?.rootDir || DEFAULT_ROOT_DIR);
   const lwrJsonConfig = config?.ignoreLwrConfigFile === true ? void 0 : getLwrConfigFromFile(rootDir, config?.lwrConfigFile);

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

@@ -127,17 +127,12 @@ function apiMiddleware(app, context) {
         const {entry} = await moduleRegistry.getModuleEntry(importerModuleId);
         moduleId = {...moduleId, importer: entry};
       }
-      const {format, compat, locale, apiVersion} = req.params;
       const {ownHash, moduleEntry} = await moduleRegistry.getModule(moduleId, ctx.runtimeParams);
       if (ownHash) {
-        const localeSegment = locale ? `/l/${locale}` : "";
-        const uriSpecifier = encodeURIComponent((0, import_shared_utils.getSpecifier)({
-          specifier: moduleEntry.specifier,
-          version: (0, import_shared_utils.normalizeVersionToUri)(moduleEntry.version)
-        }));
-        const jsonQuery = req.isJsonRequest() ? "?json" : "";
+        const jsonQuery = req.isJsonRequest() ? `${ctx.runtimeEnvironment.debug ? "&" : "?"}json` : "";
+        const uri = await moduleRegistry.resolveModuleUri({...moduleId, version: moduleEntry.version}, ctx.runtimeEnvironment, ctx.runtimeParams);
         res.set({
-          Location: `/${apiVersion}/bundle/${format}/${compat}${localeSegment}/bi/0/module/mi/${uriSpecifier}/s/${ownHash}/${moduleId.specifier.replace(/\//g, "_")}${jsonQuery}`
+          Location: `${uri}${jsonQuery}`
         });
         res.sendStatus(302);
       }
@@ -241,17 +236,12 @@ function apiMiddleware(app, context) {
         const {entry} = await moduleRegistry.getModuleEntry(importerModuleId);
         moduleId = {...moduleId, importer: entry};
       }
-      const {format, compat, locale, apiVersion} = req.params;
       const {ownHash, moduleEntry} = await moduleRegistry.getModule(moduleId, ctx.runtimeParams);
       if (ownHash) {
-        const localeSegment = locale ? `/l/${locale}` : "";
-        const uriSpecifier = encodeURIComponent((0, import_shared_utils.getSpecifier)({
-          specifier: moduleEntry.specifier,
-          version: (0, import_shared_utils.normalizeVersionToUri)(moduleEntry.version)
-        }));
-        const jsonQuery = req.isJsonRequest() ? "?json" : "";
+        const jsonQuery = req.isJsonRequest() ? `${ctx.runtimeEnvironment.debug ? "&" : "?"}json` : "";
+        const uri = await moduleRegistry.resolveModuleUri({...moduleId, version: moduleEntry.version}, ctx.runtimeEnvironment, ctx.runtimeParams);
         res.set({
-          Location: `/${apiVersion}/module/${format}/${compat}${localeSegment}/mi/${uriSpecifier}/s/${ownHash}/${moduleId.specifier.replace(/\//g, "_")}${jsonQuery}`
+          Location: `${uri}${jsonQuery}`
         });
         res.sendStatus(302);
       }

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

@@ -108,9 +108,10 @@ var SiteGenerator = class {
     await (0, import_stream.writeResponse)(context, fullPath);
     const dispatchRequests = [];
     if (normalizedUrl.indexOf("/s/") !== -1) {
-      const rewriteUrl = normalizedUrl.substring(0, normalizedUrl.indexOf("/s/"));
-      siteConfig.urlRewriteMap.set(rewriteUrl, normalizedUrl);
+      siteConfig.urlRewriteMap.set(normalizedUrl.substring(0, normalizedUrl.indexOf("/s/")), normalizedUrl);
       siteConfig.urlRewriteMap.set(url.substring(0, url.indexOf("/s/")), normalizedUrl);
+      siteConfig.urlRewriteMap.set(normalizedUrl.substring(0, normalizedUrl.indexOf("/v/")), normalizedUrl);
+      siteConfig.urlRewriteMap.set(url.substring(0, url.indexOf("%2Fv%2F")), normalizedUrl);
     }
     const moduleDefinition = context.fs?.metadata?.moduleDefinition;
     if (moduleDefinition) {

package/build/es/context/hooks.js

@@ -13,7 +13,19 @@ export async function runConfigurationsHook(hookPlugins, lwrConfig, dataConfig,
         // eslint-disable-next-line no-await-in-loop
         await hookPlugin.initConfigs(lwrConfig, dataConfig, runtimeConfig);
     }
-    validateLwrAppConfig(JSON.stringify(lwrConfig), 'post');
+    try {
+        validateLwrAppConfig(JSON.stringify(lwrConfig), 'post');
+    }
+    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');
+            console.dir(e, { depth: null });
+        }
+        else {
+            throw e;
+        }
+    }
     normalizeRoutesBootstrap(lwrConfig);
     return {
         lwrConfig,

package/build/es/env-config.js

@@ -101,12 +101,21 @@ function createCacheFolder(cache, rootDir) {
 function getLwrConfigFromFile(rootDir, customDir = DEFAULT_LWR_CONFIG_JSON) {
     const lwrConfigPath = path.resolve(normalizeDirectory(customDir, rootDir));
     if (fs.existsSync(lwrConfigPath)) {
+        const configAsString = readFile(lwrConfigPath);
         try {
-            return validateLwrAppConfig(readFile(lwrConfigPath), 'file');
+            return validateLwrAppConfig(configAsString, 'file');
         }
         catch (e) {
             if (e instanceof LwrConfigValidationError) {
-                throw 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');
+                    console.dir(e, { depth: null });
+                    return JSON.parse(configAsString);
+                }
+                else {
+                    throw e;
+                }
             }
             return undefined;
         }
@@ -268,7 +277,19 @@ function trimLwrConfig(config) {
 export function normalizeConfig(config) {
     if (config !== undefined) {
         config = trimLwrConfig(config);
-        validateLwrAppConfig(JSON.stringify(config), 'pre');
+        try {
+            validateLwrAppConfig(JSON.stringify(config), 'pre');
+        }
+        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');
+                console.dir(e, { depth: null });
+            }
+            else {
+                throw e;
+            }
+        }
     }
     // Merge all configurations together, and return
     const rootDir = path.resolve(config?.rootDir || DEFAULT_ROOT_DIR);

package/build/es/middlewares/api-middleware.js

@@ -1,5 +1,5 @@
 import { LwrUnresolvableError, createSingleDiagnosticError as createDiagnostic, descriptions, } from '@lwrjs/diagnostics';
-import { LATEST_SIGNATURE, explodeSpecifier, getImportMetadataMappings, getSpecifier, normalizeVersionToUri, serializeModuleToJson, getModuleIdentity, getResourceIdentity, getAssetIdentity, getMappingIdentity, getVersionedModuleId, } from '@lwrjs/shared-utils';
+import { LATEST_SIGNATURE, explodeSpecifier, getImportMetadataMappings, serializeModuleToJson, getModuleIdentity, getResourceIdentity, getAssetIdentity, getMappingIdentity, getVersionedModuleId, } from '@lwrjs/shared-utils';
 import { createReturnStatus, isSupportedEnvironment } from './utils.js';
 export default function apiMiddleware(app, context) {
     const { appConfig: { environment: environmentConfig }, moduleRegistry, moduleBundler, resourceRegistry, runtimeEnvironment: defaultRuntimeEnvironment, } = context;
@@ -118,20 +118,15 @@ export default function apiMiddleware(app, context) {
                 const { entry } = await moduleRegistry.getModuleEntry(importerModuleId);
                 moduleId = { ...moduleId, importer: entry };
             }
-            // const { ownHash, moduleEntry } = await moduleRegistry.getModule(moduleId, ctx.runtimeParams);
-            const { format, compat, locale, apiVersion } = req.params;
             const { ownHash, moduleEntry } = await moduleRegistry.getModule(moduleId, ctx.runtimeParams);
             if (ownHash) {
-                const localeSegment = locale ? `/l/${locale}` : '';
-                const uriSpecifier = encodeURIComponent(getSpecifier({
-                    specifier: moduleEntry.specifier,
-                    version: normalizeVersionToUri(moduleEntry.version),
-                })); // get specifier from registry, not req.params
-                const jsonQuery = req.isJsonRequest() ? '?json' : '';
+                const jsonQuery = req.isJsonRequest()
+                    ? `${ctx.runtimeEnvironment.debug ? '&' : '?'}json`
+                    : '';
+                const uri = await moduleRegistry.resolveModuleUri({ ...moduleId, version: moduleEntry.version }, ctx.runtimeEnvironment, ctx.runtimeParams);
                 res.set({
                     // This redirects to a signed URI
-                    // A prettifier is added to the end so resources have a meaningful name in browser devtools
-                    Location: `/${apiVersion}/bundle/${format}/${compat}${localeSegment}/bi/0/module/mi/${uriSpecifier}/s/${ownHash}/${moduleId.specifier.replace(/\//g, '_')}${jsonQuery}`,
+                    Location: `${uri}${jsonQuery}`,
                 });
                 res.sendStatus(302);
             }
@@ -261,19 +256,15 @@ export default function apiMiddleware(app, context) {
                 moduleId = { ...moduleId, importer: entry };
             }
             // Get the module's signature from the registry
-            const { format, compat, locale, apiVersion } = req.params;
             const { ownHash, moduleEntry } = await moduleRegistry.getModule(moduleId, ctx.runtimeParams);
             if (ownHash) {
-                const localeSegment = locale ? `/l/${locale}` : '';
-                const uriSpecifier = encodeURIComponent(getSpecifier({
-                    specifier: moduleEntry.specifier,
-                    version: normalizeVersionToUri(moduleEntry.version),
-                })); // get specifier from registry, not req.params
-                const jsonQuery = req.isJsonRequest() ? '?json' : '';
+                const jsonQuery = req.isJsonRequest()
+                    ? `${ctx.runtimeEnvironment.debug ? '&' : '?'}json`
+                    : '';
+                const uri = await moduleRegistry.resolveModuleUri({ ...moduleId, version: moduleEntry.version }, ctx.runtimeEnvironment, ctx.runtimeParams);
                 res.set({
                     // This redirects to a signed URI
-                    // A prettifier is added to the end so resources have a meaningful name in browser devtools
-                    Location: `/${apiVersion}/module/${format}/${compat}${localeSegment}/mi/${uriSpecifier}/s/${ownHash}/${moduleId.specifier.replace(/\//g, '_')}${jsonQuery}`,
+                    Location: `${uri}${jsonQuery}`,
                 });
                 res.sendStatus(302);
             }

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

@@ -129,13 +129,20 @@ export default class SiteGenerator {
         const dispatchRequests = [];
         // Add URL re-writes for module redirects
         if (normalizedUrl.indexOf('/s/') !== -1) {
-            const rewriteUrl = normalizedUrl.substring(0, normalizedUrl.indexOf('/s/'));
-            // Redirect /1/bundle/amd/l/en-US/bi/0/module/mi/lwr/navigation/v/0_1_6 -> /1/bundle/amd/l/en-US/bi/0/module/mi/lwr/navigation/v/0_1_6/s/{signature}
-            siteConfig.urlRewriteMap.set(rewriteUrl, normalizedUrl);
-            // Redirect /1/bundle/amd/l/en-US/bi/0/module/mi/lwr%2Fnavigation%2Fv%2F0_1_6 -> /1/bundle/amd/l/en-US/bi/0/module/mi/lwr/navigation/v/0_1_6/s/{signature}
+            // Redirect unsigned to signed URIs
+            // e.g. /1/bundle/amd/l/en-US/bi/0/module/mi/c/module/v/0_1_6 -> /1/bundle/amd/l/en-US/bi/0/module/mi/c/module/v/0_1_6/s/{signature}
+            siteConfig.urlRewriteMap.set(normalizedUrl.substring(0, normalizedUrl.indexOf('/s/')), normalizedUrl);
+            // Redirect encoded signed URIs to UNencoded signed URIs
+            // e.g. /1/bundle/amd/l/en-US/bi/0/module/mi/c%2Fmodule%2Fv%2F0_1_6/s/{signature} -> /1/bundle/amd/l/en-US/bi/0/module/mi/c/module/v/0_1_6/s/{signature}
             siteConfig.urlRewriteMap.set(url.substring(0, url.indexOf('/s/')), normalizedUrl);
-            // TODO Redirect /1/bundle/amd/l/en-US/bi/0/module/mi/lwr/navigation -> /1/bundle/amd/l/en-US/bi/0/module/mi/lwr/navigation/v/0_1_6/s/{signature}
-            // Dynamic import example /1/bundle/amd/l/en-US/bi/0/module/mi/dynamic%2Fmodule?importer=examples%2Fhome%2Fv%2F0_1_6
+            // Redirect unversioned/unsigned URIs to signed URIs
+            // e.g. /1/bundle/amd/l/en-US/bi/0/module/mi/c/module -> /1/bundle/amd/l/en-US/bi/0/module/mi/c/module/v/0_1_6/s/{signature}
+            // e.g. with importer /1/bundle/amd/l/en-US/bi/0/module/mi/c/module?importer=parent%2Fmodule%2Fv%2F2_1_0 -> /1/bundle/amd/l/en-US/bi/0/module/mi/c/module/v/0_1_6/s/{signature}
+            siteConfig.urlRewriteMap.set(normalizedUrl.substring(0, normalizedUrl.indexOf('/v/')), normalizedUrl);
+            // Redirect encoded unversioned/unsigned URIs to UNencoded signed URIs
+            // e.g. /1/bundle/amd/l/en-US/bi/0/module/mi/c%2Fmodule -> /1/bundle/amd/l/en-US/bi/0/module/mi/c/module/v/0_1_6/s/{signature}
+            // e.g. with importer /1/bundle/amd/l/en-US/bi/0/module/mi/c%2Fmodule?importer=parent%2Fmodule%2Fv%2F2_1_0 -> /1/bundle/amd/l/en-US/bi/0/module/mi/c/module/v/0_1_6/s/{signature}
+            siteConfig.urlRewriteMap.set(url.substring(0, url.indexOf('%2Fv%2F')), normalizedUrl);
         }
         // Recursively traverse dependencies
         const moduleDefinition = context.fs?.metadata?.moduleDefinition; // LinkedModuleDefinition | BundleDefinition

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.6.0-alpha.13",
+    "version": "0.6.0-alpha.14",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -33,31 +33,31 @@
         "package.cjs"
     ],
     "dependencies": {
-        "@lwrjs/app-service": "0.6.0-alpha.13",
-        "@lwrjs/asset-registry": "0.6.0-alpha.13",
-        "@lwrjs/asset-transformer": "0.6.0-alpha.13",
-        "@lwrjs/base-template-engine": "0.6.0-alpha.13",
-        "@lwrjs/base-view-provider": "0.6.0-alpha.13",
-        "@lwrjs/base-view-transformer": "0.6.0-alpha.13",
-        "@lwrjs/client-modules": "0.6.0-alpha.13",
-        "@lwrjs/compiler": "0.6.0-alpha.13",
-        "@lwrjs/diagnostics": "0.6.0-alpha.13",
-        "@lwrjs/fs-asset-provider": "0.6.0-alpha.13",
-        "@lwrjs/html-view-provider": "0.6.0-alpha.13",
-        "@lwrjs/loader": "0.6.0-alpha.13",
-        "@lwrjs/lwc-module-provider": "0.6.0-alpha.13",
-        "@lwrjs/lwc-ssr": "0.6.0-alpha.13",
-        "@lwrjs/markdown-view-provider": "0.6.0-alpha.13",
-        "@lwrjs/module-bundler": "0.6.0-alpha.13",
-        "@lwrjs/module-registry": "0.6.0-alpha.13",
-        "@lwrjs/npm-module-provider": "0.6.0-alpha.13",
-        "@lwrjs/nunjucks-view-provider": "0.6.0-alpha.13",
-        "@lwrjs/o11y": "0.6.0-alpha.13",
-        "@lwrjs/resource-registry": "0.6.0-alpha.13",
-        "@lwrjs/router": "0.6.0-alpha.13",
-        "@lwrjs/server": "0.6.0-alpha.13",
-        "@lwrjs/shared-utils": "0.6.0-alpha.13",
-        "@lwrjs/view-registry": "0.6.0-alpha.13",
+        "@lwrjs/app-service": "0.6.0-alpha.14",
+        "@lwrjs/asset-registry": "0.6.0-alpha.14",
+        "@lwrjs/asset-transformer": "0.6.0-alpha.14",
+        "@lwrjs/base-template-engine": "0.6.0-alpha.14",
+        "@lwrjs/base-view-provider": "0.6.0-alpha.14",
+        "@lwrjs/base-view-transformer": "0.6.0-alpha.14",
+        "@lwrjs/client-modules": "0.6.0-alpha.14",
+        "@lwrjs/compiler": "0.6.0-alpha.14",
+        "@lwrjs/diagnostics": "0.6.0-alpha.14",
+        "@lwrjs/fs-asset-provider": "0.6.0-alpha.14",
+        "@lwrjs/html-view-provider": "0.6.0-alpha.14",
+        "@lwrjs/loader": "0.6.0-alpha.14",
+        "@lwrjs/lwc-module-provider": "0.6.0-alpha.14",
+        "@lwrjs/lwc-ssr": "0.6.0-alpha.14",
+        "@lwrjs/markdown-view-provider": "0.6.0-alpha.14",
+        "@lwrjs/module-bundler": "0.6.0-alpha.14",
+        "@lwrjs/module-registry": "0.6.0-alpha.14",
+        "@lwrjs/npm-module-provider": "0.6.0-alpha.14",
+        "@lwrjs/nunjucks-view-provider": "0.6.0-alpha.14",
+        "@lwrjs/o11y": "0.6.0-alpha.14",
+        "@lwrjs/resource-registry": "0.6.0-alpha.14",
+        "@lwrjs/router": "0.6.0-alpha.14",
+        "@lwrjs/server": "0.6.0-alpha.14",
+        "@lwrjs/shared-utils": "0.6.0-alpha.14",
+        "@lwrjs/view-registry": "0.6.0-alpha.14",
         "dompurify": "^2.3.0",
         "fs-extra": "^10.0.0",
         "jsdom": "^16.7.0",
@@ -67,7 +67,7 @@
         "qs": "^6.9.4"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.6.0-alpha.13"
+        "@lwrjs/types": "0.6.0-alpha.14"
     },
     "peerDependencies": {
         "lwc": ">= 1.x <= 2.x"
@@ -75,5 +75,5 @@
     "engines": {
         "node": ">=14.15.4 <17"
     },
-    "gitHead": "056d10307fe29540d1586f8fd75e357b82ce2acc"
+    "gitHead": "2850ceddcf17cdc561abbdbeb465edc5d5391cfa"
 }