Merge branch 'v.0.39.1'

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.39.0 (build 15465)**
+**Current version: 0.39.1 (build 15483)**
 
 ## Why Publii?
 Unlike static-site generators that are often unwieldy and difficult to use, Publii provides an

app/back-end/builddata.json

@@ -1 +1 @@
-{"version":"0.39.0","build":15465}
+{"version":"0.39.1","build":15483}

app/back-end/modules/deploy/google-cloud.js

@@ -32,8 +32,14 @@ class GoogleCloud {
             return;
         }
 
+        let keyData = require(keyFilePath); 
+
         let gcs = new Storage({
-            credentials: require(keyFilePath)
+            projectId: keyData.project_id,
+            credentials: {
+                client_email: keyData.client_email,
+                private_key: keyData.private_key
+            }
         });
 
         this.connection = gcs.bucket(bucketName);
@@ -268,8 +274,14 @@ class GoogleCloud {
             return;
         }
 
+        let keyData = require(keyFilePath); 
+
         let gcs = new Storage({
-            credentials: require(keyFilePath)
+            projectId: keyData.project_id,
+            credentials: {
+                client_email: keyData.client_email,
+                private_key: keyData.private_key
+            }
         });
 
         let bucket = gcs.bucket(bucketName);

app/back-end/modules/render-html/contexts/post-preview.js

@@ -41,7 +41,7 @@ class RendererContextPostPreview extends RendererContext {
         let postURL = this.siteConfig.domain + '/preview.html';
         let preparedText = this.prepareContent(this.renderer.postData.text, this.renderer.postData.id);
         let hasCustomExcerpt = false;
-        let readmoreMatches = preparedText.match(/\<hr\s+id=["']{1}read-more["']{1}[\s\S]{1,}?\/?\>/gmi);
+        let readmoreMatches = preparedText.match(/\<hr\s+id=["']{1}read-more["']{1}[\s\S]*?\/?\>/gmi);
 
         if (readmoreMatches && readmoreMatches.length) {
             hasCustomExcerpt = true;
@@ -53,7 +53,7 @@ class RendererContextPostPreview extends RendererContext {
             slug: this.renderer.postData.slug,
             author: this.renderer.cachedItems.authors[this.renderer.postData.author],
             url: postURL,
-            text: preparedText.replace(/\<hr\s+id=["']{1}read-more["']{1}[\s\S]{1,}?\/?\>/gmi, ''),
+            text: preparedText.replace(/\<hr\s+id=["']{1}read-more["']{1}[\s\S]*?\/?\>/gmi, ''),
             excerpt: ContentHelper.prepareExcerpt(this.themeConfig.config.excerptLength, preparedText),
             createdAt: this.renderer.postData.creationDate,
             modifiedAt: this.renderer.postData.modificationDate,
@@ -485,7 +485,7 @@ class RendererContextPostPreview extends RendererContext {
         preparedText = preparedText.replace(/contentEditable="true"/gi, '');
 
         // Remove read more text
-        preparedText = preparedText.replace(/\<hr\s+id=["']{1}read-more["']{1}[\s\S]{1,}?\/?\>/gmi, '');
+        preparedText = preparedText.replace(/\<hr\s+id=["']{1}read-more["']{1}[\s\S]*?\/?\>/gmi, '');
 
         // Remove the last empty paragraph
         preparedText = preparedText.replace(/<p>&nbsp;<\/p>\s?$/gmi, '');

app/back-end/modules/render-html/helpers/content.js

@@ -162,10 +162,10 @@ class ContentHelper {
      */
     static prepareExcerpt(length, text) {
         // Detect readmore
-        let readmoreMatches = text.match(/\<hr\s+id=["']{1}read-more["']{1}[\s\S]{1,}?\/?\>/gmi);
+        let readmoreMatches = text.match(/\<hr\s+id=["']{1}read-more["']{1}[\s\S]*?\/?\>/gmi);
 
         if(readmoreMatches && readmoreMatches.length) {
-            text = text.split(/\<hr\s+id=["']{1}read-more["']{1}[\s\S]{1,}?\/?\>/gmi);
+            text = text.split(/\<hr\s+id=["']{1}read-more["']{1}[\s\S]*?\/?\>/gmi);
             text = text[0];
             return text;
         }

app/back-end/modules/render-html/items/post.js

@@ -39,17 +39,17 @@ class PostItem {
         let preparedExcerpt = ContentHelper.prepareExcerpt(this.themeConfig.config.excerptLength, preparedText);
         preparedExcerpt = ContentHelper.setInternalLinks(preparedExcerpt, this.renderer);
         let hasCustomExcerpt = false;
-        let readmoreMatches = preparedText.match(/\<hr\s+id=["']{1}read-more["']{1}[\s\S]{1,}?\/?\>/gmi);
+        let readmoreMatches = preparedText.match(/\<hr\s+id=["']{1}read-more["']{1}[\s\S]*?\/?\>/gmi);
 
         if (readmoreMatches && readmoreMatches.length) {
             hasCustomExcerpt = true;
 
             // Detect if hide of the custom excerpt is enabled
             if (this.renderer.siteConfig.advanced.postUseTextWithoutCustomExcerpt) {
-                preparedText = preparedText.split(/\<hr\s+id=["']{1}read-more["']{1}[\s\S]{1,}?\/?\>/gmi);
+                preparedText = preparedText.split(/\<hr\s+id=["']{1}read-more["']{1}[\s\S]*?\/?\>/gmi);
                 preparedText = preparedText[1];
             } else {
-                preparedText = preparedText.replace(/\<hr\s+id=["']{1}read-more["']{1}[\s\S]{1,}?\/?\>/gmi, '');
+                preparedText = preparedText.replace(/\<hr\s+id=["']{1}read-more["']{1}[\s\S]*?\/?\>/gmi, '');
             }
         }
 

app/back-end/site.js

@@ -363,7 +363,7 @@ class Site {
                 return;
             }
 
-            if(data.type === 'finished') {
+            if (data.type === 'finished') {
                 sender.send('app-site-regenerate-thumbnails-success', true);
             }
         });

app/back-end/workers/thumbnails/regenerate.js

@@ -83,15 +83,22 @@ function regenerateImage (images, fullPath, catalog) {
     if (promises[0] === 'NO-RESPONSIVE-IMAGES') {
         process.send({
             type: 'progress',
-            value: 100,
+            value: parseInt((context.totalProgress / context.numberOfImages) * 100, 10),
             files: [
                 {
                     translation: 'core.images.responsiveImagesDisabled'
                 }
             ]
         });
 
-        finishProcess();
+        context.totalProgress++;
+
+        if (context.totalProgress >= context.numberOfImages) {
+            finishProcess();
+        } else {
+            regenerateImage(images, fullPath, catalog);
+        }
+
         return;
     }
 
@@ -213,6 +220,8 @@ function getImageType(context, image, catalog) {
  * @private
  */
 function finishProcess() {
+    console.log('Finish process...');
+
     process.send({
         type: 'finished'
     });

app/default-files/default-themes/simple/assets/css/main.css

@@ -1121,7 +1121,7 @@ textarea {
   color: var(--nav-link-color) !important;
 }
 .navbar .navbar__toggle {
-  background: var(--dark);
+  background: var(--section-bg);
   -webkit-box-shadow: none;
           box-shadow: none;
   border: none;
@@ -1233,7 +1233,7 @@ textarea {
 }
 
 .navbar_mobile_overlay {
-  background: var(--white);
+  background: var(--page-bg);
   height: calc(100vh - 4.4rem);
   left: 0;
   opacity: 1;
@@ -1307,7 +1307,7 @@ textarea {
 }
 
 .navbar_mobile_sidebar {
-  background: var(--white);
+  background: var(--page-bg);
   -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.25);
           box-shadow: 0 0 5px rgba(0, 0, 0, 0.25);
   height: 100vh;

app/default-files/default-themes/simple/config.json

@@ -1,6 +1,6 @@
 {
     "name": "Simple",
-    "version": "2.4.0.0",
+    "version": "2.4.1.0",
     "author": "TidyCustoms <https://tidycustoms.net/>",
     "menus": {
         "mainMenu": "Main menu"

app/package.json

@@ -1,7 +1,7 @@
 {
   "productName": "Publii",
   "name": "Publii",
-  "version": "0.39.0",
+  "version": "0.39.1",
   "description": "Static Site CMS",
   "main": "main.js",
   "scripts": {

app/src/components/LanguagesListItem.vue

@@ -61,7 +61,10 @@ export default {
             return false;
         },
         isOutdated () {
-            if (compare(this.languageData.publiiSupport, this.$store.state.app.versionInfo.version) === -1) {
+            let publiiSupport = this.languageData.publiiSupport.split('.').slice(0, 2).join('.');
+            let currentMajorVersion = this.$store.state.app.versionInfo.version.split('.').slice(0, 2).join('.');
+           
+            if (compare(publiiSupport, currentMajorVersion) === -1) {
                 return true;
             }
 

app/src/components/SyncPopup.vue

@@ -55,7 +55,7 @@
                 <div class="buttons">
                     <p-button
                         v-if="isManual"
-                        type="primary medium quarter-width"
+                        type="primary medium green quarter-width"
                         :onClick="showFolder">
                         {{ $t('sync.getWebsiteFiles') }}
                     </p-button>

app/src/components/block-editor/components/default-blocks/publii-code/block.vue

@@ -3,7 +3,6 @@
     <prism-editor
       :class="{ 'publii-block-code': true }"
       ref="block"
-      @paste="pastePlainText"
       @focus="updateCurrentBlockID"
       @keyup="handleKeyboard($event); debouncedSave()"
       :code="content"

app/src/components/block-editor/components/default-blocks/publii-html/block.vue

@@ -3,7 +3,6 @@
     <prism-editor
       :class="{ 'publii-block-html': true, 'is-visible': true }"
       ref="block"
-      @paste="pastePlainText"
       @keyup="handleKeyboard($event); debouncedSave()"
       @focus="updateCurrentBlockID"
       :code="content"

package.json

@@ -1,7 +1,7 @@
 {
   "productName": "Publii",
   "name": "Publii",
-  "version": "0.39.0",
+  "version": "0.39.1",
   "description": "Static Site CMS",
   "homepage": "https://getpublii.com",
   "author": {