chore: upgrade dependencies

SevenTV · Nov 25, 2023 · 4c0f3b9 · 4c0f3b9
1 parent 29d1812
commit 4c0f3b9
Show file tree

Hide file tree

Showing 16 changed files with 1,444 additions and 1,132 deletions.
diff --git a/.stylelintrc b/.stylelintrc
@@ -4,8 +4,7 @@ extends:
 rules:
     color-function-notation: "legacy"
     declaration-block-no-redundant-longhand-properties:
-        - true
-        - ignoreShorthands: ["/grid/"]
+        - null
 ignoreFiles: ["locale/*.ts"]
 overrides:
     - files: ["**/*.scss"]

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -29,5 +29,8 @@
 				"rules": {}
 			}
 		]
+	},
+	"[typescript]": {
+		"editor.defaultFormatter": "esbenp.prettier-vscode"
 	}
 }
diff --git a/package.json b/package.json
@@ -37,25 +37,25 @@
 	"devDependencies": {
 		"@apollo/client": "^3.8.1",
 		"@floating-ui/dom": "^1.5.1",
-		"@intlify/unplugin-vue-i18n": "^0.12.3",
+		"@intlify/unplugin-vue-i18n": "^1.5.0",
 		"@trivago/prettier-plugin-sort-imports": "^4.2.0",
-		"@types/chrome": "^0.0.243",
+		"@types/chrome": "^0.0.253",
 		"@types/dompurify": "^3.0.2",
 		"@types/fs-extra": "^11.0.1",
-		"@types/marked": "^5.0.1",
+		"@types/marked": "^6.0.0",
 		"@types/node": "^20.5.1",
-		"@types/sharedworker": "^0.0.102",
+		"@types/sharedworker": "^0.0.107",
 		"@types/ua-parser-js": "^0.7.36",
 		"@types/uuid": "^9.0.2",
-		"@typescript-eslint/eslint-plugin": "^5.62.0",
+		"@typescript-eslint/eslint-plugin": "^6.12.0",
 		"@typescript-eslint/parser": "^6.4.0",
 		"@vitejs/plugin-vue": "^4.3.1",
 		"@vue/apollo-composable": "^4.0.0-beta.8",
 		"@vue/compiler-sfc": "^3.3.4",
 		"@vue/eslint-config-prettier": "^8.0.0",
-		"@vue/eslint-config-typescript": "^11.0.3",
+		"@vue/eslint-config-typescript": "^12.0.0",
 		"@vueuse/core": "^10.3.0",
-		"@vueuse/head": "^1.3.1",
+		"@vueuse/head": "^2.0.0",
 		"chokidar": "^3.5.3",
 		"color2k": "^2.0.2",
 		"date-fns": "^2.30.0",
@@ -65,29 +65,31 @@
 		"eslint-plugin-prettier": "^5.0.0",
 		"eslint-plugin-vue": "^9.17.0",
 		"graphql": "^16.8.0",
-		"marked": "^7.0.4",
-		"nanoid": "^4.0.2",
+		"javascript-obfuscator": "^4.1.0",
+		"marked": "^10.0.0",
+		"nanoid": "^5.0.3",
 		"npm-run-all": "^4.1.5",
 		"pinia": "^2.1.6",
 		"postcss-html": "^1.5.0",
 		"postcss-scss": "^4.0.7",
 		"prettier": "^3.0.2",
+		"rollup-plugin-obfuscator": "^1.0.3",
 		"sass": "^1.66.1",
 		"stylelint": "^15.10.3",
 		"stylelint-config-html": "^1.1.0",
 		"stylelint-config-standard": "^34.0.0",
-		"stylelint-config-standard-scss": "^10.0.0",
+		"stylelint-config-standard-scss": "^11.1.0",
 		"stylelint-config-standard-vue": "^1.0.0",
 		"stylelint-scss": "^5.1.0",
 		"terser": "^5.19.2",
 		"tldts": "^6.0.14",
-		"typescript": "^5.1.3",
+		"typescript": "^5.3.2",
 		"ua-parser-js": "^1.0.35",
 		"uuid": "^9.0.0",
-		"vite": "^4.4.9",
+		"vite": "^5.0.2",
 		"vite-plugin-chrome-extension": "^0.0.7",
-		"vue-i18n": "9.2.2",
-		"vue-router": "4.2.4",
+		"vue-i18n": "9.7.1",
+		"vue-router": "4.2.5",
 		"vue-tsc": "^1.8.8",
 		"webextension-polyfill-ts": "^0.26.0"
 	}

diff --git a/src/app/settings/SettingsViewHome.vue b/src/app/settings/SettingsViewHome.vue
@@ -19,55 +19,18 @@
 				</div>
 			</div>
 		</div>
-		<div ref="sidebarEl" class="seventv-settings-home-sidebar seventv-settings-compact">
-			<a
-				v-if="sidebarEl"
-				class="twitter-timeline"
-				noscrollbar="1"
-				noborders="1"
-				transparent="1"
-				data-chrome="noheader nofooter noborders noscrollbar transparent"
-				:data-tweet-limit="10"
-				:data-height="sidebarEl.offsetHeight"
-				:data-theme="theme.toLowerCase()"
-				href="https://twitter.com/Official_7TV?ref_src=twsrc%5Etfw"
-			/>
-		</div>
 	</div>
 </template>
 <script setup lang="ts">
-import { onMounted, ref } from "vue";
-import { storeToRefs } from "pinia";
-import { useStore } from "@/store/main";
-import { useUserAgent } from "@/composable/useUserAgent";
 import Changelog from "@/site/global/Changelog.vue";
 import CloudIcon from "@/assets/svg/icons/CloudIcon.vue";
 import UiScrollable from "@/ui/UiScrollable.vue";
 
-const { theme } = storeToRefs(useStore());
-
-const { browser } = useUserAgent();
-
 const appName = import.meta.env.VITE_APP_NAME;
 const appContainer = import.meta.env.VITE_APP_CONTAINER ?? "Extension";
 const appServer = import.meta.env.VITE_APP_API ?? "Offline";
 const version = import.meta.env.VITE_APP_VERSION;
-const isRemote = seventv.remote || false;
-
-const sidebarEl = ref<HTMLElement | null>(null);
-
-onMounted(() => {
-	// Skip loading the twitter widget on Firefox
-	if (browser.name === "Firefox") return;
-
-	// Insert twitter widget
-	const twitterScript = document.createElement("script");
-	twitterScript.async = true;
-	twitterScript.setAttribute("src", "https://platform.twitter.com/widgets.js");
-	twitterScript.setAttribute("charset", "utf-8");
-
-	document.head.appendChild(twitterScript);
-});
+const isRemote = seventv.hosted || false;
 </script>
 <style scoped lang="scss">
 .seventv-settings-home {
@@ -77,10 +40,6 @@ onMounted(() => {
 
 	@media (width <= 1600px) {
 		grid-template-columns: 1.25fr 0;
-
-		.seventv-settings-home-sidebar {
-			display: none !important;
-		}
 	}
 
 	.seventv-settings-home-body {
@@ -117,10 +76,5 @@ onMounted(() => {
 			}
 		}
 	}
-
-	.seventv-settings-home-sidebar {
-		z-index: 1;
-		overflow: clip;
-	}
 }
 </style>
diff --git a/src/composable/useModule.ts b/src/composable/useModule.ts
@@ -11,19 +11,19 @@ const data = reactive({
 export type PlatformModuleID<P extends Platform> = P extends "KICK"
 	? KickModuleID
 	: P extends "TWITCH"
-	? TwModuleID
-	: P extends "YOUTUBE"
-	? YtModuleID
-	: string;
+	  ? TwModuleID
+	  : P extends "YOUTUBE"
+	    ? YtModuleID
+	    : string;
 
 export type PlatformModuleComponentMap<P extends Platform> = P extends "KICK"
 	? KickModuleComponentMap
 	: P extends "TWITCH"
-	? TwModuleComponentMap
-	: P extends "YOUTUBE"
-	? YtModuleComponentMap
-	: // eslint-disable-next-line @typescript-eslint/no-explicit-any
-	  any;
+	  ? TwModuleComponentMap
+	  : P extends "YOUTUBE"
+	    ? YtModuleComponentMap
+	    : // eslint-disable-next-line @typescript-eslint/no-explicit-any
+	      any;
 
 export type AnyModuleID =
 	| PlatformModuleID<"UNKNOWN">

diff --git a/src/site/site.app.ts b/src/site/site.app.ts
@@ -64,7 +64,7 @@ app.provide("app-id", appID);
 const extensionOrigin = scr?.getAttribute("extension_origin") ?? "";
 app.provide(
 	SITE_WORKER_URL,
-	seventv.remote ? seventv.host_manifest?.worker_file ?? null : null ?? scr?.getAttribute("worker_url"),
+	seventv.hosted ? seventv.host_manifest?.worker_file ?? null : null ?? scr?.getAttribute("worker_url"),
 );
 app.provide(SITE_ASSETS_URL, extensionOrigin + "assets");
 app.provide(SITE_EXT_OPTIONS_URL, extensionOrigin + "index.html");
@@ -76,7 +76,7 @@ app.use(createPinia())
 	.mount("#seventv-root");
 
 // unlink built-in stylesheet while in hosted mode
-if (seventv.remote) {
+if (seventv.hosted) {
 	const sheets = document.querySelectorAll<HTMLLinkElement>("#seventv-stylesheet");
 	for (let i = 0; i < sheets.length; i++) {
 		const sheet = sheets.item(i);

diff --git a/src/site/site.normal.ts b/src/site/site.normal.ts
@@ -0,0 +1,3 @@
+export function loadSite() {
+	import("./site.app");
+}
diff --git a/src/site/site.ts b/src/site/site.ts
@@ -1,10 +1,12 @@
 import { log } from "@/common/Logger";
 import { semanticVersionToNumber } from "@/common/Transform";
+import { loadSite } from "./site.normal";
 
 (async () => {
-	const manifestURL = `${import.meta.env.VITE_APP_HOST}/manifest${
-		import.meta.env.VITE_APP_VERSION_BRANCH ? "." + import.meta.env.VITE_APP_VERSION_BRANCH.toLowerCase() : ""
-	}.json`;
+	const host: string = import.meta.env.VITE_APP_HOST;
+	const versionBranch: string = import.meta.env.VITE_APP_VERSION_BRANCH;
+
+	const manifestURL = `${host}/manifest${versionBranch ? "." + versionBranch.toLowerCase() : ""}.json`;
 
 	const manifest = await fetch(manifestURL)
 		.then((res) => res.json())
@@ -17,29 +19,29 @@ import { semanticVersionToNumber } from "@/common/Transform";
 		host_manifest: manifest ?? null,
 	};
 
-	if (manifest && hostedVersion > localVersion) {
-		seventv.remote = true;
+	if (!manifest || hostedVersion <= localVersion) {
+		log.info("<Site>", "Using Local Mode,", "v" + import.meta.env.VITE_APP_VERSION);
+		loadSite();
+	} else {
+		seventv.hosted = true;
 
-		const scr = document.createElement("script");
-		scr.id = "seventv-site-hosted";
-		scr.src = manifest.index_file;
-		scr.type = "module";
+		const v1 = document.createElement("script");
+		v1.id = "seventv-site-hosted";
+		v1.src = manifest.index_file;
+		v1.type = "module";
 
-		const style = document.createElement("link");
-		style.rel = "stylesheet";
-		style.type = "text/css";
-		style.href = manifest.stylesheet_file;
-		style.setAttribute("charset", "utf-8");
-		style.setAttribute("content", "text/html");
-		style.setAttribute("http-equiv", "content-type");
-		style.id = "seventv-stylesheet";
+		const v2 = document.createElement("link");
+		v2.rel = "stylesheet";
+		v2.type = "text/css";
+		v2.href = manifest.stylesheet_file;
+		v2.setAttribute("charset", "utf-8");
+		v2.setAttribute("content", "text/html");
+		v2.setAttribute("http-equiv", "content-type");
+		v2.id = "seventv-stylesheet";
 
-		document.head.appendChild(style);
-		document.head.appendChild(scr);
+		document.head.appendChild(v2);
+		document.head.appendChild(v1);
 
 		log.info("<Site>", "Using Hosted Mode,", "v" + manifest.version);
-	} else {
-		import("./site.app");
-		log.info("<Site>", "Using Local Mode,", "v" + import.meta.env.VITE_APP_VERSION);
 	}
 })();
diff --git a/src/types/app.d.ts b/src/types/app.d.ts
@@ -5,7 +5,7 @@ declare interface SeventvGlobalScope {
 		stylesheet_file: string;
 		index_file: string;
 	};
-	remote?: boolean;
+	hosted?: boolean;
 }
 
 declare const seventv: SeventvGlobalScope;

diff --git a/src/types/react.d.ts b/src/types/react.d.ts
@@ -853,8 +853,8 @@ declare namespace React {
 		T extends JSXElementConstructor<infer P>
 			? P
 			: T extends keyof JSX.IntrinsicElements
-			? JSX.IntrinsicElements[T]
-			: {};
+			  ? JSX.IntrinsicElements[T]
+			  : {};
 	type ComponentPropsWithRef<T extends ElementType> = T extends new (props: infer P) => Component<any, any>
 		? PropsWithoutRef<P> & RefAttributes<InstanceType<T>>
 		: PropsWithRef<ComponentProps<T>>;
@@ -865,8 +865,8 @@ declare namespace React {
 	>
 		? Method
 		: ComponentPropsWithRef<T> extends RefAttributes<infer Method>
-		? Method
-		: never;
+		  ? Method
+		  : never;
 
 	// will show `Memo(${Component.displayName || Component.name})` in devtools by default,
 	// but can be given its own specific name
@@ -3058,8 +3058,8 @@ declare namespace React {
 		[K in keyof T]?: null extends T[K]
 			? Validator<T[K] | null | undefined>
 			: undefined extends T[K]
-			? Validator<T[K] | null | undefined>
-			: Validator<T[K]>;
+			  ? Validator<T[K] | null | undefined>
+			  : Validator<T[K]>;
 	};
 
 	interface ReactPropTypes {
@@ -3155,12 +3155,12 @@ type MergePropTypes<P, T> =
 		? IsExactlyAny<P> extends true
 			? T // If declared props have indexed properties, ignore inferred props entirely as keyof gets widened
 			: string extends keyof P
-			? P // Prefer declared types which are not exactly any
-			: Pick<P, NotExactlyAnyPropertyKeys<P>> &
-					// For props which are exactly any, use the type inferred from propTypes if present
-					Pick<T, Exclude<keyof T, NotExactlyAnyPropertyKeys<P>>> &
-					// Keep leftover props not specified in propTypes
-					Pick<P, Exclude<keyof P, keyof T>>
+			  ? P // Prefer declared types which are not exactly any
+			  : Pick<P, NotExactlyAnyPropertyKeys<P>> &
+						// For props which are exactly any, use the type inferred from propTypes if present
+						Pick<T, Exclude<keyof T, NotExactlyAnyPropertyKeys<P>>> &
+						// Keep leftover props not specified in propTypes
+						Pick<P, Exclude<keyof P, keyof T>>
 		: never;
 
 type InexactPartial<T> = { [K in keyof T]?: T[K] | undefined };
@@ -3183,7 +3183,7 @@ type ReactManagedAttributes<C, P> = C extends {
 }
 	? Defaultize<MergePropTypes<P, PropTypes.InferProps<T>>, D>
 	: C extends { propTypes: infer T }
-	? MergePropTypes<P, PropTypes.InferProps<T>>
-	: C extends { defaultProps: infer D }
-	? Defaultize<P, D>
-	: P;
+	  ? MergePropTypes<P, PropTypes.InferProps<T>>
+	  : C extends { defaultProps: infer D }
+	    ? Defaultize<P, D>
+	    : P;
diff --git a/vite.config.background.ts b/vite.config.background.ts
@@ -12,7 +12,7 @@ export default defineConfig(() => {
 		...loadEnv(mode, process.cwd()),
 		VITE_APP_NAME: appName,
 		VITE_APP_VERSION: getFullVersion(isNightly),
-		VITE_APP_VERSION_BRANCH: process.env.BRANCH,
+		VITE_APP_VERSION_BRANCH: process.env.BRANCH || "",
 	};
 
 	return {

diff --git a/vite.config.content.ts b/vite.config.content.ts
@@ -14,7 +14,7 @@ export default defineConfig(() => {
 		...loadEnv(mode, process.cwd()),
 		VITE_APP_NAME: appName,
 		VITE_APP_VERSION: fullVersion,
-		VITE_APP_VERSION_BRANCH: process.env.BRANCH,
+		VITE_APP_VERSION_BRANCH: process.env.BRANCH || "",
 		VITE_APP_STYLESHEET_NAME: `seventv.style.${fullVersion}.css`,
 	};
 

diff --git a/vite.config.hosted.ts b/vite.config.hosted.ts
@@ -16,7 +16,7 @@ export default defineConfig(() => {
 		...loadEnv(mode, process.cwd()),
 		VITE_APP_NAME: appName,
 		VITE_APP_VERSION: fullVersion,
-		VITE_APP_VERSION_BRANCH: process.env.BRANCH,
+		VITE_APP_VERSION_BRANCH: process.env.BRANCH || "",
 		VITE_APP_CHANGELOG: fs.readFileSync(
 			r(
 				{