mango-cms 0.2.50 → 0.3.0

package/cli.js

@@ -1,13 +1,18 @@
 #!/usr/bin/env node
 
-const { Command } = require('commander');
-const { execSync, spawn } = require('child_process');
-const path = require('path');
-const inquirer = require('inquirer');
-const fs = require('fs-extra');
-const axios = require('axios');
-const AdmZip = require('adm-zip');
-const { addHosts, removeHosts } = require('./lib/hosts-manager');
+import { Command } from 'commander';
+import { execSync, spawn } from 'child_process';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import inquirer from 'inquirer';
+import fs from 'fs-extra';
+import axios from 'axios';
+import AdmZip from 'adm-zip';
+import { addHosts, removeHosts } from './lib/hosts-manager.js';
+import os from 'os';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 const program = new Command();
 
@@ -332,20 +337,47 @@ async function startMangoCMS() {
         console.log(`CMS package located at: ${cmsPackagePath}`);
         console.log(`Running in context of: ${userProjectRoot}`);
 
-        // Run Webpack with the config from @mango-cms/core, but in the user's project context
-        const webpackConfigPath = path.join(cmsPackagePath, 'webpack.config.js');
-        execSync(
-            `npx webpack --config "${webpackConfigPath}" --watch --mode development`,
-            {
-                cwd: cmsPackagePath,
-                stdio: 'inherit',
-                env: {
-                    ...process.env,
-                    MANGO_ROOT: cmsPackagePath,
-                    PROJECT_ROOT: userProjectRoot
-                }
+        const viteConfigPath = path.join(cmsPackagePath, 'vite.config.js');
+        const buildDir = path.join(userProjectRoot, 'build');
+
+        // Start Vite build in watch mode
+        const viteProcess = spawn('npx', ['vite', 'build', '--watch', '--mode', 'development'], {
+            cwd: cmsPackagePath,
+            stdio: 'inherit',
+            env: {
+                ...process.env,
+                MANGO_ROOT: cmsPackagePath,
+                PROJECT_ROOT: userProjectRoot
+            }
+        });
+
+        // Give Vite a moment to do the initial build
+        await new Promise(resolve => setTimeout(resolve, 3000));
+
+        // Start nodemon to watch the build output and restart the server
+        const nodemonProcess = spawn('npx', ['nodemon', '--watch', buildDir, '--ext', 'js', path.join(buildDir, 'index.js')], {
+            cwd: userProjectRoot,
+            stdio: 'inherit',
+            env: {
+                ...process.env,
+                MANGO_ROOT: cmsPackagePath,
+                PROJECT_ROOT: userProjectRoot
             }
-        );
+        });
+
+        // Handle process termination
+        process.on('SIGINT', () => {
+            viteProcess.kill();
+            nodemonProcess.kill();
+            process.exit(0);
+        });
+
+        process.on('SIGTERM', () => {
+            viteProcess.kill();
+            nodemonProcess.kill();
+            process.exit(0);
+        });
+
     } catch (error) {
         console.error('Error starting Mango CMS:', error.message);
         process.exit(1);
@@ -409,7 +441,7 @@ server {
     index index.html;
 
     # Serve static files directly if they exist
-    location ~* \.(?:js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot|otf|json|html)$ {
+    location ~* \\.(?:js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot|otf|json|html)$ {
         expires 1y;
         access_log off;
         add_header Cache-Control "public";
@@ -445,6 +477,7 @@ server {
 function generateApacheConfig(settings, buildPath) {
     const domain = settings.mangoDomain;
     const port = settings.port || 3002;
+    const frontPort = settings.frontPort || 3001;
 
     return `<VirtualHost *:80>
     ServerName ${domain}
@@ -479,7 +512,7 @@ function generateApacheConfig(settings, buildPath) {
     IndexIndex index.html
 
     # Serve static files directly
-    <FilesMatch \.\.(?:js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot|otf|json)$>
+    <FilesMatch \\.\\.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot|otf|json)$>
         Header set Cache-Control "max-age=31536000"
     </FilesMatch>
 
@@ -653,10 +686,9 @@ program
             console.log(`CMS package located at: ${cmsPackagePath}`);
             console.log(`Building in context of: ${userProjectRoot}`);
 
-            // Run Webpack with the config from @mango-cms/core in production mode
-            const webpackConfigPath = path.join(cmsPackagePath, 'webpack.config.js');
+            // Run Vite build in production mode
             execSync(
-                `npx webpack --config "${webpackConfigPath}" --mode production`,
+                `npx vite build --mode production`,
                 {
                     cwd: cmsPackagePath,
                     stdio: 'inherit',
@@ -705,7 +737,7 @@ program
             console.log(`Using server IP: ${serverIp}`);
             console.log(`Using database: ${database}`);
 
-            const downloadsDir = path.join(require('os').homedir(), 'Downloads');
+            const downloadsDir = path.join(os.homedir(), 'Downloads');
             const dumpZip = path.join(downloadsDir, 'dump.zip');
             const dumpDir = path.join(downloadsDir, 'dump');
 

package/default/package.json

@@ -13,7 +13,6 @@
     "dependencies": {
         "@headlessui/vue": "^1.6.7",
         "@mapbox/mapbox-gl-geocoder": "^5.0.0",
-        "@sweetalert2/theme-dark": "^5.0.10",
         "@tinymce/tinymce-vue": "^4",
         "@vitejs/plugin-vue": "^5.2.3",
         "@vueup/vue-quill": "^1.0.0-beta.7",
@@ -25,9 +24,8 @@
         "dayjs": "^1.10.7",
         "express": "^4.18.1",
         "google-maps": "^4.3.3",
-        "mango-cms": "^0.2.50",
+        "mango-cms": "^0.3.0",
         "mapbox-gl": "^2.7.0",
-        "sweetalert2": "^11.4.0",
         "vite": "^6.2.2",
         "vue": "^3.2.37",
         "vue-router": "4",

package/default/vite.config.js

@@ -57,6 +57,7 @@ export default defineConfig({
 	],
 	server: {
 		host: '0.0.0.0',
+		allowedHosts: ['.mango'],
 		// When running behind mango proxy, configure HMR to use the proxy domain
 		// VITE_DEV_PROXY is set to api.{slug}.mango; derive frontend domain by stripping "api." prefix
 		...(process.env.VITE_DEV_PROXY?.startsWith('api.') ? {

package/lib/dev-proxy.js

@@ -9,9 +9,9 @@
  * Usage: node lib/dev-proxy.js <frontDomain> <apiDomain> <frontPort> <backendPort> [pidPath]
  */
 
-const http = require('http');
-const httpProxy = require('http-proxy');
-const fs = require('fs');
+import http from 'http';
+import httpProxy from 'http-proxy';
+import fs from 'fs';
 
 const frontDomain = process.argv[2];
 const apiDomain = process.argv[3];

package/lib/hosts-manager.js

@@ -3,13 +3,13 @@
  * Lines are tagged with "# mango-proxy" for easy cleanup.
  */
 
-const fs = require('fs');
-const { execSync } = require('child_process');
+import fs from 'fs';
+import { execSync } from 'child_process';
 
 const HOSTS_FILE = '/etc/hosts';
 const TAG = '# mango-proxy';
 
-function addHosts(domains) {
+export function addHosts(domains) {
     const hostsContent = fs.readFileSync(HOSTS_FILE, 'utf8');
     const newDomains = domains.filter(d => !hostsContent.includes(d));
 
@@ -29,7 +29,7 @@ function addHosts(domains) {
     }
 }
 
-function removeHosts() {
+export function removeHosts() {
     try {
         const hostsContent = fs.readFileSync(HOSTS_FILE, 'utf8');
         const lines = hostsContent.split('\n');
@@ -49,5 +49,3 @@ function removeHosts() {
         console.error('Failed to clean /etc/hosts:', err.message);
     }
 }
-
-module.exports = { addHosts, removeHosts };

package/package.json

@@ -1,6 +1,7 @@
 {
     "name": "mango-cms",
-    "version": "0.2.50",
+    "version": "0.3.0",
+    "type": "module",
     "main": "./index.js",
     "exports": {
         ".": "./index.js",
@@ -9,7 +10,7 @@
     "files": [
         "index.js",
         "cli.js",
-        "webpack.config.js",
+        "vite.config.js",
         "lib/**/*",
         "default/**/*",
         "!default/node_modules/**"
@@ -21,9 +22,9 @@
     },
     "scripts": {
         "postinstall": "",
-        "build": "npx webpack",
-        "watch": "NODE_OPTIONS='--trace-warnings' npx webpack --watch --mode development",
-        "dev": "NODE_OPTIONS='--trace-warnings' npx webpack --watch --mode development"
+        "build": "vite build",
+        "watch": "vite build --watch",
+        "dev": "vite build --watch"
     },
     "peerDependencies": {
         "algoliasearch": "^4.10.3",
@@ -38,9 +39,6 @@
     "dependencies": {
         "@aws-sdk/client-s3": "^3.423.0",
         "@aws-sdk/lib-storage": "^3.423.0",
-        "@babel/core": "^7.12.9",
-        "@babel/plugin-transform-runtime": "^7.12.1",
-        "@babel/preset-env": "^7.12.7",
         "@sentry/node": "^7.85.0",
         "@sentry/profiling-node": "^1.2.6",
         "adm-zip": "^0.5.16",
@@ -50,16 +48,16 @@
         "archiver": "^7.0.1",
         "aws-sdk": "^2.1469.0",
         "axios": "^0.21.4",
-        "babel-loader": "^8.2.2",
-        "babel-plugin-source-map-support": "^2.1.3",
         "cli-progress": "^3.12.0",
         "connect-multiparty": "^2.2.0",
+        "connect-redis": "7",
         "cors": "^2.8.5",
         "country-state-city": "^3.2.1",
         "crypto": "^1.0.1",
         "dayjs": "^1.11.6",
         "dotenv": "^8.2.0",
         "express": "^4.17.1",
+        "express-session": "^1.19.0",
         "fast-csv": "^5.0.5",
         "fs-extra": "^11.3.0",
         "get-audio-duration": "^3.1.0",
@@ -84,12 +82,11 @@
         "multer": "^1.4.2",
         "node-lame": "^1.3.2",
         "node-zip": "^1.1.1",
-        "nodemon-webpack-plugin": "^4.3.2",
+        "nodemon": "^3.0.0",
         "openai": "^5.15.0",
         "pack": "^2.2.0",
         "parse-html-text-content": "^1.1.1",
         "redis": "^4.7.0",
-        "require-all": "^3.0.0",
         "resend": "^6.3.0",
         "sharp": "^0.32.1",
         "socket.io": "^4.8.0",
@@ -100,10 +97,7 @@
         "subscriptions-transport-ws": "^0.9.18",
         "util": "^0.12.3",
         "uuid": "3.4.0",
-        "web": "^0.0.2",
-        "webpack": "^5.10.0",
-        "webpack-cli": "^5.1.4",
-        "webpack-node-externals": "^2.5.2"
+        "web": "^0.0.2"
     },
     "optionalDependencies": {
         "bufferutil": "^4.0.8",

package/vite.config.js

@@ -0,0 +1,76 @@
+import { defineConfig } from 'vite'
+import { fileURLToPath } from 'url'
+import path from 'path'
+import fs from 'fs'
+import { builtinModules } from 'module'
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url))
+
+export default defineConfig(({ mode }) => {
+  process.env.PROJECT_ROOT = process.env.PROJECT_ROOT || process.cwd()
+  process.env.MANGO_ROOT = process.env.MANGO_ROOT || __dirname
+
+  const mangoRoot = process.env.MANGO_ROOT
+  let userProjectRoot = process.env.PROJECT_ROOT
+
+  const legacyMode = userProjectRoot === mangoRoot
+  if (legacyMode) {
+    userProjectRoot = path.join(__dirname, '..')
+    process.env.PROJECT_ROOT = userProjectRoot
+  }
+
+  // Determine config directory - prefer 'mango' over 'config' (legacy)
+  let configDir = 'mango'
+  if (!fs.existsSync(path.join(userProjectRoot, 'mango')) && fs.existsSync(path.join(userProjectRoot, 'config'))) {
+    configDir = 'config'
+  }
+  process.env.CONFIG_ROOT = path.join(userProjectRoot, configDir)
+
+  const buildPath = legacyMode ? mangoRoot : userProjectRoot
+
+  console.log('Vite config:', {
+    PROJECT_ROOT: process.env.PROJECT_ROOT,
+    MANGO_ROOT: mangoRoot,
+    CONFIG_ROOT: process.env.CONFIG_ROOT,
+    legacyMode,
+    buildPath
+  })
+
+  return {
+    build: {
+      ssr: path.resolve(mangoRoot, 'src/main.js'),
+      outDir: path.resolve(buildPath, 'build'),
+      emptyOutDir: true,
+      sourcemap: 'inline',
+      minify: mode === 'production',
+      rollupOptions: {
+        output: {
+          entryFileNames: 'index.js',
+          format: 'esm'
+        }
+      }
+    },
+    resolve: {
+      alias: {
+        '@mango': path.resolve(userProjectRoot, configDir),
+        '@cms': path.resolve(mangoRoot, 'src/cms'),
+        '@config': path.resolve(userProjectRoot, configDir),
+        '@settings': path.resolve(userProjectRoot, configDir, 'config/settings.json'),
+        '@fields': path.resolve(mangoRoot, 'src/cms/1. build/fields'),
+        '@mongo': path.resolve(mangoRoot, 'src/cms/1. build/libraries/mongo'),
+        '@query': path.resolve(mangoRoot, 'src/cms/1. build/libraries/mongo'),
+        '@helpers': path.resolve(mangoRoot, 'src/cms/1. build/helpers'),
+        '@main': path.resolve(mangoRoot, 'src/cms/2. process/0. main')
+      }
+    },
+    ssr: {
+      external: [...builtinModules, ...builtinModules.map(m => `node:${m}`)],
+      noExternal: []
+    },
+    define: {
+      'process.env.MANGO_ROOT': JSON.stringify(mangoRoot),
+      'process.env.PROJECT_ROOT': JSON.stringify(process.env.PROJECT_ROOT),
+      'process.env.CONFIG_ROOT': JSON.stringify(process.env.CONFIG_ROOT)
+    }
+  }
+})

package/webpack.config.js

@@ -1,65 +0,0 @@
-const path = require('path');
-const webpack = require('webpack');
-const nodeExternals = require('webpack-node-externals');
-const NodemonPlugin = require('nodemon-webpack-plugin');
-
-
-// Get the user's project root from the execution context (passed via CLI or fallback to cwd)
-process.env.PROJECT_ROOT = process.env.PROJECT_ROOT || process.cwd();
-process.env.MANGO_ROOT = process.env.MANGO_ROOT || __dirname;
-let moduleLocation = process.env.PROJECT_ROOT
-
-let legacyMode = process.env.PROJECT_ROOT == process.env.MANGO_ROOT
-if (legacyMode) {
-    moduleLocation = __dirname
-    process.env.PROJECT_ROOT = path.join(__dirname, '..')
-}
-process.env.CONFIG_ROOT = process.env.PROJECT_ROOT + (legacyMode ? '/config' : '/mango')
-console.log('env', process.env.PROJECT_ROOT, process.env.MANGO_ROOT, legacyMode, path.resolve(moduleLocation, 'node_modules'))
-
-const userProjectRoot = process.env.PROJECT_ROOT
-const mangoRoot = process.env.MANGO_ROOT
-const buildPath = legacyMode ? mangoRoot : userProjectRoot
-
-console.log('moduleLocation', moduleLocation, process.env.CONFIG_ROOT)
-
-module.exports = {
-    mode: 'production',
-    resolve: {
-        alias: {
-
-            '@mango$': path.resolve(mangoRoot, 'src/cms/exports'),
-            '@mango': path.resolve(userProjectRoot, legacyMode ? 'config' : 'mango'),
-
-            '@cms': path.resolve(mangoRoot, 'src/cms'),
-            '@config': path.resolve(userProjectRoot, legacyMode ? 'config' : 'mango'),
-            '@settings': path.resolve(userProjectRoot, legacyMode ? 'config/config/settings.json' : 'mango/config/settings.json'),
-            '@fields': path.resolve(mangoRoot, 'src/cms/1. build/fields'),
-            '@mongo': path.resolve(mangoRoot, 'src/cms/1. build/libraries/mongo'),
-            '@query': path.resolve(mangoRoot, 'src/cms/1. build/libraries/mongo'),
-            '@helpers': path.resolve(mangoRoot, 'src/cms/1. build/helpers'),
-            '@main': path.resolve(mangoRoot, 'src/cms/2. process/0. main'),
-        },
-    },
-    devtool: 'inline-source-map',
-    entry: {
-        server: path.resolve(mangoRoot, 'src/main.js'), // Entry point in @mango-cms/core
-    },
-    output: {
-        path: path.resolve(buildPath, 'build'), // Change to build in mango directory
-        filename: 'index.js',
-    },
-    target: 'node',
-    plugins: [new NodemonPlugin()],
-    node: {
-        __dirname: false,
-        __filename: false,
-    },
-    externals: [
-        nodeExternals(),
-        // Also check for externals in the mango package
-        nodeExternals({
-            modulesDir: path.resolve(moduleLocation, 'node_modules')
-        })
-    ],
-};