@silexlabs/silex 3.3.1-3 → 3.3.1-5

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

@@ -8,20 +8,9 @@
  * https://github.com/osartun/Backbone.Undo.js
  */
 
-/*!
- * jQuery JavaScript Library v3.7.1
- * https://jquery.com/
- *
- * Copyright OpenJS Foundation and other contributors
- * Released under the MIT license
- * https://jquery.org/license
- *
- * Date: 2023-08-28T13:37Z
- */
-
-/*! @silexlabs/grapesjs-filter-styles - 1.1.0 */
+/*! @silexlabs/grapesjs-filter-styles - 1.1.1-0 */
 
-/*! @silexlabs/grapesjs-loading - 1.1.0 */
+/*! @silexlabs/grapesjs-loading - 1.1.1-0 */
 
 /*! grapesjs-style-border - 1.0.4 */
 

package/dist/client/page.d.ts

@@ -1,2 +1,2 @@
-export declare function getPageSlug(pageName: any): any;
+export declare function getPageSlug(pageName: string | undefined): string;
 export declare function getPageLink(pageName: any): string;

package/dist/client/types.d.ts

@@ -1,3 +1,4 @@
+import { Page } from 'grapesjs';
 /**
  * @fileoverview define types for Silex client and server
  */
@@ -138,23 +139,6 @@ export type ApiConnectorUserQuery = {
 };
 export type ApiConnectorUserResponse = ConnectorUser;
 export declare const defaultWebsiteData: WebsiteData;
-export interface Component {
-    type: string;
-    content?: string;
-    attributes: {
-        [key: string]: string;
-    };
-    components: Component[];
-}
-export interface Page {
-    id: string;
-    name: string;
-    slug: string;
-    settings: WebsiteSettings;
-    frames: {
-        component: Component;
-    }[];
-}
 export interface WebsiteData {
     pages: Page[];
     assets: Asset[];

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

@@ -1,3 +1,4 @@
+import { Page } from 'grapesjs';
 /**
  * @fileoverview define types for Silex client and server
  */
@@ -138,23 +139,6 @@ export type ApiConnectorUserQuery = {
 };
 export type ApiConnectorUserResponse = ConnectorUser;
 export declare const defaultWebsiteData: WebsiteData;
-export interface Component {
-    type: string;
-    content?: string;
-    attributes: {
-        [key: string]: string;
-    };
-    components: Component[];
-}
-export interface Page {
-    id: string;
-    name: string;
-    slug: string;
-    settings: WebsiteSettings;
-    frames: {
-        component: Component;
-    }[];
-}
 export interface WebsiteData {
     pages: Page[];
     assets: Asset[];

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/ts/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAmBH,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;AAgDD,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;AAuDhB,0BAA0B;AAC1B,oDAAoD;AACpD,4BAA4B;AAC5B,GAAG;AACH,EAAE;AACF,8BAA8B;AAC9B,iBAAiB;AACjB,qBAAqB;AACrB,0CAA0C;AAC1C,4BAA4B;AAC5B,GAAG;AAEH,MAAM,CAAN,IAAY,IAEX;AAFD,WAAY,IAAI;IACd,iBAAS,CAAA;AACX,CAAC,EAFW,IAAI,KAAJ,IAAI,QAEf;AAkCD,MAAM,CAAN,IAAY,kBAKX;AALD,WAAY,kBAAkB;IAC5B,mCAAa,CAAA;IACb,qCAAe,CAAA;IACf,iCAAW,CAAA;IACX,qCAAe,CAAA;AACjB,CAAC,EALW,kBAAkB,KAAlB,kBAAkB,QAK7B;AAED,MAAM,CAAN,IAAY,SAGX;AAHD,WAAY,SAAS;IACnB,0BAAa,CAAA;IACb,wBAAW,CAAA;AACb,CAAC,EAHW,SAAS,KAAT,SAAS,QAGpB;AA2CD;;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;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;AAgDD,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;AAmChB,0BAA0B;AAC1B,oDAAoD;AACpD,4BAA4B;AAC5B,GAAG;AACH,EAAE;AACF,8BAA8B;AAC9B,iBAAiB;AACjB,qBAAqB;AACrB,0CAA0C;AAC1C,4BAA4B;AAC5B,GAAG;AAEH,MAAM,CAAN,IAAY,IAEX;AAFD,WAAY,IAAI;IACd,iBAAS,CAAA;AACX,CAAC,EAFW,IAAI,KAAJ,IAAI,QAEf;AAkCD,MAAM,CAAN,IAAY,kBAKX;AALD,WAAY,kBAAkB;IAC5B,mCAAa,CAAA;IACb,qCAAe,CAAA;IACf,iCAAW,CAAA;IACX,qCAAe,CAAA;AACjB,CAAC,EALW,kBAAkB,KAAlB,kBAAkB,QAK7B;AAED,MAAM,CAAN,IAAY,SAGX;AAHD,WAAY,SAAS;IACnB,0BAAa,CAAA;IACb,wBAAW,CAAA;AACb,CAAC,EAHW,SAAS,KAAT,SAAS,QAGpB;AA2CD;;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/page.d.ts

@@ -1,2 +1,2 @@
-export declare function getPageSlug(pageName: any): any;
+export declare function getPageSlug(pageName: string | undefined): string;
 export declare function getPageLink(pageName: any): string;

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

@@ -1 +1 @@
-{"version":3,"file":"page.js","sourceRoot":"","sources":["../../../src/ts/page.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;AAIH,kCAQC;AACD,kCAEC;AAbD,yBAAyB;AACzB,4CAA4C;AAC5C,SAAgB,WAAW,CAAC,QAAQ;IAClC,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC;SACzB,WAAW,EAAE;SACb,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC;QAC5B,uCAAuC;SACtC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;QACrB,kBAAkB;SACjB,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;AACxB,CAAC;AACD,SAAgB,WAAW,CAAC,QAAQ;IAClC,OAAO,KAAK,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAA;AAC1C,CAAC"}
+{"version":3,"file":"page.js","sourceRoot":"","sources":["../../../src/ts/page.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;AAIH,kCAQC;AACD,kCAEC;AAbD,yBAAyB;AACzB,4CAA4C;AAC5C,SAAgB,WAAW,CAAC,QAA4B;IACtD,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC;SACzB,WAAW,EAAE;SACb,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC;QAC5B,uCAAuC;SACtC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;QACrB,kBAAkB;SACjB,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;AACxB,CAAC;AACD,SAAgB,WAAW,CAAC,QAAQ;IAClC,OAAO,KAAK,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAA;AAC1C,CAAC"}

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

@@ -26,6 +26,7 @@ const os_1 = require("os");
 const uuid_1 = require("uuid");
 const promises_1 = require("fs/promises");
 const fs_1 = require("fs");
+const websiteDataSerialization_1 = require("../../server/utils/websiteDataSerialization");
 // **
 // Utils methos
 function formHtml(redirectTo, type, { host, user, pass, port, secure, storageRootPath, publicationPath, websiteUrl }, err = '') {
@@ -334,7 +335,7 @@ class FtpConnector {
         const websiteId = (0, validation_1.requiredParam)(id, 'website id');
         const path = (0, path_1.join)(this.rootPath(session), websiteId, constants_1.WEBSITE_META_DATA_FILE);
         const ftp = await this.getClient(this.sessionData(session));
-        await this.write(ftp, path, JSON.stringify(data));
+        await this.write(ftp, path, (0, websiteDataSerialization_1.stringify)(data));
         this.closeClient(ftp);
     }
     async getWebsiteMeta(session, id) {
@@ -376,10 +377,10 @@ class FtpConnector {
         await this.mkdir(ftp, assetsPath);
         // create website data file
         const websiteDataPath = (0, path_1.join)(this.rootPath(session), id, constants_1.WEBSITE_DATA_FILE);
-        await this.write(ftp, websiteDataPath, JSON.stringify(types_1.defaultWebsiteData));
+        await this.write(ftp, websiteDataPath, (0, websiteDataSerialization_1.stringify)(types_1.defaultWebsiteData));
         // create website meta data file
         const websiteMetaDataPath = (0, path_1.join)(this.rootPath(session), id, constants_1.WEBSITE_META_DATA_FILE);
-        await this.write(ftp, websiteMetaDataPath, JSON.stringify({}));
+        await this.write(ftp, websiteMetaDataPath, (0, websiteDataSerialization_1.stringify)({}));
         // Clean up
         this.closeClient(ftp);
         // All good
@@ -401,15 +402,59 @@ class FtpConnector {
         const storageRootPath = this.rootPath(session);
         const ftp = await this.getClient(this.sessionData(session));
         const websiteDataPath = (0, path_1.join)(storageRootPath, websiteId, constants_1.WEBSITE_DATA_FILE);
-        const data = await this.read(ftp, websiteDataPath);
-        this.closeClient(ftp);
-        return data;
+        try {
+            const websiteDataStream = await this.read(ftp, websiteDataPath);
+            const websiteDataContent = await (0, connectors_1.contentToString)(websiteDataStream);
+            // Check if this is the new split format by trying to parse
+            const parsedData = JSON.parse(websiteDataContent);
+            if (parsedData.fileFormatVersion === '1.0.0') {
+                // Use the merge function to reconstruct website data
+                const pageLoader = async (pagePath) => {
+                    const fullPath = (0, path_1.join)(storageRootPath, websiteId, pagePath);
+                    const pageStream = await this.read(ftp, fullPath);
+                    return await (0, connectors_1.contentToString)(pageStream);
+                };
+                const result = await (0, websiteDataSerialization_1.merge)(websiteDataContent, pageLoader);
+                this.closeClient(ftp);
+                return result;
+            }
+            else {
+                // Legacy format, return as is
+                this.closeClient(ftp);
+                return parsedData;
+            }
+        }
+        catch (error) {
+            this.closeClient(ftp);
+            throw error;
+        }
     }
     async updateWebsite(session, websiteId, data) {
         const storageRootPath = this.rootPath(session);
         const ftp = await this.getClient(this.sessionData(session));
-        const websiteDataPath = (0, path_1.join)(storageRootPath, websiteId, constants_1.WEBSITE_DATA_FILE);
-        await this.write(ftp, websiteDataPath, JSON.stringify(data));
+        // Use the split function to create separate files for pages
+        const filesToWrite = (0, websiteDataSerialization_1.split)(data);
+        // **
+        // Delete pages that are not in the new website data
+        const pagesPath = (0, path_1.join)(storageRootPath, websiteId, constants_1.WEBSITE_PAGES_FOLDER);
+        try {
+            const existingPageFiles = await this.readdir(ftp, pagesPath);
+            const newPageFiles = new Set(filesToWrite
+                .filter(f => f.path.startsWith(constants_1.WEBSITE_PAGES_FOLDER))
+                .map(f => f.path.replace(`${constants_1.WEBSITE_PAGES_FOLDER}/`, '')));
+            for (const existingFile of existingPageFiles) {
+                if (existingFile.name.endsWith('.json') && !newPageFiles.has(existingFile.name)) {
+                    await this.unlink(ftp, (0, path_1.join)(pagesPath, existingFile.name));
+                }
+            }
+        }
+        catch (error) {
+            // Ignore error if pages directory doesn't exist yet
+        }
+        for (const file of filesToWrite) {
+            const filePath = (0, path_1.join)(storageRootPath, websiteId, file.path);
+            await this.write(ftp, filePath, file.content);
+        }
         this.closeClient(ftp);
     }
     async deleteWebsite(session, websiteId) {

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

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

package/dist/plugins/server/plugins/server/GitlabConnector.js

@@ -50,7 +50,7 @@ const node_fetch_1 = __importDefault(require("node-fetch"));
 const crypto_1 = __importStar(require("crypto"));
 const path_1 = require("path");
 const https_1 = require("https");
-const page_1 = require("../../page");
+const websiteDataSerialization_1 = require("../../server/utils/websiteDataSerialization");
 /**
  * Gitlab connector
  * @fileoverview Gitlab connector for Silex, connect to the user's Gitlab account to store websites
@@ -237,15 +237,21 @@ class GitlabConnector {
             'Content-Type': 'application/json',
         };
         if (method === 'GET' && requestBody) {
-            console.error('Gitlab API error (4) - GET request with body', { url, method, body: requestBody, params });
+            console.error('[GitlabConnector] Invalid GET request: GET requests should not have a body', { url, method, body: requestBody, params });
         }
         // With or without body
         let response;
         const body = requestBody ? JSON.stringify(requestBody) : undefined;
         try {
             if (body && Buffer.byteLength(body) > MAX_BODY_SIZE_KB * 1024) {
-                // TODO: warn the end user
-                console.warn('Gitlab API warning - body too big', Buffer.byteLength(body), 'bytes', { url, method, params });
+                console.warn('[GitlabConnector] Request body size exceeds Gitlab API limit', {
+                    size: Buffer.byteLength(body),
+                    maxAllowed: MAX_BODY_SIZE_KB * 1024,
+                    url,
+                    method,
+                    params,
+                    session,
+                });
             }
             response = await (0, node_fetch_1.default)(url, requestBody && method !== 'GET' ? {
                 agent: this.getAgent(),
@@ -259,8 +265,16 @@ class GitlabConnector {
             });
         }
         catch (e) {
-            console.error('Gitlab API error (0)', e);
-            throw new types_1.ApiError(`Gitlab API error (0): ${e.message} ${e.text} ${e.code} ${e.name} ${e.type}`, 500);
+            console.error('[GitlabConnector] Failed to reach Gitlab API endpoint', {
+                error: e,
+                url,
+                method,
+                body: requestBody,
+                params,
+                session,
+                stack: e?.stack || new Error().stack,
+            });
+            throw new types_1.ApiError(`Could not reach Gitlab API: ${e.message || e}`, 500);
         }
         // Pass the response headers to the caller
         response.headers.forEach((value, name) => responseHeaders[name] = value);
@@ -270,14 +284,30 @@ class GitlabConnector {
                 return await response.text();
             }
             catch (e) {
-                console.error('Gitlab API error (6) - could not parse response', response.status, response.statusText, { url, method, body: requestBody, params }, e);
-                throw new types_1.ApiError(`Gitlab API error (6): response body not available. ${e.message}`, 500);
+                console.error('[GitlabConnector] Failed to read response body from Gitlab API', {
+                    status: response.status,
+                    statusText: response.statusText,
+                    url,
+                    method,
+                    body: requestBody,
+                    params,
+                    error: e
+                });
+                throw new types_1.ApiError(`Gitlab API: Could not read response body (${e.message})`, 500);
             }
         }();
         if (!response.ok) {
-            console.error('Gitlab API error (7) - response not ok', response.status, response.statusText, { url, method, body: requestBody, params, text: text });
+            console.error('[GitlabConnector] Gitlab API responded with error status', {
+                status: response.status,
+                statusText: response.statusText,
+                url,
+                method,
+                body: requestBody,
+                params,
+                responseText: text
+            });
             if (text.includes('A file with this name doesn\'t exist')) {
-                throw new types_1.ApiError('Gitlab API error (5): Not Found', 404);
+                throw new types_1.ApiError('Gitlab API: File not found', 404);
             }
             else if (response.status === 401 && this.getSessionToken(session).token?.refresh_token) {
                 // Refresh the token
@@ -315,18 +345,29 @@ class GitlabConnector {
                 }
                 else {
                     const message = typeof refreshJson?.message === 'object' ? Object.entries(refreshJson.message).map(entry => entry.join(' ')).join(' ') : refreshJson?.message ?? refreshJson?.error ?? response.statusText;
-                    console.error('Gitlab API error (2) - could not refresh token', response.status, response.statusText, { message }, 'refresh_token:', token?.refresh_token);
-                    // Workaround for when the token is invalid
-                    // It happens often which is not normal (refresh token should last 6 months)
+                    console.error('[GitlabConnector] Failed to refresh Gitlab OAuth token', {
+                        status: response.status,
+                        statusText: response.statusText,
+                        message,
+                        refresh_token: token?.refresh_token
+                    });
                     this.logout(session);
-                    // Notify the user
-                    throw new types_1.ApiError(`Gitlab API error (2): ${message}`, response.status);
+                    throw new types_1.ApiError(`Gitlab API: Could not refresh token (${message})`, response.status);
                 }
             }
             else {
                 const message = response.statusText;
-                console.error('Gitlab API error (1)', response.status, response.statusText, { url, method, body: requestBody, params, text: text, message });
-                throw new types_1.ApiError(`Gitlab API error (1): ${message} (${text})`, response.status);
+                console.error('[GitlabConnector] Unhandled Gitlab API error response', {
+                    status: response.status,
+                    statusText: response.statusText,
+                    url,
+                    method,
+                    body: requestBody,
+                    params,
+                    responseText: text,
+                    message
+                });
+                throw new types_1.ApiError(`Gitlab API error: ${message} (${text})`, response.status);
             }
         }
         let json;
@@ -335,12 +376,20 @@ class GitlabConnector {
         }
         catch (e) {
             if (!response.ok) {
-                // A real error
                 throw e;
             }
             else {
-                // Useless error linked to the fact that the response is not JSON
-                console.error('Gitlab API error (3) - could not parse response', response.status, response.statusText, { url, method, body: requestBody, params, text: text });
+                console.error('[GitlabConnector] Response from Gitlab API is not valid JSON', {
+                    statusText: response.statusText,
+                    url,
+                    method,
+                    body: requestBody,
+                    params,
+                    responseText: text,
+                    error: e,
+                    session,
+                    stack: e?.stack || new Error().stack,
+                });
                 return text;
             }
         }
@@ -364,18 +413,30 @@ class GitlabConnector {
         if (!fileRes.ok) {
             const errText = await fileRes.text();
             if (errText.includes('not found') || fileRes.status === 404) {
-                throw new types_1.ApiError('GitLab raw error (5): Not Found', 404);
+                console.error('[GitlabConnector] GitLab raw file not found', {
+                    status: fileRes.status,
+                    statusText: fileRes.statusText,
+                    url: rawUrl,
+                    responseText: errText
+                });
+                throw new types_1.ApiError(`GitLab raw file not found: filePath="${filePath}" (status ${fileRes.status})`, 404);
             }
-            console.error('GitLab raw error (1)', fileRes.status, fileRes.statusText, { rawUrl, errText });
-            throw new types_1.ApiError(`GitLab raw error (1): ${fileRes.statusText} (${errText})`, fileRes.status);
+            console.error('[GitlabConnector] Failed to fetch raw file from GitLab', {
+                filePath,
+                url: rawUrl,
+                status: fileRes.status,
+                statusText: fileRes.statusText,
+                responseText: errText
+            });
+            throw new types_1.ApiError(`Failed to fetch raw file from GitLab: filePath="${filePath}" - ${fileRes.statusText} (${errText})`, fileRes.status);
         }
         try {
             const buffer = await fileRes.buffer();
             return buffer;
         }
         catch (e) {
-            console.error('GitLab raw error (3): could not read buffer', e);
-            throw new types_1.ApiError('GitLab raw error (3): failed to read binary content', 500);
+            console.error('[GitlabConnector] Error reading binary content from GitLab raw file', e);
+            throw new types_1.ApiError('Failed to read binary content from GitLab raw file', 500);
         }
     }
     generateCodeVerifier() {
@@ -561,35 +622,13 @@ class GitlabConnector {
      */
     async readWebsite(session, websiteId) {
         const websiteDataBuf = await this.downloadRawFile(session, websiteId, constants_1.WEBSITE_DATA_FILE);
-        const websiteDataOb = JSON.parse(websiteDataBuf.toString('utf8'));
-        const { fileFormatVersion, ...websiteData } = websiteDataOb;
-        // Check the file format version
-        if (fileFormatVersion !== WEBSITE_DATA_FILE_FORMAT_VERSION) {
-            // This should be handled by a migration mechanism
-            console.warn('Gitlab connector: website data file format version mismatch', fileFormatVersion, '!=', WEBSITE_DATA_FILE_FORMAT_VERSION);
-        }
-        // This happens when the website was just created
-        // Let grapesjs create the pages in the frontend
-        if (!websiteData.pages) {
-            return websiteData;
-        }
-        // Load each page in parallel
-        const pages = await Promise.all(websiteData.pages.map(async (page) => {
-            if (page.isFile) {
-                const name = (0, page_1.getPageSlug)(page.name);
-                const fileName = (`${name}-${page.id}`);
-                const filePath = `${constants_1.WEBSITE_PAGES_FOLDER}/${fileName}.json`;
-                const pageContent = await this.downloadRawFile(session, websiteId, filePath);
-                const res = JSON.parse(pageContent.toString('utf8'));
-                return res;
-            }
-            return page;
-        }));
-        // Read each page file if needed
-        return {
-            ...websiteData,
-            pages,
+        const websiteDataContent = websiteDataBuf.toString('utf8');
+        // Use the common merge function to reconstruct website data
+        const pageLoader = async (pagePath) => {
+            const pageBuffer = await this.downloadRawFile(session, websiteId, pagePath);
+            return pageBuffer.toString('utf8');
         };
+        return await (0, websiteDataSerialization_1.merge)(websiteDataContent, pageLoader);
     }
     /**
      * Create a new website, i.e. a new Gitlab repository with an empty website data file
@@ -603,7 +642,7 @@ class GitlabConnector {
                 name: this.options.repoPrefix + websiteMeta.name,
             }
         });
-        await this.createFile(session, project.id, constants_1.WEBSITE_DATA_FILE, JSON.stringify({}));
+        await this.createFile(session, project.id, constants_1.WEBSITE_DATA_FILE, (0, websiteDataSerialization_1.stringify)({}));
         //await this.createFile(session, project.id, WEBSITE_META_DATA_FILE, JSON.stringify(websiteMeta))
         //await this.updateWebsite(session, project.id, {} as WebsiteData)
         //await this.setWebsiteMeta(session, project.id, websiteMeta)
@@ -625,14 +664,16 @@ class GitlabConnector {
             recursive: false,
         });
         // **
-        // Create the pages for batch upload
-        const pages = websiteData.pages.map((page) => {
-            const fileName = encodeURIComponent(`${(0, page_1.getPageSlug)(page.name)}-${page.id}`);
-            const filePath = `${constants_1.WEBSITE_PAGES_FOLDER}/${fileName}.json`;
-            const content = JSON.stringify(page);
+        // Use the common split function to create files
+        const filesToWrite = (0, websiteDataSerialization_1.split)(websiteData);
+        // **
+        // Process each file to create/update
+        for (const file of filesToWrite) {
+            const filePath = file.path;
+            const content = file.content;
             const newSha = computeGitBlobSha(content, false);
-            const existingSha = existingFiles.get(filePath);
-            if (existingSha) {
+            const existingSha = existingFiles.get(filePath) || (filePath === constants_1.WEBSITE_DATA_FILE ? 'always-update' : undefined);
+            if (existingSha && existingSha !== 'always-update') {
                 if (existingSha !== newSha) {
                     batchActions.push({
                         action: 'update',
@@ -643,24 +684,17 @@ class GitlabConnector {
             }
             else {
                 batchActions.push({
-                    action: 'create',
+                    action: file.path === constants_1.WEBSITE_DATA_FILE ? 'update' : 'create',
                     file_path: filePath,
                     content,
                 });
             }
-            return {
-                name: page.name,
-                id: page.id,
-                isFile: true,
-            };
-        });
+        }
         // **
         // Delete pages that are not in the new website data
+        const newPageFiles = new Set(filesToWrite.filter(f => f.path.startsWith(constants_1.WEBSITE_PAGES_FOLDER)).map(f => f.path));
         for (const filePath of existingFiles.keys()) {
-            const pageName = filePath.replace(/.*\//, '').replace(/\.json$/, '');
-            const pageId = pageName.split('-').pop();
-            const page = websiteData.pages.find((p) => p.id === pageId);
-            if (!page) {
+            if (!newPageFiles.has(filePath)) {
                 batchActions.push({
                     action: 'delete',
                     file_path: filePath,
@@ -668,19 +702,6 @@ class GitlabConnector {
             }
         }
         // **
-        // Add the main website data file
-        const websiteDataWithGitlabPages = {
-            ...websiteData,
-            fileFormatVersion: WEBSITE_DATA_FILE_FORMAT_VERSION,
-            pages,
-        };
-        const websiteJsonContent = JSON.stringify(websiteDataWithGitlabPages);
-        batchActions.push({
-            action: 'update',
-            file_path: constants_1.WEBSITE_DATA_FILE,
-            content: websiteJsonContent,
-        });
-        // **
         // Perform a batch commit
         return this.callApi({
             session,