nextjs-cms 0.5.62 → 0.5.63

package/dist/core/config/loader-with-esbuild.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader-with-esbuild.d.ts","sourceRoot":"","sources":["../../../src/core/config/loader-with-esbuild.ts"],"names":[],"mappings":"AA0CA,eAAO,MAAM,sBAAsB,cAAmC,CAAA;AA0KtE;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,QAAa,OAAO,CAAC,OAAO,CAiBxD,CAAA"}
+{"version":3,"file":"loader-with-esbuild.d.ts","sourceRoot":"","sources":["../../../src/core/config/loader-with-esbuild.ts"],"names":[],"mappings":"AA0CA,eAAO,MAAM,sBAAsB,cAAmC,CAAA;AA0KtE;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,QAAa,OAAO,CAAC,OAAO,CASxD,CAAA"}

package/dist/core/config/loader-with-esbuild.js

@@ -180,16 +180,9 @@ const findConfigFile = () => {
 export const loadConfigModule = async () => {
     startConfigWatcher();
     const { found, isTs } = findConfigFile();
-    if (!isTs) {
-        // For non-TS configs, load directly
-        const url = pathToFileURL(found).href;
-        // IMPORTANT: prevent Turbopack from trying to statically analyze the specifier
-        const mod = await import(/* turbopackIgnore: true */ url);
-        return mod?.default ?? mod;
-    }
     // For TS configs, bundle them first (like sections do)
     const bundled = await ensureBundledConfig(found);
     const url = `${pathToFileURL(bundled).href}?v=${configWatcherState.version}`;
-    const mod = await import(/* turbopackIgnore: true */ url);
+    const mod = await import(/* turbopackIgnore: true */ /* webpackIgnore: true */ url);
     return mod?.default ?? mod;
 };

package/dist/core/factories/section-factory-with-esbuild.d.ts

@@ -1,6 +1,7 @@
 import { HasItemsSection, SimpleSection, CategorySection } from '../sections/index.js';
 import type { CategorySectionConfig, HasItemsSectionConfig, SimpleSectionConfig } from '../sections/index.js';
 import type { SectionTypes } from '../types/index.js';
+export declare const getSectionImportVersion: () => number;
 type AnySectionConfig = HasItemsSectionConfig | SimpleSectionConfig | CategorySectionConfig;
 export declare class SectionFactory {
     /**
@@ -20,9 +21,7 @@ export declare class SectionFactory {
      */
     private static allSectionsPromise;
     private static allSectionsLoaded;
-    private static watcherStarted;
     private static configVersion;
-    private static sectionWatcher;
     private static ensureConfigFresh;
     static bumpHotMarker(): void;
     /**

package/dist/core/factories/section-factory-with-esbuild.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"section-factory-with-esbuild.d.ts","sourceRoot":"","sources":["../../../src/core/factories/section-factory-with-esbuild.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"section-factory-with-esbuild.d.ts","sourceRoot":"","sources":["../../../src/core/factories/section-factory-with-esbuild.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtF,OAAO,KAAK,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAC7G,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AA2CrD,eAAO,MAAM,uBAAuB,cAAoC,CAAA;AAsHxE,KAAK,gBAAgB,GAAG,qBAAqB,GAAG,mBAAmB,GAAG,qBAAqB,CAAA;AAY3F,qBAAa,cAAc;IACvB;;OAEG;IACH,MAAM,CAAC,QAAQ,CAAC,aAAa,WAAiD;IAE9E,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAwC;IACrE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAc;IAE5C,OAAO,CAAC,MAAM,CAAC,uBAAuB,CAA+B;IACrE,OAAO,CAAC,MAAM,CAAC,qBAAqB,CAA+B;IACnE,OAAO,CAAC,MAAM,CAAC,UAAU,CAAI;IAE7B;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAA2C;IAC5E,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAQ;IACxC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAK;mBAEZ,iBAAiB;IAsBtC,MAAM,CAAC,aAAa,IAAI,IAAI;IAwB5B;;;;OAIG;WACU,WAAW,CAAC,IAAI,CAAC,EAAE,YAAY,GAAG,YAAY,EAAE,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAI3F;;;;;OAKG;WACU,mBAAmB,CAAC,EAC7B,IAAI,EACJ,KAAK,GACR,EAAE;QACC,IAAI,CAAC,EAAE,YAAY,GAAG,YAAY,EAAE,CAAA;QACpC,KAAK,EAAE;YACH,EAAE,EAAE,MAAM,CAAA;YACV,YAAY,CAAC,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,CAAA;SACjC,CAAA;KACJ,GAAG,OAAO,CAAC;QACR,MAAM,EAAE,mBAAmB,EAAE,CAAA;QAC7B,SAAS,EAAE,qBAAqB,EAAE,CAAA;QAClC,QAAQ,EAAE,qBAAqB,EAAE,CAAA;QACjC,KAAK,EAAE,MAAM,EAAE,CAAA;KAClB,CAAC;IA+BF;;;;;OAKG;WACU,UAAU,CAAC,EACpB,IAAI,EACJ,IAAI,GACP,EAAE;QACC,IAAI,EAAE,MAAM,CAAA;QACZ,IAAI,CAAC,EAAE,YAAY,GAAG,YAAY,EAAE,CAAA;KACvC,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAKpC;;;;;;OAMG;WACU,kBAAkB,CAAC,EAC5B,IAAI,EACJ,IAAI,EACJ,KAAK,GACR,EAAE;QACC,IAAI,EAAE,MAAM,CAAA;QACZ,IAAI,CAAC,EAAE,YAAY,GAAG,YAAY,EAAE,CAAA;QACpC,KAAK,EAAE;YACH,EAAE,EAAE,MAAM,CAAA;YACV,YAAY,CAAC,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,CAAA;SACjC,CAAA;KACJ,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAKpC;;;;;;;;;;OAUG;IACH,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE;QAClB,KAAK,EAAE,MAAM,eAAe,GAAG,aAAa,GAAG,eAAe,CAAA;QAC9D,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KACrB,GAAG,eAAe,GAAG,aAAa,GAAG,eAAe;IAYrD;;;;;;;;;OASG;mBACkB,GAAG;IA6FxB;;;;OAIG;mBACkB,eAAe;IAmKpC,OAAO,CAAC,MAAM,CAAC,YAAY;IAqD3B,OAAO,CAAC,MAAM,CAAC,IAAI;CAatB"}

package/dist/core/factories/section-factory-with-esbuild.js

@@ -21,6 +21,19 @@ const getCmsConfigCached = async (currentVersion = getConfigImportVersion()) =>
     return cachedCmsConfig;
 };
 const hotMarkerFile = resolve(process.cwd(), 'components/form/helpers/_section-hot-reload.js');
+const sectionWatcherState = (() => {
+    const key = Symbol.for('nextjs-cms.sectionWatcher');
+    const globalAny = globalThis;
+    if (!globalAny[key]) {
+        globalAny[key] = {
+            watcher: null,
+            version: 0,
+            lastEventAt: new Map(),
+        };
+    }
+    return globalAny[key];
+})();
+export const getSectionImportVersion = () => sectionWatcherState.version;
 // Create a require function that works in ES modules
 const safeRequire = createRequire(import.meta.url);
 /**
@@ -66,11 +79,6 @@ const loadEsbuildRegister = () => {
     const id = 'esbuild-register/dist/node'; // avoid inline literal in require call
     return safeRequire(id);
 };
-/**
- * Runtime module import version token.
- * Node caches ESM modules by URL. Adding `?v=` busts the cache when files change.
- */
-let sectionImportVersion = 0;
 const getEsbuild = () => safeRequire('esbuild');
 const cacheRoot = resolve(process.cwd(), '.nextjs-cms', 'sections');
 if (!existsSync(cacheRoot))
@@ -118,8 +126,8 @@ const loadSectionModuleRuntime = async (absPath) => {
     }
     // Dev/runtime: bundle then import the bundled output (Turbopack-safe)
     const bundled = await ensureBundledSection(absPath);
-    const url = `${pathToFileURL(bundled).href}?v=${sectionImportVersion}`;
-    const mod = await import(/* turbopackIgnore: true */ url);
+    const url = `${pathToFileURL(bundled).href}?v=${sectionWatcherState.version}`;
+    const mod = await import(/* turbopackIgnore: true */ /* webpackIgnore: true */ url);
     return mod?.default;
 };
 /**
@@ -150,9 +158,7 @@ export class SectionFactory {
      */
     static allSectionsPromise = null;
     static allSectionsLoaded = false;
-    static watcherStarted = false;
     static configVersion = -1;
-    static sectionWatcher = null;
     static async ensureConfigFresh() {
         const currentVersion = getConfigImportVersion();
         const cmsConfig = await getCmsConfigCached(currentVersion);
@@ -163,13 +169,10 @@ export class SectionFactory {
             this.errorCount = 0;
             this.allSectionsPromise = null;
             this.allSectionsLoaded = false;
-            // Reset section import version to force re-bundling
-            sectionImportVersion = 0;
             // Close and reset the watcher if it exists
-            if (this.sectionWatcher) {
-                await this.sectionWatcher.close();
-                this.sectionWatcher = null;
-                this.watcherStarted = false;
+            if (sectionWatcherState.watcher) {
+                await sectionWatcherState.watcher.close();
+                sectionWatcherState.watcher = null;
             }
         }
         return cmsConfig;
@@ -490,23 +493,17 @@ If you added an extension manually, remove it.`);
     }
     // ---------- DEV WATCHER & CACHE INVALIDATION ----------
     static startWatcher(cmsConfig) {
-        if (!this.isDev || this.watcherStarted)
+        if (!this.isDev || sectionWatcherState.watcher)
             return;
-        this.watcherStarted = true;
-        const watcher = chokidar.watch('**/*.section.ts', {
-            cwd: cmsConfig.sections.path,
-            ignoreInitial: true,
-        });
-        this.sectionWatcher = watcher;
-        log('Starting section watcher in dev mode...');
-        /**
-         * Invalidate section cache + bust runtime import cache.
-         * For Turbopack runtime import we increment sectionImportVersion which changes the URL (`?v=`).
-         * We still bump the hot marker to trigger Fast Refresh + react-query invalidation.
-         */
         const invalidateForRelPath = (relPath) => {
-            // Bust ESM import cache (Node caches by URL)
-            sectionImportVersion++;
+            const normalized = relPath.replace(/\\/g, '/');
+            const now = Date.now();
+            const last = sectionWatcherState.lastEventAt.get(normalized);
+            if (last && now - last < 150)
+                return;
+            sectionWatcherState.lastEventAt.set(normalized, now);
+            // Increment global version to force re-bundling
+            sectionWatcherState.version++;
             // Reset our in-process caches
             this.sectionProcessingErrors = {};
             this.sectionFetchingErrors = {};
@@ -516,7 +513,17 @@ If you added an extension manually, remove it.`);
             log('Invalidated section cache due to change in', relPath);
             this.bumpHotMarker();
         };
-        watcher
+        sectionWatcherState.watcher = chokidar
+            .watch('**/*.section.ts', {
+            cwd: cmsConfig.sections.path,
+            ignoreInitial: true,
+            atomic: true,
+            awaitWriteFinish: {
+                stabilityThreshold: 100,
+                pollInterval: 20,
+            },
+        })
+            .setMaxListeners(3)
             .on('add', (path) => {
             log('Section file added:', path);
             invalidateForRelPath(path);
@@ -529,6 +536,7 @@ If you added an extension manually, remove it.`);
             log('Section file removed:', path);
             invalidateForRelPath(path);
         });
+        log('Starting section watcher in dev mode...');
     }
     static init() {
         if (this.isProd) {

package/dist/core/factories/section-factory-with-jiti.d.ts

@@ -1,6 +1,7 @@
 import { HasItemsSection, SimpleSection, CategorySection } from '../sections/index.js';
 import type { CategorySectionConfig, HasItemsSectionConfig, SimpleSectionConfig } from '../sections/index.js';
 import type { SectionTypes } from '../types/index.js';
+export declare const getSectionImportVersion: () => number;
 type AnySectionConfig = HasItemsSectionConfig | SimpleSectionConfig | CategorySectionConfig;
 export declare class SectionFactory {
     /**
@@ -20,9 +21,7 @@ export declare class SectionFactory {
      */
     private static allSectionsPromise;
     private static allSectionsLoaded;
-    private static watcherStarted;
     private static configVersion;
-    private static sectionWatcher;
     private static ensureConfigFresh;
     static bumpHotMarker(): void;
     /**

package/dist/core/factories/section-factory-with-jiti.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"section-factory-with-jiti.d.ts","sourceRoot":"","sources":["../../../src/core/factories/section-factory-with-jiti.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"section-factory-with-jiti.d.ts","sourceRoot":"","sources":["../../../src/core/factories/section-factory-with-jiti.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtF,OAAO,KAAK,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAC7G,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AA+BrD,eAAO,MAAM,uBAAuB,cAAoC,CAAA;AAyIxE,KAAK,gBAAgB,GAAG,qBAAqB,GAAG,mBAAmB,GAAG,qBAAqB,CAAA;AAE3F,qBAAa,cAAc;IACvB;;OAEG;IACH,MAAM,CAAC,QAAQ,CAAC,aAAa,WAAiD;IAE9E,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAwC;IACrE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAc;IAE5C,OAAO,CAAC,MAAM,CAAC,uBAAuB,CAA+B;IACrE,OAAO,CAAC,MAAM,CAAC,qBAAqB,CAA+B;IACnE,OAAO,CAAC,MAAM,CAAC,UAAU,CAAI;IAE7B;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAA2C;IAC5E,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAQ;IACxC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAK;mBAEZ,iBAAiB;IAqBtC,MAAM,CAAC,aAAa,IAAI,IAAI;IAwB5B;;;;OAIG;WACU,WAAW,CAAC,IAAI,CAAC,EAAE,YAAY,GAAG,YAAY,EAAE,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAI3F;;;;;OAKG;WACU,mBAAmB,CAAC,EAC7B,IAAI,EACJ,KAAK,GACR,EAAE;QACC,IAAI,CAAC,EAAE,YAAY,GAAG,YAAY,EAAE,CAAA;QACpC,KAAK,EAAE;YACH,EAAE,EAAE,MAAM,CAAA;YACV,YAAY,CAAC,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,CAAA;SACjC,CAAA;KACJ,GAAG,OAAO,CAAC;QACR,MAAM,EAAE,mBAAmB,EAAE,CAAA;QAC7B,SAAS,EAAE,qBAAqB,EAAE,CAAA;QAClC,QAAQ,EAAE,qBAAqB,EAAE,CAAA;QACjC,KAAK,EAAE,MAAM,EAAE,CAAA;KAClB,CAAC;IA+BF;;;;;OAKG;WACU,UAAU,CAAC,EACpB,IAAI,EACJ,IAAI,GACP,EAAE;QACC,IAAI,EAAE,MAAM,CAAA;QACZ,IAAI,CAAC,EAAE,YAAY,GAAG,YAAY,EAAE,CAAA;KACvC,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAKpC;;;;;;OAMG;WACU,kBAAkB,CAAC,EAC5B,IAAI,EACJ,IAAI,EACJ,KAAK,GACR,EAAE;QACC,IAAI,EAAE,MAAM,CAAA;QACZ,IAAI,CAAC,EAAE,YAAY,GAAG,YAAY,EAAE,CAAA;QACpC,KAAK,EAAE;YACH,EAAE,EAAE,MAAM,CAAA;YACV,YAAY,CAAC,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,CAAA;SACjC,CAAA;KACJ,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAKpC;;;;;;;;;;OAUG;IACH,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE;QAClB,KAAK,EAAE,MAAM,eAAe,GAAG,aAAa,GAAG,eAAe,CAAA;QAC9D,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KACrB,GAAG,eAAe,GAAG,aAAa,GAAG,eAAe;IAYrD;;;;;;;;;OASG;mBACkB,GAAG;IA6FxB;;;;OAIG;mBACkB,eAAe;IAmKpC,OAAO,CAAC,MAAM,CAAC,YAAY;IAwE3B,OAAO,CAAC,MAAM,CAAC,IAAI;CAatB"}

package/dist/core/factories/section-factory-with-jiti.js

@@ -10,6 +10,19 @@ import { db } from '../../db/client.js';
 import { AdminPrivilegesTable } from '../../db/schema.js';
 import { getCMSConfig, getConfigImportVersion } from '../config/index.js';
 const hotMarkerFile = resolve(process.cwd(), 'components/form/helpers/_section-hot-reload.js');
+const sectionWatcherState = (() => {
+    const key = Symbol.for('nextjs-cms.sectionWatcher');
+    const globalAny = globalThis;
+    if (!globalAny[key]) {
+        globalAny[key] = {
+            watcher: null,
+            version: 0,
+            lastEventAt: new Map(),
+        };
+    }
+    return globalAny[key];
+})();
+export const getSectionImportVersion = () => sectionWatcherState.version;
 // Create a require function that works in ES modules
 const safeRequire = createRequire(import.meta.url);
 /**
@@ -146,9 +159,7 @@ export class SectionFactory {
      */
     static allSectionsPromise = null;
     static allSectionsLoaded = false;
-    static watcherStarted = false;
     static configVersion = -1;
-    static sectionWatcher = null;
     static async ensureConfigFresh() {
         const currentVersion = getConfigImportVersion();
         const cmsConfig = await getCmsConfigCached(currentVersion);
@@ -159,10 +170,9 @@ export class SectionFactory {
             this.errorCount = 0;
             this.allSectionsPromise = null;
             this.allSectionsLoaded = false;
-            if (this.sectionWatcher) {
-                await this.sectionWatcher.close();
-                this.sectionWatcher = null;
-                this.watcherStarted = false;
+            if (sectionWatcherState.watcher) {
+                await sectionWatcherState.watcher.close();
+                sectionWatcherState.watcher = null;
             }
         }
         return cmsConfig;
@@ -483,24 +493,15 @@ If you added an extension manually, remove it.`);
     }
     // ---------- DEV WATCHER & CACHE INVALIDATION ----------
     static startWatcher(cmsConfig) {
-        if (!this.isDev || this.watcherStarted)
+        if (!this.isDev || sectionWatcherState.watcher)
             return;
-        this.watcherStarted = true;
-        const watcher = chokidar.watch('**/*.section.ts', {
-            cwd: cmsConfig.sections.path,
-            ignoreInitial: true,
-        });
-        this.sectionWatcher = watcher;
-        log('Starting section watcher in dev mode...');
-        /**
-         * Invalidate section cache + bust runtime import cache.
-         * When a section file changes, we need to:
-         * 1. Clear jiti's module cache for that file
-         * 2. Reset our in-process caches
-         * 3. Reset the promise so sections reload on next access
-         * 4. Bump the hot marker to trigger Next.js Fast Refresh
-         */
         const invalidateForRelPath = (relPath) => {
+            const normalized = relPath.replace(/\\/g, '/');
+            const now = Date.now();
+            const last = sectionWatcherState.lastEventAt.get(normalized);
+            if (last && now - last < 150)
+                return;
+            sectionWatcherState.lastEventAt.set(normalized, now);
             const absPath = resolve(cmsConfig.sections.path, relPath);
             // Clear jiti's cache for the changed file
             clearJitiCache(absPath);
@@ -523,11 +524,23 @@ If you added an extension manually, remove it.`);
             this.errorCount = 0;
             this.allSectionsPromise = null;
             this.allSectionsLoaded = false;
+            // Increment version to force re-bundling
+            sectionWatcherState.version++;
             log('Invalidated section cache due to change in', relPath);
             // Bump the hot marker to trigger Next.js Fast Refresh
             this.bumpHotMarker();
         };
-        watcher
+        sectionWatcherState.watcher = chokidar
+            .watch('**/*.section.ts', {
+            cwd: cmsConfig.sections.path,
+            ignoreInitial: true,
+            atomic: true,
+            awaitWriteFinish: {
+                stabilityThreshold: 100,
+                pollInterval: 20,
+            },
+        })
+            .setMaxListeners(3)
             .on('add', (path) => {
             log('Section file added:', path);
             invalidateForRelPath(path);
@@ -540,6 +553,7 @@ If you added an extension manually, remove it.`);
             log('Section file removed:', path);
             invalidateForRelPath(path);
         });
+        log('Starting section watcher in dev mode...');
     }
     static init() {
         if (this.isProd) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nextjs-cms",
-  "version": "0.5.62",
+  "version": "0.5.63",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "type": "module",
@@ -150,8 +150,8 @@
     "prettier": "^3.3.3",
     "tsx": "^4.20.6",
     "typescript": "^5.9.2",
-    "@lzcms/prettier-config": "0.1.0",
     "@lzcms/eslint-config": "0.3.0",
+    "@lzcms/prettier-config": "0.1.0",
     "@lzcms/tsconfig": "0.1.0"
   },
   "license": "MIT",