npm - @silexlabs/silex - Versions diffs - 3.0.10-6 → 3.1.0 - Mend

@silexlabs/silex 3.0.10-6 → 3.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (58) hide show

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

@@ -19,9 +19,9 @@
  * Date: 2023-08-28T13:37Z
  */
-/*! @silexlabs/grapesjs-filter-styles - 1.0.1-6 */
+/*! @silexlabs/grapesjs-filter-styles - 1.1.0 */
-/*! @silexlabs/grapesjs-loading - 1.0.11-2 */
+/*! @silexlabs/grapesjs-loading - 1.1.0 */
 /*! grapesjs-style-border - 1.0.4 */

package/dist/client/types.d.ts CHANGED Viewed

@@ -336,4 +336,6 @@ export interface JobData {
 export interface PublicationJobData extends JobData {
     logs: string[][];
     errors: string[][];
+    startTime?: number;
+    endTime?: number;
 }

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

@@ -336,4 +336,6 @@ export interface JobData {
 export interface PublicationJobData extends JobData {
     logs: string[][];
     errors: string[][];
+    startTime?: number;
+    endTime?: number;
 }

package/dist/plugins/server/plugins/server/GitlabConnector.d.ts CHANGED Viewed

@@ -147,13 +147,18 @@ export default class GitlabConnector implements StorageConnector {
     duplicateWebsite(session: GitlabSession, websiteId: string): Promise<void>;
     getWebsiteMeta(session: GitlabSession, websiteId: WebsiteId): Promise<WebsiteMeta>;
     setWebsiteMeta(session: GitlabSession, websiteId: WebsiteId, websiteMeta: WebsiteMetaFileContent): Promise<void>;
-    writeAssets(session: GitlabSession, websiteId: string, files: ConnectorFile[], status?: StatusCallback): Promise<void>;
+    writeAssets(session: GitlabSession, websiteId: string, files: ConnectorFile[], status?: StatusCallback, removeUnlisted?: boolean): Promise<void>;
     readAsset(session: GitlabSession, websiteId: string, fileName: string): Promise<ConnectorFileContent>;
     deleteAssets(session: GitlabSession, websiteId: string, fileNames: string[]): Promise<void>;
     /**
      * List all the files in a folder
      * The result is a map of file paths to their SHA
      */
-    private ls;
+    protected ls({ session, websiteId, recursive, path, }: {
+        session: GitlabSession;
+        websiteId: string;
+        recursive?: boolean;
+        path?: string;
+    }): Promise<Map<string, string>>;
 }
 export {};

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

@@ -58,6 +58,7 @@ const page_1 = require("../../page");
  */
 const MAX_BATCH_UPLOAD_SIZE = 100;
 const MAX_BODY_SIZE_KB = 8 * 1000 * 1024; // 8MB (note that 10 MB PNG → becomes ~13.3 MB → ❌ often too big for Gitlab)
+const WEBSITE_DATA_FILE_FORMAT_VERSION = '1.0.0';
 // interface MetaRepoFileContent {
 //   websites: {
 //     [websiteId: string]: {
@@ -540,8 +541,13 @@ class GitlabConnector {
      */
     async readWebsite(session, websiteId) {
         const websiteDataBuf = await this.downloadRawFile(session, websiteId, constants_1.WEBSITE_DATA_FILE);
-        const websiteData = JSON.parse(websiteDataBuf.toString('utf8'));
-        // If the website pages are not in the main file, we need to read them
+        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) {
@@ -551,7 +557,7 @@ class GitlabConnector {
         const pages = await Promise.all(websiteData.pages.map(async (page) => {
             if (page.isFile) {
                 const name = (0, page_1.getPageSlug)(page.name);
-                const fileName = (`${((0, page_1.getPageSlug)(page.name))}-${page.id}`);
+                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'));
@@ -629,9 +635,23 @@ class GitlabConnector {
             };
         });
         // **
+        // Delete pages that are not in the new website data
+        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) {
+                batchActions.push({
+                    action: 'delete',
+                    file_path: filePath,
+                });
+            }
+        }
+        // **
         // Add the main website data file
         const websiteDataWithGitlabPages = {
             ...websiteData,
+            fileFormatVersion: WEBSITE_DATA_FILE_FORMAT_VERSION,
             pages,
         };
         const websiteJsonContent = JSON.stringify(websiteDataWithGitlabPages);
@@ -772,17 +792,18 @@ class GitlabConnector {
             });
         }
     }
-    async writeAssets(session, websiteId, files, status) {
+    async writeAssets(session, websiteId, files, status, removeUnlisted = false) {
         status && await status({ message: `Preparing ${files.length} files`, status: types_1.JobStatus.IN_PROGRESS });
         // List all the files in assets folder
         const existingFiles = await this.ls({
             session,
             websiteId,
-            recursive: false,
+            recursive: true,
             path: this.options.assetsFolder,
         });
         // Create the actions for the batch
         const filesToUpload = [];
+        const filesToKeep = new Set(files.map(file => this.getAssetPath(file.path, false)));
         for (const file of files) {
             const filePath = this.getAssetPath(file.path, false);
             const content = (await (0, connectors_1.contentToBuffer)(file.content)).toString('base64');
@@ -807,6 +828,17 @@ class GitlabConnector {
                 });
             }
         }
+        // Optionally remove unlisted files
+        if (removeUnlisted) {
+            for (const [existingFilePath] of existingFiles) {
+                if (!filesToKeep.has(existingFilePath)) {
+                    filesToUpload.push({
+                        action: 'delete',
+                        file_path: existingFilePath,
+                    });
+                }
+            }
+        }
         // Split the files into chunks to avoid the number of files limit
         const chunks = [];
         for (let i = 0; i < filesToUpload.length; i += MAX_BATCH_UPLOAD_SIZE) {
@@ -821,17 +853,11 @@ class GitlabConnector {
         // Upload the files in chunks
         for (let chunkIndex = 0; chunkIndex < chunks.length; chunkIndex++) {
             const chunk = chunks[chunkIndex];
-            if (chunks.length > 1) {
-                status && await status({ message: `Batch ${chunkIndex + 1}/${chunks.length}: Downloading ${chunk.length} files`, status: types_1.JobStatus.IN_PROGRESS });
-            }
-            else {
-                status && await status({ message: `Downloading ${files.length} file`, status: types_1.JobStatus.IN_PROGRESS });
-            }
             if (chunks.length > 1) {
                 status && await status({ message: `Batch ${chunkIndex + 1}/${chunks.length}: Uploading ${chunk.length} files`, status: types_1.JobStatus.IN_PROGRESS });
             }
             else {
-                status && await status({ message: `Uploading ${files.length} file`, status: types_1.JobStatus.IN_PROGRESS });
+                status && await status({ message: `Uploading ${files.length} file(s)`, status: types_1.JobStatus.IN_PROGRESS });
             }
             try {
                 await this.callApi({

package/dist/plugins/server/plugins/server/GitlabConnector.js.map CHANGED Viewed

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

package/dist/plugins/server/plugins/server/GitlabHostingConnector.js CHANGED Viewed

@@ -90,6 +90,8 @@ class GitlabHostingConnector extends GitlabConnector_1.default {
         }
         // publishing all files for website
         // Do not await for the result, return the job and continue the publication in the background
+        //this .startPublicationJob(session, websiteId, files, job, () => this.endPublicationJob(session, websiteId, job))
+        console.log('Publishing files to gitlab:', files.map(file => file.path));
         this.writeAssets(session, websiteId, files, async ({ status, message }) => {
             // Update the job status
             if (status === types_1.JobStatus.SUCCESS) {
@@ -152,13 +154,49 @@ class GitlabHostingConnector extends GitlabConnector_1.default {
                 job.message = message;
                 job.logs[0].push(message);
             }
-        })
+        }, true)
             .catch(e => {
             console.error('Error uploading files to gitlab:', e.message);
             jobError(job.jobId, `Failed to upload files: ${e.message}`);
         });
         return job;
     }
+    // async startPublicationJob(session: GitlabSession, websiteId: WebsiteId, files: ConnectorFile[], job: PublicationJobData, endJob: () => void) {
+    //   job.message = `Preparing ${files.length} files...`
+    //   job.logs[0].push(job.message)
+    //   job.status = JobStatus.IN_PROGRESS
+    //   job.startTime = Date.now()
+    //   // List all the files in assets folder
+    //   const existingFiles = await this.ls({
+    //     session,
+    //     websiteId,
+    //     recursive: false,
+    //     path: this.options.assetsFolder,
+    //   })
+    //   // Create the actions for the batch
+    //   const filesToUpload = [] as GitlabAction[]
+    //   for (const file of files) {
+    //     const filePath = this.getAssetPath(file.path, false)
+    //     const content = (await contentToBuffer(file.content)).toString('base64')
+    //     const existingSha = existingFiles.get(filePath)
+    //     const newSha = computeGitBlobSha(content, true)
+    //     if (existingSha) {
+    //       if (existingSha !== newSha) {
+    //         filesToUpload.push({
+    //           action: 'update',
+    //           file_path: filePath,
+    //           content,
+    //           encoding: 'base64',
+    //         })
+    //       } // else: skip unchanged file
+    //     } else {
+    //       filesToUpload.push({
+    //         action: 'create',
+    //         file_path: filePath,
+    //         content,
+    //         encoding: 'base64',
+    //       })
+    //     }
     /* Get and return Url Gitlab Pages */
     async getUrl(session, websiteId) {
         const response = await this.callApi({

package/dist/plugins/server/plugins/server/GitlabHostingConnector.js.map CHANGED Viewed

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

package/dist/plugins/server/types.d.ts CHANGED Viewed

@@ -336,4 +336,6 @@ export interface JobData {
 export interface PublicationJobData extends JobData {
     logs: string[][];
     errors: string[][];
+    startTime?: number;
+    endTime?: number;
 }

package/dist/server/server/cli.js CHANGED Viewed

File without changes

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@silexlabs/silex",
   "description": "Free and easy website builder for everyone.",
-  "version": "3.0.10-6",
+  "version": "3.1.0",
   "version:backwardcompat": "3.0.0",
   "author": {
     "name": "Alex Hoyau",
@@ -105,15 +105,15 @@
   "dependencies": {
     "@fontsource/ubuntu": "^5.0.13",
     "@fortawesome/fontawesome-free": "6.6.0",
-    "@silexlabs/grapesjs-filter-styles": "1.0.1-6",
-    "@silexlabs/grapesjs-fonts": "1.0.22-1",
-    "@silexlabs/grapesjs-keymaps-dialog": "1.0.17-2",
-    "@silexlabs/grapesjs-loading": "1.0.11-2",
-    "@silexlabs/grapesjs-notifications": "0.0.10-0",
-    "@silexlabs/grapesjs-storage-rate-limit": "1.0.9-0",
-    "@silexlabs/grapesjs-symbols": "1.1.7-2",
-    "@silexlabs/grapesjs-ui-suggest-classes": "1.0.24-1",
-    "@silexlabs/silex-plugins": "1.0.12-3",
+    "@silexlabs/grapesjs-filter-styles": "1.1.0",
+    "@silexlabs/grapesjs-fonts": "1.1.0",
+    "@silexlabs/grapesjs-keymaps-dialog": "1.1.0",
+    "@silexlabs/grapesjs-loading": "1.1.0",
+    "@silexlabs/grapesjs-notifications": "0.1.0",
+    "@silexlabs/grapesjs-storage-rate-limit": "1.1.0",
+    "@silexlabs/grapesjs-symbols": "1.2.0",
+    "@silexlabs/grapesjs-ui-suggest-classes": "1.1.0",
+    "@silexlabs/silex-plugins": "1.1.0",
     "@types/archiver": "^6.0.2",
     "adm-zip": "0.5.14",
     "archiver": "^7.0.1",
@@ -141,7 +141,7 @@
     "html-minifier": "^4.0.0",
     "lit-html": "3.2.1",
     "mkdirp": "3.0.1",
-    "node_modules-path": "2.0.9-2",
+    "node_modules-path": "2.1.0",
     "node-fetch": "2.6.9",
     "normalize.css": "8.0.1",
     "npm-run-all": "^4.1.5",

package/src/ts/plugins/server/GitlabConnector.ts CHANGED Viewed

@@ -35,6 +35,7 @@ import { fork } from 'child_process'
 const MAX_BATCH_UPLOAD_SIZE = 100
 const MAX_BODY_SIZE_KB = 8 * 1000 * 1024 // 8MB (note that 10 MB PNG → becomes ~13.3 MB → ❌ often too big for Gitlab)
+const WEBSITE_DATA_FILE_FORMAT_VERSION = '1.0.0'
 export interface GitlabOptions {
   clientId: string
@@ -126,6 +127,7 @@ interface GitlabPage {
 }
 interface GitlabWebsiteData {
+  fileFormatVersion: string
   pages: GitlabPage[]
 }
@@ -650,9 +652,15 @@ export default class GitlabConnector implements StorageConnector {
    */
   async readWebsite(session: GitlabSession, websiteId: string): Promise<WebsiteData> {
     const websiteDataBuf = await this.downloadRawFile(session, websiteId, WEBSITE_DATA_FILE)
-    const websiteData = JSON.parse(websiteDataBuf.toString('utf8')) as GitlabWebsiteData | WebsiteData
+    const websiteDataOb = JSON.parse(websiteDataBuf.toString('utf8')) as GitlabWebsiteData & WebsiteData
+    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)
+    }
-    // If the website pages are not in the main file, we need to read them
     // This happens when the website was just created
     // Let grapesjs create the pages in the frontend
     if (!websiteData.pages) {
@@ -663,7 +671,7 @@ export default class GitlabConnector implements StorageConnector {
     const pages = await Promise.all(websiteData.pages.map(async (page: GitlabPage | Page) => {
       if ((page as GitlabPage).isFile) {
         const name = getPageSlug(page.name)
-        const fileName = (`${(getPageSlug(page.name))}-${page.id}`)
+        const fileName = (`${name}-${page.id}`)
         const filePath = `${WEBSITE_PAGES_FOLDER}/${fileName}.json`
         const pageContent = await this.downloadRawFile(session, websiteId, filePath)
         const res = JSON.parse(pageContent.toString('utf8')) as Page
@@ -748,10 +756,25 @@ export default class GitlabConnector implements StorageConnector {
       }
     })
+    // **
+    // Delete pages that are not in the new website data
+    for (const filePath of existingFiles.keys()) {
+      const pageName = filePath.replace(/.*\//, '').replace(/\.json$/, '')
+      const pageId = pageName.split('-').pop()
+      const page = websiteData.pages.find((p: Page) => p.id === pageId)
+      if (!page) {
+        batchActions.push({
+          action: 'delete',
+          file_path: filePath,
+        })
+      }
+    }
     // **
     // Add the main website data file
     const websiteDataWithGitlabPages = {
       ...websiteData,
+      fileFormatVersion: WEBSITE_DATA_FILE_FORMAT_VERSION,
       pages,
     } as GitlabWebsiteData
@@ -905,19 +928,21 @@ export default class GitlabConnector implements StorageConnector {
     }
   }
-  async writeAssets(session: GitlabSession, websiteId: string, files: ConnectorFile[], status?: StatusCallback): Promise<void> {
+  async writeAssets(session: GitlabSession, websiteId: string, files: ConnectorFile[], status?: StatusCallback, removeUnlisted = false): Promise<void> {
     status && await status({ message: `Preparing ${files.length} files`, status: JobStatus.IN_PROGRESS })
     // List all the files in assets folder
     const existingFiles = await this.ls({
       session,
       websiteId,
-      recursive: false,
+      recursive: true,
       path: this.options.assetsFolder,
     })
     // Create the actions for the batch
     const filesToUpload = [] as GitlabAction[]
+    const filesToKeep = new Set(files.map(file => this.getAssetPath(file.path, false)))
     for (const file of files) {
       const filePath = this.getAssetPath(file.path, false)
       const content = (await contentToBuffer(file.content)).toString('base64')
@@ -942,6 +967,17 @@ export default class GitlabConnector implements StorageConnector {
       }
     }
+    // Optionally remove unlisted files
+    if (removeUnlisted) {
+      for (const [existingFilePath] of existingFiles) {
+        if (!filesToKeep.has(existingFilePath)) {
+          filesToUpload.push({
+            action: 'delete',
+            file_path: existingFilePath,
+          })
+        }
+      }
+    }
     // Split the files into chunks to avoid the number of files limit
     const chunks: GitlabAction[][] = []
@@ -959,16 +995,10 @@ export default class GitlabConnector implements StorageConnector {
     // Upload the files in chunks
     for (let chunkIndex = 0; chunkIndex < chunks.length; chunkIndex++) {
       const chunk = chunks[chunkIndex]
-      if (chunks.length > 1) {
-        status && await status({ message: `Batch ${chunkIndex + 1}/${chunks.length}: Downloading ${chunk.length} files`, status: JobStatus.IN_PROGRESS })
-      } else {
-        status && await status({ message: `Downloading ${files.length} file`, status: JobStatus.IN_PROGRESS })
-      }
       if (chunks.length > 1) {
         status && await status({ message: `Batch ${chunkIndex + 1}/${chunks.length}: Uploading ${chunk.length} files`, status: JobStatus.IN_PROGRESS })
       } else {
-        status && await status({ message: `Uploading ${files.length} file`, status: JobStatus.IN_PROGRESS })
+        status && await status({ message: `Uploading ${files.length} file(s)`, status: JobStatus.IN_PROGRESS })
       }
       try {
         await this.callApi({
@@ -1044,7 +1074,7 @@ export default class GitlabConnector implements StorageConnector {
    * List all the files in a folder
    * The result is a map of file paths to their SHA
    */
-  private async ls({
+  protected async ls({
     session,
     websiteId,
     recursive = false,

package/src/ts/plugins/server/GitlabHostingConnector.ts CHANGED Viewed

@@ -94,6 +94,8 @@ export default class GitlabHostingConnector extends GitlabConnector implements H
     // publishing all files for website
     // Do not await for the result, return the job and continue the publication in the background
+    //this .startPublicationJob(session, websiteId, files, job, () => this.endPublicationJob(session, websiteId, job))
+    console.log('Publishing files to gitlab:', files.map(file => file.path))
     this.writeAssets(session, websiteId, files, async ({status, message}) => {
       // Update the job status
       if(status === JobStatus.SUCCESS) {
@@ -155,7 +157,7 @@ export default class GitlabHostingConnector extends GitlabConnector implements H
         job.message = message
         job.logs[0].push(message)
       }
-    })
+    }, true)
       .catch(e => {
         console.error('Error uploading files to gitlab:', e.message)
         jobError(job.jobId, `Failed to upload files: ${e.message}`)
@@ -164,6 +166,45 @@ export default class GitlabHostingConnector extends GitlabConnector implements H
     return job
   }
+  // async startPublicationJob(session: GitlabSession, websiteId: WebsiteId, files: ConnectorFile[], job: PublicationJobData, endJob: () => void) {
+  //   job.message = `Preparing ${files.length} files...`
+  //   job.logs[0].push(job.message)
+  //   job.status = JobStatus.IN_PROGRESS
+  //   job.startTime = Date.now()
+  //   // List all the files in assets folder
+  //   const existingFiles = await this.ls({
+  //     session,
+  //     websiteId,
+  //     recursive: false,
+  //     path: this.options.assetsFolder,
+  //   })
+  //   // Create the actions for the batch
+  //   const filesToUpload = [] as GitlabAction[]
+  //   for (const file of files) {
+  //     const filePath = this.getAssetPath(file.path, false)
+  //     const content = (await contentToBuffer(file.content)).toString('base64')
+  //     const existingSha = existingFiles.get(filePath)
+  //     const newSha = computeGitBlobSha(content, true)
+  //     if (existingSha) {
+  //       if (existingSha !== newSha) {
+  //         filesToUpload.push({
+  //           action: 'update',
+  //           file_path: filePath,
+  //           content,
+  //           encoding: 'base64',
+  //         })
+  //       } // else: skip unchanged file
+  //     } else {
+  //       filesToUpload.push({
+  //         action: 'create',
+  //         file_path: filePath,
+  //         content,
+  //         encoding: 'base64',
+  //       })
+  //     }
   /* Get and return Url Gitlab Pages */
   async getUrl(session: GitlabSession, websiteId: WebsiteId): Promise<string> {
     const response = await this.callApi({