adapt for additional upstream changes

KentoNishi · KentoNishi · commit c115bb111ace · 2025-04-15T11:56:00.000-04:00
diff --git a/package.json b/package.json
@@ -64,6 +64,5 @@
     "vite": "2.9.16",
     "vite-plugin-web-extension": "^1.4.0",
     "vite-plugin-zip-pack": "1.0.7"
-  },
-  "dependencies": {}
+  }
 }
diff --git a/src/components/YtcFilterSetup.svelte b/src/components/YtcFilterSetup.svelte
@@ -4,7 +4,6 @@
   import '../stylesheets/ui.css';
   import '../stylesheets/line.css';
   import { exioButton, exioComponent, exioIcon, exioZoomInAnimation } from 'exio/svelte';
-  import { getBrowser, Browser } from '../ts/chat-constants';
   import { onMount } from 'svelte';
   import ExioRadios from './common/ExioRadios.svelte';
   import { downloadV2Data, getV2Storage, migrateV2toV3, readFromJson } from '../ts/ytcf-logic';
@@ -23,7 +22,7 @@
   let v2BackupSkipped = false;
   onMount(async () => {
     if (paramsTabId != null && paramsFrameId != null && paramsTabId.length >= 1 && paramsFrameId.length >= 1) {
-      if (getBrowser() === Browser.FIREFOX) {
+      if (__BROWSER__ === 'firefox') {
         const frameInfo = {
           tabId: parseInt(paramsTabId),
           frameId: parseInt(paramsFrameId)
diff --git a/src/hyperchat.html b/src/hyperchat.html
@@ -1,24 +1,20 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="UTF-8">
-    <link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900|Material+Icons&display=swap" rel="stylesheet">
 
 <head>
   <meta charset="UTF-8">
-  <link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900|Material+Icons&display=swap" rel="stylesheet">
+  <link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900|Material+Icons&display=swap"
+    rel="stylesheet">
   <script defer="defer" type="module" src="/hyperchat.ts"></script>
-  <title>YtcFilter Popout</title>
-  <style id="shift-screenshot"></style>
-  <style>
-    body {
-      background-color: transparent;
-    }
-  </style>
 </head>
+<title>YtcFilter Popout</title>
+<style id="shift-screenshot"></style>
+<style>
+  body {
+    background-color: transparent;
+  }
+</style>
 
-<body style="background-color: transparent;">
-  <body>
-    <script type="module" src="/hyperchat.ts"></script>
-  </body>
-</html>
+<body style="background-color: transparent;" />
+
+</html>
diff --git a/src/options.html b/src/options.html
@@ -1,20 +1,19 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="UTF-8">
-    <link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900|Material+Icons&display=swap" rel="stylesheet">
 
 <head>
   <meta charset="UTF-8">
   <link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900|Material+Icons&display=swap"
     rel="stylesheet">
-  <title>YtcFilter Settings</title>
-  <style>
-    /* Ensure the window's big enough when in the action popup */
-    html {
-      min-height: 50em;
-      min-width: 50em;
-    }
-  </style>
-  <script defer="defer" type="module" src="/options.ts"></script>
 </head>
+<title>YtcFilter Settings</title>
+<style>
+  /* Ensure the window's big enough when in the action popup */
+  html {
+    min-height: 50em;
+    min-width: 50em;
+  }
+</style>
+<script defer="defer" type="module" src="/options.ts"></script>
+
+</html>
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,5 @@`
`64`	`64`	`"vite": "2.9.16",`
`65`	`65`	`"vite-plugin-web-extension": "^1.4.0",`
`66`	`66`	`"vite-plugin-zip-pack": "1.0.7"`
`67`		`- },`
`68`		`- "dependencies": {}`
	`67`	`+ }`
`69`	`68`	`}`