Add import order prettier plugin

.prettierrc

@@ -1,8 +0,0 @@
-{
-	"useTabs": true,
-	"singleQuote": true,
-	"trailingComma": "none",
-	"printWidth": 100,
-	"plugins": ["prettier-plugin-svelte"],
-	"overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }]
-}

.prettierrc.cjs

@@ -0,0 +1,17 @@
+// @ts-check
+
+/** @type {import("prettier").Config} */
+module.exports = {
+	useTabs: true,
+	singleQuote: true,
+	trailingComma: 'none',
+	printWidth: 100,
+	plugins: ['prettier-plugin-svelte', '@ianvs/prettier-plugin-sort-imports'],
+	/* prettier-plugin-svelte */
+	overrides: [{ files: '*.svelte', options: { parser: 'svelte' } }],
+	/* @ianvs/prettier-plugin-sort-imports */
+	importOrder: ['^~/(.*)$', '^./(.*)$', ''],
+	importOrderParserPlugins: ['typescript'],
+	importOrderTypeScriptVersion: '5.0.0',
+	importOrderCaseSensitive: false
+};

eslint.config.mjs

@@ -1,5 +1,5 @@
-import prettier from 'eslint-config-prettier';
 import js from '@eslint/js';
+import prettier from 'eslint-config-prettier';
 import svelte from 'eslint-plugin-svelte';
 import ts from 'typescript-eslint';
 

package-lock.json

@@ -1,14 +1,15 @@
 {
 	"name": "stream-bypass",
-	"version": "3.1.2",
+	"version": "3.1.3",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "stream-bypass",
-			"version": "3.1.2",
+			"version": "3.1.3",
 			"license": "MIT",
 			"devDependencies": {
+				"@ianvs/prettier-plugin-sort-imports": "^4.4.1",
 				"@samrum/vite-plugin-web-extension": "^5.1.1",
 				"@sveltejs/vite-plugin-svelte": "^5.0.3",
 				"@tsconfig/svelte": "^5.0.4",
@@ -60,6 +61,33 @@
 				"node": ">=6.9.0"
 			}
 		},
+		"node_modules/@babel/generator": {
+			"version": "7.27.0",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.0.tgz",
+			"integrity": "sha512-VybsKvpiN1gU1sdMZIp7FcqphVVKEwcuj02x73uvcHE0PTihx1nlBcowYWhDwjpoAXRv43+gDzyggGnn1XZhVw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/parser": "^7.27.0",
+				"@babel/types": "^7.27.0",
+				"@jridgewell/gen-mapping": "^0.3.5",
+				"@jridgewell/trace-mapping": "^0.3.25",
+				"jsesc": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/helper-string-parser": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+			"integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
 		"node_modules/@babel/helper-validator-identifier": {
 			"version": "7.25.9",
 			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
@@ -70,6 +98,22 @@
 				"node": ">=6.9.0"
 			}
 		},
+		"node_modules/@babel/parser": {
+			"version": "7.27.0",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.0.tgz",
+			"integrity": "sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/types": "^7.27.0"
+			},
+			"bin": {
+				"parser": "bin/babel-parser.js"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
 		"node_modules/@babel/runtime": {
 			"version": "7.26.10",
 			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.10.tgz",
@@ -83,6 +127,64 @@
 				"node": ">=6.9.0"
 			}
 		},
+		"node_modules/@babel/template": {
+			"version": "7.27.0",
+			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.0.tgz",
+			"integrity": "sha512-2ncevenBqXI6qRMukPlXwHKHchC7RyMuu4xv5JBXRfOGVcTy1mXCD12qrp7Jsoxll1EV3+9sE4GugBVRjT2jFA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/code-frame": "^7.26.2",
+				"@babel/parser": "^7.27.0",
+				"@babel/types": "^7.27.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/traverse": {
+			"version": "7.27.0",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.0.tgz",
+			"integrity": "sha512-19lYZFzYVQkkHkl4Cy4WrAVcqBkgvV2YM2TU3xG6DIwO7O3ecbDPfW3yM3bjAGcqcQHi+CCtjMR3dIEHxsd6bA==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/code-frame": "^7.26.2",
+				"@babel/generator": "^7.27.0",
+				"@babel/parser": "^7.27.0",
+				"@babel/template": "^7.27.0",
+				"@babel/types": "^7.27.0",
+				"debug": "^4.3.1",
+				"globals": "^11.1.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/traverse/node_modules/globals": {
+			"version": "11.12.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/@babel/types": {
+			"version": "7.27.0",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.0.tgz",
+			"integrity": "sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"@babel/helper-string-parser": "^7.25.9",
+				"@babel/helper-validator-identifier": "^7.25.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
 		"node_modules/@devicefarmer/adbkit": {
 			"version": "3.3.8",
 			"resolved": "https://registry.npmjs.org/@devicefarmer/adbkit/-/adbkit-3.3.8.tgz",
@@ -817,6 +919,29 @@
 				"url": "https://github.com/sponsors/nzakas"
 			}
 		},
+		"node_modules/@ianvs/prettier-plugin-sort-imports": {
+			"version": "4.4.1",
+			"resolved": "https://registry.npmjs.org/@ianvs/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-4.4.1.tgz",
+			"integrity": "sha512-F0/Hrcfpy8WuxlQyAWJTEren/uxKhYonOGY4OyWmwRdeTvkh9mMSCxowZLjNkhwi/2ipqCgtXwwOk7tW0mWXkA==",
+			"dev": true,
+			"license": "Apache-2.0",
+			"dependencies": {
+				"@babel/generator": "^7.26.2",
+				"@babel/parser": "^7.26.2",
+				"@babel/traverse": "^7.25.9",
+				"@babel/types": "^7.26.0",
+				"semver": "^7.5.2"
+			},
+			"peerDependencies": {
+				"@vue/compiler-sfc": "2.7.x || 3.x",
+				"prettier": "2 || 3"
+			},
+			"peerDependenciesMeta": {
+				"@vue/compiler-sfc": {
+					"optional": true
+				}
+			}
+		},
 		"node_modules/@jridgewell/gen-mapping": {
 			"version": "0.3.8",
 			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
@@ -5215,6 +5340,19 @@
 				"js-yaml": "bin/js-yaml.js"
 			}
 		},
+		"node_modules/jsesc": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+			"integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
+			"dev": true,
+			"license": "MIT",
+			"bin": {
+				"jsesc": "bin/jsesc"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
 		"node_modules/json-buffer": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",

package.json

@@ -11,8 +11,8 @@
 		"serve:firefox": "web-ext run --start-url \"about:debugging#/runtime/this-firefox\" --source-dir ./dist/",
 		"serve:chrome": "web-ext run -t chromium --start-url \"https://example.com\" --source-dir ./dist/",
 		"check": "svelte-check --tsconfig ./tsconfig.json",
-		"lint": "prettier --check --plugin prettier-plugin-svelte . && eslint .",
+		"lint": "prettier --check . && eslint .",
-		"format": "prettier --write --plugin prettier-plugin-svelte .",
+		"format": "prettier --write .",
 		"release:firefox": "MANIFEST_VERSION=2 vite build --outDir release/firefox",
 		"release:chrome": "MANIFEST_VERSION=3 vite build --outDir release/chrome"
 	},
@@ -25,6 +25,7 @@
 		"url": "https://github.com/bytedream/stream-bypass/issues"
 	},
 	"devDependencies": {
+		"@ianvs/prettier-plugin-sort-imports": "^4.4.1",
 		"@samrum/vite-plugin-web-extension": "^5.1.1",
 		"@sveltejs/vite-plugin-svelte": "^5.0.3",
 		"@tsconfig/svelte": "^5.0.4",

src/entries/background/mv2.ts

@@ -1,8 +1,7 @@
 import './shared';
 
-import type { Match } from '~/lib/match';
+import { getMatch, type Match } from '~/lib/match';
 import { Redirect, UrlReferer } from '~/lib/settings';
-import { getMatch } from '~/lib/match';
 
 chrome.webRequest.onBeforeSendHeaders.addListener(
 	// eslint-disable-next-line @typescript-eslint/ban-ts-comment

src/entries/contentScript/main.ts

@@ -1,4 +1,4 @@
-import { getMatch, type Match, MatchMediaType } from '~/lib/match';
+import { getMatch, MatchMediaType, type Match } from '~/lib/match';
 import { Other, Redirect } from '~/lib/settings';
 
 async function main() {

src/entries/player/Player.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
-	import { play } from '~/entries/player/player';
 	import { onMount } from 'svelte';
+	import { play } from '~/entries/player/player';
 
 	let errorMessage: string | null = $state(null);
 

src/entries/player/player.html

@@ -6,8 +6,8 @@
 	</head>
 	<body>
 		<script type="module">
-			import Player from '~/entries/player/Player.svelte';
 			import { mount } from 'svelte';
+			import Player from '~/entries/player/Player.svelte';
 
 			mount(Player, {
 				target: document.body

src/entries/player/player.ts

@@ -1,5 +1,5 @@
-import { matches, MatchMediaType } from '~/lib/match';
 import Hls from 'hls.js';
+import { matches, MatchMediaType } from '~/lib/match';
 import { UrlReferer } from '~/lib/settings';
 
 async function playNative(url: string, domain: string, videoElem: HTMLVideoElement) {

src/entries/popup/Popup.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { type Match, matches } from '~/lib/match';
+	import { matches, type Match } from '~/lib/match';
 	import { Hosters, Other } from '~/lib/settings';
 	import Toggle from './toggle.svelte';
 

src/entries/popup/index.html

@@ -7,8 +7,8 @@
 	</head>
 	<body style="overflow-y: scroll">
 		<script type="module">
-			import Popup from '~/entries/popup/Popup.svelte';
 			import { mount } from 'svelte';
+			import Popup from '~/entries/popup/Popup.svelte';
 
 			mount(Popup, {
 				target: document.body

src/lib/match.ts

@@ -1,6 +1,6 @@
-import { unpack } from './util/userspace';
 import { Hosters, Redirect, TmpHost } from './settings';
 import { lastPathSegment } from './util/extract';
+import { unpack } from './util/userspace';
 
 export interface Match {
 	name: string;

src/lib/settings.ts

@@ -1,5 +1,4 @@
-import type { Match } from './match';
+import { matches, type Match } from './match';
-import { matches } from './match';
 
 export const Hosters = {
 	getDisabled: async () => {

vite.config.ts

@@ -1,9 +1,9 @@
-import { defineConfig, loadEnv, type PluginOption } from 'vite';
-import { svelte } from '@sveltejs/vite-plugin-svelte';
-import webExtension from '@samrum/vite-plugin-web-extension';
-import { getManifest } from './src/manifest';
-import { matches } from './src/lib/match';
 import { fileURLToPath } from 'url';
+import webExtension from '@samrum/vite-plugin-web-extension';
+import { svelte } from '@sveltejs/vite-plugin-svelte';
+import { defineConfig, loadEnv, type PluginOption } from 'vite';
+import { matches } from './src/lib/match';
+import { getManifest } from './src/manifest';
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => {