@lwrjs/loader 0.17.2-alpha.4 → 0.17.2-alpha.6

package/build/modules/lwr/loaderLegacy/moduleRegistry/moduleRegistry.js

@@ -1,14 +1,15 @@
-/* global console,process */
-import { invariant, NO_AMD_REQUIRE, LoaderError, FAIL_INSTANTIATE, FAILED_DEP, UNRESOLVED, INVALID_HOOK, INVALID_LOADER_SERVICE_RESPONSE, MODULE_ALREADY_LOADED, MODULE_LOAD_TIMEOUT, EXPORTER_ERROR, } from '../errors/messages.js';
+/* global process console */
+import { invariant, NO_AMD_REQUIRE, LoaderError, FAIL_INSTANTIATE, FAILED_DEP, UNRESOLVED, INVALID_HOOK, INVALID_LOADER_SERVICE_RESPONSE, MODULE_LOAD_TIMEOUT, EXPORTER_ERROR, } from '../errors/messages.js';
 import { resolveIfNotPlainOrUrl, isUrl } from '../utils/url.js';
 import { hasDocument, hasConsole, hasProcessEnv } from '../utils/dom.js';
 import { loadModuleDef } from './scriptLoad.js';
 import { evaluateLoadHookResponse, evaluateLoadHook, isResponseAPromise, } from '../hooks/resolveAndLoadHook.js';
 import { evaluateHandleStaleModuleHooks } from '../hooks/moduleInvalidation.js';
-import { MODULE_LOAD_TIMEOUT_TIMER } from '../constants/constants.js';
+import { MODULE_LOAD_TIMEOUT_TIMER, MODULE_WARNING } from '../constants/constants.js';
 import { MODULE_DEFINE, MODULE_ERROR, MODULE_FETCH, MODULE_DYNAMIC_LOAD } from 'lwr/metrics';
 export class ModuleRegistry {
     constructor(config) {
+        this.isAppMounted = false;
         // A registry for named AMD defines containing the *metadata* of AMD module
         this.namedDefineRegistry = new Map();
         // The evaluated module registry where the module identifier (name or URL?) is the key
@@ -17,6 +18,11 @@ export class ModuleRegistry {
         this.aliases = new Map();
         this.baseUrl = config.baseUrl || '';
         this.profiler = config.profiler;
+        this.warnings = {
+            [MODULE_WARNING.MODULE_REDEFINE]: [],
+            [MODULE_WARNING.MODULE_ALREADY_LOADED]: [],
+            [MODULE_WARNING.ALIAS_UPDATE]: [],
+        };
     }
     clearRegistry() {
         this.moduleRegistry = new Map();
@@ -134,10 +140,13 @@ export class ModuleRegistry {
                 // eslint-disable-next-line lwr/no-unguarded-apis
                 process.env.NODE_ENV !== 'production' &&
                 // eslint-disable-next-line lwr/no-unguarded-apis
-                process.env.MRT_HMR !== 'true' &&
-                hasConsole) {
-                // eslint-disable-next-line lwr/no-unguarded-apis
-                console.warn(`Module redefine attempted: ${name}`);
+                process.env.MRT_HMR !== 'true') {
+                if (!this.warnings[MODULE_WARNING.MODULE_REDEFINE].includes(name)) {
+                    this.warnings[MODULE_WARNING.MODULE_REDEFINE].push(name);
+                }
+                if (this.isAppMounted) {
+                    this.logMessage('warning', `${MODULE_WARNING.MODULE_REDEFINE}: ${name}`);
+                }
             }
             this.lastDefine = mod;
             return;
@@ -195,9 +204,13 @@ export class ModuleRegistry {
                 this.namedDefineRegistry.set(id, moduleDef);
                 // eslint-disable-next-line lwr/no-unguarded-apis
             }
-            else if (process.env.NODE_ENV !== 'production' && hasConsole) {
-                // eslint-disable-next-line lwr/no-unguarded-apis
-                console.warn(MODULE_ALREADY_LOADED.message, id);
+            else if (process.env.NODE_ENV !== 'production') {
+                if (!this.warnings[MODULE_WARNING.MODULE_ALREADY_LOADED].includes(id)) {
+                    this.warnings[MODULE_WARNING.MODULE_ALREADY_LOADED].push(id);
+                }
+                if (this.isAppMounted) {
+                    this.logMessage('warning', `${MODULE_WARNING.MODULE_ALREADY_LOADED}: ${id}`);
+                }
             }
         });
     }
@@ -296,15 +309,18 @@ export class ModuleRegistry {
         if (aliasId !== resolvedId) {
             if (!this.aliases.has(aliasId)) {
                 this.aliases.set(aliasId, resolvedId);
+                // eslint-disable-next-line lwr/no-unguarded-apis
             }
-            else if (hasConsole) {
+            else if (hasConsole && process.env.NODE_ENV !== 'production') {
                 // Warn the user if they were not aliasing to the resolvedId
                 const currentResolvedId = this.aliases.get(aliasId);
                 if (currentResolvedId !== resolvedId) {
-                    // eslint-disable-next-line lwr/no-unguarded-apis
-                    if (process.env.NODE_ENV !== 'production' && hasConsole) {
-                        // eslint-disable-next-line lwr/no-unguarded-apis, no-undef
-                        console.warn(`Alias update attempt: ${aliasId}=>${currentResolvedId}, ${resolvedId}`);
+                    const warningMsg = `${aliasId}=>${currentResolvedId}, ${resolvedId}`;
+                    if (!this.warnings[MODULE_WARNING.ALIAS_UPDATE].includes(warningMsg)) {
+                        this.warnings[MODULE_WARNING.ALIAS_UPDATE].push(warningMsg);
+                    }
+                    if (this.isAppMounted) {
+                        this.logMessage('warning', `${MODULE_WARNING.ALIAS_UPDATE}: ${warningMsg}`);
                     }
                 }
             }
@@ -551,5 +567,24 @@ export class ModuleRegistry {
     isValidResolveResponse(res) {
         return (res === null || typeof res === 'string' || (res && typeof res.url === 'string'));
     }
+    getModuleWarnings(isAppMounted = false) {
+        this.isAppMounted = isAppMounted;
+        return this.warnings;
+    }
+    logMessage(logType, message) {
+        if (!hasProcessEnv ||
+            !hasConsole || // eslint-disable-next-line lwr/no-unguarded-apis
+            process.env.NODE_ENV === 'production') {
+            return;
+        }
+        if (logType == 'warning') {
+            // eslint-disable-next-line lwr/no-unguarded-apis
+            console.warn(message);
+        }
+        else {
+            // eslint-disable-next-line lwr/no-unguarded-apis
+            console.log(message);
+        }
+    }
 }
 //# sourceMappingURL=moduleRegistry.js.map

package/build/shim/shim.d.ts

@@ -27,5 +27,6 @@ export default class LoaderShim {
     private mountApp;
     private enterErrorState;
     private startWatchdogTimer;
+    private logWarnings;
 }
 //# sourceMappingURL=shim.d.ts.map

package/build/shim/shim.js

@@ -1,4 +1,4 @@
-/* global document */
+/* global document, process, console */
 import { BOOTSTRAP_ERROR } from 'lwr/metrics';
 import { logOperationStart, logOperationEnd } from 'lwr/profiler';
 import { createLoader } from './loader.js';
@@ -7,6 +7,7 @@ import { customInit } from './customInit.js';
 /* eslint-disable lwr/no-unguarded-apis */
 const hasSetTimeout = typeof setTimeout === 'function';
 const hasConsole = typeof console !== 'undefined';
+const hasProcess = typeof process !== 'undefined';
 /* eslint-enable lwr/no-unguarded-apis */
 export default class LoaderShim {
     constructor(global) {
@@ -101,6 +102,14 @@ export default class LoaderShim {
             };
             const loader = createLoader(this.loaderSpecifier, this.defineCache[this.loaderSpecifier], loaderConfig, this.config.preloadModules);
             this.mountApp(loader);
+            if (loader &&
+                typeof loader.getModuleWarnings === 'function' &&
+                hasProcess &&
+                hasConsole &&
+                // eslint-disable-next-line lwr/no-unguarded-apis
+                process.env.NODE_ENV !== 'production') {
+                this.logWarnings(loader.getModuleWarnings(true)); // the true indicates the app is mounted
+            }
         }
         catch (e) {
             this.enterErrorState(e);
@@ -190,5 +199,13 @@ export default class LoaderShim {
             this.enterErrorState(new Error('Failed to load required modules - timed out'));
         }, REQUIRED_MODULES_TIMEOUT);
     }
+    logWarnings(warnings) {
+        for (const warningKey in warnings) {
+            if (warnings[warningKey].length) {
+                // eslint-disable-next-line lwr/no-unguarded-apis
+                console.warn(warningKey, warnings[warningKey]);
+            }
+        }
+    }
 }
 //# sourceMappingURL=shim.js.map

package/build/shim-legacy/shimLegacy.d.ts

@@ -27,5 +27,6 @@ export default class LoaderShim {
     private mountApp;
     private enterErrorState;
     private startWatchdogTimer;
+    private logWarnings;
 }
 //# sourceMappingURL=shimLegacy.d.ts.map

package/build/shim-legacy/shimLegacy.js

@@ -1,4 +1,4 @@
-/* global document */
+/* global document, process, console */
 import { BOOTSTRAP_ERROR } from 'lwr/metrics';
 import { logOperationStart, logOperationEnd } from 'lwr/profiler';
 import { createLoader } from './loaderLegacy.js';
@@ -7,6 +7,7 @@ import { customInit } from '../shim/customInit.js';
 /* eslint-disable lwr/no-unguarded-apis */
 const hasSetTimeout = typeof setTimeout === 'function';
 const hasConsole = typeof console !== 'undefined';
+const hasProcess = typeof process !== 'undefined';
 /* eslint-enable lwr/no-unguarded-apis */
 export default class LoaderShim {
     constructor(global) {
@@ -100,6 +101,14 @@ export default class LoaderShim {
             };
             const loader = createLoader(this.loaderModule, this.defineCache[this.loaderModule], loaderConfig, this.config.preloadModules);
             this.mountApp(loader);
+            if (loader &&
+                typeof loader.getModuleWarnings === 'function' &&
+                hasProcess &&
+                hasConsole &&
+                // eslint-disable-next-line lwr/no-unguarded-apis
+                process.env.NODE_ENV !== 'production') {
+                this.logWarnings(loader.getModuleWarnings(true)); // the true indicates the app is mounted
+            }
         }
         catch (e) {
             this.enterErrorState(e);
@@ -184,5 +193,13 @@ export default class LoaderShim {
             this.enterErrorState(new Error('Failed to load required modules - timed out'));
         }, REQUIRED_MODULES_TIMEOUT);
     }
+    logWarnings(warnings) {
+        for (const warningKey in warnings) {
+            if (warnings[warningKey].length) {
+                // eslint-disable-next-line lwr/no-unguarded-apis
+                console.warn(warningKey, warnings[warningKey]);
+            }
+        }
+    }
 }
 //# sourceMappingURL=shimLegacy.js.map

package/build/types.d.ts

@@ -18,6 +18,7 @@ export interface BaseLoaderAPI {
     registerExternalModules(modules: string[]): void;
     services: Record<string, Function>;
     clearRegistry: Function;
+    getModuleWarnings(isAppMounted: boolean): Record<string, string[]>;
 }
 export interface LoaderAPI extends BaseLoaderAPI {
     registerImportMappings(mappings?: ImportMap): Promise<void>;

package/package.json

@@ -5,7 +5,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.17.2-alpha.4",
+    "version": "0.17.2-alpha.6",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -61,16 +61,16 @@
     },
     "devDependencies": {
         "@locker/trusted-types": "0.23.6",
-        "@lwrjs/diagnostics": "0.17.2-alpha.4",
-        "@lwrjs/types": "0.17.2-alpha.4",
+        "@lwrjs/diagnostics": "0.17.2-alpha.6",
+        "@lwrjs/types": "0.17.2-alpha.6",
         "@rollup/plugin-node-resolve": "^15.2.3",
         "@rollup/plugin-sucrase": "^5.0.2",
         "@rollup/plugin-terser": "^0.4.4",
         "rollup": "^2.79.2"
     },
     "dependencies": {
-        "@lwrjs/client-modules": "0.17.2-alpha.4",
-        "@lwrjs/shared-utils": "0.17.2-alpha.4"
+        "@lwrjs/client-modules": "0.17.2-alpha.6",
+        "@lwrjs/shared-utils": "0.17.2-alpha.6"
     },
     "lwc": {
         "modules": [
@@ -90,5 +90,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "d7fb1605cec0bf9fef18e3daeb17dc28b35a80d3"
+    "gitHead": "e52a06333b7cd8d6d4bdc846ea9019d13f9fb85d"
 }