nextjs-cms 0.5.58 → 0.5.60

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

@@ -1,3 +1,4 @@
+export declare const getConfigImportVersion: () => number;
 /**
  * Turbopack-safe loader:
  * - In Next 16 Turbopack SSR, dynamic require(found) fails ("expression is too dynamic")

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":"AAgFA;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,QAAa,OAAO,CAAC,OAAO,CA2BxD,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,CAiBxD,CAAA"}

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

@@ -4,12 +4,116 @@
 // - Uses runtime import(file://...) with `turbopackIgnore`
 // - Still supports TS configs via esbuild-register
 // - Keeps your Node CJS resolve patch for tests (js specifier -> ts fallback)
-import { existsSync } from 'fs';
+import { existsSync, mkdirSync, statSync } from 'fs';
 import { resolve, join } from 'path';
 import { createRequire } from 'module';
 import { pathToFileURL } from 'url';
+import chokidar from 'chokidar';
+import chalk from 'chalk';
+import { writeFileSync } from 'fs';
+import crypto from 'crypto';
 // Create a require function that works in ES modules
 const safeRequire = createRequire(import.meta.url);
+const configWatcherState = (() => {
+    const key = Symbol.for('nextjs-cms.configWatcher');
+    const globalAny = globalThis;
+    if (!globalAny[key]) {
+        globalAny[key] = {
+            watcher: null,
+            version: 0,
+            lastEventAt: new Map(),
+        };
+    }
+    return globalAny[key];
+})();
+export const getConfigImportVersion = () => configWatcherState.version;
+const hotMarkerFile = resolve(process.cwd(), 'components/form/helpers/_section-hot-reload.js');
+const getEsbuild = () => safeRequire('esbuild');
+const configCacheRoot = resolve(process.cwd(), '.nextjs-cms', 'config');
+if (!existsSync(configCacheRoot))
+    mkdirSync(configCacheRoot, { recursive: true });
+const hashKey = (s) => crypto.createHash('sha1').update(s).digest('hex');
+const ensureBundledConfig = async (entryAbsPath) => {
+    const esbuild = getEsbuild();
+    // Make output stable per file path and rebuild only when the source is newer
+    const st = statSync(entryAbsPath);
+    const key = hashKey(entryAbsPath);
+    const outFile = join(configCacheRoot, `${key}.mjs`);
+    if (existsSync(outFile)) {
+        const outStat = statSync(outFile);
+        if (outStat.mtimeMs >= st.mtimeMs)
+            return outFile;
+    }
+    // Bundle so extensionless imports work (esbuild resolves them)
+    await esbuild.build({
+        entryPoints: [entryAbsPath],
+        outfile: outFile,
+        bundle: true,
+        platform: 'node',
+        format: 'esm',
+        target: 'node18',
+        sourcemap: 'inline',
+        logLevel: 'silent',
+        // This is the magic for your UX:
+        resolveExtensions: ['.ts', '.tsx', '.mts', '.cts', '.js', '.jsx', '.mjs', '.cjs', '.json'],
+        // Don't bundle your library deps; keep them as runtime imports
+        packages: 'external',
+    });
+    return outFile;
+};
+const bumpHotMarker = async () => {
+    if (process.env.NODE_ENV === 'production')
+        return;
+    const content = `/**\n` +
+        ` * AUTO-GENERATED. DO NOT EDIT.\n` +
+        ` * This file is used to track the last time the sections/config schema was updated.\n` +
+        ` * It is used to trigger a hot reload of the section/config in development mode.\n` +
+        ` */\n` +
+        `\n` +
+        `export const revalidate = 0\n` +
+        `\n` +
+        `// @refresh reset\n` +
+        `\n` +
+        `export const configLastUpdated = ${Date.now()}\n`;
+    try {
+        writeFileSync(hotMarkerFile, content, 'utf8');
+    }
+    catch (err) {
+        console.error('Failed to bump _section-hot-reload.js:', err);
+    }
+};
+const startConfigWatcher = () => {
+    if (process.env.NODE_ENV === 'production' || configWatcherState.watcher)
+        return;
+    const cwd = process.cwd();
+    const invalidateForRelPath = async (relPath) => {
+        const normalized = relPath.replace(/\\/g, '/');
+        const now = Date.now();
+        const last = configWatcherState.lastEventAt.get(normalized);
+        if (last && now - last < 150)
+            return;
+        configWatcherState.lastEventAt.set(normalized, now);
+        console.log(chalk.green('Detected config file change, reloading config...'));
+        const absPath = resolve(cwd, relPath);
+        delete safeRequire.cache?.[absPath];
+        configWatcherState.version++;
+        await bumpHotMarker();
+    };
+    configWatcherState.watcher = chokidar
+        .watch('cms.config.*', {
+        cwd,
+        ignoreInitial: true,
+        atomic: true,
+        awaitWriteFinish: {
+            stabilityThreshold: 100,
+            pollInterval: 20,
+        },
+    })
+        .setMaxListeners(3)
+        .on('add', async (path) => await invalidateForRelPath(path))
+        .on('change', async (path) => await invalidateForRelPath(path))
+        .on('unlink', async (path) => await invalidateForRelPath(path));
+};
 /**
  * See SectionFactory.ts: during dev/tests we may runtime-load TS that contains NodeNext-style `./x.js` specifiers
  * pointing at `./x.ts` in the source tree. Patch CJS resolution to fall back to `.ts` for relative imports.
@@ -74,25 +178,18 @@ const findConfigFile = () => {
  * - Use runtime import(file://...) and tell turbopack to ignore analyzing it.
  */
 export const loadConfigModule = async () => {
+    startConfigWatcher();
     const { found, isTs } = findConfigFile();
-    let unregister;
-    try {
-        if (isTs) {
-            unregister = registerEsbuildForTs();
-        }
-        // For tests (NODE_ENV=test), keep your CJS resolver patch behavior
-        const importConfig = async () => {
-            const url = pathToFileURL(found).href;
-            // IMPORTANT: prevent Turbopack from trying to statically analyze the specifier
-            const mod = await import(/* turbopackIgnore: true */ url);
-            return mod;
-        };
-        const mod = process.env.NODE_ENV === 'test' && isTs
-            ? await withPatchedCjsResolveJsToTs(() => importConfig())
-            : await importConfig();
+    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;
     }
-    finally {
-        unregister?.();
-    }
+    // 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);
+    return mod?.default ?? mod;
 };

package/dist/core/config/loader.d.ts

@@ -1,2 +1,2 @@
-export * from './loader-with-jiti.js';
+export * from './loader-with-esbuild.js';
 //# sourceMappingURL=loader.d.ts.map

package/dist/core/config/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/core/config/loader.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAA"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/core/config/loader.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAA"}

package/dist/core/config/loader.js

@@ -1 +1 @@
-export * from './loader-with-jiti.js';
+export * from './loader-with-esbuild.js';

package/dist/core/factories/SectionFactory.d.ts

@@ -1,2 +1,2 @@
-export * from './section-factory-with-jiti.js';
+export * from './section-factory-with-esbuild.js';
 //# sourceMappingURL=SectionFactory.d.ts.map

package/dist/core/factories/SectionFactory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SectionFactory.d.ts","sourceRoot":"","sources":["../../../src/core/factories/SectionFactory.ts"],"names":[],"mappings":"AAAA,cAAc,gCAAgC,CAAA"}
+{"version":3,"file":"SectionFactory.d.ts","sourceRoot":"","sources":["../../../src/core/factories/SectionFactory.ts"],"names":[],"mappings":"AAAA,cAAc,mCAAmC,CAAA"}

package/dist/core/factories/SectionFactory.js

@@ -1 +1 @@
-export * from './section-factory-with-jiti.js';
+export * from './section-factory-with-esbuild.js';

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

@@ -21,6 +21,9 @@ 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;
     /**
      * Get all sections

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":"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;AAiIrD,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,cAAc,CAAQ;IAErC,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;IAkKpC,OAAO,CAAC,MAAM,CAAC,YAAY;IA+C3B,OAAO,CAAC,MAAM,CAAC,IAAI;CAatB"}
+{"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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"}

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

@@ -9,9 +9,17 @@ import { createRequire } from 'module';
 import { pathToFileURL } from 'url';
 import { db } from '../../db/client.js';
 import { AdminPrivilegesTable } from '../../db/schema.js';
-import { getCMSConfig } from '../config/index.js';
+import { getCMSConfig, getConfigImportVersion } from '../config/index.js';
 import crypto from 'crypto';
-const cmsConfig = await getCMSConfig();
+let cachedCmsConfig = null;
+let cachedCmsConfigVersion = -1;
+const getCmsConfigCached = async (currentVersion = getConfigImportVersion()) => {
+    if (!cachedCmsConfig || cachedCmsConfigVersion !== currentVersion) {
+        cachedCmsConfig = await getCMSConfig();
+        cachedCmsConfigVersion = currentVersion;
+    }
+    return cachedCmsConfig;
+};
 const hotMarkerFile = resolve(process.cwd(), 'components/form/helpers/_section-hot-reload.js');
 // Create a require function that works in ES modules
 const safeRequire = createRequire(import.meta.url);
@@ -70,12 +78,15 @@ if (!existsSync(cacheRoot))
 const hashKey = (s) => crypto.createHash('sha1').update(s).digest('hex');
 const ensureBundledSection = async (entryAbsPath) => {
     const esbuild = getEsbuild();
-    // Make output stable per file + mtime (so edits re-bundle)
+    // Make output stable per file path and rebuild only when the source is newer
     const st = statSync(entryAbsPath);
-    const key = hashKey(`${entryAbsPath}|${st.mtimeMs}`);
+    const key = hashKey(entryAbsPath);
     const outFile = join(cacheRoot, `${key}.mjs`);
-    if (existsSync(outFile))
-        return outFile;
+    if (existsSync(outFile)) {
+        const outStat = statSync(outFile);
+        if (outStat.mtimeMs >= st.mtimeMs)
+            return outFile;
+    }
     // Bundle so extensionless imports work (esbuild resolves them)
     await esbuild.build({
         entryPoints: [entryAbsPath],
@@ -117,7 +128,7 @@ const loadSectionModuleRuntime = async (absPath) => {
  * @returns void
  */
 const log = (...args) => {
-    if (!cmsConfig.debug)
+    if (!cachedCmsConfig?.debug)
         return;
     console.log(chalk.black.bgGreen(`[${new Date().toISOString()}][next-cms-debug]`, ...args));
 };
@@ -140,6 +151,29 @@ 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);
+        if (this.configVersion !== currentVersion) {
+            this.configVersion = currentVersion;
+            this.sectionProcessingErrors = {};
+            this.sectionFetchingErrors = {};
+            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;
+            }
+        }
+        return cmsConfig;
+    }
     static bumpHotMarker() {
         if (!SectionFactory.isDev)
             return;
@@ -328,12 +362,13 @@ export class SectionFactory {
      * (until invalidated in dev by file changes).
      */
     static async loadAllSections() {
+        const cmsConfig = await this.ensureConfigFresh();
         if (this.allSectionsPromise)
             return this.allSectionsPromise;
         if (this.isDev) {
             // In dev, watch for changes and reload on demand
             // This will lazy load on first get() as well
-            this.startWatcher();
+            this.startWatcher(cmsConfig);
         }
         this.allSectionsPromise = (async () => {
             if (!this.allSectionsLoaded) {
@@ -454,7 +489,7 @@ If you added an extension manually, remove it.`);
         return this.allSectionsPromise;
     }
     // ---------- DEV WATCHER & CACHE INVALIDATION ----------
-    static startWatcher() {
+    static startWatcher(cmsConfig) {
         if (!this.isDev || this.watcherStarted)
             return;
         this.watcherStarted = true;
@@ -462,6 +497,7 @@ If you added an extension manually, remove it.`);
             cwd: cmsConfig.sections.path,
             ignoreInitial: true,
         });
+        this.sectionWatcher = watcher;
         log('Starting section watcher in dev mode...');
         /**
          * Invalidate section cache + bust runtime import cache.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nextjs-cms",
-  "version": "0.5.58",
+  "version": "0.5.60",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "type": "module",