@silexlabs/silex 3.0.1-0 → 3.0.1

package/dist/server/server/connectors/FsHosting.js

@@ -1,29 +1,39 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FsHosting = void 0;
+const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = require("path");
-const jobs_1 = require("../jobs");
 const FsStorage_1 = require("./FsStorage");
 const types_1 = require("../../types");
 class FsHosting extends FsStorage_1.FsStorage {
     connectorId = 'fs-hosting';
     displayName = 'File system hosting';
-    icon = 'data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20stroke%3D%22currentColor%22%20stroke-width%3D%222%22%20stroke-linecap%3D%22round%22%20stroke-linejoin%3D%22round%22%3E%3Cpath%20d%3D%22M6%202L6%2022%2018%2022%2018%207%2012%202%206%202Z%22%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M18%202L12%202%2012%208%2018%208%2018%202Z%22%3E%3C%2Fpath%3E%3C%2Fsvg%3E';
     connectorType = types_1.ConnectorType.HOSTING;
-    async publish(session, id, files) {
-        const job = (0, jobs_1.startJob)(`Publishing to ${this.displayName}`);
+    async initFs() {
+        const stat = await promises_1.default.stat(this.options.path).catch(() => null);
+        if (!stat) {
+            await promises_1.default.mkdir((0, path_1.join)(this.options.path, 'assets'), { recursive: true });
+            await promises_1.default.mkdir((0, path_1.join)(this.options.path, 'css'), { recursive: true });
+            console.info(`> [FsHosting] Created folders assets/ and css/ in ${this.options.path}`);
+        }
+    }
+    async publish(session, id, files, { startJob, jobSuccess, jobError }) {
+        const job = startJob(`Publishing to ${this.displayName}`);
         job.logs = [[`Publishing to ${this.displayName}`]];
         job.errors = [[]];
-        this.writeAssets(session, id, files, async ({ status, message }) => {
+        await this.write(session, '', files, '', async ({ status, message }) => {
             job.status = status;
             job.message = message;
             job.logs[0].push(message);
             if (status === types_1.JobStatus.SUCCESS) {
-                (0, jobs_1.jobSuccess)(job.jobId, message);
+                jobSuccess(job.jobId, message);
             }
             else if (status === types_1.JobStatus.ERROR) {
                 job.errors[0].push(message);
-                (0, jobs_1.jobError)(job.jobId, message);
+                jobError(job.jobId, message);
             }
         });
         return job;

package/dist/server/server/connectors/FsStorage.js

@@ -1,30 +1,10 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FsStorage = void 0;
-const promises_1 = __importStar(require("fs/promises"));
+const promises_1 = __importDefault(require("fs/promises"));
 const fs_1 = require("fs");
 const connectors_1 = require("./connectors");
 const path_1 = require("path");
@@ -36,10 +16,21 @@ const stream_1 = require("stream");
 const uuid_1 = require("uuid");
 if (!globalThis.__dirname) {
     globalThis.__dirname = (0, path_1.dirname)(process.cwd() + '/src/ts/server/connectors/FsStorage.ts');
-    console.log('Redefining __dirname', globalThis.__dirname);
+    console.info('Redefining __dirname', globalThis.__dirname);
+}
+async function copyDir(src, dest) {
+    await promises_1.default.mkdir(dest, { recursive: true });
+    const entries = await promises_1.default.readdir(src, { withFileTypes: true });
+    for (const entry of entries) {
+        const srcPath = (0, path_1.join)(src, entry.name);
+        const destPath = (0, path_1.join)(dest, entry.name);
+        entry.isDirectory() ?
+            await copyDir(srcPath, destPath) :
+            await promises_1.default.copyFile(srcPath, destPath);
+    }
 }
 const USER_ICON = 'data:image/svg+xml,%3Csvg xmlns=\'http://www.w3.org/2000/svg\' height=\'1em\' viewBox=\'0 0 448 512\'%3E%3Cpath d=\'M304 128a80 80 0 1 0 -160 0 80 80 0 1 0 160 0zM96 128a128 128 0 1 1 256 0A128 128 0 1 1 96 128zM49.3 464H398.7c-8.9-63.3-63.3-112-129-112H178.3c-65.7 0-120.1 48.7-129 112zM0 482.3C0 383.8 79.8 304 178.3 304h91.4C368.2 304 448 383.8 448 482.3c0 16.4-13.3 29.7-29.7 29.7H29.7C13.3 512 0 498.7 0 482.3z\'/%3E%3C/svg%3E';
-const FILE_ICON = 'data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20stroke%3D%22currentColor%22%20stroke-width%3D%222%22%20stroke-linecap%3D%22round%22%20stroke-linejoin%3D%22round%22%3E%3Cpath%20d%3D%22M6%202L6%2022%2018%2022%2018%207%2012%202%206%202Z%22%3E%3C%2Fpath%3E%3Cpath%20d%3D%22M18%202L12%202%2012%208%2018%208%2018%202Z%22%3E%3C%2Fpath%3E%3C%2Fsvg%3E';
+const FILE_ICON = '/assets/laptop.png';
 class FsStorage {
     connectorId = 'fs-storage';
     displayName = 'File system storage';
@@ -64,6 +55,7 @@ class FsStorage {
             await promises_1.default.mkdir((0, path_1.join)(this.options.path, id, this.options.assetsFolder), { recursive: true });
             await this.setWebsiteMeta({}, id, { name: 'Default website', connectorUserSettings: {} });
             await this.updateWebsite({}, id, types_1.defaultWebsiteData);
+            console.info(`> [FsStorage] Created ${id} in ${this.options.path}`);
         }
     }
     updateStatus(filesStatuses, status, statusCbk) {
@@ -110,7 +102,7 @@ class FsStorage {
     }
     async getWebsiteMeta(session, id) {
         const websiteId = (0, validation_1.requiredParam)(id, 'website id');
-        const fileStat = await (0, promises_1.stat)((0, path_1.join)(this.options.path, websiteId));
+        const fileStat = await promises_1.default.stat((0, path_1.join)(this.options.path, websiteId));
         const path = (0, path_1.join)(this.options.path, websiteId, constants_1.WEBSITE_META_DATA_FILE);
         const content = await promises_1.default.readFile(path);
         const meta = await JSON.parse(content.toString());
@@ -146,6 +138,17 @@ class FsStorage {
         const path = (0, path_1.join)(this.options.path, id);
         return promises_1.default.rmdir(path, { recursive: true });
     }
+    async duplicateWebsite(session, websiteId) {
+        const newWebsiteId = (0, uuid_1.v4)();
+        const from = (0, path_1.join)(this.options.path, websiteId);
+        const to = (0, path_1.join)(this.options.path, newWebsiteId);
+        await copyDir(from, to);
+        const meta = await this.getWebsiteMeta(session, websiteId);
+        await this.setWebsiteMeta(session, newWebsiteId, {
+            ...meta,
+            name: `${meta.name} copy`,
+        });
+    }
     async listWebsites(session) {
         const list = await promises_1.default.readdir(this.options.path);
         return Promise.all(list.map(async (fileName) => {
@@ -159,16 +162,19 @@ class FsStorage {
         return { path, content };
     }
     async writeAssets(session, id, files, statusCbk) {
+        return this.write(session, id, files, this.options.assetsFolder, statusCbk);
+    }
+    async write(session, id, files, assetsFolder, statusCbk) {
         const filesStatuses = this.initStatus(files);
         let error = null;
         for (const fileStatus of filesStatuses) {
             const { file } = fileStatus;
-            const path = (0, path_1.join)(this.options.path, id, this.options.assetsFolder, file.path);
+            const path = (0, path_1.join)(this.options.path, id, assetsFolder, file.path);
             if (typeof file.content === 'string' || Buffer.isBuffer(file.content)) {
                 fileStatus.message = 'Writing';
                 this.updateStatus(filesStatuses, types_1.JobStatus.IN_PROGRESS, statusCbk);
                 try {
-                    await promises_1.default.writeFile(path, file.content, 'binary');
+                    await promises_1.default.writeFile(path, file.content);
                 }
                 catch (err) {
                     fileStatus.message = `Error (${err})`;

package/dist/server/server/connectors/connectors.js

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.contentToReadable = exports.contentToBuffer = exports.contentToString = exports.toConnectorData = exports.getConnector = exports.toConnectorEnum = void 0;
+exports.toConnectorEnum = toConnectorEnum;
+exports.getConnector = getConnector;
+exports.toConnectorData = toConnectorData;
+exports.contentToString = contentToString;
+exports.contentToBuffer = contentToBuffer;
+exports.contentToReadable = contentToReadable;
 const stream_1 = require("stream");
 const types_1 = require("../../types");
 function toConnectorEnum(type) {
@@ -9,7 +14,6 @@ function toConnectorEnum(type) {
         throw new Error(`Unknown connector type ${type}. It should be one of ${Object.keys(types_1.ConnectorType).join(', ')}`);
     return result;
 }
-exports.toConnectorEnum = toConnectorEnum;
 async function getConnector(config, session, type, connectorId) {
     const connectors = config.getConnectors(type);
     if (connectorId)
@@ -21,7 +25,6 @@ async function getConnector(config, session, type, connectorId) {
     }
     return connectors[0];
 }
-exports.getConnector = getConnector;
 async function toConnectorData(session, connector) {
     return {
         connectorId: connector.connectorId,
@@ -35,7 +38,6 @@ async function toConnectorData(session, connector) {
         background: connector.background,
     };
 }
-exports.toConnectorData = toConnectorData;
 async function contentToString(content) {
     if (typeof content === 'string')
         return content;
@@ -54,7 +56,6 @@ async function contentToString(content) {
         });
     });
 }
-exports.contentToString = contentToString;
 async function contentToBuffer(content) {
     if (typeof content === 'string')
         return Buffer.from(content, 'utf8');
@@ -76,7 +77,6 @@ async function contentToBuffer(content) {
     }
     throw new Error('Unknown content type');
 }
-exports.contentToBuffer = contentToBuffer;
 function contentToReadable(content) {
     if (typeof content === 'string')
         return stream_1.Readable.from([content]);
@@ -86,4 +86,3 @@ function contentToReadable(content) {
         return content;
     throw new Error('Unknown content type');
 }
-exports.contentToReadable = contentToReadable;

package/dist/server/server/express.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.start = exports.create = void 0;
+exports.create = create;
+exports.start = start;
 const express_1 = __importDefault(require("express"));
 const body_parser_1 = __importDefault(require("body-parser"));
 const compression_1 = __importDefault(require("compression"));
@@ -16,7 +17,7 @@ function create(config) {
     app.set('config', config);
     const options = config.expressOptions;
     if (options.cors) {
-        console.log('> CORS are ENABLED:', options.cors);
+        console.info('> CORS are ENABLED:', options.cors);
         app.use((0, cors_1.default)({
             origin: options.cors,
         }));
@@ -25,7 +26,7 @@ function create(config) {
     app.use(body_parser_1.default.json({ limit: options.jsonLimit }));
     app.use(body_parser_1.default.text({ limit: options.textLimit }));
     app.use(body_parser_1.default.urlencoded({ limit: options.urlencodedLimit }));
-    console.log('> Session name:', options.sessionName);
+    console.info('> Session name:', options.sessionName);
     app.use((0, cookie_parser_1.default)());
     app.use((0, cookie_session_1.default)({
         name: options.sessionName,
@@ -33,7 +34,6 @@ function create(config) {
     }));
     return app;
 }
-exports.create = create;
 async function start(app) {
     const config = app.get('config');
     config.emit(events_1.ServerEvent.STARTUP_START, { app });
@@ -44,4 +44,3 @@ async function start(app) {
         });
     });
 }
-exports.start = start;

package/dist/server/server/index.js

@@ -29,13 +29,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = silex;
 const silexApp = __importStar(require("./express"));
 const api_1 = __importDefault(require("./api/api"));
 const config_1 = require("./config");
 const dotenv_1 = __importDefault(require("dotenv"));
 const path_1 = require("path");
+const constants_1 = require("../constants");
 __exportStar(require("./expose"), exports);
 async function silex() {
+    console.info(constants_1.DEV_MESSAGE);
+    console.info(`Node version: ${process.version}`);
+    console.info(`CWD: ${process.cwd()}`);
     const curDirEnv = dotenv_1.default.config();
     if (curDirEnv.error) {
         if (curDirEnv.error['code'] === 'ENOENT') {
@@ -73,7 +78,6 @@ I'm ready, listening to port ${config.port}
         startLiverReload();
     }
 }
-exports.default = silex;
 async function startLiverReload() {
     const { createServer } = await Promise.resolve().then(() => __importStar(require('livereload')));
     const { resolve } = await Promise.resolve().then(() => __importStar(require('path')));

package/dist/server/server/jobs.js

@@ -1,9 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.killJob = exports.jobError = exports.jobSuccess = exports.getJob = exports.startJob = void 0;
+exports.jobManager = void 0;
+exports.startJob = startJob;
+exports.getJob = getJob;
+exports.jobSuccess = jobSuccess;
+exports.jobError = jobError;
+exports.killJob = killJob;
 const types_1 = require("../types");
 const TIME_TO_KEEP_AFTER_STOP = 60 * 10 * 1000;
 const jobs = new Array();
+const timers = new WeakMap();
 const processKey = Math.ceil(Math.random() * 1000000);
 let nextJobId = 0;
 function startJob(message = '') {
@@ -16,32 +22,29 @@ function startJob(message = '') {
     jobs.push(job);
     return job;
 }
-exports.startJob = startJob;
 function getJob(id) {
     return jobs.find(job => job.jobId === id);
 }
-exports.getJob = getJob;
 function jobSuccess(id, message = '') {
     return end(id, types_1.JobStatus.SUCCESS, message);
 }
-exports.jobSuccess = jobSuccess;
 function jobError(id, message = '') {
     return end(id, types_1.JobStatus.ERROR, message);
 }
-exports.jobError = jobError;
 function killJob(job) {
-    clearTimeout(job._timeout);
+    clearTimeout(timers.get(job));
+    timers.delete(job);
     jobs.splice(jobs.findIndex(j => job.jobId === j.jobId), 1);
 }
-exports.killJob = killJob;
 function end(id, status, message = '') {
     const job = getJob(id);
     if (job) {
         job.status = status;
         if (message)
             job.message = message;
-        job._timeout = setTimeout(() => killJob(job), TIME_TO_KEEP_AFTER_STOP);
+        timers.set(job, setTimeout(() => killJob(job), TIME_TO_KEEP_AFTER_STOP));
         return true;
     }
     return false;
 }
+exports.jobManager = { startJob, jobSuccess, jobError };

package/dist/server/server/utils/validation.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.requiredParam = void 0;
+exports.requiredParam = requiredParam;
 function requiredParam(value, name, defaultValue) {
     if (value === undefined) {
         if (defaultValue !== undefined) {
@@ -12,4 +12,3 @@ function requiredParam(value, name, defaultValue) {
     }
     return value;
 }
-exports.requiredParam = requiredParam;

package/dist/server/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JobStatus = exports.ConnectorType = exports.Unit = exports.defaultWebsiteData = exports.ApiError = void 0;
+exports.JobStatus = exports.ConnectorType = exports.Initiator = exports.ClientSideFileType = exports.Unit = exports.defaultWebsiteData = exports.ApiError = void 0;
 class ApiError extends Error {
     httpStatusCode;
     constructor(message, httpStatusCode) {
@@ -15,6 +15,18 @@ var Unit;
 (function (Unit) {
     Unit["PX"] = "px";
 })(Unit || (exports.Unit = Unit = {}));
+var ClientSideFileType;
+(function (ClientSideFileType) {
+    ClientSideFileType["HTML"] = "html";
+    ClientSideFileType["ASSET"] = "asset";
+    ClientSideFileType["CSS"] = "css";
+    ClientSideFileType["OTHER"] = "other";
+})(ClientSideFileType || (exports.ClientSideFileType = ClientSideFileType = {}));
+var Initiator;
+(function (Initiator) {
+    Initiator["HTML"] = "html";
+    Initiator["CSS"] = "css";
+})(Initiator || (exports.Initiator = Initiator = {}));
 var ConnectorType;
 (function (ConnectorType) {
     ConnectorType["STORAGE"] = "STORAGE";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@silexlabs/silex",
   "description": "Free and easy website builder for everyone.",
-  "version": "3.0.1-0",
+  "version": "3.0.1",
   "version:backwardcompat": "3.0.0",
   "author": {
     "name": "Alex Hoyau",
@@ -16,7 +16,6 @@
     "src/",
     "public",
     ".silex.js",
-    ".silex",
     ".env.default",
     "package.json",
     "package-lock.json",
@@ -77,9 +76,11 @@
   },
   "scripts": {
     "release": "",
+    "dev": "run-p watch start:debug",
     "watch": "npm-watch",
     "start": "node dist/server/server/",
-    "start:debug": "cross-env SILEX_FS_ROOT=`pwd`/.silex cross-env SILEX_DEBUG=true nodemon --watch dist/server dist/server/server/",
+    "start:debug": "cross-env SILEX_FS_ROOT=`pwd`/silex SILEX_DEBUG=true nodemon --watch dist/server dist/server/server/",
+    "start:preview": "http-server silex/hosting -o",
     "prepublishOnly": "$npm_execpath run lint && $npm_execpath test && $npm_execpath run build",
     "preversion": "$npm_execpath run prepublishOnly",
     "build": "run-s build:css:release build:html build:client:release build:server:release build:plugins:client build:plugins:server",
@@ -94,74 +95,87 @@
     "build:server:debug": "SILEX_DEBUG=true tsc -p tsconfig-server-debug.json",
     "build:plugins:server": "tsc -p tsconfig-plugins-server.json",
     "build:plugins:client": "tsc -p tsconfig-plugins-client.json",
-    "lint": "eslint 'src/ts/**/*.ts'",
+    "lint": "eslint \"src/ts/**/*.ts\"",
     "lint:fix": "$npm_execpath run lint -- --fix",
     "test": "node --experimental-vm-modules `node_modules jest`/jest/bin/jest.js",
-    "test:watch": "$npm_execpath test -- --watch"
+    "test:watch": "$npm_execpath test -- --watch",
+    "prepare": "husky"
   },
   "dependencies": {
-    "@directus/sdk": "10.3.3",
-    "@fortawesome/fontawesome-free": "6.4.0",
-    "@gitbeaker/rest": "^39.7.0",
-    "@silexlabs/grapesjs-directus-storage": "1.0.15",
-    "@silexlabs/grapesjs-fonts": "1.0.12",
-    "@silexlabs/grapesjs-loading": "1.0.8",
-    "@silexlabs/grapesjs-symbols": "1.0.22",
+    "@fontsource/ubuntu": "^5.0.13",
+    "@fortawesome/fontawesome-free": "6.6.0",
+    "@silexlabs/grapesjs-filter-styles": "^1.0.0",
+    "@silexlabs/grapesjs-fonts": "^1.0.20",
+    "@silexlabs/grapesjs-keymaps-dialog": "^1.0.16",
+    "@silexlabs/grapesjs-loading": "1.0.9",
+    "@silexlabs/grapesjs-notifications": "^0.0.8",
+    "@silexlabs/grapesjs-storage-rate-limit": "^1.0.8",
+    "@silexlabs/grapesjs-symbols": "1.0.43",
     "@silexlabs/grapesjs-ui-suggest-classes": "1.0.23",
     "@silexlabs/silex-plugins": "1.0.10",
-    "adm-zip": "0.5.10",
-    "basic-ftp": "^5.0.3",
+    "@types/archiver": "^6.0.2",
+    "adm-zip": "0.5.14",
+    "archiver": "^7.0.1",
+    "basic-ftp": "^5.0.5",
     "body-parser": "1.20.2",
     "cli": "1.0.1",
     "compression": "1.7.4",
     "cookie-parser": "1.4.6",
-    "cookie-session": "2.0.0",
+    "cookie-session": "2.1.0",
     "cors": "2.8.5",
     "cross-env": "7.0.3",
     "crypto": "^1.0.1",
-    "dotenv": "^16.3.1",
-    "express": "4.18.2",
+    "dotenv": "^16.4.5",
+    "express": "4.19.2",
     "express-force-ssl": "0.3.2",
-    "formidable": "2.1.1",
-    "fs-extra": "^11.1.1",
-    "grapesjs": "0.21.2",
+    "formidable": "3.5.1",
+    "fs-extra": "^11.2.0",
+    "grapesjs": "^0.21.13",
     "grapesjs-blocks-basic": "1.0.2",
     "grapesjs-custom-code": "1.0.2",
+    "grapesjs-navbar": "^1.0.2",
     "grapesjs-plugin-forms": "2.0.6",
-    "grapesjs-style-filter": "1.0.2",
+    "grapesjs-style-bg": "^2.0.2",
+    "grapesjs-style-border": "1.0.4",
+    "grapesjs-style-filter": "^1.0.2",
     "html-minifier": "^4.0.0",
-    "lit-html": "2.7.4",
+    "lit-html": "3.2.1",
     "mkdirp": "3.0.1",
-    "node_modules-path": "2.0.7",
+    "node_modules-path": "2.0.8",
     "node-fetch": "2.6.9",
     "normalize.css": "8.0.1",
+    "npm-run-all": "^4.1.5",
     "object-path": "0.11.8",
     "promise-sequential": "1.1.1",
-    "sass": "1.63.6",
+    "sass": "1.77.8",
     "serve-static": "1.15.0",
-    "uuid": "^9.0.0"
+    "uuid": "^10.0.0"
   },
   "devDependencies": {
-    "@types/express": "4.17.17",
-    "@types/jest": "^29.5.2",
-    "@types/node": "20.3.1",
-    "@typescript-eslint/eslint-plugin": "5.60.0",
-    "@typescript-eslint/parser": "5.60.0",
-    "css-loader": "6.8.1",
-    "eslint": "8.43.0",
+    "@commitlint/cli": "^19.6.1",
+    "@commitlint/config-conventional": "^19.6.0",
+    "@types/express": "4.17.21",
+    "@types/jest": "^29.5.12",
+    "@types/node": "22.1.0",
+    "@typescript-eslint/eslint-plugin": "6.10.0",
+    "@typescript-eslint/parser": "6.10.0",
+    "css-loader": "7.1.2",
+    "dedent": "^1.5.3",
+    "eslint": "8.53.0",
     "file-loader": "6.2.0",
-    "jest": "29.5.0",
-    "jest-environment-jsdom": "29.5.0",
+    "http-server": "^14.1.1",
+    "husky": "^9.1.7",
+    "jest": "29.7.0",
+    "jest-environment-jsdom": "29.7.0",
     "livereload": "0.9.3",
-    "nodemon": "2.0.22",
-    "npm-run-all": "4.1.5",
-    "npm-watch": "0.11.0",
+    "nodemon": "3.1.4",
+    "npm-watch": "0.13.0",
     "pug-cli": "1.0.0-alpha6",
-    "style-loader": "3.3.3",
-    "ts-jest": "29.1.0",
-    "ts-loader": "9.4.3",
-    "typescript": "5.1.3",
-    "webpack": "5.88.0",
+    "style-loader": "4.0.0",
+    "ts-jest": "29.2.4",
+    "ts-loader": "9.5.1",
+    "typescript": "5.5.4",
+    "webpack": "5.93.0",
     "webpack-cli": "5.1.4"
   },
   "repository": {

package/public/silex.js

@@ -15,28 +15,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-// This file is loaded by Silex when the user opens the editor
-// Unless you override the default config with the environment variable SILEX_CLIENT_CONFIG or the CLI option --client-config
+/**
+ * This file is loaded by Silex when the user opens the editor
+ * Unless you override the default config with the environment variable SILEX_CLIENT_CONFIG or the CLI option --client-config
+ */
+
 export default async function (config) {
-  // // For example add a GrapesJs plugin like this
-  // config.editor.plugins.push(plugin)
-  // config.editor.pluginsOpts[plugin] = {
-  // }
-  // // Or like this to override the default options
-  // // See the docs for the list of options
-  // return {
-  //   ...config,
-  //   editor: {
-  //     ...config.editor,
-  //     plugins: [
-  //       ...config.editor.plugins,
-  //       plugin,
-  //     ],
-  //     pluginsOpts: {
-  //       ...config.editor.pluginsOpts,
-  //       [plugin]: {
-  //       },
-  //     },
-  //   },
-  // }
 }

package/src/css/_variables.scss

@@ -1,34 +1,37 @@
-// $silexlightergrey: #ddd;
-// $silexlightgrey: #535353;
-// $silexmediumgrey: #444;
-// $silexmediumdarkgrey: #393939;
-// $silexdarkgrey: #2f2f2f;
-// $silexdarkergrey: #2a2a2a;
-// $silexlightblue: #7bc0ff;
-
-$primaryColor: #444;
+// All colors
+// /!\ Duplicated in the grapesjs/index.ts too => keep in sync
+$primaryColor: #333333;
 $secondaryColor: #ddd;
-$tertiaryColor: #5e85a8;
-$quaternaryColor: #7bc0ff;
-$darkerPrimaryColor: #363636;
+$tertiaryColor: #8873FE;
+$quaternaryColor: #A291FF;;
+$darkerPrimaryColor: #292929;
 $lighterPrimaryColor: #575757;
+
 $topBarHeight: 40px;
 $projectBarWidth: 35px;
 $projectPanelWidth: 13%;
 $projectPanelMinWidth: 150px;
-$transitionSpeedMedium: .35s;
-$transitionSpeedSlow: .5s;
+$viewsPanelWidth: 25%; // 15% is grapesjs default
+$viewsProjectPanelWidth: 13%;
+$footerHeight: 30px;
+$transitionSpeedMedium: .15s;
+$transitionSpeedSlow: .30s;
 $prefix: 'gjs-';
 $pn-prefix: '#{$prefix}pn-';
 $cv-prefix: '#{$prefix}cv-';
 $z-dialog-inline: 10;
 $z-loader: 10;
+$z-views-options-buttons: 5;
+
+$fontFamily: 'Ubuntu', sans-serif;
 
 :root {
-  --primaryColor: #444;
-  --secondaryColor: #ddd;
-  --tertiaryColor: #5e85a8;
-  --quaternaryColor: #7bc0ff;
-  --darkerPrimaryColor: #363636;
-  --lighterPrimaryColor: #575757;
+  --primaryColor: #{$primaryColor};
+  --secondaryColor: #{$secondaryColor};
+  --tertiaryColor: #{$tertiaryColor};
+  --quaternaryColor: #{$quaternaryColor};
+  --darkerPrimaryColor: #{$darkerPrimaryColor};
+  --lighterPrimaryColor: #{$lighterPrimaryColor};
+  --viewsPanelWidth: #{$viewsPanelWidth};
+  --viewsProjectPanelWidth: #{$viewsProjectPanelWidth};
 }