@olonjs/cli 3.0.91 → 3.0.93

package/assets/src_tenant_alpha.sh

@@ -1645,7 +1645,7 @@ cat << 'END_OF_FILE_CONTENT' > "package.json"
     "@tiptap/extension-link": "^2.11.5",
     "@tiptap/react": "^2.11.5",
     "@tiptap/starter-kit": "^2.11.5",
-    "@olonjs/core": "^1.0.79",
+    "@olonjs/core": "^1.0.81",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "lucide-react": "^0.474.0",
@@ -11195,9 +11195,9 @@ cat << 'END_OF_FILE_CONTENT' > "src/data/pages/platform/overview.json"
           }
         ],
         "badge": "",
-        "title": "Platssform",
-        "titleItalic": "Infra you can rers",
-        "description": "wsf"
+        "title": "Platform",
+        "titleItalic": "Overview",
+        "description": "The platform overview page."
       }
     }
   ]
@@ -13308,7 +13308,7 @@ END_OF_FILE_CONTENT
 echo "Creating vite.config.ts..."
 cat << 'END_OF_FILE_CONTENT' > "vite.config.ts"
 /**
- * Generated by @olonjs/cli. Dev server API: /api/save-to-file, /api/upload-asset, /api/list-assets.
+ * Generated by @jsonpages/cli. Dev server API: /api/save-to-file, /api/upload-asset, /api/list-assets.
  */
 import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
@@ -13322,8 +13322,6 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const ASSETS_IMAGES_DIR = path.resolve(__dirname, 'public', 'assets', 'images');
 const DATA_CONFIG_DIR = path.resolve(__dirname, 'src', 'data', 'config');
 const DATA_PAGES_DIR = path.resolve(__dirname, 'src', 'data', 'pages');
-const MONOREPO_ROOT_DIR = path.resolve(__dirname, '../..');
-const CORE_SRC_INDEX = path.resolve(__dirname, '../../packages/core/src/index.ts');
 const IMAGE_EXT = new Set(['.jpg', '.jpeg', '.png', '.gif', '.webp', '.svg', '.avif']);
 const IMAGE_MIMES = new Set([
   'image/jpeg', 'image/png', 'image/webp', 'image/gif', 'image/svg+xml', 'image/avif',
@@ -13365,37 +13363,6 @@ function isTenantPageJsonRequest(req, pathname) {
   const viteOrStaticPrefixes = ['/api/', '/assets/', '/src/', '/node_modules/', '/public/', '/@'];
   return !viteOrStaticPrefixes.some((prefix) => pathname.startsWith(prefix));
 }
-
-function sanitizeNestedSlug(rawSlug) {
-  const normalized = String(rawSlug || '')
-    .replace(/\\/g, '/')
-    .replace(/^\/+|\/+$/g, '');
-  const segments = normalized
-    .split('/')
-    .map((segment) => segment.trim())
-    .filter(Boolean)
-    .map((segment) => segment.replace(/[^a-zA-Z0-9-_]/g, '_'))
-    .filter((segment) => segment && segment !== '.' && segment !== '..');
-  return segments.join('/');
-}
-
-function writeJsonWithoutWatcher(server, targetPath, value) {
-  const normalized = path.resolve(targetPath);
-  try {
-    server.watcher.unwatch(normalized);
-  } catch {
-    // best-effort
-  }
-  fs.mkdirSync(path.dirname(normalized), { recursive: true });
-  fs.writeFileSync(normalized, JSON.stringify(value, null, 2), 'utf8');
-  setTimeout(() => {
-    try {
-      server.watcher.add(normalized);
-    } catch {
-      // best-effort
-    }
-  }, 250);
-}
 export default defineConfig({
   plugins: [
     react(),
@@ -13435,29 +13402,12 @@ export default defineConfig({
                 if (!projectState || typeof slug !== 'string') { sendJson(res, 400, { error: 'Missing projectState or slug' }); return; }
                 if (!fs.existsSync(DATA_CONFIG_DIR)) fs.mkdirSync(DATA_CONFIG_DIR, { recursive: true });
                 if (!fs.existsSync(DATA_PAGES_DIR)) fs.mkdirSync(DATA_PAGES_DIR, { recursive: true });
-                const touchedFiles = [];
-                if (projectState.site != null) {
-                  const sitePath = path.join(DATA_CONFIG_DIR, 'site.json');
-                  writeJsonWithoutWatcher(server, sitePath, projectState.site);
-                  touchedFiles.push(sitePath);
-                }
-                if (projectState.theme != null) {
-                  const themePath = path.join(DATA_CONFIG_DIR, 'theme.json');
-                  writeJsonWithoutWatcher(server, themePath, projectState.theme);
-                  touchedFiles.push(themePath);
-                }
-                if (projectState.menu != null) {
-                  const menuPath = path.join(DATA_CONFIG_DIR, 'menu.json');
-                  writeJsonWithoutWatcher(server, menuPath, projectState.menu);
-                  touchedFiles.push(menuPath);
-                }
+                if (projectState.site != null) fs.writeFileSync(path.join(DATA_CONFIG_DIR, 'site.json'), JSON.stringify(projectState.site, null, 2), 'utf8');
+                if (projectState.theme != null) fs.writeFileSync(path.join(DATA_CONFIG_DIR, 'theme.json'), JSON.stringify(projectState.theme, null, 2), 'utf8');
+                if (projectState.menu != null) fs.writeFileSync(path.join(DATA_CONFIG_DIR, 'menu.json'), JSON.stringify(projectState.menu, null, 2), 'utf8');
                 if (projectState.page != null) {
-                  const safeSlug = sanitizeNestedSlug(slug) || 'page';
-                  const pagePath = path.resolve(DATA_PAGES_DIR, `${safeSlug}.json`);
-                  const isInsidePagesDir = pagePath.startsWith(`${DATA_PAGES_DIR}${path.sep}`) || pagePath === DATA_PAGES_DIR;
-                  if (!isInsidePagesDir) { sendJson(res, 400, { error: 'Invalid page slug path' }); return; }
-                  writeJsonWithoutWatcher(server, pagePath, projectState.page);
-                  touchedFiles.push(pagePath);
+                  const safeSlug = (slug.replace(/[^a-zA-Z0-9-_]/g, '_') || 'page');
+                  fs.writeFileSync(path.join(DATA_PAGES_DIR, `${safeSlug}.json`), JSON.stringify(projectState.page, null, 2), 'utf8');
                 }
                 sendJson(res, 200, { ok: true });
               } catch (e) { sendJson(res, 500, { error: e?.message || 'Save to file failed' }); }
@@ -13487,26 +13437,16 @@ export default defineConfig({
       },
     },
   ],
-  server: {
-    fs: {
-      allow: [MONOREPO_ROOT_DIR],
-    },
-  },
-  optimizeDeps: {
-    exclude: ['@olonjs/core', '@jsonpages/core'],
-  },
   resolve: {
-    dedupe: ['react', 'react-dom'],
     alias: {
       '@': path.resolve(__dirname, './src'),
-      '@olonjs/core': CORE_SRC_INDEX,
-      '@jsonpages/core': CORE_SRC_INDEX,
+      'next/link': path.resolve(__dirname, './src/shims/next-link.tsx'),
     },
   },
 });
 
-
-
-
+
+
+
 
 END_OF_FILE_CONTENT

package/assets/templates/agritourism/src_tenant.sh

@@ -596,7 +596,7 @@ cat << 'END_OF_FILE_CONTENT' > "package.json"
     "@tiptap/extension-link": "^2.11.5",
     "@tiptap/react": "^2.11.5",
     "@tiptap/starter-kit": "^2.11.5",
-    "@olonjs/core": "^1.0.79",
+    "@olonjs/core": "^1.0.81",
     "clsx": "^2.1.1",
     "lucide-react": "^0.474.0",
     "react": "^19.0.0",

package/assets/templates/alpha/src_tenant.sh

@@ -1645,7 +1645,7 @@ cat << 'END_OF_FILE_CONTENT' > "package.json"
     "@tiptap/extension-link": "^2.11.5",
     "@tiptap/react": "^2.11.5",
     "@tiptap/starter-kit": "^2.11.5",
-    "@olonjs/core": "^1.0.79",
+    "@olonjs/core": "^1.0.81",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "lucide-react": "^0.474.0",
@@ -11195,9 +11195,9 @@ cat << 'END_OF_FILE_CONTENT' > "src/data/pages/platform/overview.json"
           }
         ],
         "badge": "",
-        "title": "Platssform",
-        "titleItalic": "Infra you can rers",
-        "description": "wsf"
+        "title": "Platform",
+        "titleItalic": "Overview",
+        "description": "The platform overview page."
       }
     }
   ]
@@ -13308,7 +13308,7 @@ END_OF_FILE_CONTENT
 echo "Creating vite.config.ts..."
 cat << 'END_OF_FILE_CONTENT' > "vite.config.ts"
 /**
- * Generated by @olonjs/cli. Dev server API: /api/save-to-file, /api/upload-asset, /api/list-assets.
+ * Generated by @jsonpages/cli. Dev server API: /api/save-to-file, /api/upload-asset, /api/list-assets.
  */
 import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
@@ -13322,8 +13322,6 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const ASSETS_IMAGES_DIR = path.resolve(__dirname, 'public', 'assets', 'images');
 const DATA_CONFIG_DIR = path.resolve(__dirname, 'src', 'data', 'config');
 const DATA_PAGES_DIR = path.resolve(__dirname, 'src', 'data', 'pages');
-const MONOREPO_ROOT_DIR = path.resolve(__dirname, '../..');
-const CORE_SRC_INDEX = path.resolve(__dirname, '../../packages/core/src/index.ts');
 const IMAGE_EXT = new Set(['.jpg', '.jpeg', '.png', '.gif', '.webp', '.svg', '.avif']);
 const IMAGE_MIMES = new Set([
   'image/jpeg', 'image/png', 'image/webp', 'image/gif', 'image/svg+xml', 'image/avif',
@@ -13365,37 +13363,6 @@ function isTenantPageJsonRequest(req, pathname) {
   const viteOrStaticPrefixes = ['/api/', '/assets/', '/src/', '/node_modules/', '/public/', '/@'];
   return !viteOrStaticPrefixes.some((prefix) => pathname.startsWith(prefix));
 }
-
-function sanitizeNestedSlug(rawSlug) {
-  const normalized = String(rawSlug || '')
-    .replace(/\\/g, '/')
-    .replace(/^\/+|\/+$/g, '');
-  const segments = normalized
-    .split('/')
-    .map((segment) => segment.trim())
-    .filter(Boolean)
-    .map((segment) => segment.replace(/[^a-zA-Z0-9-_]/g, '_'))
-    .filter((segment) => segment && segment !== '.' && segment !== '..');
-  return segments.join('/');
-}
-
-function writeJsonWithoutWatcher(server, targetPath, value) {
-  const normalized = path.resolve(targetPath);
-  try {
-    server.watcher.unwatch(normalized);
-  } catch {
-    // best-effort
-  }
-  fs.mkdirSync(path.dirname(normalized), { recursive: true });
-  fs.writeFileSync(normalized, JSON.stringify(value, null, 2), 'utf8');
-  setTimeout(() => {
-    try {
-      server.watcher.add(normalized);
-    } catch {
-      // best-effort
-    }
-  }, 250);
-}
 export default defineConfig({
   plugins: [
     react(),
@@ -13435,29 +13402,12 @@ export default defineConfig({
                 if (!projectState || typeof slug !== 'string') { sendJson(res, 400, { error: 'Missing projectState or slug' }); return; }
                 if (!fs.existsSync(DATA_CONFIG_DIR)) fs.mkdirSync(DATA_CONFIG_DIR, { recursive: true });
                 if (!fs.existsSync(DATA_PAGES_DIR)) fs.mkdirSync(DATA_PAGES_DIR, { recursive: true });
-                const touchedFiles = [];
-                if (projectState.site != null) {
-                  const sitePath = path.join(DATA_CONFIG_DIR, 'site.json');
-                  writeJsonWithoutWatcher(server, sitePath, projectState.site);
-                  touchedFiles.push(sitePath);
-                }
-                if (projectState.theme != null) {
-                  const themePath = path.join(DATA_CONFIG_DIR, 'theme.json');
-                  writeJsonWithoutWatcher(server, themePath, projectState.theme);
-                  touchedFiles.push(themePath);
-                }
-                if (projectState.menu != null) {
-                  const menuPath = path.join(DATA_CONFIG_DIR, 'menu.json');
-                  writeJsonWithoutWatcher(server, menuPath, projectState.menu);
-                  touchedFiles.push(menuPath);
-                }
+                if (projectState.site != null) fs.writeFileSync(path.join(DATA_CONFIG_DIR, 'site.json'), JSON.stringify(projectState.site, null, 2), 'utf8');
+                if (projectState.theme != null) fs.writeFileSync(path.join(DATA_CONFIG_DIR, 'theme.json'), JSON.stringify(projectState.theme, null, 2), 'utf8');
+                if (projectState.menu != null) fs.writeFileSync(path.join(DATA_CONFIG_DIR, 'menu.json'), JSON.stringify(projectState.menu, null, 2), 'utf8');
                 if (projectState.page != null) {
-                  const safeSlug = sanitizeNestedSlug(slug) || 'page';
-                  const pagePath = path.resolve(DATA_PAGES_DIR, `${safeSlug}.json`);
-                  const isInsidePagesDir = pagePath.startsWith(`${DATA_PAGES_DIR}${path.sep}`) || pagePath === DATA_PAGES_DIR;
-                  if (!isInsidePagesDir) { sendJson(res, 400, { error: 'Invalid page slug path' }); return; }
-                  writeJsonWithoutWatcher(server, pagePath, projectState.page);
-                  touchedFiles.push(pagePath);
+                  const safeSlug = (slug.replace(/[^a-zA-Z0-9-_]/g, '_') || 'page');
+                  fs.writeFileSync(path.join(DATA_PAGES_DIR, `${safeSlug}.json`), JSON.stringify(projectState.page, null, 2), 'utf8');
                 }
                 sendJson(res, 200, { ok: true });
               } catch (e) { sendJson(res, 500, { error: e?.message || 'Save to file failed' }); }
@@ -13487,26 +13437,16 @@ export default defineConfig({
       },
     },
   ],
-  server: {
-    fs: {
-      allow: [MONOREPO_ROOT_DIR],
-    },
-  },
-  optimizeDeps: {
-    exclude: ['@olonjs/core', '@jsonpages/core'],
-  },
   resolve: {
-    dedupe: ['react', 'react-dom'],
     alias: {
       '@': path.resolve(__dirname, './src'),
-      '@olonjs/core': CORE_SRC_INDEX,
-      '@jsonpages/core': CORE_SRC_INDEX,
+      'next/link': path.resolve(__dirname, './src/shims/next-link.tsx'),
     },
   },
 });
 
-
-
-
+
+
+
 
 END_OF_FILE_CONTENT

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@olonjs/cli",
-    "version": "3.0.91",
+    "version": "3.0.93",
     "description": "The Sovereign CLI Engine for OlonJS.",
     "type": "module",
     "bin": {