@openmrs/esm-dynamic-loading 6.3.1-pre.3106 → 6.3.1-pre.3119

package/.turbo/turbo-build.log

@@ -1,3 +1,3 @@
-[0] Successfully compiled: 3 files with swc (154.21ms)
+[0] Successfully compiled: 3 files with swc (212.99ms)
 [0] swc --strip-leading-paths src -d dist exited with code 0
 [1] tsc --project tsconfig.build.json exited with code 0

package/dist/dynamic-loading.js

@@ -41,7 +41,9 @@ import { getCoreTranslation } from "@openmrs/esm-translations";
             }, maxLoadingTime);
         })
     ]);
-    timeout && clearTimeout(timeout);
+    if (timeout) {
+        clearTimeout(timeout);
+    }
     const jsPackageSlug = slugify(jsPackage);
     const container = window[jsPackageSlug];
     if (!isFederatedModule(container)) {
@@ -169,8 +171,12 @@ const OPENMRS_SCRIPT_LOADING = Symbol('__openmrs_script_loading');
         finishScriptLoading = ()=>{
             clearTimeout(loadTimeout);
             scriptLoading.delete(url);
-            loadFn && element.removeEventListener('load', loadFn);
-            errFn && element.removeEventListener('error', errFn);
+            if (loadFn) {
+                element.removeEventListener('load', loadFn);
+            }
+            if (errFn) {
+                element.removeEventListener('error', errFn);
+            }
         };
         loadFn = ()=>{
             finishScriptLoading();
@@ -189,8 +195,12 @@ const OPENMRS_SCRIPT_LOADING = Symbol('__openmrs_script_loading');
         if (scriptLoading.has(url)) {
             let loadFn, errFn, finishScriptLoading;
             finishScriptLoading = ()=>{
-                loadFn && scriptElement.removeEventListener('load', loadFn);
-                errFn && scriptElement.removeEventListener('error', errFn);
+                if (loadFn) {
+                    scriptElement.removeEventListener('load', loadFn);
+                }
+                if (errFn) {
+                    scriptElement.removeEventListener('error', errFn);
+                }
             };
             loadFn = ()=>{
                 finishScriptLoading();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-dynamic-loading",
-  "version": "6.3.1-pre.3106",
+  "version": "6.3.1-pre.3119",
   "license": "MPL-2.0",
   "description": "Utilities for dynamically loading code in OpenMRS",
   "type": "module",
@@ -52,8 +52,8 @@
     "@openmrs/esm-translations": "6.x"
   },
   "devDependencies": {
-    "@openmrs/esm-globals": "6.3.1-pre.3106",
-    "@openmrs/esm-translations": "6.3.1-pre.3106",
+    "@openmrs/esm-globals": "6.3.1-pre.3119",
+    "@openmrs/esm-translations": "6.3.1-pre.3119",
     "@swc/cli": "^0.7.7",
     "@swc/core": "^1.11.29",
     "concurrently": "^9.1.2",

package/src/dynamic-loading.ts

@@ -57,7 +57,9 @@ export async function importDynamic<T = any>(
     }),
   ]);
 
-  timeout && clearTimeout(timeout);
+  if (timeout) {
+    clearTimeout(timeout);
+  }
 
   const jsPackageSlug = slugify(jsPackage);
 
@@ -209,7 +211,7 @@ function loadScript(
   reject: (reason?: any) => void,
 ) {
   const scriptElement = document.head.querySelector(`script[src="${url}"]`);
-  let scriptLoading: Set<String> = window[OPENMRS_SCRIPT_LOADING];
+  let scriptLoading: Set<string> = window[OPENMRS_SCRIPT_LOADING];
   if (!scriptLoading) {
     scriptLoading = window[OPENMRS_SCRIPT_LOADING] = new Set([]);
   }
@@ -233,8 +235,14 @@ function loadScript(
     finishScriptLoading = () => {
       clearTimeout(loadTimeout);
       scriptLoading.delete(url);
-      loadFn && element.removeEventListener('load', loadFn);
-      errFn && element.removeEventListener('error', errFn);
+
+      if (loadFn) {
+        element.removeEventListener('load', loadFn);
+      }
+
+      if (errFn) {
+        element.removeEventListener('error', errFn);
+      }
     };
 
     loadFn = () => {
@@ -258,8 +266,13 @@ function loadScript(
       let loadFn: () => void, errFn: (ev: ErrorEvent) => void, finishScriptLoading: () => void;
 
       finishScriptLoading = () => {
-        loadFn && scriptElement.removeEventListener('load', loadFn);
-        errFn && scriptElement.removeEventListener('error', errFn);
+        if (loadFn) {
+          scriptElement.removeEventListener('load', loadFn);
+        }
+
+        if (errFn) {
+          scriptElement.removeEventListener('error', errFn);
+        }
       };
 
       loadFn = () => {