rimecms 0.28.1 → 0.28.2

package/dist/core/dev/cli/generate/index.server.js

@@ -1,3 +1,4 @@
+import cache from '../../cache/index.server.js';
 import { sanitize } from '../../generate/sanitize/index.server.js';
 import { ensureGeneratedConfig, ensureUserConfigExist } from '../../../ensure.server.js';
 import { logger } from '../../../logger/index.server.js';
@@ -58,21 +59,30 @@ export const generate = async (args) => {
             clearConfigCache();
             clearRoutes();
         }
-        ensureUserConfigExist();
-        await sanitizeConfig();
-        const importPathJS = ensureGeneratedConfig();
-        logger.info('Starting vite server...');
-        const vite = await createServer();
+        // Mark that a CLI generation is in flight, so a concurrently running dev
+        // server doesn't race us on the shared .rime cache (see rime.server.ts).
+        process.env.RIME_CLI = 'true';
+        cache.set('.cli', new Date().toISOString());
         try {
-            const mod = await vite.ssrLoadModule(importPathJS);
-            // The generated config's default export is the createRime() promise;
-            // ssrLoadModule only awaits the module's synchronous evaluation, so we
-            // must await it directly to observe init failures (e.g. config validation).
-            await mod.default;
-            logger.info('[✓] Generation completed successfully');
+            ensureUserConfigExist();
+            await sanitizeConfig();
+            const importPathJS = ensureGeneratedConfig();
+            logger.info('Starting vite server...');
+            const vite = await createServer();
+            try {
+                const mod = await vite.ssrLoadModule(importPathJS);
+                // The generated config's default export is the createRime() promise;
+                // ssrLoadModule only awaits the module's synchronous evaluation, so we
+                // must await it directly to observe init failures (e.g. config validation).
+                await mod.default;
+                logger.info('[✓] Generation completed successfully');
+            }
+            finally {
+                await vite.close();
+            }
         }
         finally {
-            await vite.close();
+            cache.delete('.cli');
         }
     }
     const [error] = await trycatch(run);

package/dist/core/rime.server.js

@@ -1,5 +1,6 @@
 // import type { Adapter } from '../adapter-sqlite/index.server.js';
 import { dev } from '$app/environment';
+import devCache from './dev/cache/index.server.js';
 import { betterAuth } from 'better-auth';
 import { AreaAPI } from './areas/local-api.server.js';
 import { CollectionAPI } from './collections/local-api.server.js';
@@ -27,6 +28,16 @@ export async function createRime(config) {
     const { createAdapter, generateSchema } = config.$adapter;
     // Generate schema, types, routes
     if (dev) {
+        // A `rime generate` CLI run may be regenerating the same .rime cache
+        // concurrently (e.g. a running dev server picking up its file writes).
+        // Defer to it instead of racing on the shared config memo.
+        if (process.env.RIME_CLI !== 'true') {
+            let waited = 0;
+            while (devCache.get('.cli') && waited < 30_000) {
+                await new Promise((resolve) => setTimeout(resolve, 200));
+                waited += 200;
+            }
+        }
         const changed = writeMemo(config);
         const valid = validate(config);
         if (!valid) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rimecms",
-  "version": "0.28.1",
+  "version": "0.28.2",
   "homepage": "https://github.com/bienbiendev/rime",
   "scripts": {
     "dev": "vite dev",