chore: upgrade some deps

.eslintignore

@@ -1,11 +0,0 @@
-resources/
-settings-dev/
-out/
-logs/
-template/
-.webpack/
-node_modules/
-localization/
-build-resources/
-.vscode/
-.github/

.eslintrc.js

@@ -1,45 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const tsEslintConfig = require('./tsconfig.eslint.json');
-
-module.exports = {
-  root: true,
-  ignorePatterns: tsEslintConfig.exclude,
-  parser: '@typescript-eslint/parser',
-  parserOptions: {
-    project: './tsconfig.eslint.json',
-    tsconfigRootDir: __dirname,
-    sourceType: 'module',
-    ecmaFeatures: {
-      jsx: true,
-    },
-  },
-  settings: {
-    react: {
-      version: '18.2.0',
-    },
-    'import/resolver': {
-      node: {
-        extensions: ['.js', '.jsx', '.ts', '.tsx'],
-      },
-      typescript: {
-        alwaysTryTypes: true,
-      },
-      alias: {
-        map: [
-          ['@', './src'],
-          ['@services', './src/services'],
-        ],
-        extensions: ['.js', '.jsx', '.ts', '.tsx'],
-      },
-    },
-  },
-  rules: {},
-  extends: [
-    'eslint-config-tidgi',
-  ],
-  plugins: [],
-  env: {
-    browser: true,
-    es6: true,
-  },
-};

.github/workflows/release.yml

@@ -22,40 +22,33 @@ concurrency:
 
 jobs:
   Linux:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
-
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
-        with:
-          submodules: 'true'
 
-      # - name: Install native dependencies for flatpack
+      - name: Install Node.js
-      #   run: sudo apt-get install -y flatpak-builder elfutils
+        uses: actions/setup-node@v4
-      # - name: Install Snapcraft
-      #   uses: samuelmeuli/action-snapcraft@v1
-      #   with:
-      #     snapcraft_token: ${{ secrets.SNAP_TOKEN }}
-      - name: Set up Node.js
-        uses: actions/setup-node@v3
         with:
-          node-version: 20
+          node-version: lts/*
-      - uses: pnpm/action-setup@v2
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
         with:
-          version: 9
+          version: 'latest'
-      - name: Get pnpm store directory
+          run_install: false
-        id: pnpm-cache
+
-        shell: bash
+      - name: Cache dependencies
-        run: |
+        uses: actions/cache@v3
-          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+        with:
-# disable pnpm cache so it always install based on npm_config_arch
+          path: |
-      # - uses: actions/cache@v3
+            **/node_modules
-      #   name: Setup pnpm cache
+            ~/.pnpm-store
-      #   with:
+            ~/.npm
-      #     path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-      #     key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
-      #     restore-keys: |
+            ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-      #       ${{ runner.os }}-pnpm-store-
+            ${{ runner.os }}-node-
 
       # only run codeql on Linux
       - name: Initialize CodeQL
@@ -117,30 +110,30 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
-        with:
-          submodules: 'true'
 
-      - name: Set up Node.js
+      - name: Install Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: lts/*
-      - uses: pnpm/action-setup@v2
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
         with:
-          version: 9
+          version: 'latest'
-          
+          run_install: false
-      # - name: Get pnpm store directory
+
-      #   id: pnpm-cache
+      - name: Cache dependencies
-      #   shell: bash
+        uses: actions/cache@v3
-      #   run: |
+        with:
-      #     echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+          path: |
-      # - uses: actions/cache@v3
+            **/node_modules
-      #   name: Setup pnpm cache
+            ~/.pnpm-store
-      #   with:
+            ~/.npm
-      #     path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-      #     key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
-      #     restore-keys: |
+            ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-      #       ${{ runner.os }}-pnpm-store-
+            ${{ runner.os }}-node-
 
       - name: Install dependencies (x64)
         run: pnpm install && pnpm remove registry-js
@@ -196,34 +189,34 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
+      - name: Install Node.js
+        uses: actions/setup-node@v4
         with:
-          submodules: 'true'
+          node-version: lts/*
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 'latest'
+          run_install: false
+
+      - name: Cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: |
+            **/node_modules
+            ~/.pnpm-store
+            ~/.npm
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+            ${{ runner.os }}-node-
 
       - name: Set up CV dependency for pngquant-bin
         uses: ilammy/msvc-dev-cmd@v1
 
-      - name: Set up Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-      - uses: pnpm/action-setup@v2
-        with:
-          version: 9
-      - name: Get pnpm store directory
-        id: pnpm-cache
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-
-      # - uses: actions/cache@v3
-      #   name: Setup pnpm cache
-      #   with:
-      #     path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-      #     key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-pnpm-store-
-
       - name: Install dependencies (x64)
         run: pnpm install
         env:

.npmrc

@@ -0,0 +1,4 @@
+strict-peer-dependencies=false
+# This is a workaround for VSCode's Eslint extension not loading plugins correctly,
+# see: https://github.com/pnpm/pnpm/issues/5447
+public-hoist-pattern[]=*eslint*

eslint.config.mjs

@@ -0,0 +1,20 @@
+import tidgiConfig from 'eslint-config-tidgi';
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+export default [
+  ...tidgiConfig,
+  {
+    languageOptions: {
+      parserOptions: {
+        projectService: {
+          allowDefaultProject: ['./*.js', './*.mjs'],
+        },
+        tsconfigRootDir: __dirname,
+      },
+    },
+  },
+];

package.json

@@ -111,7 +111,7 @@
     "@types/circular-dependency-plugin": "5.0.8",
     "@types/fs-extra": "11.0.4",
     "@types/html-minifier-terser": "^7.0.2",
-    "@types/i18next-fs-backend": "1.2.0",
+    "@types/i18next-fs-backend": "1.1.5",
     "@types/intercept-stdout": "0.1.3",
     "@types/lodash": "4.17.15",
     "@types/node": "22.13.0",
@@ -135,7 +135,7 @@
     "electron": "34.0.2",
     "esbuild": "^0.24.2",
     "esbuild-loader": "^4.2.2",
-    "eslint-config-tidgi": "1.2.3",
+    "eslint-config-tidgi": "2.0.7",
     "fork-ts-checker-webpack-plugin": "9.0.2",
     "graphql-hooks": "8.2.0",
     "json5": "^2.2.3",
@@ -164,9 +164,16 @@
   },
   "pnpm": {
     "overrides": {
-      "node-abi": "latest",
       "prebuild-install": "latest"
-    }
+    },
+    "onlyBuiltDependencies": [
+      "dprint",
+      "dugite",
+      "electron",
+      "electron-winstaller",
+      "esbuild",
+      "registry-js"
+    ]
   },
   "private": false
 }

template/wiki

@@ -1 +1 @@
-Subproject commit 72324b54af8d3e98a2f266894881ad567a45b981
+Subproject commit de896ab9afd34831a8eb69710ed719f8232097fc

tsconfig.eslint.json

@@ -1,24 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "noEmit": true
-  },
-  "include": [
-    "src/**/*.ts",
-    "src/**/*.js",
-    "src/**/*.tsx",
-    "src/**/*.jsx",
-    "public/**/*.ts",
-    "public/**/*.js",
-    "features/**/*.ts",
-    "scripts/**/*.ts",
-    "scripts/**/*.js",
-    "scripts/**/*.mjs",
-    "src/**/*.d.ts",
-    "public/**/*.d.ts",
-    "./*.json",
-    "./*.js",
-    "./*.*.js"
-  ],
-  "exclude": ["template/**/*.js", "src/services/libs/i18n/i18next-electron-fs-backend.ts"]
-}