Skip to content

Commit

Permalink
Merge pull request #846 from VPKSoft/develop
Browse files Browse the repository at this point in the history
GitFlow release v0.1.1
  • Loading branch information
VPKSoft committed Sep 27, 2024
2 parents cccebc7 + 9eb08ae commit 80b0dd7
Show file tree
Hide file tree
Showing 54 changed files with 11,333 additions and 4,549 deletions.
5 changes: 3 additions & 2 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// eslint-disable-next-line unicorn/filename-case
module.exports = {
extends: [
"eslint:recommended",
Expand All @@ -9,7 +8,7 @@ module.exports = {
"plugin:import/warnings",
],
parser: "@typescript-eslint/parser",
ignorePatterns: [".eslintrc.cjs"],
ignorePatterns: [".eslintrc.cjs", "src/localization/rust_i18n_transform", "vite.config.ts"],
parserOptions: {
sourceType: "module",
ecmaVersion: 2_020,
Expand All @@ -36,6 +35,7 @@ module.exports = {
"@typescript-eslint/explicit-module-boundary-types": "off",
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/no-floating-promises": "warn",
"react/forbid-component-props": ["error", { forbid: [{ "propName": "style", message: "Use className to define the component style"}] }],
"@typescript-eslint/no-explicit-any": "warn",
"@typescript-eslint/no-unused-vars": "warn",
"unicorn/prevent-abbreviations": "off",
Expand All @@ -44,6 +44,7 @@ module.exports = {
"react/jsx-no-bind": "error",
"unicorn/no-null": "off",
"import/order": "warn",
"react/jsx-curly-brace-presence": ["warn", { "props": "never", "children": "never" }],
"unicorn/numeric-separators-style": ["error", { number: { minimumDigits: 0, groupLength: 3 } }],
"unicorn/filename-case": [
"error",
Expand Down
23 changes: 19 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,31 @@ updates:
directory: "/src-tauri" # Location of package manifests
schedule:
interval: "weekly"
open-pull-requests-limit: 10

open-pull-requests-limit: 20
groups:
production-dependencies:
dependency-type: "production"
development-dependencies:
dependency-type: "development"

- package-ecosystem: "npm" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
open-pull-requests-limit: 10
open-pull-requests-limit: 20
groups:
production-dependencies:
dependency-type: "production"
development-dependencies:
dependency-type: "development"

- package-ecosystem: "npm" # See documentation for possible values
directory: "/webdriver/webdriverio" # Location of package manifests
schedule:
interval: "weekly"
open-pull-requests-limit: 10
open-pull-requests-limit: 20
groups:
production-dependencies:
dependency-type: "production"
development-dependencies:
dependency-type: "development"
10 changes: 5 additions & 5 deletions .github/workflows/e2e_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ jobs:
strategy:
fail-fast: false
matrix:
platform: [ubuntu-20.04]
platform: [ubuntu-24.04]
runs-on: ${{ matrix.platform }}

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Install dependencies (ubuntu only)
if: matrix.platform == 'ubuntu-20.04'
if: matrix.platform == 'ubuntu-24.04'
# You can remove libayatana-appindicator3-dev if you don't use the system tray feature.
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev libwebkit2gtk-4.0-dev webkit2gtk-driver xvfb
sudo apt-get install -y libgtk-3-dev build-essential libwebkit2gtk-4.1-dev libayatana-appindicator3-dev librsvg2-dev webkit2gtk-driver xvfb
- name: Rust setup
uses: dtolnay/rust-toolchain@stable
Expand All @@ -45,11 +45,11 @@ jobs:
if: matrix.platform == 'windows-latest'
run: ${{ github.workspace }}\init.ps1
- name: init install folder (Linux & Mac)
if: matrix.platform == 'ubuntu-20.04' || matrix.platform == 'macos-latest'
if: matrix.platform == 'ubuntu-24.04' || matrix.platform == 'macos-latest'
run: ${{ github.workspace }}/init.sh

- name: E2E Linux
if: matrix.platform == 'ubuntu-20.04'
if: matrix.platform == 'ubuntu-24.04'
run: |
cd webdriver/webdriverio
npm i
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/main-lint-test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,26 @@ jobs:
release:
environment: Release
env:
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
permissions:
contents: write
strategy:
fail-fast: false
matrix:
platform: [macos-latest, ubuntu-20.04, windows-latest]
platform: [macos-latest, ubuntu-24.04, windows-latest]
runs-on: ${{ matrix.platform }}

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Install dependencies (ubuntu only)
if: matrix.platform == 'ubuntu-20.04'
if: matrix.platform == 'ubuntu-24.04'
# You can remove libayatana-appindicator3-dev if you don't use the system tray feature.
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev
sudo apt-get install -y libgtk-3-dev build-essential libwebkit2gtk-4.1-dev libayatana-appindicator3-dev librsvg2-dev
- name: Rust setup
uses: dtolnay/rust-toolchain@stable
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release-publish_draft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
fail-fast: false
matrix:
platform: [macos-latest, ubuntu-20.04, windows-latest]
platform: [macos-latest, ubuntu-24.04, windows-latest]

runs-on: ${{ matrix.platform }}
steps:
Expand All @@ -21,17 +21,17 @@ jobs:
- name: install Rust stable
uses: dtolnay/rust-toolchain@stable
- name: install dependencies (ubuntu only)
if: matrix.platform == 'ubuntu-20.04'
if: matrix.platform == 'ubuntu-24.04'
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
sudo apt-get install -y libgtk-3-dev build-essential libwebkit2gtk-4.1-dev libayatana-appindicator3-dev librsvg2-dev
- name: init install folder (Windows)
# run: npm install # change this to npm or pnpm depending on which one you use
if: matrix.platform == 'windows-latest'
run: ${{ github.workspace }}\init.ps1
- name: init install folder (Linux & Mac)
# run: npm install # change this to npm or pnpm depending on which one you use
if: matrix.platform == 'ubuntu-20.04' || matrix.platform == 'macos-latest'
if: matrix.platform == 'ubuntu-24.04' || matrix.platform == 'macos-latest'
run: ${{ github.workspace }}/init.sh
- uses: tauri-apps/tauri-action@v0
env:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ jobs:
publish-tauri:
environment: Release
env:
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
permissions:
contents: write
strategy:
fail-fast: false
matrix:
platform: [macos-latest, ubuntu-20.04, windows-latest]
platform: [macos-latest, ubuntu-24.04, windows-latest]

runs-on: ${{ matrix.platform }}
steps:
Expand All @@ -29,17 +29,17 @@ jobs:
- name: install Rust stable
uses: dtolnay/rust-toolchain@stable
- name: install dependencies (ubuntu only)
if: matrix.platform == 'ubuntu-20.04'
if: matrix.platform == 'ubuntu-24.04'
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
sudo apt-get install -y libgtk-3-dev build-essential libwebkit2gtk-4.1-dev libayatana-appindicator3-dev librsvg2-dev
- name: init install folder (Windows)
# run: npm install # change this to npm or pnpm depending on which one you use
if: matrix.platform == 'windows-latest'
run: ${{ github.workspace }}\init.ps1
- name: init install folder (Linux & Mac)
# run: npm install # change this to npm or pnpm depending on which one you use
if: matrix.platform == 'ubuntu-20.04' || matrix.platform == 'macos-latest'
if: matrix.platform == 'ubuntu-24.04' || matrix.platform == 'macos-latest'
run: ${{ github.workspace }}/init.sh
- uses: tauri-apps/tauri-action@v0
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_docusaurus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: npm

- name: Install dependencies
Expand Down
66 changes: 37 additions & 29 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -1,31 +1,39 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"label": "ui:dev",
"type": "shell",
"isBackground": true,
"command": "npm run dev",
// "args": [
// "run dev"
// ]
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"label": "ui:dev",
"type": "shell",
"isBackground": true,
"command": "npm run dev",
// "args": [
// "run dev"
// ]
"problemMatcher": {
"base": "$tsc-watch",
"background": {
"activeOnStart": true,
"beginsPattern": "VITE v",
"endsPattern": "http://localhost:1420/" // This must match the port in `vite.config.ts` and/or `src-tauri/tauri.conf.json` ?
}
},
{
"label": "ui:build",
"type": "shell",
"command": "npm run build",
// "args": [
// " run build"
// ]
},
{
"type": "npm",
"script": "build",
"group": "build",
"label": "npm: build",
"detail": "next build"
}
]
}
},
{
"label": "ui:build",
"type": "shell",
"command": "npm run build",
// "args": [
// " run build"
// ]
},
{
"type": "npm",
"script": "build",
"group": "build",
"label": "npm: build",
"detail": "next build"
}
]
}
Loading

0 comments on commit 80b0dd7

Please sign in to comment.