cindel 1.0.0 → 1.0.2

package/README.md

@@ -3,9 +3,8 @@
 > Hot module replacement server and client with file watching, static file serving, CORS proxy and WebSocket proxy support
 
 [![npm version](https://img.shields.io/npm/v/cindel.svg)](https://www.npmjs.com/package/cindel)
+[![npm bundle size](https://img.shields.io/bundlephobia/minzip/cindel?style=round-square)](https://bundlephobia.com/package/cindel@latest)
 [![license](https://img.shields.io/npm/l/cindel.svg)](LICENSE)
-[![bundle size](https://img.shields.io/bundlephobia/minzip/cindel)](https://bundlephobia.com/package/cindel)
-
 ---
 
 ## Features
@@ -13,10 +12,10 @@
 **HMR & File Watching**
 
 - Instant push driven HMR over WebSocket on file change
-- Atomic CSS hot swap (no flash of unstyled content), script execution, and ES module reload
 - Glob pattern support for watch, ignore, and cold file configuration
 - Cold file patterns that can trigger a full page reload instead of HMR
 - Override detection to map replacement files onto their originals
+- Atomic CSS hot swap (no flash of unstyled content), script execution, and ES module reload
 
 **Server**
 
@@ -399,6 +398,7 @@ process.on("SIGINT", () => server.stop().then(() => process.exit(0)));
 | `autoReconnect`     | `boolean`                            | `true`                    | Reconnect on disconnect with exponential backoff                                                 |
 | `reconnectDelay`    | `number`                             | `2000`                    | Base reconnect delay in ms                                                                       |
 | `maxReconnectDelay` | `number`                             | `30000`                   | Maximum reconnect delay cap in ms                                                                |
+| `skipOnReconnect`   | `boolean`                            | `true`                    | Skip files already loaded in the page when the server reconnects                                 |
 | `skip`              | `string[]`                           |                           | Glob patterns for files to never load                                                            |
 | `filterSkip`        | `(file, allFiles) => boolean`        |                           | Custom skip logic, OR'd with `skip`                                                              |
 | `cold`              | `string[]`                           |                           | Glob patterns that trigger a full page reload. Merged with the server's `cold` config on connect |

package/dist/client/file-loader.d.ts

@@ -12,9 +12,16 @@ export class FileLoader {
         timeout: number;
         resolvers: Function[];
     }>;
+    /**
+     * Load counter per file used for cache busting.
+     * Produces short URLs like Logger.js?v=3 which keeps
+     * browser stack traces readable.
+     * @type {Map<string, number>}
+     */
+    versions: Map<string, number>;
     loadFile(path: any): Promise<any>;
     loadCSS(path: any): Promise<any>;
-    loadModule(path: any): Promise<any>;
+    loadModule(path: any): Promise<boolean>;
     loadScript(path: any): Promise<any>;
     reloadFile(path: any): Promise<any>;
     _flushReload(path: any): Promise<void>;

package/dist/client/file-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file-loader.d.ts","sourceRoot":"","sources":["../../src/client/file-loader.js"],"names":[],"mappings":"AAAA,mFAAmF;AACnF;IACE,0BASC;IARC,aAAsB;IACtB;;;;;OAKG;IACH,WAFU,GAAG,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,UAAU,CAAA;KAAE,CAAC,CAEvC;IAG5B,kCAOC;IAKD,iCAoBC;IAKD,oCAgBC;IAED,oCAeC;IAKD,oCAeC;IAED,uCAUC;IAED,qCAcC;IAGD,2BAGC;CACF"}
+{"version":3,"file":"file-loader.d.ts","sourceRoot":"","sources":["../../src/client/file-loader.js"],"names":[],"mappings":"AAAA,mFAAmF;AACnF;IACE,0BAgBC;IAfC,aAAsB;IACtB;;;;;OAKG;IACH,WAFU,GAAG,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,UAAU,CAAA;KAAE,CAAC,CAEvC;IAC1B;;;;;OAKG;IACH,UAFU,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAEJ;IAG3B,kCAOC;IAKD,iCAoBC;IAED,wCAIC;IAED,oCAeC;IAKD,oCAeC;IAED,uCAUC;IAED,qCAiBC;IAGD,2BAIC;CACF"}

package/dist/client/hmr-client.d.ts

@@ -39,6 +39,7 @@ export class HMRClient {
      * @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.
@@ -57,6 +58,7 @@ export class HMRClient {
         autoReconnect?: boolean;
         reconnectDelay?: number;
         maxReconnectDelay?: number;
+        skipOnReconnect?: boolean;
         skip?: string[];
         filterSkip?: (arg0: string, arg1: string[]) => boolean;
         cold?: string[];
@@ -72,6 +74,7 @@ export class HMRClient {
     autoReconnect: boolean;
     reconnectDelay: number;
     maxReconnectDelay: number;
+    skipOnReconnect: boolean;
     _coldPatterns: string[];
     _filterCold: (arg0: string) => boolean;
     shouldSkipFile: any;

package/dist/client/hmr-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hmr-client.d.ts","sourceRoot":"","sources":["../../src/client/hmr-client.js"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH;IACE;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,qBAjBG;QAAyB,KAAK,GAAtB,MAAM;QACW,OAAO,GAAxB,MAAM;QACY,UAAU,GAA5B,OAAO;QACU,IAAI,GAArB,MAAM;QACW,IAAI,GAArB,MAAM;QACY,MAAM,GAAxB,OAAO;QACW,aAAa,GAA/B,OAAO;QACU,cAAc,GAA/B,MAAM;QACW,iBAAiB,GAAlC,MAAM;QACa,IAAI,GAAvB,MAAM,EAAE;QACsC,UAAU,GAAxD,CAAS,IAAM,EAAN,MAAM,EAAE,IAAQ,EAAR,MAAM,EAAE,KAAG,OAAO;QAChB,IAAI,GAAvB,MAAM,EAAE;QAC4B,UAAU,GAA9C,CAAS,IAAM,EAAN,MAAM,KAAG,OAAO;QACyB,iBAAiB,GAAnE,CAAS,IAAM,EAAN,MAAM,EAAE,IAAQ,EAAR,MAAM,EAAE,KAAG,MAAM,GAAC,IAAI;QACN,YAAY,GAA7C,CAAS,IAAM,EAAN,MAAM,KAAG,IAAI;QACiB,SAAS,GAAhD,CAAS,IAAQ,EAAR,MAAM,EAAE,KAAG,MAAM,EAAE;KACtC,EA8DA;IAvDC,WAAkB;IAClB,aAAsB;IACtB,oBAAsB;IAEtB,+BAAyD;IACzD,uBAA+C;IAC/C,uBAAiD;IACjD,0BAAwD;IAGxD,wBAAsC;IACtC,oBAtBkB,MAAM,KAAG,OAAO,CAsBQ;IAG1C,oBAAiF;IACjF,gBAAuE;IAGvE,gBAAkB;IAElB,0BA9BkB,MAAM,QAAE,MAAM,EAAE,KAAG,MAAM,GAAC,IAAI,CA8BO;IACvD,qBA9BkB,MAAM,KAAG,IAAI,CA8Bc;IAC7C,eAAmE;IAEnE,kBAAkB;IAClB,0BAA0B;IAC1B,qBAAwB;IACxB,6BAA8B;IAC9B,gCAA2B;IAI3B,qBAAuB;IACvB,6BAAgC;IAEhC,uBAA8C;IAE9C,wEAAwE;IACxE,aADW,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CACF;IAC5B,uFAAuF;IACvF,qBADW,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CACC;IAEpC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAYC;IAGH,oCAmBC;IAED,8CAcC;IAED,mCAIC;IAED,sEAoDC;IAED,kCA0BC;IAED,4CAgCC;IAED,8EAkEC;IAED,2CA4CC;IAED,wCA6CC;IAED;;;;;OAKG;IACH,UAJW,MAAM,GAAC,QAAQ,GAAC,KAAK,GAAC,QAAQ,GAAC,MAAM,GAAC,SAAS,GAAC,YAAY,GAAC,OAAO,sBAElE,SAAS,CAQrB;IAED;;;;;OAKG;IACH,YAJW,MAAM,GAAC,QAAQ,GAAC,KAAK,GAAC,QAAQ,GAAC,MAAM,GAAC,SAAS,GAAC,YAAY,GAAC,OAAO,sBAElE,SAAS,CASrB;IAED;;;;;OAKG;IACH,WAJW,MAAM,GAAC,QAAQ,GAAC,KAAK,GAAC,QAAQ,GAAC,MAAM,GAAC,SAAS,GAAC,YAAY,GAAC,OAAO,sBAElE,SAAS,CAoBrB;IAED,uCAQC;IAMD,iCAGC;IAED,oCAWC;IAED;;;OAGG;IACH,WAFa,OAAO,CAAC,IAAI,CAAC,CAuFzB;IAED;;OAEG;IACH,mBAUC;CACF;2BApnB0B,kBAAkB"}
+{"version":3,"file":"hmr-client.d.ts","sourceRoot":"","sources":["../../src/client/hmr-client.js"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH;IACE;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACH,qBAlBG;QAAyB,KAAK,GAAtB,MAAM;QACW,OAAO,GAAxB,MAAM;QACY,UAAU,GAA5B,OAAO;QACU,IAAI,GAArB,MAAM;QACW,IAAI,GAArB,MAAM;QACY,MAAM,GAAxB,OAAO;QACW,aAAa,GAA/B,OAAO;QACU,cAAc,GAA/B,MAAM;QACW,iBAAiB,GAAlC,MAAM;QACY,eAAe,GAAjC,OAAO;QACY,IAAI,GAAvB,MAAM,EAAE;QACsC,UAAU,GAAxD,CAAS,IAAM,EAAN,MAAM,EAAE,IAAQ,EAAR,MAAM,EAAE,KAAG,OAAO;QAChB,IAAI,GAAvB,MAAM,EAAE;QAC4B,UAAU,GAA9C,CAAS,IAAM,EAAN,MAAM,KAAG,OAAO;QACyB,iBAAiB,GAAnE,CAAS,IAAM,EAAN,MAAM,EAAE,IAAQ,EAAR,MAAM,EAAE,KAAG,MAAM,GAAC,IAAI;QACN,YAAY,GAA7C,CAAS,IAAM,EAAN,MAAM,KAAG,IAAI;QACiB,SAAS,GAAhD,CAAS,IAAQ,EAAR,MAAM,EAAE,KAAG,MAAM,EAAE;KACtC,EA+DA;IAxDC,WAAkB;IAClB,aAAsB;IACtB,oBAAsB;IAEtB,+BAAyD;IACzD,uBAA+C;IAC/C,uBAAiD;IACjD,0BAAwD;IACxD,yBAAqD;IAGrD,wBAAsC;IACtC,oBAvBkB,MAAM,KAAG,OAAO,CAuBQ;IAG1C,oBAAiF;IACjF,gBAAuE;IAGvE,gBAAkB;IAElB,0BA/BkB,MAAM,QAAE,MAAM,EAAE,KAAG,MAAM,GAAC,IAAI,CA+BO;IACvD,qBA/BkB,MAAM,KAAG,IAAI,CA+Bc;IAC7C,eAAmE;IAEnE,kBAAkB;IAClB,0BAA0B;IAC1B,qBAAwB;IACxB,6BAA8B;IAC9B,gCAA2B;IAI3B,qBAAuB;IACvB,6BAAgC;IAEhC,uBAA8C;IAE9C,wEAAwE;IACxE,aADW,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CACF;IAC5B,uFAAuF;IACvF,qBADW,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CACC;IAEpC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAYC;IAGH,oCAmBC;IAED,8CAcC;IAED,mCAIC;IAED,sEAoDC;IAED,kCA0BC;IAED,4CAgDC;IAED,8EAkEC;IAED,2CA4CC;IAED,wCA6CC;IAED;;;;;OAKG;IACH,UAJW,MAAM,GAAC,QAAQ,GAAC,KAAK,GAAC,QAAQ,GAAC,MAAM,GAAC,SAAS,GAAC,YAAY,GAAC,OAAO,sBAElE,SAAS,CAQrB;IAED;;;;;OAKG;IACH,YAJW,MAAM,GAAC,QAAQ,GAAC,KAAK,GAAC,QAAQ,GAAC,MAAM,GAAC,SAAS,GAAC,YAAY,GAAC,OAAO,sBAElE,SAAS,CASrB;IAED;;;;;OAKG;IACH,WAJW,MAAM,GAAC,QAAQ,GAAC,KAAK,GAAC,QAAQ,GAAC,MAAM,GAAC,SAAS,GAAC,YAAY,GAAC,OAAO,sBAElE,SAAS,CAoBrB;IAED,uCAQC;IAMD,iCAGC;IAED,oCAWC;IAED;;;OAGG;IACH,WAFa,OAAO,CAAC,IAAI,CAAC,CAuFzB;IAED;;OAEG;IACH,mBAUC;CACF;2BAtoB0B,kBAAkB"}

package/dist/client.iife.js

@@ -1561,6 +1561,7 @@ var HMR = (() => {
     constructor(httpUrl) {
       this.httpUrl = httpUrl;
       this.loadQueue = /* @__PURE__ */ new Map();
+      this.versions = /* @__PURE__ */ new Map();
     }
     async loadFile(path) {
       const isCSS = path.endsWith(".css");
@@ -1591,22 +1592,10 @@ var HMR = (() => {
         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);
@@ -1662,11 +1651,13 @@ var HMR = (() => {
         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}`;
     }
   };
 
@@ -1764,6 +1755,7 @@ var HMR = (() => {
      * @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.
@@ -1783,6 +1775,7 @@ var HMR = (() => {
       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);
@@ -1930,7 +1923,19 @@ var HMR = (() => {
         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) {