@silexlabs/silex 3.0.0-alpha.49 → 3.0.0-alpha.51

package/dist/plugins/client/client/publication-transformers.js

@@ -0,0 +1,165 @@
+/*
+ * 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/>.
+ */
+import { ClientEvent } from './events';
+import { onAll } from './utils';
+/**
+ * @fileoverview Silex publication transformers are used to control how the site is rendered and published
+ */
+// Properties names used to store the original methods on the components and styles
+const ATTRIBUTE_METHOD_STORE_HTML = 'tmp-pre-publication-transformer-tohtml';
+const ATTRIBUTE_METHOD_STORE_CSS = 'tmp-pre-publication-transformer-tocss';
+/**
+ * Init publication transformers
+ * Called at startup in the /index.ts file
+ */
+export async function initPublicationTransformers(config) {
+    const editor = config.getEditor();
+    // Override default rendering of components and styles
+    // Also create page slugs
+    editor.on(ClientEvent.PUBLISH_START, () => {
+        transformComponents(config);
+        transformStyles(config);
+        transformPages(config);
+    });
+    // Reset the components and styles rendering
+    editor.on(ClientEvent.PUBLISH_END, () => {
+        resetTransformComponents(config);
+        resetTransformStyles(config);
+        resetTransformPages(config);
+    });
+    // Transform files after generating all files to be published
+    editor.on(ClientEvent.PUBLISH_DATA, (data) => {
+        transformFiles(config, data);
+    });
+}
+/**
+ * Alter the components rendering
+ * Exported for unit tests
+ */
+export function transformComponents(config) {
+    const editor = config.getEditor();
+    onAll(editor, (c) => {
+        if (c.get(ATTRIBUTE_METHOD_STORE_HTML)) {
+            console.warn('Publication transformer: HTML transform already altered', c);
+        }
+        else {
+            const initialToHTML = c.toHTML.bind(c);
+            c[ATTRIBUTE_METHOD_STORE_HTML] = c.toHTML;
+            c.toHTML = () => {
+                return config.publicationTransformers.reduce((html, transformer) => {
+                    try {
+                        return transformer.renderComponent ? transformer.renderComponent(c, initialToHTML) ?? html : html;
+                    }
+                    catch (e) {
+                        console.error('Publication transformer: error rendering component', c, e);
+                        return html;
+                    }
+                }, initialToHTML());
+            };
+        }
+    });
+}
+/**
+ * Alter the styles rendering
+ * Exported for unit tests
+ */
+export function transformStyles(config) {
+    const editor = config.getEditor();
+    editor.Css.getAll().forEach(c => {
+        if (c[ATTRIBUTE_METHOD_STORE_CSS]) {
+            console.warn('Publication transformer: CSS transform already altered', c);
+        }
+        else {
+            const initialGetStyle = c.getStyle.bind(c);
+            c[ATTRIBUTE_METHOD_STORE_CSS] = c.getStyle;
+            c.getStyle = () => {
+                try {
+                    return config.publicationTransformers.reduce((style, transformer) => {
+                        return {
+                            ...transformer.renderCssRule ? transformer.renderCssRule(c, initialGetStyle) ?? style : style,
+                        };
+                    }, initialGetStyle());
+                }
+                catch (e) {
+                    console.error('Publication transformer: error rendering style', c, e);
+                    return initialGetStyle();
+                }
+            };
+        }
+    });
+}
+/**
+ * Create page slugs
+ * Exported for unit tests
+ */
+export function transformPages(config) {
+    const editor = config.getEditor();
+    editor.Pages.getAll().forEach((page) => {
+        page.set('slug', config.publicationTransformers.reduce((slug, transformer) => {
+            try {
+                return transformer.pageToSlug ? transformer.pageToSlug(page) ?? slug : slug;
+            }
+            catch (e) {
+                console.error('Publication transformer: error creating page slug', page, e);
+                return slug;
+            }
+        }, page.get('slug')));
+    });
+}
+/**
+ * Transform files
+ * Exported for unit tests
+ */
+export function transformFiles(config, data) {
+    data.files = config.publicationTransformers.reduce((files, transformer) => {
+        return files.map((file, idx) => {
+            try {
+                const page = data.pages[idx] ?? null;
+                return transformer.transformFile ? transformer.transformFile(file, page) ?? file : file;
+            }
+            catch (e) {
+                console.error('Publication transformer: error transforming file', file, e);
+                return file;
+            }
+        });
+    }, data.files);
+}
+export function resetTransformComponents(config) {
+    const editor = config.getEditor();
+    onAll(editor, (c) => {
+        if (c[ATTRIBUTE_METHOD_STORE_HTML]) {
+            c.toHTML = c[ATTRIBUTE_METHOD_STORE_HTML];
+            delete c[ATTRIBUTE_METHOD_STORE_HTML];
+        }
+    });
+}
+export function resetTransformStyles(config) {
+    const editor = config.getEditor();
+    editor.Css.getAll().forEach(c => {
+        if (c[ATTRIBUTE_METHOD_STORE_CSS]) {
+            c.getStyle = c[ATTRIBUTE_METHOD_STORE_CSS];
+            delete c[ATTRIBUTE_METHOD_STORE_CSS];
+        }
+    });
+}
+export function resetTransformPages(config) {
+    const editor = config.getEditor();
+    editor.Pages.getAll().forEach(page => {
+        page.unset('slug');
+    });
+}
+//# sourceMappingURL=publication-transformers.js.map

package/dist/plugins/client/client/publication-transformers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"publication-transformers.js","sourceRoot":"","sources":["../../../../src/ts/client/publication-transformers.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,29 @@
+/**
+ * @fileoverview define constants for Silex client and server
+ */
+export declare const WEBSITE_DATA_FILE = "website.json";
+export declare const WEBSITE_META_DATA_FILE = "meta.json";
+export declare const DEFAULT_WEBSITE_ID = "default";
+export declare const DEFAULT_LANGUAGE = "en";
+export declare const CLIENT_CONFIG_FILE_NAME = "silex.js";
+export declare const API_PATH = "/api";
+export declare const API_CONNECTOR_PATH = "/connector";
+export declare const API_CONNECTOR_USER = "/user";
+export declare const API_CONNECTOR_LIST = "/";
+export declare const API_CONNECTOR_LOGOUT = "/logout";
+export declare const API_CONNECTOR_LOGIN = "/login";
+export declare const API_CONNECTOR_SETTINGS = "/settings";
+export declare const API_CONNECTOR_LOGIN_CALLBACK = "/login/callback";
+export declare const API_PUBLICATION_PATH = "/publication";
+export declare const API_PUBLICATION_PUBLISH = "/";
+export declare const API_PUBLICATION_STATUS = "/publication/status";
+export declare const API_WEBSITE_PATH = "/website";
+export declare const API_WEBSITE_READ = "/";
+export declare const API_WEBSITE_WRITE = "/";
+export declare const API_WEBSITE_CREATE = "/";
+export declare const API_WEBSITE_DELETE = "/";
+export declare const API_WEBSITE_LIST = "/";
+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";

package/dist/plugins/client/constants.js

@@ -0,0 +1,46 @@
+/*
+ * 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/>.
+ */
+/**
+ * @fileoverview define constants for Silex client and server
+ */
+export const WEBSITE_DATA_FILE = 'website.json';
+export const WEBSITE_META_DATA_FILE = 'meta.json';
+export const DEFAULT_WEBSITE_ID = 'default';
+export const DEFAULT_LANGUAGE = 'en';
+export const CLIENT_CONFIG_FILE_NAME = 'silex.js';
+export const API_PATH = '/api';
+export const API_CONNECTOR_PATH = '/connector';
+export const API_CONNECTOR_USER = '/user';
+export const API_CONNECTOR_LIST = '/';
+export const API_CONNECTOR_LOGOUT = '/logout';
+export const API_CONNECTOR_LOGIN = '/login';
+export const API_CONNECTOR_SETTINGS = '/settings';
+export const API_CONNECTOR_LOGIN_CALLBACK = '/login/callback';
+export const API_PUBLICATION_PATH = '/publication';
+export const API_PUBLICATION_PUBLISH = '/';
+export const API_PUBLICATION_STATUS = '/publication/status';
+export const API_WEBSITE_PATH = '/website';
+export const API_WEBSITE_READ = '/';
+export const API_WEBSITE_WRITE = '/';
+export const API_WEBSITE_CREATE = '/';
+export const API_WEBSITE_DELETE = '/';
+export const API_WEBSITE_LIST = '/';
+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';
+//# sourceMappingURL=constants.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/ts/constants.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH;;GAEG;AAEH,MAAM,CAAC,MAAM,iBAAiB,GAAG,cAAc,CAAA;AAC/C,MAAM,CAAC,MAAM,sBAAsB,GAAG,WAAW,CAAA;AAEjD,MAAM,CAAC,MAAM,kBAAkB,GAAG,SAAS,CAAA;AAC3C,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAA;AACpC,MAAM,CAAC,MAAM,uBAAuB,GAAG,UAAU,CAAA;AAEjD,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAA;AAE9B,MAAM,CAAC,MAAM,kBAAkB,GAAG,YAAY,CAAA;AAC9C,MAAM,CAAC,MAAM,kBAAkB,GAAG,OAAO,CAAA;AACzC,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,CAAA;AACrC,MAAM,CAAC,MAAM,oBAAoB,GAAG,SAAS,CAAA;AAC7C,MAAM,CAAC,MAAM,mBAAmB,GAAG,QAAQ,CAAA;AAC3C,MAAM,CAAC,MAAM,sBAAsB,GAAG,WAAW,CAAA;AACjD,MAAM,CAAC,MAAM,4BAA4B,GAAG,iBAAiB,CAAA;AAE7D,MAAM,CAAC,MAAM,oBAAoB,GAAG,cAAc,CAAA;AAClD,MAAM,CAAC,MAAM,uBAAuB,GAAG,GAAG,CAAA;AAC1C,MAAM,CAAC,MAAM,sBAAsB,GAAG,qBAAqB,CAAA;AAE3D,MAAM,CAAC,MAAM,gBAAgB,GAAG,UAAU,CAAA;AAC1C,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,CAAA;AACnC,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,CAAA;AACpC,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,CAAA;AACrC,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,CAAA;AACrC,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,CAAA;AACnC,MAAM,CAAC,MAAM,sBAAsB,GAAG,SAAS,CAAA;AAC/C,MAAM,CAAC,MAAM,wBAAwB,GAAG,SAAS,CAAA;AACjD,MAAM,CAAC,MAAM,qBAAqB,GAAG,OAAO,CAAA;AAC5C,MAAM,CAAC,MAAM,sBAAsB,GAAG,OAAO,CAAA"}

package/dist/plugins/client/plugins/client/11ty.d.ts

@@ -0,0 +1,17 @@
+import { ClientConfig } from '../../client/config';
+interface PluginOptions {
+    html: {
+        url: string;
+        path: string;
+    };
+    css: {
+        url: string;
+        path: string;
+    };
+    assets: {
+        url: string;
+        path: string;
+    };
+}
+declare const _default: (config: ClientConfig, opts: Partial<PluginOptions>) => void;
+export default _default;

package/dist/plugins/client/plugins/client/11ty.js

@@ -0,0 +1,70 @@
+export default (config, opts) => {
+    const options = {
+        ...opts,
+        html: {
+            url: '/',
+            path: './',
+            ...opts.html,
+        },
+        css: {
+            url: '/css',
+            path: './css',
+            ...opts.css,
+        },
+        assets: {
+            url: '/assets',
+            path: './',
+            ...opts.assets,
+        },
+    };
+    config.addPublicationTransformers({
+        transformFile: (file, page) => {
+            const fileWithContent = file;
+            console.log('Silex: transform file for 11ty', fileWithContent);
+            switch (file.type) {
+                case 'html':
+                    return {
+                        ...file,
+                        path: options.html.path + fileWithContent.path,
+                        //content: `---\npermalink: ${options.html.url}${fileWithContent.path}\n---\n${fileWithContent.content}`
+                    };
+                case 'css':
+                    return {
+                        ...file,
+                        path: options.css.path + fileWithContent.path.replace(/\.css$/, '.css.liquid'),
+                        content: `---\npermalink: ${options.css.url}${fileWithContent.path}\n---\n${fileWithContent.content}`
+                    };
+                case 'asset':
+                    return {
+                        ...file,
+                        path: options.assets.path + fileWithContent.path,
+                    };
+            }
+            throw new Error(`Unknown file type ${file.type}`);
+        },
+        renderComponent: (c, toHtml) => {
+            if (c.get('type') === 'image') {
+                // Concat the paths, handles the trailing and leading slashes
+                const publishedUrl = path => `${options.assets.url.replace(/\/+$/, '')}/${path.replace(/^\/+/, '')}`;
+                const src = c.get('src');
+                c.set('src', publishedUrl(src));
+                const html = toHtml();
+                console.log('Silex: transform component for 11ty', publishedUrl, html);
+                c.set('src', src);
+                return html;
+            }
+        },
+        renderCssRule(c, getStyle) {
+            const publishedUrl = path => `${options.assets.url.replace(/\/+$/, '')}/${path.replace(/^\/+/, '')}`;
+            const url = getStyle()['background-image'];
+            const bgUrl = url?.match(/url\('(.*)'\)/)?.pop();
+            if (bgUrl) {
+                return {
+                    ...getStyle(),
+                    'background-image': `url('${publishedUrl(bgUrl)}')`,
+                };
+            }
+        }
+    });
+};
+//# sourceMappingURL=11ty.js.map

package/dist/plugins/client/plugins/client/11ty.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"11ty.js","sourceRoot":"","sources":["../../../../../src/ts/plugins/client/11ty.ts"],"names":[],"mappings":"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"}

package/dist/plugins/client/plugins/client/publicationRenderer.js

@@ -1,3 +1,39 @@
+/*
+ * 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/>.
+ */
+// Silex: publication renderer plugin is deprecated. Use the publication renderer plugin instead.
+console.warn('Silex: publication renderer plugin is deprecated. Use the publication renderer plugin instead.');
+/* Usage:
+  import publicationRenderer from '/node_modules/@silexlabs/silex/dist/plugins/client/plugins/client/publicationRenderer.js'
+  await config.addPlugin(publicationRenderer, {
+    css: {
+      frontMatter: true,
+      ext: '.css.liquid',
+      path: '../../../pages'
+    },
+    html: {
+      frontMatter: false,
+      path: '../../../_includes'
+    },
+    assets: {
+      path: '../../../',
+      url: '/',
+    },
+  })
+*/
 import { getPageSlug } from '../../page.js';
 import { onAll } from '../../client/utils.js';
 import { ClientEvent } from '../../client/events.js';
@@ -102,27 +138,29 @@ export default (config, opts = {}) => {
                 });
             }
         });
-        editor.on(ClientEvent.PUBLISH_DATA, data => {
-            data.pages.forEach((page, idx) => {
-                const file = data.files[idx];
-                // CSS
-                file.cssPath = file.cssPath.replace(/\.css$/, options.css.ext);
-                file.cssPath = options.css.path + file.cssPath;
-                if (options.css.frontMatter) {
-                    file.css = `---\npermalink: ${options.css.url}/${page.slug}.css\n---\n${file.css}`;
-                }
-                // HTML
-                file.htmlPath = file.htmlPath.replace(/\.html$/, options.html.ext);
-                file.htmlPath = options.html.path + file.htmlPath;
-                if (options.html.frontMatter) {
-                    file.html = `---\npermalink: ${options.html.url}/${page.slug}.html\n---\n${file.html}`;
-                }
-            });
-            data.assets.forEach((asset, idx) => {
-                asset.path = options.assets.path + asset.src;
-                // The rest is handled by the editor.Css.getAll loop
-            });
-        });
+        //editor.on(ClientEvent.PUBLISH_DATA, data => {
+        //  data.pages.forEach((page: Page, idx) => {
+        //    const file = data.files[idx] as ClientSideFile
+        //    console.log('Silex: publication renderer: page', page, file)
+        //    // CSS
+        //    if(file.type === 'css') {
+        //    file.cssPath = file.cssPath.replace(/\.css$/, options.css.ext)
+        //    file.cssPath = options.css.path + file.cssPath
+        //    if (options.css.frontMatter) {
+        //      file.css = `---\npermalink: ${options.css.url}/${page.slug}.css\n---\n${file.css}`
+        //    }
+        //    // HTML
+        //    file.htmlPath = file.htmlPath.replace(/\.html$/, options.html.ext)
+        //    file.htmlPath = options.html.path + file.htmlPath
+        //    if (options.html.frontMatter) {
+        //      file.html = `---\npermalink: ${options.html.url}/${page.slug}.html\n---\n${file.html}`
+        //    }
+        //  })
+        //  data.assets.forEach((asset, idx) => {
+        //    asset.path = options.assets.path + asset.src
+        //    // The rest is handled by the editor.Css.getAll loop
+        //  })
+        //})
     });
 };
 //# sourceMappingURL=publicationRenderer.js.map

package/dist/plugins/client/plugins/client/publicationRenderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"publicationRenderer.js","sourceRoot":"","sources":["../../../../../src/ts/plugins/client/publicationRenderer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"publicationRenderer.js","sourceRoot":"","sources":["../../../../../src/ts/plugins/client/publicationRenderer.ts"],"names":[],"mappings":"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"}

package/dist/plugins/client/plugins/client/website-info.js

@@ -46,7 +46,7 @@ export default async function (config) {
             topBar?.appendChild(container);
             // Display the website meta data
             container.innerHTML = `
-        <div class="gjs-website-meta-image" style="background: url(${websiteMeta.imageUrl});"></div>
+        ${websiteMeta.imageUrl ? `<div class="gjs-website-meta-image" style="background: url(${websiteMeta.imageUrl});"></div>` : ''}
         <div class="gjs-website-meta-name">${websiteMeta.name}</div>
       `;
         }

package/dist/plugins/client/plugins/client/website-info.js.map

@@ -1 +1 @@
-{"version":3,"file":"website-info.js","sourceRoot":"","sources":["../../../../../src/ts/plugins/client/website-info.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AAQpD,MAAM,CAAC,OAAO,CAAC,KAAK,WAAU,MAAM;IAClC,MAAM,CAAC,EAAE,CAAC,WAAW,CAAC,cAAc,EAAE,KAAK,IAAI,EAAE;QAC/C,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,IAAiC,EAAE,EAAE;YACjE,MAAM,OAAO,GAAG;gBACd,QAAQ,EAAE,UAAU;gBACpB,GAAG,IAAI;aACc,CAAA;YACvB,MAAM,CAAC,EAAE,CAAC,kBAAkB,EAAE,KAAK,IAAI,EAAE;gBACvC,wBAAwB;gBACxB,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,OAAO,CAAA;gBAC1C,4BAA4B;gBAC5B,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,CAAA;gBAChF,kBAAkB,CAAC,WAAW,CAAC,CAAA;YACjC,CAAC,CAAC,CAAA;YACF,OAAO,EAAE,CAAA;QACX,CAAC,CAAA;QAED,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QAChD,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,GAAG;YAC3D,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,WAAW,EAAE,MAAM,CAAC,SAAS;SAC9B,CAAA;QACD,SAAS,kBAAkB,CAAC,WAAW;YACrC,uBAAuB;YACvB,MAAM,SAAS,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;YAC/C,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAA;YAC3C,8BAA8B;YAC9B,6CAA6C;YAC7C,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAA;YAC1D,MAAM,EAAE,WAAW,CAAC,SAAS,CAAC,CAAA;YAC9B,gCAAgC;YAChC,SAAS,CAAC,SAAS,GAAG;qEACyC,WAAW,CAAC,QAAQ;6CAC5C,WAAW,CAAC,IAAI;OACtD,CAAA;QACH,CAAC;IACH,CAAC,CAAC,CAAA;AACJ,CAAC"}
+{"version":3,"file":"website-info.js","sourceRoot":"","sources":["../../../../../src/ts/plugins/client/website-info.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AAQpD,MAAM,CAAC,OAAO,CAAC,KAAK,WAAU,MAAM;IAClC,MAAM,CAAC,EAAE,CAAC,WAAW,CAAC,cAAc,EAAE,KAAK,IAAI,EAAE;QAC/C,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,IAAiC,EAAE,EAAE;YACjE,MAAM,OAAO,GAAG;gBACd,QAAQ,EAAE,UAAU;gBACpB,GAAG,IAAI;aACc,CAAA;YACvB,MAAM,CAAC,EAAE,CAAC,kBAAkB,EAAE,KAAK,IAAI,EAAE;gBACvC,wBAAwB;gBACxB,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,OAAO,CAAA;gBAC1C,4BAA4B;gBAC5B,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,CAAA;gBAChF,kBAAkB,CAAC,WAAW,CAAC,CAAA;YACjC,CAAC,CAAC,CAAA;YACF,OAAO,EAAE,CAAA;QACX,CAAC,CAAA;QAED,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QAChD,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,GAAG;YAC3D,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,WAAW,EAAE,MAAM,CAAC,SAAS;SAC9B,CAAA;QACD,SAAS,kBAAkB,CAAC,WAAW;YACrC,uBAAuB;YACvB,MAAM,SAAS,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;YAC/C,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAA;YAC3C,8BAA8B;YAC9B,6CAA6C;YAC7C,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,mBAAmB,CAAC,CAAA;YAC1D,MAAM,EAAE,WAAW,CAAC,SAAS,CAAC,CAAA;YAC9B,gCAAgC;YAChC,SAAS,CAAC,SAAS,GAAG;UACjB,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,8DAA8D,WAAW,CAAC,QAAQ,YAAY,CAAC,CAAC,CAAC,EAAG;6CACzF,WAAW,CAAC,IAAI;OACtD,CAAA;QACH,CAAC;IACH,CAAC,CAAC,CAAA;AACJ,CAAC"}

package/dist/plugins/client/types.d.ts

@@ -5,7 +5,6 @@ export interface PublicationSettings {
     connector?: ConnectorData;
     options?: ConnectorOptions;
     url?: string;
-    autoHomePage?: boolean;
 }
 export interface WebsiteFile {
     html: string;
@@ -137,7 +136,7 @@ export type ApiConnectorUserQuery = {
 export type ApiConnectorUserResponse = ConnectorUser;
 export declare const defaultWebsiteData: WebsiteData;
 export interface WebsiteData {
-    pages: Page[];
+    pages: any[];
     assets: Asset[];
     styles: Style[];
     settings: WebsiteSettings;
@@ -146,7 +145,7 @@ export interface WebsiteData {
     publication: PublicationSettings;
 }
 export interface PublicationData extends WebsiteData {
-    files?: WebsiteFile[];
+    files?: ClientSideFile[];
 }
 export interface WebsiteSettings {
     description?: string;
@@ -163,16 +162,6 @@ export interface Font {
     value: string;
     variants: string[];
 }
-export interface Page {
-    name?: string;
-    id: string;
-    type?: string;
-    frames: Frame[];
-    settings?: WebsiteSettings;
-    cssExt?: string;
-    htmlExt?: string;
-    slug?: string;
-}
 export interface Frame {
     component: {
         type: string;
@@ -216,13 +205,26 @@ export type Selector = string | {
 export type ConnectorId = string;
 export type ConnectorOptions = object;
 /**
- * Type for a client side file
- * @see connector/File
+ * Type for a client side file when the content is available as a string
  */
-export interface ClientSideFile {
+export interface ClientSideFileWithContent {
     path: string;
     content: string;
+    type: 'html' | 'asset' | 'css';
+}
+/**
+ * Type for a client side file when the content is in the storage connector
+ */
+export interface ClientSideFileWithSrc {
+    path: string;
+    src: string;
+    type: 'html' | 'asset' | 'css';
 }
+/**
+ * Type for a client side file
+ * @see connector/File
+ */
+export type ClientSideFile = ClientSideFileWithContent | ClientSideFileWithSrc;
 /**
  * Type for file listing
  */

package/dist/plugins/client/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/ts/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAqBH,MAAM,OAAO,QAAS,SAAQ,KAAK;IACY;IAA7C,YAAY,OAAe,EAAkB,cAAsB;QACjE,KAAK,CAAC,OAAO,CAAC,CAAA;QAD6B,mBAAc,GAAd,cAAc,CAAQ;QAEjE,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,EAAE,OAAO,CAAC,CAAA;IACpD,CAAC;CACF;AA+CD,KAAK;AACL,cAAc;AACd,MAAM,CAAC,MAAM,kBAAkB,GAAgB;AAC7C,YAAY;AACZ,aAAa;AACb,aAAa;AACb,eAAe;AACf,YAAY;AACZ,cAAc;AACd,kBAAkB;CACJ,CAAA;AAyDhB,MAAM,CAAN,IAAY,IAEX;AAFD,WAAY,IAAI;IACd,iBAAS,CAAA;AACX,CAAC,EAFW,IAAI,KAAJ,IAAI,QAEf;AAoDD;;GAEG;AACH,MAAM,CAAN,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,oCAAmB,CAAA;IACnB,oCAAmB,CAAA;AACrB,CAAC,EAHW,aAAa,KAAb,aAAa,QAGxB;AAuDD;;GAEG;AACH,MAAM,CAAN,IAAY,SAIX;AAJD,WAAY,SAAS;IACnB,wCAA2B,CAAA;IAC3B,gCAAmB,CAAA;IACnB,4BAAe,CAAA;AACjB,CAAC,EAJW,SAAS,KAAT,SAAS,QAIpB"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/ts/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAoBH,MAAM,OAAO,QAAS,SAAQ,KAAK;IACY;IAA7C,YAAY,OAAe,EAAkB,cAAsB;QACjE,KAAK,CAAC,OAAO,CAAC,CAAA;QAD6B,mBAAc,GAAd,cAAc,CAAQ;QAEjE,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,EAAE,OAAO,CAAC,CAAA;IACpD,CAAC;CACF;AA+CD,KAAK;AACL,cAAc;AACd,MAAM,CAAC,MAAM,kBAAkB,GAAgB;AAC7C,YAAY;AACZ,aAAa;AACb,aAAa;AACb,eAAe;AACf,YAAY;AACZ,cAAc;AACd,kBAAkB;CACJ,CAAA;AA8ChB,MAAM,CAAN,IAAY,IAEX;AAFD,WAAY,IAAI;IACd,iBAAS,CAAA;AACX,CAAC,EAFW,IAAI,KAAJ,IAAI,QAEf;AAmED;;GAEG;AACH,MAAM,CAAN,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,oCAAmB,CAAA;IACnB,oCAAmB,CAAA;AACrB,CAAC,EAHW,aAAa,KAAb,aAAa,QAGxB;AAuDD;;GAEG;AACH,MAAM,CAAN,IAAY,SAIX;AAJD,WAAY,SAAS;IACnB,wCAA2B,CAAA;IAC3B,gCAAmB,CAAA;IACnB,4BAAe,CAAA;AACjB,CAAC,EAJW,SAAS,KAAT,SAAS,QAIpB"}

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

@@ -3,6 +3,7 @@ import { Readable } from 'stream';
 import { ConnectorFile, ConnectorFileContent, StatusCallback, StorageConnector } from '../../server/connectors/connectors';
 import { ConnectorType, ConnectorUser, WebsiteMeta, JobData, WebsiteId, WebsiteMetaFileContent, WebsiteData, ConnectorOptions } from '../../types';
 import { ServerConfig } from '../../server/config';
+import { JobManager } from '../../server/jobs';
 /**
  * @fileoverview FTP connector for Silex
  * This is a connector for Silex, which allows to store the website on a FTP server
@@ -79,5 +80,5 @@ export default class FtpConnector implements StorageConnector<FtpSession> {
     readAsset(session: FtpSession, id: string, path: string): Promise<ConnectorFileContent>;
     deleteAssets(session: FtpSession, id: WebsiteId, paths: string[]): Promise<void>;
     getUrl(session: FtpSession, id: WebsiteId): Promise<string>;
-    publish(session: FtpSession, id: string, files: ConnectorFile[]): Promise<JobData>;
+    publish(session: FtpSession, id: WebsiteId, files: ConnectorFile[], { startJob, jobSuccess, jobError }: JobManager): Promise<JobData>;
 }

package/dist/plugins/server/plugins/server/FtpConnector.js

@@ -22,7 +22,6 @@ const connectors_1 = require("../../server/connectors/connectors");
 const validation_1 = require("../../server/utils/validation");
 const constants_1 = require("../../constants");
 const types_1 = require("../../types");
-const jobs_1 = require("../../server/jobs");
 const path_1 = require("path");
 const os_1 = require("os");
 const uuid_1 = require("uuid");
@@ -309,7 +308,7 @@ class FtpConnector {
     async getUser(session) {
         return {
             name: this.sessionData(session).user,
-            picture: 'data://image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAA',
+            picture: 'data:image/svg+xml,%3Csvg xmlns=\'http://www.w3.org/2000/svg\' height=\'1em\' viewBox=\'0 0 448 512\'%3E%3C!--! Font Awesome Free 6.4.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --%3E%3Cpath d=\'M224 256A128 128 0 1 0 224 0a128 128 0 1 0 0 256zm-45.7 48C79.8 304 0 383.8 0 482.3C0 498.7 13.3 512 29.7 512H418.3c16.4 0 29.7-13.3 29.7-29.7C448 383.8 368.2 304 269.7 304H178.3z\'/%3E%3C/svg%3E',
             storage: await (0, connectors_1.toConnectorData)(session, this)
         };
     }
@@ -491,8 +490,8 @@ class FtpConnector {
         console.warn('FIXME: do not store websiteUrl in the session, but in the website data');
         return this.sessionData(session).websiteUrl ?? '';
     }
-    async publish(session, id, files) {
-        const job = (0, jobs_1.startJob)(`Publishing to ${this.displayName}`);
+    async publish(session, id, files, { startJob, jobSuccess, jobError }) {
+        const job = startJob(`Publishing to ${this.displayName}`);
         job.logs = [[`Publishing to ${this.displayName}`]];
         job.errors = [[]];
         // Create folders
@@ -507,11 +506,11 @@ class FtpConnector {
             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;