Merge branch 'v.0.45'

GetPublii · Mar 4, 2024 · 8cb60c9 · 8cb60c9
2 parents a2ce42f + d61037c
commit 8cb60c9
Show file tree

Hide file tree

Showing 75 changed files with 25,353 additions and 22,920 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v16.19.1
+v18.19.0
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@
 [Publii](https://getpublii.com/) is a desktop-based CMS for Windows, Mac and Linux that makes creating static websites fast
 and hassle-free, even for beginners.
 
-**Current version: 0.44.4 (build 16557)**
+**Current version: 0.45.0 (build 16606)**
 
 ## Why Publii?
 Unlike static-site generators that are often unwieldy and difficult to use, Publii provides an
@@ -41,7 +41,7 @@ If you want to build newest version of Publii or contribute to the Publii code,
 ## Getting Started
 You can learn more about getting started in our [User documentation](https://getpublii.com/docs/) or [Developer documentation](https://getpublii.com/dev/).
 If you have any questions or suggestions, or just need some help with using Publii, you can
-visit our [Community Hub](https://getpublii.com/forum) or follow us on [Twitter](https://twitter.com/GetPublii)
+visit our [Community Hub](https://github.com/GetPublii/Publii/discussions) or follow us on [Twitter](https://twitter.com/GetPublii)
 
 ### Learn More
 

diff --git a/app/back-end/app.js b/app/back-end/app.js
@@ -4,8 +4,9 @@
 
 // Necessary packages
 const fs = require('fs-extra');
+const os = require('os');
 const path = require('path');
-const { Database } = require('node-sqlite3-wasm');
+const Database = os.platform() === 'linux' ? require('node-sqlite3-wasm').Database : require('better-sqlite3');
 const compare = require('node-version-compare');
 const normalizePath = require('normalize-path');
 const url = require('url');

diff --git a/app/back-end/builddata.json b/app/back-end/builddata.json
@@ -1,4 +1,4 @@
 {
-  "version": "0.44.4",
-  "build": 16557
-}
+  "version": "0.45.0",
+  "build": 16606
+}
diff --git a/app/back-end/events/deploy.js b/app/back-end/events/deploy.js
@@ -2,6 +2,7 @@ const fs = require('fs-extra');
 const ipcMain = require('electron').ipcMain;
 const Deployment = require('../modules/deploy/deployment.js');
 const childProcess = require('child_process');
+const stripTags = require('striptags');
 
 class DeployEvents {
     constructor(appInstance) {
@@ -123,14 +124,14 @@ class DeployEvents {
                     event.sender.send('app-deploy-render-error', {
                         message: [{
                             message: errorTitle,
-                            desc: errorDesc
+                            desc: stripTags(errorDesc)
                         }]
                     });
                 }
             } else {
                 event.sender.send(data.type, {
                     progress: data.progress,
-                    message: data.message
+                    message: stripTags((data.message).toString())
                 });
             }
         });
@@ -156,7 +157,8 @@ class DeployEvents {
             type: 'dependencies',
             appDir: this.app.appDir,
             sitesDir: this.app.sitesDir,
-            siteConfig: deploymentConfig
+            siteConfig: deploymentConfig,
+            useFtpAlt: this.app.appConfig.experimentalFeatureAppAutoBeautifySourceCode
         });
 
         this.deploymentProcess.on('message', function(data) {
@@ -174,9 +176,14 @@ class DeployEvents {
         });
     }
 
-    testConnection(deploymentConfig, siteName, uuid) {
-        let deployment = new Deployment(this.app.app.getPath('logs'), this.app.sitesDir, deploymentConfig);
-        deployment.testConnection(this.app, deploymentConfig, siteName, uuid);
+    async testConnection(deploymentConfig, siteName, uuid) {
+        let deployment = new Deployment(
+            this.app.app.getPath('logs'), 
+            this.app.sitesDir, 
+            deploymentConfig, 
+            this.app.appConfig.experimentalFeatureAppFtpAlt
+        );
+        await deployment.testConnection(this.app, deploymentConfig, siteName, uuid);
     }
 }
 

diff --git a/app/back-end/events/preview.js b/app/back-end/events/preview.js
@@ -5,6 +5,7 @@ const shell = electron.shell;
 const ipcMain = electron.ipcMain;
 const childProcess = require('child_process');
 const UtilsHelper = require('../helpers/utils.js');
+const stripTags = require('striptags');
 
 class PreviewEvents {
     /**
@@ -90,7 +91,7 @@ class PreviewEvents {
                     event.sender.send('app-preview-render-error', {
                         message: [{
                             message: errorTitle,
-                            desc: errorDesc
+                            desc: stripTags(errorDesc)
                         }]
                     });
                 }
@@ -142,7 +143,7 @@ class PreviewEvents {
             } else {
                 event.sender.send(data.type, {
                     progress: data.progress,
-                    message: data.message
+                    message: stripTags((data.message).toString())
                 });
             }
         });

diff --git a/app/back-end/events/site.js b/app/back-end/events/site.js
@@ -1,11 +1,12 @@
 const fs = require('fs-extra');
+const os = require('os');
 const path = require('path');
 const slug = require('./../helpers/slug');
 const passwordSafeStorage = require('keytar');
 const ipcMain = require('electron').ipcMain;
 const Site = require('../site.js');
 const Themes = require('../themes.js');
-const { Database } = require('node-sqlite3-wasm');
+const Database = os.platform() === 'linux' ? require('node-sqlite3-wasm').Database : require('better-sqlite3');
 const DBUtils = require('../helpers/db.utils.js');
 const UtilsHelper = require('../helpers/utils.js');
 const normalizePath = require('normalize-path');

diff --git a/app/back-end/helpers/db.utils.js b/app/back-end/helpers/db.utils.js
@@ -1,10 +1,13 @@
+const os = require('os');
+
 /*
  * Other helper functions
  */
 class DBUtils {
     constructor (dbInstance) {
         this.DB = dbInstance; 
         this.statement = '';
+        this.useWASM = os.platform() === 'linux';
     }
 
     prepare (sqlStatement) {
@@ -13,30 +16,54 @@ class DBUtils {
     }
 
     get (paramsObject = null) {
-        if (paramsObject) {
-            paramsObject = this.transformParams(paramsObject);
-            return this.DB.get(this.statement, paramsObject);
+        if (this.useWASM) {
+            if (paramsObject) {
+                paramsObject = this.transformParams(paramsObject);
+                return this.DB.get(this.statement, paramsObject);
+            }
+
+            return this.DB.get(this.statement);
         }
 
-        return this.DB.get(this.statement);
+        if (paramsObject !== null) {
+            return this.DB.prepare(this.statement).get(paramsObject);
+        }
+
+        return this.DB.prepare(this.statement).get();
     }
 
     run (paramsObject = null) {
-        if (paramsObject) {
-            paramsObject = this.transformParams(paramsObject);
-            return this.DB.run(this.statement, paramsObject);
+        if (this.useWASM) {
+            if (paramsObject) {
+                paramsObject = this.transformParams(paramsObject);
+                return this.DB.run(this.statement, paramsObject);
+            }
+
+            return this.DB.run(this.statement);
         }
 
-        return this.DB.run(this.statement);
+        if (paramsObject !== null) {
+            return this.DB.prepare(this.statement).run(paramsObject);
+        }
+
+        return this.DB.prepare(this.statement).run();
     }
 
     all (paramsObject = null) {
-        if (paramsObject) {
-            paramsObject = this.transformParams(paramsObject);
-            return this.DB.all(this.statement, paramsObject);
+        if (this.useWASM) {
+            if (paramsObject) {
+                paramsObject = this.transformParams(paramsObject);
+                return this.DB.all(this.statement, paramsObject);
+            }
+
+            return this.DB.all(this.statement);
+        }
+
+        if (paramsObject !== null) {
+            return this.DB.prepare(this.statement).all(paramsObject);
         }
 
-        return this.DB.all(this.statement);
+        return this.DB.prepare(this.statement).all();
     }
 
     exec (sqlQueries) {

diff --git a/app/back-end/helpers/slug.js b/app/back-end/helpers/slug.js
@@ -55,7 +55,10 @@ function createSlug(textToSlugify, filenameMode = false, saveLowerChars = false)
         ['ü', 'ue'], 
         ['Ü', 'UE'], 
         ['ß', 'ss'], 
-        ['ẞ', 'SS']
+        ['ẞ', 'SS'],
+        ['«', ''],
+        ['»', ''],
+        ['$', '']
     ] });
 
     if(!filenameMode) {

diff --git a/app/back-end/helpers/specs/slug.spec.js b/app/back-end/helpers/specs/slug.spec.js
@@ -52,4 +52,17 @@ describe('Slug creation', function() {
         assert.strictEqual('indexhtml', slug('index.html', false));
         assert.strictEqual('index.html', slug('index.html', true));
     });
+
+    it('should remove some special characters', function() {
+        assert.strictEqual('title-with-and-arrows', slug('Title with « and » arrows'));
+        assert.strictEqual('title-with-typoraphical-quotes-and-normal-quotes', slug('Title with „typoraphical quotes“ and "normal quotes"'));
+        assert.strictEqual('title-with-brackets-in-different-forms', slug('Title (with) [brackets] {in} ⟨different forms⟩'));
+        assert.strictEqual('title-with-different-types-of-dashes', slug('Title with different - types – of — dashes'));
+        assert.strictEqual('title-with-many-apostrophes-many-many', slug('Title with many \' apostrophes \‘ many \’ many'));
+        assert.strictEqual('title-with-dots-and-commas', slug('Title with dots . and commas,'));
+        assert.strictEqual('and-another-characters', slug('And another characters ; : ? !'));
+        assert.strictEqual('also-ellipsis', slug('Also ellipsis…'));
+        assert.strictEqual('and-slashes', slug('And slashes \/ \\'));
+        assert.strictEqual('and-other-chars', slug('And other chars * # $ @ ^ % ♥ ☆'));
+    });
 });
diff --git a/app/back-end/image.js b/app/back-end/image.js
@@ -10,7 +10,7 @@ const normalizePath = require('normalize-path');
 const Themes = require('./themes.js');
 const Utils = require('./helpers/utils.js');
 const slug = require('./helpers/slug');
-const Jimp = require('jimp');
+const Jimp = require('./vendor/jimp.custom.js');
 // Default config
 const defaultAstCurrentSiteConfig = require('./../config/AST.currentSite.config');
 let sharp = require('sharp');

diff --git a/app/back-end/migrators/site-config.js b/app/back-end/migrators/site-config.js
@@ -1,7 +1,8 @@
 const fs = require('fs');
 const path = require('path');
+const os = require('os');
 const slug = require('./../helpers/slug');
-const { Database } = require('node-sqlite3-wasm');
+const Database = os.platform() === 'linux' ? require('node-sqlite3-wasm').Database : require('better-sqlite3');
 const DBUtils = require('../helpers/db.utils.js');
 
 class SiteConfigMigrator {

diff --git a/app/back-end/modules/deploy/deployment.js b/app/back-end/modules/deploy/deployment.js
@@ -6,6 +6,7 @@ const normalizePath = require('normalize-path');
 const isBinaryFileSync = require('isbinaryfile').isBinaryFileSync;
 const slug = require('./../../helpers/slug');
 const FTP = require('./ftp.js');
+const FTPAlt = require('./ftp-alt.js');
 const SFTP = require('./sftp.js');
 const S3 = require('./s3.js');
 const Git = require('./git.js');
@@ -37,11 +38,12 @@ class Deployment {
      * @param sitesDir
      * @param siteConfig
      */
-    constructor(appDir, sitesDir, siteConfig) {
+    constructor(appDir, sitesDir, siteConfig, useAltFtp) {
         this.appDir = appDir;
         this.siteConfig = siteConfig;
         this.siteName = this.siteConfig.name;
         this.sitesDir = sitesDir;
+        this.useAltFtp = useAltFtp;
         this.progressOfDeleting = 0;
         this.progressOfUploading = 0;
         this.client = false;
@@ -58,7 +60,7 @@ class Deployment {
      * @param deploymentConfig
      * @param siteName
      */
-    testConnection(app, deploymentConfig, siteName, uuid) {
+    async testConnection(app, deploymentConfig, siteName, uuid) {
         let connection = false;
 
         switch(deploymentConfig.protocol) {
@@ -70,11 +72,17 @@ class Deployment {
             case 'git':             connection = new Git();                         break;
             case 'github-pages':    connection = new GithubPages(deploymentConfig); break;
             case 'gitlab-pages':    connection = new GitlabPages();                 break;
-            default:                connection = new FTP();                         break;
+            default:   
+                if (this.useAltFtp) {             
+                    connection = new FTPAlt();    
+                } else {
+                    connection = new FTP();
+                }               
+                break;
         }
 
         if (connection) {
-            connection.testConnection(app, deploymentConfig, siteName, uuid).then(() => true);
+            await connection.testConnection(app, deploymentConfig, siteName, uuid);
         }
     }
 
@@ -92,7 +100,13 @@ class Deployment {
             case 'netlify':         this.client = new Netlify(this);            break;
             case 'google-cloud':    this.client = new GoogleCloud(this);        break;
             case 'manual':          this.client = new ManualDeployment(this);   break;
-            default:                this.client = new FTP(this);                break;
+            default:                
+                if (this.useAltFtp) {             
+                    this.client = new FTPAlt(this); 
+                } else {
+                    this.client = new FTP(this);
+                }                
+                break;
         }
 
         await this.client.initConnection();