Skip to content

Commit

Permalink
Merge pull request #908 from elPandaFriki/master
Browse files Browse the repository at this point in the history
4.2.0
  • Loading branch information
elPandaFriki authored Apr 26, 2024
2 parents 75b25ae + 55ebfac commit 7dab9e9
Show file tree
Hide file tree
Showing 41 changed files with 10,518 additions and 12,873 deletions.
12 changes: 0 additions & 12 deletions .eslintrc.cjs

This file was deleted.

54 changes: 54 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"env": {
"browser": true,
"es2020": true
},
"extends": [
"eslint:recommended",
"plugin:react/jsx-runtime",
"plugin:@typescript-eslint/recommended",
"plugin:react-hooks/recommended",
"prettier"
],
"root": true,
"ignorePatterns": ["node_modules", "dist", "build", "scripts"],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"project": true,
"tsconfigRootDir": "./",
"ecmaVersion": "latest",
"sourceType": "module"
},
"plugins": ["react", "react-refresh", "@typescript-eslint"],
"rules": {
"@typescript-eslint/consistent-type-imports": [
2,
{
"fixStyle": "separate-type-imports"
}
],
"@typescript-eslint/no-restricted-imports": [
2,
{
"paths": [
{
"name": "react-redux",
"importNames": ["useSelector", "useStore", "useDispatch"],
"message": "Please use pre-typed versions from `src/app/hooks.ts` instead."
}
]
}
]
},
"overrides": [
{
"files": ["*.{c,m,}{t,j}s", "*.{t,j}sx"]
},
{
"files": ["*{test,spec}.{t,j}s?(x)"],
"env": {
"jest": true
}
}
]
}
2 changes: 1 addition & 1 deletion .github/workflows/code_quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
language: ['typescript']
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
Expand Down
74 changes: 37 additions & 37 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
name: Deploy
on:
workflow_run:
workflows: ['Tests']
types:
- completed
branches: ['production']
workflow_dispatch:
workflow_run:
workflows: ['Tests']
types:
- completed
branches: ['production']
workflow_dispatch:
permissions:
contents: read
pages: write
id-token: write
contents: read
pages: write
id-token: write
concurrency:
group: 'pages'
cancel-in-progress: true
group: 'pages'
cancel-in-progress: true
jobs:
deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Set up Node
uses: actions/setup-node@v3
with:
node-version: 16
cache: 'npm'
- name: Install dependencies
run: npm install
- name: Build
run: npm run build
- name: Setup Pages
uses: actions/configure-pages@v3
- name: Upload artifact
uses: actions/upload-pages-artifact@v1
with:
path: './build'
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Set up Node
uses: actions/setup-node@v4
with:
node-version: 20
cache: 'npm'
- name: Install dependencies
run: npm install
- name: Build
run: npm run build
- name: Setup Pages
uses: actions/configure-pages@v4
- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
path: './build'
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16.x]
node-version: [20.x]
steps:
- name: Set repository to latest commit
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up Node.js environment to version ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Install dependencies
Expand Down
File renamed without changes.
Loading

0 comments on commit 7dab9e9

Please sign in to comment.