cindel 1.0.0 → 1.0.1

package/dist/client.js

@@ -1547,6 +1547,7 @@ var FileLoader = class {
   constructor(httpUrl) {
     this.httpUrl = httpUrl;
     this.loadQueue = /* @__PURE__ */ new Map();
+    this.versions = /* @__PURE__ */ new Map();
   }
   async loadFile(path) {
     const isCSS = path.endsWith(".css");
@@ -1577,22 +1578,10 @@ var FileLoader = class {
       document.head.appendChild(link);
     });
   }
-  // Replace the existing module script with a cache busted URL.
-  // Changing the URL makes the browser treat it as a new module
-  // and execute it from scratch.
   async loadModule(path) {
     const url = this.makeUrl(path);
-    const existing = document.querySelector(`script[data-file="${path}"]`);
-    if (existing) existing.remove();
-    const script = document.createElement("script");
-    script.type = "module";
-    script.src = url;
-    script.setAttribute("data-file", path);
-    return new Promise((resolve, reject) => {
-      script.onload = () => resolve(true);
-      script.onerror = () => reject(new Error(`Failed to execute module: ${path}`));
-      document.head.appendChild(script);
-    });
+    await import(url);
+    return true;
   }
   async loadScript(path) {
     const url = this.makeUrl(path);
@@ -1648,11 +1637,13 @@ var FileLoader = class {
       el.remove();
       await new Promise((r) => setTimeout(r, 0));
     }
+    this.versions.delete(path);
   }
-  // Cache bust with timestamp + random to avoid duplicate URLs on rapid reloads.
+  // Increment the version counter for individual files and return a versioned URL
   makeUrl(path) {
-    const cb = `${Date.now()}-${Math.random().toString(36).slice(2, 11)}`;
-    return `${this.httpUrl}${path}?cb=${cb}`;
+    const v = (this.versions.get(path) ?? 0) + 1;
+    this.versions.set(path, v);
+    return `${this.httpUrl}${path}?v=${v}`;
   }
 };
 
@@ -1750,6 +1741,7 @@ var HMRClient = class {
    * @param {boolean} [options.autoReconnect=true] - Reconnect on disconnect with exponential backoff.
    * @param {number} [options.reconnectDelay=2000] - Base reconnect delay in ms
    * @param {number} [options.maxReconnectDelay=30000] - Maximum reconnect delay cap in ms
+   * @param {boolean} [options.skipOnReconnect=true] - Skip files already present in the page on reconnect, preventing them from being loaded again.
    * @param {string[]} [options.skip] - Glob patterns for files that should never be loaded (e.g. `['_*\/**']`)
    * @param {function(string, string[]): boolean} [options.filterSkip] - Custom skip logic. Receives `(filePath, allFiles)`. Combined with `skip` via OR.
    * @param {string[]} [options.cold] - Glob patterns for files that require a full page reload. Merged with the server's `cold` config on connect. A `cold` event is emitted instead of hot reloading.
@@ -1769,6 +1761,7 @@ var HMRClient = class {
     this.autoReconnect = this._autoReconnectDefault;
     this.reconnectDelay = opts.reconnectDelay || 2e3;
     this.maxReconnectDelay = opts.maxReconnectDelay || 3e4;
+    this.skipOnReconnect = opts.skipOnReconnect !== false;
     this._coldPatterns = opts.cold || null;
     this._filterCold = opts.filterCold || null;
     this.shouldSkipFile = this.makeFilter(opts.skip || null, opts.filterSkip || null);
@@ -1916,7 +1909,19 @@ var HMRClient = class {
       skipped.forEach((f) => console.log(`  \u2514\u2500 ${getFileName(f)}`));
       console.groupEnd();
     }
-    const withOverrides = this.buildOverrideMap(filtered);
+    let toLoad = filtered;
+    if (this.skipOnReconnect) {
+      const alreadyLoaded = [];
+      toLoad = [];
+      for (const f of filtered) {
+        const isLoaded = this.fileLoader.versions.has(f) || document.querySelector(`[data-file="${f}"]`);
+        (isLoaded ? alreadyLoaded : toLoad).push(f);
+      }
+      if (alreadyLoaded.length > 0) {
+        this.log("info", `Server reconnected - skipping ${alreadyLoaded.length} existing file${alreadyLoaded.length !== 1 ? "s" : ""}`);
+      }
+    }
+    const withOverrides = this.buildOverrideMap(toLoad);
     const sorted2 = this.sortFiles(withOverrides);
     this.logInitFileGroup(sorted2, this.overrideMap, this.isColdFile.bind(this));
     for (const file of sorted2) {