Feature/upgrades

.github/workflows/release.yml

@@ -7,49 +7,59 @@ on:
  workflow_dispatch:
 
 jobs:
- release:
+ publish-tauri:
  permissions:
  contents: write
  strategy:
  fail-fast: false
  matrix:
- platform: [ macos-latest, ubuntu-latest, windows-latest ]
+ include:
+ - platform: 'macos-latest'
+ args: '--target aarch64-apple-darwin'
+ - platform: 'macos-latest'
+ args: '--target x86_64-apple-darwin'
+ - platform: 'ubuntu-22.04'
+ args: ''
+ - platform: 'windows-latest'
+ args: ''
+
  runs-on: ${{ matrix.platform }}
  steps:
- - name: Checkout repository
- uses: actions/checkout@v4
+ - uses: actions/checkout@v4
 
- - name: Install dependencies (ubuntu only)
- if: matrix.platform == 'ubuntu-latest'
+ - name: install dependencies (ubuntu only)
+ if: matrix.platform == 'ubuntu-22.04'
  run: |
  sudo apt-get update
  sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
 
- - name: Node.js setup
+ - name: setup node
  uses: actions/setup-node@v4
  with:
- node-version: 'lts/*'
+ node-version: lts/*
  cache: 'yarn'
 
- - name: Rust setup
+ - name: install Rust stable
  uses: dtolnay/rust-toolchain@stable
+ with:
+ targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
 
  - name: Rust cache
  uses: swatinem/rust-cache@v2
  with:
  workspaces: './src-tauri -> target'
 
- - name: Install app dependencies and build web
- run: yarn && yarn build
+ - name: Install frontend dependencies
+ run: yarn install
 
  - name: Build the app
  uses: tauri-apps/tauri-action@v0
-
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
  with:
- tagName: ${{ github.ref_name }}
+ tagName: app-v__VERSION__
  releaseName: 'Advanced PortChecker v__VERSION__'
- releaseBody: 'See the assets to download and install this version.'
+ releaseBody: 'See the assets to download this version and install.'
  releaseDraft: true
  prerelease: false
+ args: ${{ matrix.args }}

.github/workflows/test.yml

@@ -15,42 +15,55 @@ jobs:
  run: yarn
 
  - name: Run ESLint
- run: yarn run eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0
+ run: yarn lint
+
+ - name: Run Prettier
+ run: yarn format
 
  test-tauri:
  strategy:
  fail-fast: false
  matrix:
- platform: [ macos-latest, ubuntu-latest, windows-latest ]
+ include:
+ - platform: 'macos-latest'
+ args: '--target aarch64-apple-darwin'
+ - platform: 'macos-latest'
+ args: '--target x86_64-apple-darwin'
+ - platform: 'ubuntu-22.04'
+ args: ''
+ - platform: 'windows-latest'
+ args: ''
 
  runs-on: ${{ matrix.platform }}
  steps:
- - name: Checkout repository
- uses: actions/checkout@v4
+ - uses: actions/checkout@v4
 
- - name: Install dependencies (ubuntu only)
- if: matrix.platform == 'ubuntu-latest'
+ - name: install dependencies (ubuntu only)
+ if: matrix.platform == 'ubuntu-22.04'
  run: |
  sudo apt-get update
  sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
 
  - name: Setup node
  uses: actions/setup-node@v4
  with:
- node-version: 'lts/*'
+ node-version: lts/*
  cache: 'yarn'
 
- - name: Rust setup
+ - name: Install Rust stable
  uses: dtolnay/rust-toolchain@stable
+ with:
+ targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
 
  - name: Rust cache
  uses: swatinem/rust-cache@v2
  with:
  workspaces: './src-tauri -> target'
 
- - name: Install app dependencies and build it
- run: yarn && yarn build
+ - name: Install frontend dependencies
+ run: yarn install
 
- - uses: tauri-apps/tauri-action@v0
+ - name: Build the app
+ uses: tauri-apps/tauri-action@v0
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.prettierignore

@@ -0,0 +1,9 @@
+dist
+.yarn
+dist
+node_modules
+nginx
+.idea
+README.md
+src-tauri
+.github

.prettierrc

@@ -0,0 +1,7 @@
+{
+ "singleQuote": true,
+ "trailingComma": "all",
+ "tabWidth": 2,
+ "semi": true,
+ "arrowParens": "always"
+}

eslint.config.js

@@ -0,0 +1,92 @@
+import js from '@eslint/js';
+import importPlugin from 'eslint-plugin-import';
+import react from 'eslint-plugin-react';
+import reactHooks from 'eslint-plugin-react-hooks';
+import reactRefresh from 'eslint-plugin-react-refresh';
+import globals from 'globals';
+
+export default [
+ importPlugin.flatConfigs.recommended,
+ {
+ ignores: [
+ 'dist',
+ '.yarn',
+ 'dist',
+ 'node_modules',
+ 'nginx',
+ '.idea',
+ 'src-tauri',
+ '.github',
+ ],
+ },
+ {
+ files: ['**/*.{js,jsx}'],
+ languageOptions: {
+ ecmaVersion: 'latest',
+ globals: globals.browser,
+ parserOptions: {
+ ecmaVersion: 'latest',
+ ecmaFeatures: { jsx: true },
+ sourceType: 'module',
+ },
+ },
+ settings: {
+ react: { version: '19.0' },
+ 'import/resolver': {
+ node: {
+ extensions: ['.js', '.jsx', '.ts', '.tsx'],
+ },
+ },
+ },
+ plugins: {
+ react,
+ 'react-hooks': reactHooks,
+ 'react-refresh': reactRefresh,
+ },
+ rules: {
+ ...js.configs.recommended.rules,
+ ...react.configs.recommended.rules,
+ ...react.configs['jsx-runtime'].rules,
+ ...reactHooks.configs.recommended.rules,
+ 'no-multi-spaces': ['error', { ignoreEOLComments: false }],
+ 'no-trailing-spaces': ['error', { skipBlankLines: false }],
+ 'no-use-before-define': ['error', { functions: true }],
+ 'react/jsx-no-target-blank': 'off',
+ 'react-refresh/only-export-components': [
+ 'warn',
+ { allowConstantExport: true },
+ ],
+ 'react/function-component-definition': [
+ 2,
+ {
+ namedComponents: 'arrow-function',
+ unnamedComponents: 'arrow-function',
+ },
+ ],
+ 'react/prop-types': 0,
+ 'react/jsx-uses-vars': 'error',
+ 'react/jsx-uses-react': 'error',
+ semi: [2, 'always'],
+ quotes: [2, 'single'],
+ 'import/order': [
+ 'error',
+ {
+ groups: ['builtin', 'external', 'internal', ['parent', 'sibling']],
+ pathGroups: [
+ {
+ pattern: 'react',
+ group: 'external',
+ position: 'before',
+ },
+ ],
+ pathGroupsExcludedImportTypes: ['react'],
+ 'newlines-between': 'never',
+ alphabetize: {
+ order: 'asc',
+ caseInsensitive: true,
+ },
+ },
+ ],
+ },
+ },
+];

index.html

@@ -1,13 +1,13 @@
 <!doctype html>
 <html lang="en">
-<head>
- <meta charset="UTF-8"/>
- <link rel="icon" type="image/svg+xml" href="/favicon.svg"/>
- <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+ <head>
+ <meta charset="UTF-8" />
+ <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
  <title>Advanced PortChecker</title>
-</head>
-<body>
-<div id="root"></div>
-<script type="module" src="/src/main.jsx"></script>
-</body>
+ </head>
+ <body>
+ <div id="root"></div>
+ <script type="module" src="/src/main.jsx"></script>
+ </body>
 </html>

package.json

@@ -6,7 +6,8 @@
  "scripts": {
  "dev": "vite",
  "build": "vite build",
- "lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0",
+ "lint": "eslint .",
+ "format": "prettier --check .",
  "preview": "vite preview",
  "tdev": "yarn tauri dev",
  "tbuild": "yarn tauri build"
@@ -17,27 +18,29 @@
  "@fontsource/roboto": "^5.2.5",
  "@mui/icons-material": "^7.0.2",
  "@mui/material": "^7.0.2",
- "@mui/x-data-grid": "^7.28.3",
- "@tauri-apps/api": "^2.4.1",
+ "@mui/x-data-grid": "^8.0.0",
+ "@tauri-apps/api": "^2.5.0",
  "@tauri-apps/plugin-dialog": "^2.2.1",
  "@tauri-apps/plugin-os": "^2.2.1",
  "react": "^19.1.0",
  "react-dom": "^19.1.0",
  "react-router-dom": "^7.5.0"
  },
  "devDependencies": {
- "@tauri-apps/cli": "^2.4.1",
- "@types/react": "^19.1.1",
+ "@eslint/js": "^9.24.0",
+ "@tauri-apps/cli": "^2.5.0",
+ "@types/react": "^19.1.2",
  "@types/react-dom": "^19.1.2",
- "@vitejs/plugin-react": "^4.3.4",
- "eslint": "^8.57.1",
- "eslint-config-airbnb": "^19.0.4",
+ "@vitejs/plugin-react": "^4.4.0",
+ "eslint": "^9.24.0",
+ "eslint-config-react-app": "^7.0.1",
  "eslint-plugin-import": "^2.31.0",
- "eslint-plugin-jsx-a11y": "^6.10.2",
  "eslint-plugin-react": "^7.37.5",
  "eslint-plugin-react-hooks": "^5.2.0",
  "eslint-plugin-react-refresh": "^0.4.19",
- "vite": "^6.2.6",
+ "globals": "^16.0.0",
+ "prettier": "^3.5.3",
+ "vite": "^6.3.1",
  "vite-plugin-eslint": "^1.8.1",
  "vite-plugin-svgr": "^4.3.0"
  },