Merge branch 'master' into renovate/electron-27.x

Enubia · Nov 29, 2023 · 508df97 · 508df97
2 parents 8fc1a2b + 5888b96
commit 508df97
Show file tree

Hide file tree

Showing 18 changed files with 219 additions and 204 deletions.
diff --git a/.editorconfig b/.editorconfig
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -47,7 +47,7 @@ jobs:
 
       - uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4
         with:
-          node-version: 18
+          node-version: 20
 
       - name: install dependencies
         run: pnpm install --frozen-lockfile

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,7 +19,7 @@ jobs:
 
       - uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4
         with:
-          node-version: 18
+          node-version: 20
 
       - name: install dependencies
         run: pnpm install --frozen-lockfile
@@ -43,7 +43,7 @@ jobs:
 
       - uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4
         with:
-          node-version: 18
+          node-version: 20
 
       - name: install dependencies
         run: pnpm install --frozen-lockfile

diff --git a/electron/main/store.ts b/electron/main/store.ts
@@ -39,6 +39,7 @@ export default function createStore() {
                 },
             },
             general: {
+                externalBrowserSources: [],
                 mac: {
                     quitOnClose: false,
                     hideDockIcon: false,
@@ -49,7 +50,7 @@ export default function createStore() {
                 channel: 'latest',
             },
 
-            // Hack to make sure the store is always up to date at first init,
+            // Hack to make sure the store is always up-to-date at first init,
             // default behavior of electron-store
             // being to consider the store in version '0.0.0' by default
             // @ts-ignore https://github.com/sindresorhus/electron-store/issues/256

diff --git a/i18n/locales/en-US.json b/i18n/locales/en-US.json
@@ -59,6 +59,9 @@
                 "hide-dock-icon-options": {
                     "checkbox-label": "Hide dock icon",
                     "info": "If set the app will not appear on the dock once it's launched."
+                },
+                "external-sources": {
+                    "heading": "External Sources"
                 }
             },
             "kap-chat": {

diff --git a/index.html b/index.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
-	<head>
-		<meta charset="UTF-8" />
-		<link rel="icon" type="image/x-icon" href="/favicon.ico" />
-		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-		<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-		<title>Ghost Chat</title>
-	</head>
-	<body>
-		<div id="app"></div>
-		<script type="module" src="/src/app.ts"></script>
-	</body>
+    <head>
+        <meta charset="UTF-8" />
+        <link rel="icon" type="image/x-icon" href="/favicon.ico" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+        <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
+        <title>Ghost Chat</title>
+    </head>
+    <body>
+        <div id="app"></div>
+        <script type="module" src="/src/app.ts"></script>
+    </body>
 </html>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "ghost-chat",
-	"version": "2.3.3",
+	"version": "2.4.0",
 	"private": true,
 	"description": "Standalone twitch chat overlay",
 	"author": {
@@ -56,13 +56,13 @@
 		"electron-store": "8.1.0",
 		"electron-unhandled": "4.0.1",
 		"electron-updater": "6.1.7",
-		"eslint-config-slurp-config": "2.3.0",
+		"eslint-config-slurp-config": "2.3.1",
 		"husky": "8.0.3",
 		"lint-staged": "15.1.0",
 		"release-it": "17.0.0",
 		"rimraf": "5.0.5",
 		"sass": "1.69.5",
-		"typescript": "5.2.2",
+		"typescript": "5.3.2",
 		"vite": "5.0.2",
 		"vite-plugin-electron": "0.15.4",
 		"vite-plugin-electron-renderer": "0.14.5",