Merge branch 'master' into master

SpacingBat3 · Aug 23, 2022 · bee510e · bee510e
2 parents 2c3afba + 503fe8b
commit bee510e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -40,4 +40,9 @@ jobs:
         run: npm install
 
       - name: Generate artifacts (${{ matrix.arch }})
-        run: npm run make -- -a ${{ matrix.arch }}
+        run: npm run make -- -a ${{ matrix.arch }}
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: ${{ matrix.name }}
+          path: out/*/make/**/*
diff --git a/package.json b/package.json
@@ -40,7 +40,6 @@
     "@electron/fuses": "^1.5.0",
     "@reforged/maker-appimage": "^1.0.2",
     "@tsconfig/node16-strictest": "^1.0.0",
-    "@types/dompurify": "^2.3.3",
     "@types/marked": "^4.0.2",
     "@types/node": "^18.6.4",
     "@types/semver": "^7.3.9",

diff --git a/sources/code/renderer/preload/docs.ts b/sources/code/renderer/preload/docs.ts
@@ -41,7 +41,7 @@ function getId(url:string) {
 }
 
 function loadMarkdown(mdBody: HTMLElement, mdFile: string) {
-  mdBody.innerHTML = sanitize(marked.parse(readFileSync(mdFile).toString()));
+  mdBody.innerHTML = sanitize(marked.parse(readFileSync(mdFile).toString()), {});
 }
 
 function setBody(mdBody: HTMLElement, mdHeader: HTMLElement, mdFile: string, mdArticle: HTMLElement) {

diff --git a/sources/code/renderer/preload/settings.ts b/sources/code/renderer/preload/settings.ts
@@ -69,9 +69,9 @@ function generateSettings(optionsGroups: htmlConfig) {
           const pDesc = document.createElement("p");
           const formContainer = document.createElement("form");
 
-          h2.innerHTML = sanitize(setting.name);
+          h2.innerHTML = sanitize(setting.name, {});
           pDesc.classList.add("description");
-          pDesc.innerHTML = sanitize(setting.description);
+          pDesc.innerHTML = sanitize(setting.description, {});
           formContainer.classList.add("settingsContainer");
 
           if("radio" in setting) {
@@ -152,7 +152,7 @@ function createForm(form:CheckBoxForm|RadioForm){
     inputLabel.classList.add("disabled");
   }
   inputTag.addEventListener("change", fetchFromWebsite);
-  inputLabel.innerHTML = sanitize(form.label+(inputTag.title !== "" ? " 🛈" : ""));
+  inputLabel.innerHTML = sanitize(form.label+(inputTag.title !== "" ? " 🛈" : ""), sanitizeConfig);
   inputForm.appendChild(inputTag);
   inputForm.appendChild(inputLabel);
   return inputForm;