chore: Package modernise, update linter

2026-05-13 11:01:16 +00:00 · 2026-05-13 04:40:32 +01:00
parent e8f8b680ef
commit 25a6fde212
9 changed files with 1340 additions and 167 deletions
--- a/esbuild.config.mjs
+++ b/esbuild.config.mjs
@@ -2,7 +2,6 @@

 import esbuild from "esbuild";
 import process from "process";
-import builtins from "builtin-modules";
 import sveltePlugin from "esbuild-svelte";
 import { sveltePreprocess } from "svelte-preprocess";
 import fs from "node:fs";
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -1,103 +1,79 @@
-import typescriptEslint from "@typescript-eslint/eslint-plugin";
-import svelte from "eslint-plugin-svelte";
-import _import from "eslint-plugin-import";
-import { fixupPluginRules } from "@eslint/compat";
 import tsParser from "@typescript-eslint/parser";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-import js from "@eslint/js";
-import { FlatCompat } from "@eslint/eslintrc";
+import obsidianmd from "eslint-plugin-obsidianmd";
+import globals from "globals";
+import { defineConfig, globalIgnores } from "eslint/config";
+import * as sveltePlugin from "eslint-plugin-svelte";

-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-const compat = new FlatCompat({
-    baseDirectory: __dirname,
-    recommendedConfig: js.configs.recommended,
-    allConfig: js.configs.all,
-});
-
-export default [
+export default defineConfig([
+    globalIgnores([
+        "**/node_modules/*",
+        "**/jest.config.js",
+        "src/lib/coverage",
+        "src/lib/browsertest",
+        "**/test.ts",
+        "**/tests.ts",
+        "**/**test.ts",
+        "**/**.test.ts",
+        "**/*.unit.spec.ts",
+        "**/esbuild.*.mjs",
+        "**/terser.*.mjs",
+        "**/node_modules",
+        "**/build",
+        "**/.eslintrc.js.bak",
+        "src/lib/src/patches/pouchdb-utils",
+        "**/esbuild.config.mjs",
+        "**/rollup.config.js",
+        "modules/octagonal-wheels/rollup.config.js",
+        "modules/octagonal-wheels/dist/**/*",
+        "src/lib/test",
+        "src/lib/_tools",
+        "src/lib/src/cli",
+        "**/main.js",
+        "src/apps/**/*",
+        ".prettierrc.*.mjs",
+        ".prettierrc.mjs",
+        "*.config.mjs",
+    ]),
+    ...sveltePlugin.configs["flat/base"],
+    ...obsidianmd.configs.recommended,
    {
-        ignores: [
-            "**/node_modules/*",
-            "**/jest.config.js",
-            "src/lib/coverage",
-            "src/lib/browsertest",
-            "**/test.ts",
-            "**/tests.ts",
-            "**/**test.ts",
-            "**/**.test.ts",
-            "**/esbuild.*.mjs",
-            "**/terser.*.mjs",
-            "**/node_modules",
-            "**/build",
-            "**/.eslintrc.js.bak",
-            "src/lib/src/patches/pouchdb-utils",
-            "**/esbuild.config.mjs",
-            "**/rollup.config.js",
-            "modules/octagonal-wheels/rollup.config.js",
-            "modules/octagonal-wheels/dist/**/*",
-            "src/lib/test",
-            "src/lib/_tools",
-            "src/lib/src/cli",
-            "**/main.js",
-            "src/apps/**/*",
-            ".prettierrc.*.mjs",
-            ".prettierrc.mjs",
-            "*.config.mjs"
-        ],
-    },
-    ...compat.extends(
-        "eslint:recommended",
-        "plugin:@typescript-eslint/eslint-recommended",
-        "plugin:@typescript-eslint/recommended"
-    ),
-    {
-        plugins: {
-            "@typescript-eslint": typescriptEslint,
-            svelte,
-            import: fixupPluginRules(_import),
-        },
-
+        files: ["**/*.ts"],
        languageOptions: {
+            globals: { ...globals.browser },
            parser: tsParser,
-            ecmaVersion: 5,
-            sourceType: "module",
-
            parserOptions: {
-                project: ["tsconfig.json"],
+                project: "./tsconfig.json",
            },
        },
-
        rules: {
            "no-unused-vars": "off",
-
-            "@typescript-eslint/no-unused-vars": [
-                "error",
-                {
-                    args: "none",
-                },
-            ],
-
+            "@typescript-eslint/no-unused-vars": ["error", { args: "none" }],
            "no-unused-labels": "off",
            "@typescript-eslint/ban-ts-comment": "off",
            "no-prototype-builtins": "off",
            "@typescript-eslint/no-empty-function": "off",
            "require-await": "error",
+            "obsidianmd/rule-custom-message": "off", // Temporary
+            "obsidianmd/ui/sentence-case": "off", // Temporary
            "@typescript-eslint/require-await": "warn",
            "@typescript-eslint/no-misused-promises": "warn",
            "@typescript-eslint/no-floating-promises": "warn",
            "no-async-promise-executor": "warn",
            "@typescript-eslint/no-explicit-any": "off",
            "@typescript-eslint/no-unnecessary-type-assertion": "error",
-
-            "no-constant-condition": [
-                "error",
-                {
-                    checkLoops: false,
-                },
-            ],
+            "no-constant-condition": ["error", { checkLoops: false }],
        },
    },
-];
-
+    {
+        files: ["**/*.svelte"],
+        languageOptions: {
+            parserOptions: {
+                parser: tsParser,
+            },
+        },
+        rules: {
+            "no-unused-vars": ["error", { argsIgnorePattern: "^_", varsIgnorePattern: "^_" }],
+            "obsidianmd/no-plugin-as-component": "off", // Temporary
+        },
+    },
+]);
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
    "id": "obsidian-livesync",
    "name": "Self-hosted LiveSync",
    "version": "0.25.60",
-    "minAppVersion": "0.9.12",
+    "minAppVersion": "1.2.3",
    "description": "Community implementation of self-hosted livesync. Reflect your vault changes to some other devices immediately. Please make sure to disable other synchronize solutions to avoid content corruption or duplication.",
    "author": "vorotamoroz",
    "authorUrl": "https://github.com/vrtmrz",
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -61,8 +61,6 @@
    "license": "MIT",
    "devDependencies": {
        "@chialab/esbuild-plugin-worker": "^0.19.0",
-        "@eslint/compat": "^2.0.2",
-        "@eslint/eslintrc": "^3.3.4",
        "@eslint/js": "^9.39.3",
        "@sveltejs/vite-plugin-svelte": "^6.2.4",
        "@tsconfig/svelte": "^5.0.8",
@@ -84,18 +82,15 @@
        "@vitest/browser": "^4.1.1",
        "@vitest/browser-playwright": "^4.1.1",
        "@vitest/coverage-v8": "^4.1.1",
-        "builtin-modules": "5.0.0",
-        "dotenv": "^17.3.1",
        "dotenv-cli": "^11.0.0",
        "esbuild": "0.25.0",
        "esbuild-plugin-inline-worker": "^0.1.1",
        "esbuild-svelte": "^0.9.4",
        "eslint": "^9.39.3",
-        "eslint-plugin-import": "^2.32.0",
+        "eslint-plugin-obsidianmd": "^0.3.0",
        "eslint-plugin-svelte": "^3.15.0",
        "events": "^3.3.0",
-        "glob": "^13.0.6",
-        "obsidian": "^1.12.3",
+        "globals": "^14.0.0",
        "playwright": "^1.58.2",
        "postcss": "^8.5.6",
        "postcss-load-config": "^6.0.1",
@@ -116,6 +111,7 @@
        "svelte-check": "^4.4.3",
        "svelte-preprocess": "^6.0.3",
        "terser": "^5.39.0",
+        "tinyglobby": "^0.2.15",
        "transform-pouch": "^2.0.0",
        "tslib": "^2.8.1",
        "tsx": "^4.21.0",
@@ -136,6 +132,7 @@
        "@trystero-p2p/nostr": "^0.23.0",
        "chokidar": "^4.0.0",
        "commander": "^14.0.3",
+        "obsidian": "^1.12.3",
        "diff-match-patch": "^1.0.5",
        "fflate": "^0.8.2",
        "idb": "^8.0.3",
--- a/src/modules/features/SetupWizard/dialogs/ScanQRCode.svelte
+++ b/src/modules/features/SetupWizard/dialogs/ScanQRCode.svelte
@@ -4,10 +4,10 @@
    import Decision from "@/lib/src/UI/components/Decision.svelte";
    import Instruction from "@/lib/src/UI/components/Instruction.svelte";
    import UserDecisions from "@/lib/src/UI/components/UserDecisions.svelte";
-        const TYPE_CLOSE = "close";
+    const TYPE_CLOSE = "close";
    type ResultType = typeof TYPE_CLOSE;
    type Props = {
-        setResult: (result: ResultType) => void;
+        setResult: (_result: ResultType) => void;
    };
    const { setResult }: Props = $props();
 </script>
--- a/versions.json
+++ b/versions.json
@@ -1,4 +1,5 @@
 {
+    "0.25.60": "1.2.3",
    "1.0.1": "0.9.12",
    "1.0.0": "0.9.7"
 }
--- a/vitest.config.p2p.ts
+++ b/vitest.config.p2p.ts
@@ -2,7 +2,8 @@ import { defineConfig, mergeConfig } from "vitest/config";
 import { playwright } from "@vitest/browser-playwright";
 import viteConfig from "./vitest.config.common";
 import path from "path";
-import dotenv from "dotenv";
+import { existsSync, readFileSync } from "node:fs";
+import { parseEnv } from "node:util";
 import { grantClipboardPermissions, writeHandoffFile, readHandoffFile } from "./test/lib/commands";

 // P2P test environment variables
@@ -22,8 +23,9 @@ import { grantClipboardPermissions, writeHandoffFile, readHandoffFile } from "./
 // General test options (also read from env):
 //   ENABLE_DEBUGGER          - Set to "true" to attach a debugger and pause before tests
 //   ENABLE_UI                - Set to "true" to open a visible browser window during tests
-const defEnv = dotenv.config({ path: ".env" }).parsed;
-const testEnv = dotenv.config({ path: ".test.env" }).parsed;
+const loadEnvFile = (path: string) => (existsSync(path) ? parseEnv(readFileSync(path, "utf-8")) : undefined);
+const defEnv = loadEnvFile(".env");
+const testEnv = loadEnvFile(".test.env");
 // Merge: dotenv files < process.env (so shell-injected vars like P2P_TEST_* take precedence)
 const p2pEnv: Record<string, string> = {};
 if (process.env.P2P_TEST_ROOM_ID) p2pEnv.P2P_TEST_ROOM_ID = process.env.P2P_TEST_ROOM_ID;
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -2,10 +2,13 @@ import { defineConfig, mergeConfig } from "vitest/config";
 import { playwright } from "@vitest/browser-playwright";
 import viteConfig from "./vitest.config.common";
 import path from "path";
-import dotenv from "dotenv";
+import { existsSync, readFileSync } from "node:fs";
+import { parseEnv } from "node:util";
 import { grantClipboardPermissions, openWebPeer, closeWebPeer, acceptWebPeer } from "./test/lib/commands";
-const defEnv = dotenv.config({ path: ".env" }).parsed;
-const testEnv = dotenv.config({ path: ".test.env" }).parsed;
+
+const loadEnvFile = (path: string) => (existsSync(path) ? parseEnv(readFileSync(path, "utf-8")) : undefined);
+const defEnv = loadEnvFile(".env");
+const testEnv = loadEnvFile(".test.env");
 const env = Object.assign({}, defEnv, testEnv);
 const debuggerEnabled = env?.ENABLE_DEBUGGER === "true";
 const enableUI = env?.ENABLE_UI === "true";