@jsonpages/cli 3.0.66 → 3.0.68

package/assets/src_tenant_alpha.sh

@@ -584,7 +584,7 @@ cat << 'END_OF_FILE_CONTENT' > "package.json"
     "dev": "vite",
     "dev:clean": "vite --force",
     "build": "tsc && vite build",
-    "dist": "bash ./src2Code.sh src index.html scripts docs package.json",
+    "dist": "bash ./src2Code.sh src index.html vite.config.ts scripts docs package.json",
     "preview": "vite preview",
     "bake:email": "tsx scripts/bake-email.tsx",
     "bakemail": "npm run bake:email --"
@@ -594,7 +594,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",
-    "@jsonpages/core": "^1.0.53",
+    "@jsonpages/core": "^1.0.55",
     "clsx": "^2.1.1",
     "lucide-react": "^0.474.0",
     "react": "^19.0.0",
@@ -7502,4 +7502,144 @@ declare module '*?inline' {
 
 
 
+END_OF_FILE_CONTENT
+echo "Creating vite.config.ts..."
+cat << 'END_OF_FILE_CONTENT' > "vite.config.ts"
+/**
+ * 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';
+import tailwindcss from '@tailwindcss/vite';
+import path from 'path';
+import fs from 'fs';
+import { fileURLToPath } from 'url';
+
+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 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',
+]);
+const MAX_FILE_SIZE_BYTES = 5 * 1024 * 1024; // 5MB
+
+function safeFilename(original, mimeType) {
+  const base = (original.replace(/\.[^.]+$/, '').replace(/[^a-zA-Z0-9-_]/g, '_').slice(0, 128)) || 'image';
+  const ext = original.includes('.') ? path.extname(original).toLowerCase() : (mimeType?.startsWith('image/') ? `.${(mimeType.split('/')[1] || 'png').replace('jpeg', 'jpg')}` : '.png');
+  return `${Date.now()}-${base}${IMAGE_EXT.has(ext) ? ext : '.png'}`;
+}
+
+function listImagesInDir(dir, urlPrefix) {
+  const list = [];
+  if (!fs.existsSync(dir)) return list;
+  for (const name of fs.readdirSync(dir)) {
+    if (IMAGE_EXT.has(path.extname(name).toLowerCase())) list.push({ id: name, url: `${urlPrefix}/${name}`, alt: name, tags: [] });
+  }
+  return list;
+}
+
+function sendJson(res, status, body) {
+  res.writeHead(status, { 'Content-Type': 'application/json' });
+  res.end(JSON.stringify(body));
+}
+
+function sendJsonFile(res, filePath) {
+  try {
+    const content = fs.readFileSync(filePath, 'utf8');
+    res.writeHead(200, { 'Content-Type': 'application/json; charset=utf-8' });
+    res.end(content);
+  } catch (e) {
+    sendJson(res, 500, { error: e?.message || 'Read failed' });
+  }
+}
+
+function isTenantPageJsonRequest(req, pathname) {
+  if (req.method !== 'GET' || !pathname.endsWith('.json')) return false;
+  const viteOrStaticPrefixes = ['/api/', '/assets/', '/src/', '/node_modules/', '/public/', '/@'];
+  return !viteOrStaticPrefixes.some((prefix) => pathname.startsWith(prefix));
+}
+export default defineConfig({
+  plugins: [
+    react(),
+    tailwindcss(),
+    {
+      name: 'upload-asset-api',
+      configureServer(server) {
+        server.middlewares.use((req, res, next) => {
+          const pathname = (req.url || '').split('?')[0];
+          const isPageJsonRequest = isTenantPageJsonRequest(req, pathname);
+
+          if (isPageJsonRequest) {
+            const normalizedPath = decodeURIComponent(pathname).replace(/\\/g, '/');
+            const slug = normalizedPath.replace(/^\/+/, '').replace(/\.json$/i, '').replace(/^\/+|\/+$/g, '');
+            const candidate = path.resolve(DATA_PAGES_DIR, `${slug}.json`);
+            const isInsidePagesDir = candidate.startsWith(`${DATA_PAGES_DIR}${path.sep}`) || candidate === DATA_PAGES_DIR;
+            if (!slug || !isInsidePagesDir || !fs.existsSync(candidate) || !fs.statSync(candidate).isFile()) {
+              sendJson(res, 404, { error: 'Page JSON not found' });
+              return;
+            }
+            sendJsonFile(res, candidate);
+            return;
+          }
+          if (req.method === 'GET' && req.url === '/api/list-assets') {
+            try { sendJson(res, 200, listImagesInDir(ASSETS_IMAGES_DIR, '/assets/images')); } catch (e) { sendJson(res, 500, { error: e?.message || 'List failed' }); }
+            return;
+          }
+          if (req.method === 'POST' && pathname === '/api/save-to-file') {
+            const chunks = [];
+            req.on('data', (chunk) => chunks.push(chunk));
+            req.on('end', () => {
+              try {
+                const raw = Buffer.concat(chunks).toString('utf8');
+                if (!raw.trim()) { sendJson(res, 400, { error: 'Empty body' }); return; }
+                const body = JSON.parse(raw);
+                const { projectState, slug } = body;
+                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 });
+                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 = (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' }); }
+            });
+            req.on('error', () => sendJson(res, 500, { error: 'Request error' }));
+            return;
+          }
+          if (req.method !== 'POST' || req.url !== '/api/upload-asset') return next();
+          const chunks = [];
+          req.on('data', (chunk) => chunks.push(chunk));
+          req.on('end', () => {
+            try {
+              const body = JSON.parse(Buffer.concat(chunks).toString('utf8'));
+              const { filename, mimeType, data } = body;
+              if (!filename || typeof data !== 'string') { sendJson(res, 400, { error: 'Missing filename or data' }); return; }
+              const buf = Buffer.from(data, 'base64');
+              if (buf.length > MAX_FILE_SIZE_BYTES) { sendJson(res, 413, { error: 'File too large. Max 5MB.' }); return; }
+              if (mimeType && !IMAGE_MIMES.has(mimeType)) { sendJson(res, 400, { error: 'Invalid file type' }); return; }
+              const name = safeFilename(filename, mimeType);
+              if (!fs.existsSync(ASSETS_IMAGES_DIR)) fs.mkdirSync(ASSETS_IMAGES_DIR, { recursive: true });
+              fs.writeFileSync(path.join(ASSETS_IMAGES_DIR, name), buf);
+              sendJson(res, 200, { url: `/assets/images/${name}` });
+            } catch (e) { sendJson(res, 500, { error: e?.message || 'Upload failed' }); }
+          });
+          req.on('error', () => sendJson(res, 500, { error: 'Request error' }));
+        });
+      },
+    },
+  ],
+  resolve: { alias: { '@': path.resolve(__dirname, './src') } },
+});
+
+
+
+
+
 END_OF_FILE_CONTENT

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonpages/cli",
-  "version": "3.0.66",
+  "version": "3.0.68",
   "description": "The Sovereign CLI Engine for JsonPages.",
   "type": "module",
   "bin": {

package/src/index.js

@@ -151,114 +151,6 @@ program
     }
   });
 
-/** Returns full vite.config.ts content with /api/save-to-file, /api/upload-asset, /api/list-assets. Inlined so generated tenant always has save-to-disk. */
-function getViteConfigWithSaveToFile() {
-  return `/**
- * 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';
-import tailwindcss from '@tailwindcss/vite';
-import path from 'path';
-import fs from 'fs';
-import { fileURLToPath } from 'url';
-
-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 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',
-]);
-const MAX_FILE_SIZE_BYTES = 5 * 1024 * 1024; // 5MB
-
-function safeFilename(original, mimeType) {
-  const base = (original.replace(/\\.[^.]+$/, '').replace(/[^a-zA-Z0-9-_]/g, '_').slice(0, 128)) || 'image';
-  const ext = original.includes('.') ? path.extname(original).toLowerCase() : (mimeType?.startsWith('image/') ? \`.\${(mimeType.split('/')[1] || 'png').replace('jpeg', 'jpg')}\` : '.png');
-  return \`\${Date.now()}-\${base}\${IMAGE_EXT.has(ext) ? ext : '.png'}\`;
-}
-
-function listImagesInDir(dir, urlPrefix) {
-  const list = [];
-  if (!fs.existsSync(dir)) return list;
-  for (const name of fs.readdirSync(dir)) {
-    if (IMAGE_EXT.has(path.extname(name).toLowerCase())) list.push({ id: name, url: \`\${urlPrefix}/\${name}\`, alt: name, tags: [] });
-  }
-  return list;
-}
-
-function sendJson(res, status, body) {
-  res.writeHead(status, { 'Content-Type': 'application/json' });
-  res.end(JSON.stringify(body));
-}
-
-export default defineConfig({
-  plugins: [
-    react(),
-    tailwindcss(),
-    {
-      name: 'upload-asset-api',
-      configureServer(server) {
-        server.middlewares.use((req, res, next) => {
-          if (req.method === 'GET' && req.url === '/api/list-assets') {
-            try { sendJson(res, 200, listImagesInDir(ASSETS_IMAGES_DIR, '/assets/images')); } catch (e) { sendJson(res, 500, { error: e?.message || 'List failed' }); }
-            return;
-          }
-          const pathname = (req.url || '').split('?')[0];
-          if (req.method === 'POST' && pathname === '/api/save-to-file') {
-            const chunks = [];
-            req.on('data', (chunk) => chunks.push(chunk));
-            req.on('end', () => {
-              try {
-                const raw = Buffer.concat(chunks).toString('utf8');
-                if (!raw.trim()) { sendJson(res, 400, { error: 'Empty body' }); return; }
-                const body = JSON.parse(raw);
-                const { projectState, slug } = body;
-                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 });
-                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 = (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' }); }
-            });
-            req.on('error', () => sendJson(res, 500, { error: 'Request error' }));
-            return;
-          }
-          if (req.method !== 'POST' || req.url !== '/api/upload-asset') return next();
-          const chunks = [];
-          req.on('data', (chunk) => chunks.push(chunk));
-          req.on('end', () => {
-            try {
-              const body = JSON.parse(Buffer.concat(chunks).toString('utf8'));
-              const { filename, mimeType, data } = body;
-              if (!filename || typeof data !== 'string') { sendJson(res, 400, { error: 'Missing filename or data' }); return; }
-              const buf = Buffer.from(data, 'base64');
-              if (buf.length > MAX_FILE_SIZE_BYTES) { sendJson(res, 413, { error: 'File too large. Max 5MB.' }); return; }
-              if (mimeType && !IMAGE_MIMES.has(mimeType)) { sendJson(res, 400, { error: 'Invalid file type' }); return; }
-              const name = safeFilename(filename, mimeType);
-              if (!fs.existsSync(ASSETS_IMAGES_DIR)) fs.mkdirSync(ASSETS_IMAGES_DIR, { recursive: true });
-              fs.writeFileSync(path.join(ASSETS_IMAGES_DIR, name), buf);
-              sendJson(res, 200, { url: \`/assets/images/\${name}\` });
-            } catch (e) { sendJson(res, 500, { error: e?.message || 'Upload failed' }); }
-          });
-          req.on('error', () => sendJson(res, 500, { error: 'Request error' }));
-        });
-      },
-    },
-  ],
-  resolve: { alias: { '@': path.resolve(__dirname, './src') } },
-});
-`;
-}
-
 async function injectInfraFiles(targetDir, name) {
   const pkg = {
     name: name,
@@ -273,10 +165,6 @@ async function injectInfraFiles(targetDir, name) {
   };
   await fs.writeJson(path.join(targetDir, 'package.json'), pkg, { spaces: 2 });
 
-  // Vite config with dev server API: /api/save-to-file, /api/upload-asset, /api/list-assets (always inline so it works when CLI is installed from npm)
-  const viteConfig = getViteConfigWithSaveToFile();
-  await fs.writeFile(path.join(targetDir, 'vite.config.ts'), viteConfig);
-
   await fs.ensureDir(path.join(targetDir, 'public', 'assets', 'images'));
   await fs.ensureDir(path.join(targetDir, 'src', 'data', 'config'));
   await fs.ensureDir(path.join(targetDir, 'src', 'data', 'pages'));
@@ -331,4 +219,4 @@ async function injectInfraFiles(targetDir, name) {
   await fs.writeJson(path.join(targetDir, 'components.json'), shadcnConfig, { spaces: 2 });
 }
 
-program.parse();
+program.parse();