@silexlabs/silex 3.0.0-alpha.32 → 3.0.1-alpha.0

package/dist/client/js/main.js.LICENSE.txt

@@ -1,32 +1,16 @@
 /*!
- * Sizzle CSS Selector Engine v2.3.10
- * https://sizzlejs.com/
- *
- * Copyright JS Foundation and other contributors
- * Released under the MIT license
- * https://js.foundation/
- *
- * Date: 2023-02-14
- */
-
-/*!
- * jQuery JavaScript Library v3.6.4
+ * jQuery JavaScript Library v3.7.0
  * https://jquery.com/
  *
- * Includes Sizzle.js
- * https://sizzlejs.com/
- *
  * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license
  * https://jquery.org/license
  *
- * Date: 2023-03-08T15:28Z
+ * Date: 2023-05-11T18:29Z
  */
 
 /*! @silexlabs/grapesjs-loading - 1.0.8 */
 
-/*! grapesjs-style-filter - 1.0.1 */
-
 /**
  * @license
  * Copyright 2017 Google LLC

package/dist/types.js

@@ -31,4 +31,4 @@ exports.defaultSite = {
 var Unit;
 (function (Unit) {
     Unit["PX"] = "px";
-})(Unit = exports.Unit || (exports.Unit = {}));
+})(Unit || (exports.Unit = Unit = {}));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@silexlabs/silex",
   "description": "Free and easy website builder for everyone.",
-  "version": "3.0.0-alpha.32",
+  "version": "3.0.1-alpha.0",
   "version:backwardcompat": "3.0.0",
   "author": {
     "name": "Alex Hoyau",
@@ -52,9 +52,9 @@
     "release": "",
     "watch": "npm-watch",
     "start": "node dist/server/index.js",
-    "start:debug": "cross-env SILEX_DEBUG=true nodemon --watch dist/server dist/server/index.js",
-    "prepublishOnly": "npm run lint && npm test && npm run build",
-    "preversion": "npm run prepublishOnly",
+    "start:debug": "cross-env FS_ROOT=`pwd`/.silex cross-env SILEX_DEBUG=true nodemon --watch dist/server dist/server/index.js",
+    "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",
     "webpack": "webpack --config webpack.config.js",
     "build:css:release": "sass --load-path ../../node_modules --load-path node_modules --no-source-map src/css/index.scss dist/client/css/admin.css",
@@ -66,67 +66,67 @@
     "build:server:release": "tsc -p tsconfig-server-release.json",
     "build:server:debug": "SILEX_DEBUG=true tsc -p tsconfig-server-debug.json",
     "lint": "eslint 'src/ts/**/*.ts'",
-    "lint:fix": "npm run lint -- --fix",
+    "lint:fix": "$npm_execpath run lint -- --fix",
     "test": "node --experimental-vm-modules `node_modules jest`/jest/bin/jest.js",
-    "test:watch": "npm test -- --watch"
+    "test:watch": "$npm_execpath test -- --watch"
   },
   "dependencies": {
-    "@directus/sdk": "^10.3.3",
+    "@directus/sdk": "10.3.3",
     "@silexlabs/grapesjs-directus-storage": "1.0.15",
     "@silexlabs/grapesjs-fonts": "1.0.12",
     "@silexlabs/grapesjs-loading": "1.0.8",
-    "@silexlabs/grapesjs-symbols": "1.0.18",
+    "@silexlabs/grapesjs-symbols": "1.0.20",
     "@silexlabs/grapesjs-ui-suggest-classes": "1.0.23",
-    "@silexlabs/silex-plugins": "^1.0.10",
+    "@silexlabs/silex-plugins": "1.0.10",
     "adm-zip": "0.5.10",
     "body-parser": "1.20.2",
-    "cli": "^1.0.1",
+    "cli": "1.0.1",
     "compression": "1.7.4",
     "cookie-parser": "1.4.6",
     "cookie-session": "2.0.0",
-    "cors": "^2.8.5",
+    "cors": "2.8.5",
     "cross-env": "7.0.3",
     "express": "4.18.2",
     "express-force-ssl": "0.3.2",
     "formidable": "2.1.1",
     "grapesjs": "0.21.2",
-    "grapesjs-blocks-basic": "1.0.1",
-    "grapesjs-custom-code": "1.0.1",
-    "grapesjs-plugin-forms": "2.0.5",
-    "grapesjs-style-filter": "1.0.1",
-    "html-minifier": "^4.0.0",
-    "lit-html": "2.7.2",
+    "grapesjs-blocks-basic": "1.0.2",
+    "grapesjs-custom-code": "1.0.2",
+    "grapesjs-plugin-forms": "2.0.6",
+    "grapesjs-style-filter": "1.0.2",
+    "html-minifier": "4.0.0",
+    "lit-html": "2.7.4",
     "mkdirp": "3.0.1",
     "node_modules-path": "2.0.7",
-    "node-fetch": "^2.6.9",
+    "node-fetch": "2.6.9",
     "normalize.css": "8.0.1",
     "object-path": "0.11.8",
     "promise-sequential": "1.1.1",
-    "sass": "1.62.0",
+    "sass": "1.63.6",
     "serve-static": "1.15.0"
   },
   "devDependencies": {
     "@types/express": "4.17.17",
-    "@types/jest": "29.5.1",
-    "@types/node": "18.16.0",
-    "@typescript-eslint/eslint-plugin": "^5.59.1",
-    "@typescript-eslint/parser": "^5.59.1",
-    "css-loader": "6.7.3",
-    "eslint": "8.39.0",
+    "@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",
     "file-loader": "6.2.0",
     "jest": "29.5.0",
-    "jest-environment-jsdom": "^29.5.0",
-    "livereload": "^0.9.3",
+    "jest-environment-jsdom": "29.5.0",
+    "livereload": "0.9.3",
     "nodemon": "2.0.22",
     "npm-run-all": "4.1.5",
     "npm-watch": "0.11.0",
     "pug-cli": "1.0.0-alpha6",
-    "style-loader": "3.3.2",
-    "ts-jest": "^29.1.0",
-    "ts-loader": "9.4.2",
-    "typescript": "5.0.4",
-    "webpack": "5.80.0",
-    "webpack-cli": "5.0.2"
+    "style-loader": "3.3.3",
+    "ts-jest": "29.1.0",
+    "ts-loader": "9.4.3",
+    "typescript": "5.1.3",
+    "webpack": "5.88.0",
+    "webpack-cli": "5.1.4"
   },
   "repository": {
     "type": "git",

package/src/plugins/DefaultBackend.js

@@ -52,17 +52,38 @@ exports.del = async function (id) {
 
 // List projects
 exports.list = async function () {
-  const ids = await readdir(FS_ROOT)
-  return Promise.all(ids.map(async id => ({
-    id,
-    ...await exports.readData(id),
-    stats: await stat(path(id) + DATA_FILE_NAME),
-  })))
+  try {
+    const ids = await readdir(FS_ROOT)
+    return Promise.all(ids.map(async id => ({
+      id,
+      ...await exports.readData(id),
+      stats: await stat(path(id) + DATA_FILE_NAME),
+    })))
+  } catch (error) {
+    if (error.code === 'ENOENT') {
+      console.log(`\nError: Directory ${FS_ROOT} does not exist.\nIf your want to read from a different folder ues the FS_ROOT environment variable or --fs-root command line argument?\n`);
+      const betterError = new Error(`The directory ${FS_ROOT} does not exist`)
+      betterError.code = 'ENOENT'
+      throw betterError
+    }
+    throw error
+  }
 }
 // Read project data
 exports.readData = async function (id) {
-  const data = await readFile(path(id) + DATA_FILE_NAME)
-  return JSON.parse(data.toString())
+  const filePath = path(id) + DATA_FILE_NAME
+  try {
+    const data = await readFile(filePath)
+    return JSON.parse(data.toString())
+  } catch (error) {
+    if (error.code === 'ENOENT') {
+      console.log(`\nError: File ${filePath} or directory ${FS_ROOT} do not exist.\nIf your want to read from a different folder use the FS_ROOT environment variable or --fs-root command line argument?\n`);
+      const betterError = new Error(`The website ${id} does not exist`)
+      betterError.code = 'ENOENT'
+      throw betterError
+    }
+    throw error
+  }
 }
 // Write project data
 exports.writeData = async function (id, data) {

package/src/ts/client/grapesjs/index.ts

@@ -1,4 +1,4 @@
-import grapesjs, { EditorConfig } from 'grapesjs'
+import grapesjs from 'grapesjs'
 import openImport from './openImport'
 
 /**
@@ -14,7 +14,7 @@ import styleFilterPlugin from 'grapesjs-style-filter'
 import formPlugin from 'grapesjs-plugin-forms'
 import codePlugin from 'grapesjs-custom-code'
 import uiSuggestClasses from '@silexlabs/grapesjs-ui-suggest-classes'
-import symbolsPlugin from '@silexlabs/grapesjs-symbols'
+import * as symbolsPlugin from '@silexlabs/grapesjs-symbols' // Why is this not working without *?
 import loadingPlugin from '@silexlabs/grapesjs-loading'
 import fontsDialogPlugin, { cmdOpenFonts } from '@silexlabs/grapesjs-fonts'
 import symbolDialogsPlugin, { cmdPromptAddSymbol } from './symbolDialogs'
@@ -212,7 +212,7 @@ export function getEditorConfig(id: string, rootUrl: string) {
 // Keep a ref to the editor singleton
 let editor
 
-export function initEditor(config: EditorConfig, grapesJsPlugins) {
+export function initEditor(config, grapesJsPlugins) {
   if(editor) throw new Error('Grapesjs editor already created')
 
   editor = grapesjs.init({
@@ -258,15 +258,19 @@ export function initEditor(config: EditorConfig, grapesJsPlugins) {
     editor.StyleManager.addProperty('extra',{ extend: 'filter' })
   })
 
-  editor.StorageManager.onError = (type: string, err: Error) => {
-    editor.Modal.open(type === 'load' ? {
+  // Handle errors
+  editor.on('storage:error:load', (err) => {
+    editor.Modal.open({
       title: 'Error loading website',
-      content: `This website could not be loaded.<br><hr>Error: ${err.message}`,
-    } : {
+      content: `This website could not be loaded.<br><hr>${err}`,
+    })
+  })
+  editor.on('storage:error:store', (err) => {
+    editor.Modal.open({
       title: 'Error saving website',
-      content: `This website could not be saved.<br><hr>Error: ${err.message}`,
+      content: `This website could not be saved.<br><hr>${err}`,
     })
-  }
+  })
 }
 
 export function getEditor() {

package/tsconfig-server-debug.json

@@ -3,7 +3,6 @@
   "compilerOptions": {
     "outDir": "dist/",
     "target": "esnext",
-    "watch": false,
     "inlineSourceMap": true,
     "module": "CommonJS",
     "removeComments": false,

package/tsconfig-server-release.json

@@ -3,7 +3,6 @@
   "compilerOptions": {
     "outDir": "dist/",
     "target": "esnext",
-    "watch": false,
     "sourceMap": false,
     "module": "CommonJS",
     "removeComments": true,

package/tsconfig.json

@@ -3,7 +3,6 @@
   "compilerOptions": {
     "outDir": "dist/client/",
     "target": "ESNext",
-    "watch": true,
     "sourceMap": true,
     "module": "ESNext",
     "removeComments": false,