mango-cms 0.1.19 → 0.1.21

package/cli.js

@@ -1,16 +1,12 @@
 #!/usr/bin/env node
 
-import { Command } from 'commander';
-import { execSync } from 'child_process';
-import path from 'path';
-import inquirer from 'inquirer';
-import fs from 'fs-extra';
-import axios from 'axios';
-import AdmZip from 'adm-zip';
-import { fileURLToPath } from 'url';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+const { Command } = require('commander');
+const { execSync } = 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 program = new Command();
 

package/default/package.json

@@ -1,42 +1,41 @@
 {
-  "name": "cfl-front",
-  "version": "0.0.0",
-  "scripts": {
-    "dev": "vite",
-    "build": "vite build",
-    "preview": "vite preview",
-    "mango": "mango"
-  },
-  "dependencies": {
-    "mango-cms": "^0.1.16",
-    "@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": "^2.2.0",
-    "@vueup/vue-quill": "^1.0.0-beta.7",
-    "@vueuse/motion": "^2.0.0-beta.12",
-    "algoliasearch": "^4.12.0",
-    "axios": "^0.24.0",
-    "canvas-confetti": "^1.5.1",
-    "datebook": "^7.0.8",
-    "dayjs": "^1.10.7",
-    "express": "^4.18.1",
-    "google-maps": "^4.3.3",
-    "mapbox-gl": "^2.7.0",
-    "sweetalert2": "^11.4.0",
-    "vue": "^3.2.37",
-    "vue-router": "4",
-    "vue-slider-component": "^4.0.0-beta.4",
-    "vue-upload-component": "^3.1.2",
-    "vue3-clipboard": "^1.0.0",
-    "vue3-touch-events": "^4.1.0",
-    "vuedraggable": "^4.1.0"
-  },
-  "devDependencies": {
-    "autoprefixer": "^10.4.0",
-    "postcss": "^8.4.5",
-    "tailwindcss": "^3.0.2",
-    "vite": "^4.2.1"
+    "name": "mango-front",
+    "version": "0.0.0",
+    "scripts": {
+      "dev": "vite",
+      "build": "vite build",
+      "preview": "vite preview",
+      "mango": "mango"
+    },
+    "dependencies": {
+      "mango-cms": "^0.1.20",
+      "@headlessui/vue": "^1.6.7",
+      "@mapbox/mapbox-gl-geocoder": "^5.0.0",
+      "@sweetalert2/theme-dark": "^5.0.10",
+      "@tinymce/tinymce-vue": "^4",
+      "@vueup/vue-quill": "^1.0.0-beta.7",
+      "@vueuse/motion": "^2.0.0-beta.12",
+      "algoliasearch": "^4.12.0",
+      "axios": "^0.24.0",
+      "canvas-confetti": "^1.5.1",
+      "datebook": "^7.0.8",
+      "dayjs": "^1.10.7",
+      "express": "^4.18.1",
+      "google-maps": "^4.3.3",
+      "mapbox-gl": "^2.7.0",
+      "sweetalert2": "^11.4.0",
+      "vue": "^3.2.37",
+      "vue-router": "4",
+      "vue-slider-component": "^4.0.0-beta.4",
+      "vue-upload-component": "^3.1.2",
+      "vue3-clipboard": "^1.0.0",
+      "vue3-touch-events": "^4.1.0",
+      "vuedraggable": "^4.1.0"
+    },
+    "devDependencies": {
+      "autoprefixer": "^10.4.0",
+      "postcss": "^8.4.5",
+      "tailwindcss": "^3.0.2",
+      "vite": "^4.5.9"
+    }
   }
-}

package/index.js

@@ -1,2 +1,2 @@
-export { default as mango } from './default/front/src/helpers/mango.js'
-export { default as Mango } from './default/front/src/helpers/Mango.vue'
+export { default as mango } from './default/src/helpers/mango.js'
+export { default as Mango } from './default/src/helpers/Mango.vue'

package/package.json

@@ -1,7 +1,6 @@
 {
     "name": "mango-cms",
-    "version": "0.1.19",
-    "type": "module",
+    "version": "0.1.21",
     "main": "./index.js",
     "exports": {
         ".": "./index.js"
@@ -9,6 +8,7 @@
     "files": [
         "index.js",
         "cli.js",
+        "webpack.config.js",
         "default/**/*",
         "!default/node_modules/**"
     ],

package/webpack.config.js

@@ -0,0 +1,58 @@
+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, '..')
+}
+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)
+
+module.exports = {
+    mode: 'production',
+    resolve: {
+        alias: {
+            '@mango': path.resolve(mangoRoot),
+            '@cms': path.resolve(mangoRoot, 'src/cms'),
+            '@config': path.resolve(userProjectRoot, 'config'),
+            '@fields': path.resolve(mangoRoot, 'src/cms/1. build/fields'),
+            '@mongo': path.resolve(mangoRoot, 'src/cms/1. build/libraries/mongo'),
+            '@helpers': path.resolve(mangoRoot, 'src/cms/1. build/helpers'),
+        },
+    },
+    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')
+        })
+    ],
+};