Skip to content

Commit

Permalink
Temp merge
Browse files Browse the repository at this point in the history
  • Loading branch information
milaiwi committed Feb 4, 2025
1 parent c5ecac3 commit 09b55d7
Show file tree
Hide file tree
Showing 270 changed files with 6,866 additions and 8,370 deletions.
58 changes: 25 additions & 33 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,49 +5,41 @@ module.exports = {
node: true,
},
extends: [
"airbnb",
"airbnb/hooks",
"airbnb-typescript",
"plugin:prettier/recommended",
"plugin:tailwindcss/recommended",
'airbnb',
'airbnb/hooks',
'airbnb-typescript',
'plugin:prettier/recommended',
'plugin:tailwindcss/recommended',
],
parser: "@typescript-eslint/parser",
parser: '@typescript-eslint/parser',
parserOptions: {
ecmaVersion: "latest",
sourceType: "module",
project: "./tsconfig.json",
ecmaVersion: 'latest',
sourceType: 'module',
project: './tsconfig.json',
},
plugins: [
"@typescript-eslint",
"react",
"import",
"jsx-a11y",
"unused-imports",
"prettier",
"tailwindcss",
],
plugins: ['@typescript-eslint', 'react', 'import', 'jsx-a11y', 'unused-imports', 'prettier', 'tailwindcss'],
rules: {
"unused-imports/no-unused-imports": "error",
"prettier/prettier": "error",
"react/function-component-definition": [
"error",
'unused-imports/no-unused-imports': 'error',
'prettier/prettier': 'error',
'react/function-component-definition': [
'error',
{
namedComponents: "arrow-function",
unnamedComponents: "arrow-function",
namedComponents: 'arrow-function',
unnamedComponents: 'arrow-function',
},
],
"import/extensions": ["off", "ignorePackages"],
"jsx-a11y/no-static-element-interactions": "off",
"jsx-a11y/click-events-have-key-events": "off",
"react/require-default-props": "off",
"import/no-extraneous-dependencies": ["error", { "devDependencies": ["**/electron/**", "**/preload/**"] }],
'import/extensions': ['off', 'ignorePackages'],
'jsx-a11y/no-static-element-interactions': 'off',
'jsx-a11y/click-events-have-key-events': 'off',
'react/require-default-props': 'off',
'import/no-extraneous-dependencies': ['error', { devDependencies: ['**/electron/**', '**/preload/**'] }],
},
ignorePatterns: ["vite.config.ts", ".eslintrc.js"],
ignorePatterns: ['vite.config.ts', '.eslintrc.js'],
settings: {
"import/resolver": {
'import/resolver': {
node: {
extensions: [".js", ".jsx", ".ts", ".tsx"],
extensions: ['.js', '.jsx', '.ts', '.tsx'],
},
},
},
};
}
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

**Describe the bug**
A description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
Expand All @@ -24,10 +24,10 @@ A clear and concise description of what you expected to happen.
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Hardware: [e.g. CPU, RAM, GPU, etc.]
- Version [e.g. 22]

- OS: [e.g. iOS]
- Hardware: [e.g. CPU, RAM, GPU, etc.]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: Build and Package Electron App
on:
push:
branches:
- "*"
- '*'
pull_request:
branches:
- "*"
- '*'
jobs:
build_and_package:
strategy:
Expand All @@ -25,7 +25,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: "20"
node-version: '20'
- name: Cache npm dependencies
uses: actions/cache@v3
with:
Expand All @@ -50,13 +50,13 @@ jobs:
CSC_LINK: ${{ secrets.CSC_LINK }}
CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NODE_OPTIONS: "--max-old-space-size=8192"
NODE_OPTIONS: '--max-old-space-size=8192'
run: |
npm run build
- name: Build for non-macOS
if: matrix.os != 'macos-13' && matrix.os != 'macos-latest'
env:
NODE_OPTIONS: "--max-old-space-size=8192"
NODE_OPTIONS: '--max-old-space-size=8192'
run: |
npm run build
- name: Notarize macOS build
Expand All @@ -70,11 +70,11 @@ jobs:
- name: Print APP_VERSION
run: echo "APP_VERSION=${{ env.APP_VERSION }}"
- name: List output files
if: matrix.os != 'macos-13' && matrix.os != 'macos-latest'
if: matrix.os != 'macos-13' && matrix.os != 'macos-latest'
run: |
ls ./release/${{ env.APP_VERSION }}/
- name: Check runner architecture
if: matrix.os != 'macos-13' && matrix.os != 'macos-latest'
if: matrix.os != 'macos-13' && matrix.os != 'macos-latest'
run: uname -m
- name: Rename artifacts for ARM architecture
if: matrix.os == 'macos-latest'
Expand All @@ -92,4 +92,4 @@ jobs:
./release/*/*.exe
./release/${{ env.APP_VERSION }}/**/*.AppImage
./release/${{ env.APP_VERSION }}/*-arm64.dmg
./release/${{ env.APP_VERSION }}/*-intel.dmg
./release/${{ env.APP_VERSION }}/*-intel.dmg
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Release script
on:
push:
tags:
- "v*"
- 'v*'
jobs:
build_and_package:
runs-on: ${{ matrix.os }}
Expand All @@ -21,7 +21,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: "20"
node-version: '20'
- name: Cache npm dependencies
uses: actions/cache@v3
with:
Expand All @@ -48,7 +48,7 @@ jobs:
CSC_LINK: ${{ secrets.CSC_LINK }}
CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NODE_OPTIONS: "--max-old-space-size=8192"
NODE_OPTIONS: '--max-old-space-size=8192'
run: |
npm run build
- name: Notarize macOS build
Expand All @@ -60,7 +60,7 @@ jobs:
- name: Build for non-macOS
if: matrix.os != 'macos-13' && matrix.os != 'macos-latest'
env:
NODE_OPTIONS: "--max-old-space-size=8192"
NODE_OPTIONS: '--max-old-space-size=8192'
run: |
npm run build
- name: Set version as env
Expand Down Expand Up @@ -98,4 +98,4 @@ jobs:
**/*.AppImage
**/*.dmg
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
"semi": false,
"singleQuote": true,
"endOfLine": "lf"
}
}
Loading

0 comments on commit 09b55d7

Please sign in to comment.