Merge branch 'master' into feature/202409_iterationcount

# Conflicts: # starskydesktop/package-lock.json
qdraw · Sep 2, 2024 · 294cb25 · 294cb25
2 parents bfd7890 + c546e7d
commit 294cb25
Show file tree

Hide file tree

Showing 8 changed files with 9,321 additions and 86 deletions.
diff --git a/documentation/package-lock.json b/documentation/package-lock.json
diff --git a/starsky-tools/end2end/package-lock.json b/starsky-tools/end2end/package-lock.json
diff --git a/starsky-tools/end2end/package.json b/starsky-tools/end2end/package.json
@@ -23,15 +23,15 @@
     "update:yes": "npm run update:install"
   },
   "devDependencies": {
-    "@types/node": "^20.14.2",
+    "@types/node": "^20.14.15",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",
-    "cypress": "^13.11.0",
+    "cypress": "^13.13.2",
     "eslint": "^8.56.0",
     "eslint-config-standard-with-typescript": "^43.0.1",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^6.2.0",
+    "eslint-plugin-promise": "^6.6.0",
     "typescript": "^5.4.5"
   }
 }
diff --git a/starsky-tools/thumbnail/package-lock.json b/starsky-tools/thumbnail/package-lock.json
diff --git a/starsky-tools/thumbnail/package.json b/starsky-tools/thumbnail/package.json
@@ -27,7 +27,7 @@
     "p-iteration": "^1.1.8"
   },
   "devDependencies": {
-    "@types/node": "^20.14.14",
+    "@types/node": "^20.14.15",
     "concurrently": "^8.2.2",
     "typescript": "^5.5.4"
   }

diff --git a/starsky/starsky.feature.webhtmlpublish/Services/WebHtmlPublishService.cs b/starsky/starsky.feature.webhtmlpublish/Services/WebHtmlPublishService.cs
@@ -421,15 +421,16 @@ await _hostFileSystemStorage.WriteStreamAsync(_subPathStorage.ReadStream(subPath
 		/// </summary>
 		/// <param name="fullFileParentFolderPath">One folder deeper than where the folder </param>
 		/// <param name="itemName">blog item name</param>
-		/// <param name="renderCopyResult"></param>
+		/// <param name="renderCopyResult">[[string,bool],[]]</param>
 		/// <param name="deleteFolderAfterwards"></param>
 		public async Task GenerateZip(string fullFileParentFolderPath, string itemName,
 			Dictionary<string, bool>? renderCopyResult,
 			bool deleteFolderAfterwards = false)
 		{
 			ArgumentNullException.ThrowIfNull(renderCopyResult);
 
-			var fileNames = renderCopyResult.Where(p => p.Value).Select(p => p.Key).ToList();
+			// to keep non publish files out use Where(p => p.Value)
+			var fileNames = renderCopyResult.Select(p => p.Key).ToList();
 
 			var slugItemName = GenerateSlugHelper.GenerateSlug(itemName, true);
 			var filePaths = fileNames