@silexlabs/silex 3.0.0-alpha.149 → 3.0.0-alpha.151

package/dist/plugins/server/constants.d.ts

@@ -28,3 +28,4 @@ export declare const API_WEBSITE_ASSET_READ = "/assets";
 export declare const API_WEBSITE_ASSETS_WRITE = "/assets";
 export declare const API_WEBSITE_META_READ = "/meta";
 export declare const API_WEBSITE_META_WRITE = "/meta";
+export declare let SILEX_VERSION: any;

package/dist/plugins/server/constants.js

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.API_WEBSITE_META_WRITE = exports.API_WEBSITE_META_READ = exports.API_WEBSITE_ASSETS_WRITE = exports.API_WEBSITE_ASSET_READ = exports.API_WEBSITE_LIST = exports.API_WEBSITE_DUPLICATE = exports.API_WEBSITE_DELETE = exports.API_WEBSITE_CREATE = exports.API_WEBSITE_WRITE = exports.API_WEBSITE_READ = exports.API_WEBSITE_PATH = exports.API_PUBLICATION_STATUS = exports.API_PUBLICATION_PUBLISH = exports.API_PUBLICATION_PATH = exports.API_CONNECTOR_LOGIN_CALLBACK = exports.API_CONNECTOR_SETTINGS = exports.API_CONNECTOR_LOGIN = exports.API_CONNECTOR_LOGOUT = exports.API_CONNECTOR_LIST = exports.API_CONNECTOR_USER = exports.API_CONNECTOR_PATH = exports.API_PATH = exports.CLIENT_CONFIG_FILE_NAME = exports.DEFAULT_LANGUAGE = exports.DEFAULT_WEBSITE_ID = exports.WEBSITE_META_DATA_FILE = exports.WEBSITE_DATA_FILE = void 0;
+exports.SILEX_VERSION = exports.API_WEBSITE_META_WRITE = exports.API_WEBSITE_META_READ = exports.API_WEBSITE_ASSETS_WRITE = exports.API_WEBSITE_ASSET_READ = exports.API_WEBSITE_LIST = exports.API_WEBSITE_DUPLICATE = exports.API_WEBSITE_DELETE = exports.API_WEBSITE_CREATE = exports.API_WEBSITE_WRITE = exports.API_WEBSITE_READ = exports.API_WEBSITE_PATH = exports.API_PUBLICATION_STATUS = exports.API_PUBLICATION_PUBLISH = exports.API_PUBLICATION_PATH = exports.API_CONNECTOR_LOGIN_CALLBACK = exports.API_CONNECTOR_SETTINGS = exports.API_CONNECTOR_LOGIN = exports.API_CONNECTOR_LOGOUT = exports.API_CONNECTOR_LIST = exports.API_CONNECTOR_USER = exports.API_CONNECTOR_PATH = exports.API_PATH = exports.CLIENT_CONFIG_FILE_NAME = exports.DEFAULT_LANGUAGE = exports.DEFAULT_WEBSITE_ID = exports.WEBSITE_META_DATA_FILE = exports.WEBSITE_DATA_FILE = void 0;
 /**
  * @fileoverview define constants for Silex client and server
  */
@@ -47,4 +47,11 @@ exports.API_WEBSITE_ASSET_READ = '/assets';
 exports.API_WEBSITE_ASSETS_WRITE = '/assets';
 exports.API_WEBSITE_META_READ = '/meta';
 exports.API_WEBSITE_META_WRITE = '/meta';
+try {
+    exports.SILEX_VERSION = SILEX_VERSION_ENV;
+}
+catch (e) {
+    // fallback to default value
+    exports.SILEX_VERSION = exports.SILEX_VERSION || '3.0.0';
+}
 //# sourceMappingURL=constants.js.map

package/dist/plugins/server/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/ts/constants.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;;AAEH;;GAEG;AAEU,QAAA,iBAAiB,GAAG,cAAc,CAAA;AAClC,QAAA,sBAAsB,GAAG,WAAW,CAAA;AAEpC,QAAA,kBAAkB,GAAG,SAAS,CAAA;AAC9B,QAAA,gBAAgB,GAAG,IAAI,CAAA;AACvB,QAAA,uBAAuB,GAAG,UAAU,CAAA;AAEpC,QAAA,QAAQ,GAAG,MAAM,CAAA;AAEjB,QAAA,kBAAkB,GAAG,YAAY,CAAA;AACjC,QAAA,kBAAkB,GAAG,OAAO,CAAA;AAC5B,QAAA,kBAAkB,GAAG,GAAG,CAAA;AACxB,QAAA,oBAAoB,GAAG,SAAS,CAAA;AAChC,QAAA,mBAAmB,GAAG,QAAQ,CAAA;AAC9B,QAAA,sBAAsB,GAAG,WAAW,CAAA;AACpC,QAAA,4BAA4B,GAAG,iBAAiB,CAAA;AAEhD,QAAA,oBAAoB,GAAG,cAAc,CAAA;AACrC,QAAA,uBAAuB,GAAG,GAAG,CAAA;AAC7B,QAAA,sBAAsB,GAAG,qBAAqB,CAAA;AAE9C,QAAA,gBAAgB,GAAG,UAAU,CAAA;AAC7B,QAAA,gBAAgB,GAAG,GAAG,CAAA;AACtB,QAAA,iBAAiB,GAAG,GAAG,CAAA;AACvB,QAAA,kBAAkB,GAAG,GAAG,CAAA;AACxB,QAAA,kBAAkB,GAAG,GAAG,CAAA;AACxB,QAAA,qBAAqB,GAAG,YAAY,CAAA;AACpC,QAAA,gBAAgB,GAAG,GAAG,CAAA;AACtB,QAAA,sBAAsB,GAAG,SAAS,CAAA;AAClC,QAAA,wBAAwB,GAAG,SAAS,CAAA;AACpC,QAAA,qBAAqB,GAAG,OAAO,CAAA;AAC/B,QAAA,sBAAsB,GAAG,OAAO,CAAA"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/ts/constants.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;;AAEH;;GAEG;AAEU,QAAA,iBAAiB,GAAG,cAAc,CAAA;AAClC,QAAA,sBAAsB,GAAG,WAAW,CAAA;AAEpC,QAAA,kBAAkB,GAAG,SAAS,CAAA;AAC9B,QAAA,gBAAgB,GAAG,IAAI,CAAA;AACvB,QAAA,uBAAuB,GAAG,UAAU,CAAA;AAEpC,QAAA,QAAQ,GAAG,MAAM,CAAA;AAEjB,QAAA,kBAAkB,GAAG,YAAY,CAAA;AACjC,QAAA,kBAAkB,GAAG,OAAO,CAAA;AAC5B,QAAA,kBAAkB,GAAG,GAAG,CAAA;AACxB,QAAA,oBAAoB,GAAG,SAAS,CAAA;AAChC,QAAA,mBAAmB,GAAG,QAAQ,CAAA;AAC9B,QAAA,sBAAsB,GAAG,WAAW,CAAA;AACpC,QAAA,4BAA4B,GAAG,iBAAiB,CAAA;AAEhD,QAAA,oBAAoB,GAAG,cAAc,CAAA;AACrC,QAAA,uBAAuB,GAAG,GAAG,CAAA;AAC7B,QAAA,sBAAsB,GAAG,qBAAqB,CAAA;AAE9C,QAAA,gBAAgB,GAAG,UAAU,CAAA;AAC7B,QAAA,gBAAgB,GAAG,GAAG,CAAA;AACtB,QAAA,iBAAiB,GAAG,GAAG,CAAA;AACvB,QAAA,kBAAkB,GAAG,GAAG,CAAA;AACxB,QAAA,kBAAkB,GAAG,GAAG,CAAA;AACxB,QAAA,qBAAqB,GAAG,YAAY,CAAA;AACpC,QAAA,gBAAgB,GAAG,GAAG,CAAA;AACtB,QAAA,sBAAsB,GAAG,SAAS,CAAA;AAClC,QAAA,wBAAwB,GAAG,SAAS,CAAA;AACpC,QAAA,qBAAqB,GAAG,OAAO,CAAA;AAC/B,QAAA,sBAAsB,GAAG,OAAO,CAAA;AAO7C,IAAI;IAAE,qBAAa,GAAG,iBAAiB,CAAA;CAAE;AAAC,OAAO,CAAC,EAAE;IAClD,4BAA4B;IAC5B,qBAAa,GAAG,qBAAa,IAAI,OAAO,CAAA;CACzC"}

package/dist/server/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.API_WEBSITE_META_WRITE = exports.API_WEBSITE_META_READ = exports.API_WEBSITE_ASSETS_WRITE = exports.API_WEBSITE_ASSET_READ = exports.API_WEBSITE_LIST = exports.API_WEBSITE_DUPLICATE = exports.API_WEBSITE_DELETE = exports.API_WEBSITE_CREATE = exports.API_WEBSITE_WRITE = exports.API_WEBSITE_READ = exports.API_WEBSITE_PATH = exports.API_PUBLICATION_STATUS = exports.API_PUBLICATION_PUBLISH = exports.API_PUBLICATION_PATH = exports.API_CONNECTOR_LOGIN_CALLBACK = exports.API_CONNECTOR_SETTINGS = exports.API_CONNECTOR_LOGIN = exports.API_CONNECTOR_LOGOUT = exports.API_CONNECTOR_LIST = exports.API_CONNECTOR_USER = exports.API_CONNECTOR_PATH = exports.API_PATH = exports.CLIENT_CONFIG_FILE_NAME = exports.DEFAULT_LANGUAGE = exports.DEFAULT_WEBSITE_ID = exports.WEBSITE_META_DATA_FILE = exports.WEBSITE_DATA_FILE = void 0;
+exports.SILEX_VERSION = exports.API_WEBSITE_META_WRITE = exports.API_WEBSITE_META_READ = exports.API_WEBSITE_ASSETS_WRITE = exports.API_WEBSITE_ASSET_READ = exports.API_WEBSITE_LIST = exports.API_WEBSITE_DUPLICATE = exports.API_WEBSITE_DELETE = exports.API_WEBSITE_CREATE = exports.API_WEBSITE_WRITE = exports.API_WEBSITE_READ = exports.API_WEBSITE_PATH = exports.API_PUBLICATION_STATUS = exports.API_PUBLICATION_PUBLISH = exports.API_PUBLICATION_PATH = exports.API_CONNECTOR_LOGIN_CALLBACK = exports.API_CONNECTOR_SETTINGS = exports.API_CONNECTOR_LOGIN = exports.API_CONNECTOR_LOGOUT = exports.API_CONNECTOR_LIST = exports.API_CONNECTOR_USER = exports.API_CONNECTOR_PATH = exports.API_PATH = exports.CLIENT_CONFIG_FILE_NAME = exports.DEFAULT_LANGUAGE = exports.DEFAULT_WEBSITE_ID = exports.WEBSITE_META_DATA_FILE = exports.WEBSITE_DATA_FILE = void 0;
 exports.WEBSITE_DATA_FILE = 'website.json';
 exports.WEBSITE_META_DATA_FILE = 'meta.json';
 exports.DEFAULT_WEBSITE_ID = 'default';
@@ -28,3 +28,9 @@ exports.API_WEBSITE_ASSET_READ = '/assets';
 exports.API_WEBSITE_ASSETS_WRITE = '/assets';
 exports.API_WEBSITE_META_READ = '/meta';
 exports.API_WEBSITE_META_WRITE = '/meta';
+try {
+    exports.SILEX_VERSION = SILEX_VERSION_ENV;
+}
+catch (e) {
+    exports.SILEX_VERSION = exports.SILEX_VERSION || '3.0.0';
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@silexlabs/silex",
   "description": "Free and easy website builder for everyone.",
-  "version": "3.0.0-alpha.149",
+  "version": "3.0.0-alpha.151",
   "version:backwardcompat": "3.0.0",
   "author": {
     "name": "Alex Hoyau",
@@ -104,7 +104,7 @@
     "@fontsource/ubuntu": "^5.0.12",
     "@fortawesome/fontawesome-free": "6.5.1",
     "@silexlabs/grapesjs-filter-styles": "^1.0.0",
-    "@silexlabs/grapesjs-fonts": "^1.0.16",
+    "@silexlabs/grapesjs-fonts": "^1.0.18",
     "@silexlabs/grapesjs-loading": "1.0.9",
     "@silexlabs/grapesjs-storage-rate-limit": "^1.0.8",
     "@silexlabs/grapesjs-symbols": "1.0.39",
@@ -127,7 +127,7 @@
     "express-force-ssl": "0.3.2",
     "formidable": "3.5.1",
     "fs-extra": "^11.2.0",
-    "grapesjs": "0.21.7",
+    "grapesjs": "^0.21.10",
     "grapesjs-blocks-basic": "1.0.2",
     "grapesjs-custom-code": "1.0.2",
     "grapesjs-plugin-forms": "2.0.6",

package/src/ts/client/config.ts

@@ -103,6 +103,20 @@ export class ClientConfig extends Config {
    */
   clientConfigUrl = `${this.rootUrl}/${CLIENT_CONFIG_FILE_NAME}`
 
+  /**
+   * Google fonts API key, see this doc to get an API key: https://developers.google.com/fonts/docs/developer_api#APIKey
+   * @default Test key for local dev
+   */
+  fontsApiKey = 'AIzaSyAdJTYSLPlKz4w5Iqyy-JAF2o8uQKd1FKc'
+
+  /**
+   * Google fonts server or a free privacy-friendly drop-in replacement for Google Fonts or a proxy server to speed up the load and protect privacy
+   * @see https://github.com/coollabsio/fonts
+   * @see https://fontlay.com/
+   * @default Google Fonts
+   */
+  fontsServerUrl = 'https://www.googleapis.com'
+
   /**
    * Init GrapesJS config which depend on the config file properties
    */

package/src/ts/client/grapesjs/css-props.ts

@@ -28,7 +28,7 @@ export default (editor: Editor, opts) => {
       property: 'min-width',
       type: 'integer',
       units: ['px', '%', 'em'],
-      default: 'auto',
+      default: '',
       fixedValues: ['inherit', 'initial', 'unset', 'none', 'max-content', 'min-content', 'fit-content'],
     }, { at: 2 })
     editor.StyleManager.addProperty('dimension', {
@@ -36,7 +36,7 @@ export default (editor: Editor, opts) => {
       property: 'max-height',
       type: 'integer',
       units: ['px', '%', 'em'],
-      default: 'auto',
+      default: '',
       fixedValues: ['inherit', 'initial', 'unset', 'none', 'max-content', 'min-content', 'fit-content'],
     }, { at: 5 })
     editor.StyleManager.addProperty('dimension', {
@@ -81,15 +81,17 @@ export default (editor: Editor, opts) => {
       max: 10000,
       units: [],
       info: 'Stacking order of the element',
-      default: 'auto',
+      default: '',
       fixedValues: ['auto', 'unset', 'initial', 'inherit', 'revert'],
     }, { at: 1 })
     editor.StyleManager.addProperty('extra', {
       name: 'Pointer events',
       property: 'pointer-events',
       type: 'select',
-      defaults: 'auto',
+      defaults: '',
       options: [
+        /* @ts-ignore */
+        { value: '', name: '' },        
         /* @ts-ignore */
         { value: 'auto', name: 'auto' },
         /* @ts-ignore */
@@ -117,8 +119,10 @@ export default (editor: Editor, opts) => {
       name: 'Cursor',
       property: 'cursor',
       type: 'select',
-      defaults: 'auto',
+      defaults: '',
       options: [
+        /* @ts-ignore */
+        { value: '', name: '' },        
         /* @ts-ignore */
         { value: 'auto', name: 'auto' },
         /* @ts-ignore */
@@ -200,7 +204,7 @@ export default (editor: Editor, opts) => {
       type: 'integer',
       units: [],
       info: 'The column-count CSS property breaks an element\'s content into the specified number of columns.',
-      default: 'auto',
+      default: '',
       fixedValues: ['auto', 'inherit', 'initial', 'revert', 'unset'],
       min: 1,
     }, { at: 4 })
@@ -210,7 +214,7 @@ export default (editor: Editor, opts) => {
       type: 'integer',
       units: ['px', '%', 'em'],
       info: 'The column-width CSS property suggests an optimal column width. This is not a absolute value but a mere hint. Browser will adjust the width of the element automatically.',
-      default: 'auto',
+      default: '',
       fixedValues: ['auto', 'inherit', 'initial', 'revert', 'unset'],
     }, { at: 5 })
     editor.StyleManager.addProperty('extra', {
@@ -219,7 +223,7 @@ export default (editor: Editor, opts) => {
       type: 'integer',
       units: ['px', '%', 'em'],
       info: 'The column-gap CSS property sets the size of the gap (gutter) between an element\'s columns.',
-      default: 'normal',
+      default: '',
       fixedValues: ['normal', 'inherit', 'initial', 'revert', 'unset'],
     }, { at: 5 })
     editor.StyleManager.addProperty('extra', {
@@ -232,14 +236,16 @@ export default (editor: Editor, opts) => {
         type: 'integer',
         units: ['px', '%', 'em'],
         info: 'The column-rule-width CSS property sets the width of the line drawn between columns in a multi-column layout.',
-        default: 'medium',
+        default: '',
         fixedValues: ['medium', 'thin', 'thick', 'inherit', 'initial', 'revert', 'unset'],
       }, {
         name: 'Column rule style',
         property: 'column-rule-style',
         type: 'select',
-        defaults: 'none',
+        defaults: '',
         options: [
+          /* @ts-ignore */
+          { value: '', name: '' },          
           /* @ts-ignore */
           { value: 'none', name: 'none' },
           /* @ts-ignore */
@@ -268,7 +274,7 @@ export default (editor: Editor, opts) => {
         name: 'Column rule color',
         property: 'column-rule-color',
         type: 'color',
-        defaults: 'none',
+        defaults: '',
         info: 'The column-rule-color CSS property sets the color of the line drawn between columns in a multi-column layout.',
       }],
     }, { at: 6 })
@@ -276,8 +282,10 @@ export default (editor: Editor, opts) => {
       name: 'Column span',
       property: 'column-span',
       type: 'select',
-      defaults: 'none',
+      defaults: '',
       options: [
+        /* @ts-ignore */
+        { value: '', name: '' },        
         /* @ts-ignore */
         { value: 'none', name: 'none' },
         /* @ts-ignore */
@@ -296,14 +304,16 @@ export default (editor: Editor, opts) => {
         type: 'integer',
         units: ['px', '%', 'em'],
         info: 'The outline-width CSS property sets the thickness of an element\'s outline. An outline is a line that is drawn around an element, outside the border.',
-        default: 'medium',
+        default: '',
         fixedValues: ['medium', 'thin', 'thick', 'inherit', 'initial', 'revert', 'unset'],
       }, {
         name: 'Outline style',
         property: 'outline-style',
         type: 'select',
-        defaults: 'none',
+        defaults: '',
         options: [
+          /* @ts-ignore */
+          { value: '', name: '' },          
           /* @ts-ignore */
           { value: 'none', name: 'none' },
           /* @ts-ignore */
@@ -330,7 +340,7 @@ export default (editor: Editor, opts) => {
         name: 'Outline color',
         property: 'outline-color',
         type: 'color',
-        defaults: 'none',
+        defaults: '',
         info: 'The outline-color CSS property sets the color of an element\'s outline.',
       }],
     }, { at: 8 })
@@ -338,8 +348,10 @@ export default (editor: Editor, opts) => {
       name: 'Word break',
       property: 'word-break',
       type: 'select',
-      defaults: 'normal',
+      defaults: '',
       options: [
+        /* @ts-ignore */
+        { value: '', name: '' },        
         /* @ts-ignore */
         { value: 'normal', name: 'normal' },
         /* @ts-ignore */
@@ -355,7 +367,7 @@ export default (editor: Editor, opts) => {
       name: 'Word wrap',
       property: 'word-wrap',
       type: 'radio',
-      defaults: 'normal',
+      defaults: '',
       options: [
         /* @ts-ignore */
         { value: 'normal', name: 'normal' },
@@ -368,8 +380,10 @@ export default (editor: Editor, opts) => {
       name: 'White space',
       property: 'white-space',
       type: 'select',
-      defaults: 'normal',
+      defaults: '',
       options: [
+        /* @ts-ignore */
+        { value: '', name: '' },        
         /* @ts-ignore */
         { value: 'normal', name: 'normal' },
         /* @ts-ignore */
@@ -393,9 +407,11 @@ export default (editor: Editor, opts) => {
         name: 'Text decoration line',
         property: 'text-decoration-line',
         type: 'select',
-        defaults: 'none',
+        defaults: '',
         fixedValues: ['auto', 'inherit', 'initial', 'revert', 'unset'],
         options: [
+          /* @ts-ignore */
+          { value: '', name: '' },                  
           /* @ts-ignore */
           { value: 'none', name: 'none' },
           /* @ts-ignore */
@@ -412,8 +428,10 @@ export default (editor: Editor, opts) => {
         name: 'Text decoration style',
         property: 'text-decoration-style',
         type: 'select',
-        defaults: 'solid',
+        defaults: '',
         options: [
+          /* @ts-ignore */
+          { value: '', name: '' },              
           /* @ts-ignore */
           { value: 'solid', name: 'solid' },
           /* @ts-ignore */
@@ -430,7 +448,7 @@ export default (editor: Editor, opts) => {
         name: 'Text decoration color',
         property: 'text-decoration-color',
         type: 'color',
-        defaults: 'initial',
+        defaults: '',
         fixedValues: ['inherit', 'initial', 'revert', 'unset'],
         info: 'The text-decoration-color CSS property sets the color of decorations added to text by text-decoration-line.',
       }, {
@@ -439,7 +457,7 @@ export default (editor: Editor, opts) => {
         type: 'integer',
         units: ['px', '%', 'em'],
         info: 'The text-decoration-thickness CSS property sets the stroke thickness of the decoration line that is used on text in an element, such as a line-through, underline, or overline.',
-        default: 'auto',
+        default: '',
         fixedValues: ['auto', 'inherit', 'initial', 'revert', 'unset'],
       }],
     }, { at: 10 })
@@ -448,8 +466,10 @@ export default (editor: Editor, opts) => {
 
       property: 'text-transform',
       type: 'select',
-      defaults: 'none',
+      defaults: '',
       options: [
+        /* @ts-ignore */
+        { value: '', name: '' },            
         /* @ts-ignore */
         { value: 'none', name: 'none' },
         /* @ts-ignore */
@@ -465,8 +485,10 @@ export default (editor: Editor, opts) => {
       name: 'Text overflow',
       property: 'text-overflow',
       type: 'select',
-      defaults: 'clip',
+      defaults: '',
       options: [
+        /* @ts-ignore */
+        { value: '', name: '' },                    
         /* @ts-ignore */
         { value: 'clip', name: 'clip' },
         /* @ts-ignore */
@@ -474,13 +496,37 @@ export default (editor: Editor, opts) => {
       ],
       info: 'The text-overflow CSS property sets how hidden overflow content is signaled to users. It can be clipped, display an ellipsis (\'…\', U+2026 HORIZONTAL ELLIPSIS) or a Web author-defined string. It covers the two long-hand properties text-overflow-clip and text-overflow-string.',
     }, { at: 12 })
-
+    /** remove default module et add custom one */
+    editor.StyleManager.removeProperty('general', 'display')
+    editor.StyleManager.addProperty('general', {
+      name: 'Display',
+      property: 'display',
+      type: 'select',
+      defaults: '',
+      options: [
+        /* @ts-ignore */
+        { value: '', name: '' },                    
+        /* @ts-ignore */
+        { value: 'block', name: 'block' },
+        /* @ts-ignore */
+        { value: 'inline', name: 'inline' },
+        /* @ts-ignore */
+        { value: 'inline-block', name: 'inline-block' },
+        /* @ts-ignore */
+        { value: 'flex', name: 'flex' },
+        /* @ts-ignore */
+        { value: 'none', name: 'none' }, 
+      ],
+      info: '',
+    }, { at: 0 })
     editor.StyleManager.addProperty('general', {
       name: 'Visibility',
       property: 'visibility',
       type: 'select',
-      defaults: 'visible',
+      defaults: '',
       options: [
+        /* @ts-ignore */
+        { value: '', name: '' },                    
         /* @ts-ignore */
         { value: 'visible', name: 'visible' },
         /* @ts-ignore */
@@ -496,7 +542,7 @@ export default (editor: Editor, opts) => {
       name: 'Content',
       property: 'content',
       type: 'text',
-      defaults: 'none',
+      defaults: '',
       info: 'The content CSS property replaces an element with a generated value. Objects inserted using the content property are anonymous replaced elements.',
       full: true,
       visible: false,

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

@@ -296,7 +296,8 @@ export function getEditorConfig(config: ClientConfig): EditorConfig {
         highlightColor: TERTIARY_COLOR,
       },
       [fontsDialogPlugin.toString()]: {
-        api_key: 'AIzaSyAdJTYSLPlKz4w5Iqyy-JAF2o8uQKd1FKc',
+        api_key: config.fontsApiKey,
+        server_url: config.fontsServerUrl,
       },
       [loginDialogPlugin.toString()]: {
         id: websiteId,

package/src/ts/client/grapesjs/settings.ts

@@ -24,6 +24,7 @@ import {defaultSections, idCodeWrapper, isSite} from './settings-sections'
 
 import { WebsiteSettings } from '../../types'
 import { ClientEvent } from '../events'
+import { SILEX_VERSION } from '../../constants'
 
 const sectionsSite = [...defaultSections]
 const sectionsPage = [...defaultSections]
@@ -31,21 +32,11 @@ const sectionsPage = [...defaultSections]
 const el = document.createElement('div')
 let modal
 
-// Get version from webpack (see plugin in webpack.config.js)
-declare const VERSION: string
-
 export const cmdOpenSettings = 'open-settings'
 
-let version = 'v3'
 let headEditor = null
 export const settingsDialog = (editor, opts) => {
-  // Display Silex version from package.json
-  try {
-    version = VERSION
-  } catch (error) {
-    // Cannot get version from webpack (see plugin in webpack.config.js)
-  }
-  console.info('Silex version:', version)
+  console.info('Silex version:', SILEX_VERSION)
   editor.Commands.add(cmdOpenSettings, {
     run: (_, sender, {page}) => {
       modal = editor.Modal.open({
@@ -87,9 +78,7 @@ export const settingsDialog = (editor, opts) => {
     const model = editor.getModel()
     model.set('settings', data.settings || {})
     model.set('name', data.name)
-  })
-  // On chrome this is needed to apply the head content to the DOM
-  editor.on('storage:end:load', () => {
+    // On chrome this is needed to apply the head content to the DOM
     setTimeout(() => {
       updateDom(editor)
     })
@@ -190,7 +179,7 @@ function displaySettings(editor, config, model = editor.getModel()) {
         </main>
       </section>
       <footer>
-        <p class="silex-version">Silex ${version}</p>
+        <p class="silex-version">Silex ${SILEX_VERSION}</p>
         <input class="silex-button" type="button" @click=${e => editor.stopCommand(cmdOpenSettings)} value="Cancel">
         <input class="silex-button" type="submit" value="Apply">
       </footer>
@@ -237,13 +226,15 @@ function getHeadContainer(doc, className) {
 }
 function updateDom(editor) {
   const doc = editor.Canvas.getDocument()
-  if(doc) {
+  const settings = editor.getModel().get('settings')
+  const pageSettings = editor.Pages.getSelected().get('settings')
+  if(doc && settings) {
     // Site head
     getHeadContainer(doc, 'site-head')
-      .innerHTML = editor.getModel().get('settings').head || ''
+      .innerHTML = settings.head || ''
     // Pages head
     getHeadContainer(doc, 'page-head')
-      .innerHTML = editor.Pages.getSelected().get('settings')?.head || ''
+      .innerHTML = pageSettings?.head || ''
   } else {
     // No document??
   }

package/src/ts/client/publication-transformers.test.ts

@@ -10,7 +10,7 @@ import {
   transformBgImage
 } from './publication-transformers'
 import { ClientConfig } from './config'
-import grapesjs, { Component, Editor, ObjectStrings, Page } from 'grapesjs'
+import grapesjs, { Component, Editor, StyleProps, Page } from 'grapesjs'
 import { ClientSideFile, ClientSideFileType, PublicationData } from '../types'
 
 describe('publication-transformers', () => {
@@ -87,12 +87,12 @@ describe('publication-transformers', () => {
   it('should transform styles', () => {
     const transformCssRule = transformer.renderCssRule as Mock
     transformCssRule.mockImplementation((rule: any) => {
-      return { color: 'test'+rule.color } as ObjectStrings
+      return { color: 'test'+rule.color } as StyleProps
     })
     renderCssRules(editor)
     const css = editor.getCss()
     expect(transformCssRule).toBeCalledTimes(2)
-    const results = transformCssRule.mock.results.map(r => r.value as ObjectStrings)
+    const results = transformCssRule.mock.results.map(r => r.value as StyleProps)
     const parent = results.find(c => c.color === 'testred')
     expect(parent).not.toBeUndefined()
     const child = results.find(c => c.color === 'testblue')
@@ -103,7 +103,7 @@ describe('publication-transformers', () => {
 
   it('should reset transformed styles', () => {
     const renderCssRule = transformer.renderCssRule as Mock
-    const returned = {color: 'test'} as ObjectStrings
+    const returned = {color: 'test'} as StyleProps
     renderCssRule.mockReturnValue(returned)
     renderCssRules(editor)
     resetRenderCssRules(editor)

package/src/ts/client/publication-transformers.ts

@@ -15,8 +15,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import { Component, CssRule, Editor, ObjectStrings, Page } from 'grapesjs'
-import { ClientSideFile, ClientSideFileType, ClientSideFileWithPermalink, Initiator, PublicationData } from '../types'
+import { Component, CssRule, StyleProps, Editor } from 'grapesjs'
+import { ClientSideFile, ClientSideFileType, Initiator, PublicationData } from '../types'
 import { onAll } from './utils'
 
 /**
@@ -43,7 +43,7 @@ export interface PublicationTransformer {
   // Temporarily override how components render at publication by grapesjs
   renderComponent?(component: Component, toHtml: () => string): string | undefined
   // Temporarily override how styles render at publication by grapesjs
-  renderCssRule?(rule: CssRule, initialRule: () => ObjectStrings): ObjectStrings | undefined
+  renderCssRule?(rule: CssRule, initialRule: () => StyleProps): StyleProps | undefined
   // Transform files after they are rendered and before they are published
   transformFile?(file: ClientSideFile): ClientSideFile
   // Define files URLs
@@ -58,7 +58,7 @@ export const publicationTransformerDefault: PublicationTransformer = {
     return toHtml()
   },
   // Override how styles render at publication by grapesjs
-  renderCssRule(rule: CssRule, initialRule: () => ObjectStrings): ObjectStrings | undefined {
+  renderCssRule(rule: CssRule, initialRule: () => StyleProps): StyleProps | undefined {
     return initialRule()
   },
   // Define where files are published
@@ -181,20 +181,24 @@ export function renderCssRules(editor: Editor) {
   })
 }
 
+function doTransformPermalink(editor: Editor, cssValue: string): string {
+  return cssValue.replace(/url\(([^)]+)\)/g, (match, url) => {
+    // Support URLs with or without quotes
+    const cleanUrl = url.replace(/['"]/g, '')
+    // Transform URLs
+    const newUrl = transformPermalink(editor, cleanUrl, ClientSideFileType.ASSET, Initiator.CSS)
+    // Return the new URL with url keyword
+    return `url(${newUrl})`
+  })
+}
+
 /**
  * Transform background image url according to the transformed path of assets
  */
-export function transformBgImage(editor: Editor, style: ObjectStrings): ObjectStrings {
+export function transformBgImage(editor: Editor, style: StyleProps): StyleProps {
   const cssValue = style['background-image']
   if (cssValue) {
-    const newCssValue = cssValue.replace(/url\(([^)]+)\)/g, (match, url) => {
-      // Support URLs with or without quotes
-      const cleanUrl = url.replace(/['"]/g, '')
-      // Transform URLs
-      const newUrl = transformPermalink(editor, cleanUrl, ClientSideFileType.ASSET, Initiator.CSS)
-      // Return the new URL with url keyword
-      return `url(${newUrl})`
-    })
+    const newCssValue = typeof cssValue === 'string' ? doTransformPermalink(editor, cssValue) : cssValue.map(value => doTransformPermalink(editor, value))
     return {
       ...style,
       'background-image': newCssValue,

package/src/ts/constants.ts

@@ -51,3 +51,13 @@ export const API_WEBSITE_ASSET_READ = '/assets'
 export const API_WEBSITE_ASSETS_WRITE = '/assets'
 export const API_WEBSITE_META_READ = '/meta'
 export const API_WEBSITE_META_WRITE = '/meta'
+
+// Env vars (build time)
+// Get env vars from webpack
+// @see webpack.config.js
+declare const SILEX_VERSION_ENV: string
+export let SILEX_VERSION
+try { SILEX_VERSION = SILEX_VERSION_ENV } catch (e) {
+  // fallback to default value
+  SILEX_VERSION = SILEX_VERSION || '3.0.0'
+}

package/dist/plugins/server/plugins/server/AuthPlugin.d.ts

@@ -1 +0,0 @@
-export default function (config: any, opts?: {}): Promise<void>;

package/dist/plugins/server/plugins/server/AuthPlugin.js

@@ -1,40 +0,0 @@
-"use strict";
-/*
- * Silex website builder, free/libre no-code tool for makers.
- * Copyright (c) 2023 lexoyo and Silex Labs foundation
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-// import express from 'express'
-// import { Directus } from '@directus/sdk'
-async function default_1(config, opts = {}) {
-    //  config.on('silex:startup:start', ({app}) => {
-    //    const router = express.Router()
-    //    router.post(['/publish', '/website', '/assets'], async function(req, res, next) {
-    //      try {
-    //        const token = req.body.token || opts.directusToken
-    //        const directus = new Directus(opts.directusUrl)
-    //        directus.storage.auth_token = token
-    //        const me = await directus.users.me.read()
-    //        next()
-    //      } catch(err) {
-    //        console.error('Publish failed in auth module. Did you provide a directus token?', err.message)
-    //        res.status(403).json({ message: err.message })
-    //      }
-    //    })
-    //    app.use(router)
-    //  })
-}
-exports.default = default_1;
-//# sourceMappingURL=AuthPlugin.js.map

package/dist/plugins/server/plugins/server/AuthPlugin.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"AuthPlugin.js","sourceRoot":"","sources":["../../../../../src/ts/plugins/server/AuthPlugin.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;AAEH,gCAAgC;AAChC,2CAA2C;AAE5B,KAAK,oBAAU,MAAM,EAAE,IAAI,GAAG,EAAE;IAC/C,iDAAiD;IACjD,qCAAqC;IACrC,uFAAuF;IACvF,aAAa;IACb,4DAA4D;IAC5D,yDAAyD;IACzD,6CAA6C;IAC7C,mDAAmD;IACnD,gBAAgB;IAChB,sBAAsB;IACtB,wGAAwG;IACxG,wDAAwD;IACxD,SAAS;IACT,QAAQ;IACR,qBAAqB;IACrB,MAAM;AACN,CAAC;AAjBD,4BAiBC"}