Merge branch 'develop'

scripts/generateDocs.ts

@@ -16,7 +16,13 @@ import SharedTagRenderings from "../Customizations/SharedTagRenderings"
 import { writeFile } from "fs"
 import Translations from "../UI/i18n/Translations"
 import * as themeOverview from "../assets/generated/theme_overview.json"
-
+import DefaultGUI from "../UI/DefaultGUI"
+import FeaturePipelineState from "../Logic/State/FeaturePipelineState"
+import LayoutConfig from "../Models/ThemeConfig/LayoutConfig"
+import * as bookcases from "../assets/generated/themes/bookcases.json"
+import { DefaultGuiState } from "../UI/DefaultGuiState"
+import * as fakedom from "fake-dom"
+import Hotkeys from "../UI/Base/Hotkeys"
 function WriteFile(
     filename,
     html: BaseUIElement,
@@ -217,5 +223,13 @@ WriteFile("./Docs/URL_Parameters.md", QueryParameterDocumentation.GenerateQueryP
     "Logic/Web/QueryParameters.ts",
     "UI/QueryParameterDocumentation.ts",
 ])
+if (fakedom === undefined || window === undefined) {
+    throw "FakeDom not initialized"
+}
+new DefaultGUI(
+    new FeaturePipelineState(new LayoutConfig(<any>bookcases)),
+    new DefaultGuiState()
+).setup()
 
+WriteFile("./Docs/Hotkeys.md", Hotkeys.generateDocumentation(), [])
 console.log("Generated docs")

scripts/generateLicenseInfo.ts

@@ -279,7 +279,23 @@ function main(args: string[]) {
     const invalidLicenses = licenseInfos
         .filter((l) => (l.license ?? "") === "")
         .map((l) => `License for artwork ${l.path} is empty string or undefined`)
+
+    let invalid = 0
     for (const licenseInfo of licenseInfos) {
+        const isTrivial =
+            licenseInfo.license
+                .split(";")
+                .map((l) => l.trim().toLowerCase())
+                .indexOf("trivial") >= 0
+        if (licenseInfo.sources.length + licenseInfo.authors.length == 0 && !isTrivial) {
+            invalid++
+            invalidLicenses.push(
+                "Invalid license: No sources nor authors given in the license for " +
+                    JSON.stringify(licenseInfo)
+            )
+            continue
+        }
+
         for (const source of licenseInfo.sources) {
             if (source == "") {
                 invalidLicenses.push(
@@ -294,7 +310,7 @@ function main(args: string[]) {
         }
     }
 
-    if (missingLicenses.length > 0) {
+    if (missingLicenses.length > 0 || invalidLicenses.length) {
         const msg = `There are ${missingLicenses.length} licenses missing and ${invalidLicenses.length} invalid licenses.`
         console.log(missingLicenses.concat(invalidLicenses).join("\n"))
         console.error(msg)