Skip to content

Commit

Permalink
Merge pull request #15 from kitloong/feature/vup
Browse files Browse the repository at this point in the history
Version up
  • Loading branch information
kitloong authored Aug 19, 2023
2 parents a045e17 + bcc683c commit 9e04bc7
Show file tree
Hide file tree
Showing 14 changed files with 1,222 additions and 1,371 deletions.
47 changes: 11 additions & 36 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,46 +1,18 @@
{
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:react/recommended",
"plugin:react-hooks/recommended",
"airbnb",
"next/core-web-vitals"
],
"overrides": [
{
"files": [
"*.ts",
"*.tsx"
],
"extends": [
"plugin:@typescript-eslint/recommended",
"airbnb-typescript"
],
"plugins": [
"@typescript-eslint"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"project": "./tsconfig.json"
},
"rules": {
"@typescript-eslint/semi": [
2,
"never"
],
// Use semicolon as member delimiter for interfaces and type
"@typescript-eslint/member-delimiter-style": 2
}
}
],
"plugins": [
"react",
"react-hooks"
"airbnb-typescript",
"next/core-web-vitals",
"prettier"
],
"parserOptions": {
"project": "./tsconfig.json"
},
"rules": {
// Checks rules of Hooks
"react-hooks/rules-of-hooks": "error",
// Checks rules of Hooks
"react-hooks/exhaustive-deps": "warn",
// https://stackoverflow.com/questions/69928061/struggling-with-typescript-react-eslint-and-simple-arrow-functions-components
"react/function-component-definition": [
2,
Expand All @@ -63,6 +35,9 @@
],
// Since we do not use prop-types
"react/require-default-props": 0,
// Use semicolon as member delimiter for interfaces and type
"@typescript-eslint/member-delimiter-style": 2,
"@typescript-eslint/semi": 0,
"semi": [
2,
"never"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ jobs:

strategy:
matrix:
node-version: [16.x, 18.x, 19.x]
node-version: [16.x, 18.x, 19.x, 20.x]

steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
with:
version: 6.32.9
version: 8
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
Expand Down
1 change: 1 addition & 0 deletions next-env.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/// <reference types="next" />
/// <reference types="next/image-types/global" />
/// <reference types="next/navigation-types/compat/navigation" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/basic-features/typescript for more information.
48 changes: 24 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,49 +9,49 @@
"lint": "next lint"
},
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^6.4.0",
"@fortawesome/free-brands-svg-icons": "^6.4.0",
"@fortawesome/free-regular-svg-icons": "^6.4.0",
"@fortawesome/free-solid-svg-icons": "^6.4.0",
"@fortawesome/fontawesome-svg-core": "^6.4.2",
"@fortawesome/free-brands-svg-icons": "^6.4.2",
"@fortawesome/free-regular-svg-icons": "^6.4.2",
"@fortawesome/free-solid-svg-icons": "^6.4.2",
"@fortawesome/react-fontawesome": "^0.2.0",
"@popperjs/core": "^2.11.7",
"@popperjs/core": "^2.11.8",
"@reduxjs/toolkit": "^1.9.5",
"axios": "^0.27.2",
"bootstrap": "^5.2.3",
"bootstrap": "^5.3.1",
"chart.js": "^3.9.1",
"classnames": "^2.3.2",
"cookie": "^0.5.0",
"cookies-next": "^2.1.1",
"next": "^13.4.2",
"cookies-next": "^2.1.2",
"next": "^13.4.18",
"nprogress": "^0.2.0",
"react": "^18.2.0",
"react-bootstrap": "^2.7.4",
"react-bootstrap": "^2.8.0",
"react-chartjs-2": "^4.3.1",
"react-dom": "^18.2.0",
"react-paginate": "^8.2.0",
"react-redux": "^8.0.5",
"react-redux": "^8.1.2",
"react-resize-detector": "^7.1.2",
"swr": "^2.1.5"
"swr": "^2.2.1"
},
"devDependencies": {
"@types/cookie": "^0.5.1",
"@types/node": "^18.16.9",
"@types/node": "^18.17.5",
"@types/nprogress": "^0.2.0",
"@types/react": "^18.2.6",
"@types/react-dom": "^18.2.4",
"@typescript-eslint/eslint-plugin": "^5.59.5",
"@typescript-eslint/parser": "^5.59.5",
"eslint": "^8.40.0",
"@types/react": "^18.2.20",
"@types/react-dom": "^18.2.7",
"@typescript-eslint/eslint-plugin": "^6.4.0",
"@typescript-eslint/parser": "^6.4.0",
"eslint": "^8.47.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-airbnb-typescript": "^17.0.0",
"eslint-config-next": "^13.4.2",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-import": "^2.27.5",
"eslint-config-airbnb-typescript": "^17.1.0",
"eslint-config-next": "^13.4.18",
"eslint-config-prettier": "^8.10.0",
"eslint-plugin-import": "^2.28.0",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"json-server": "^0.17.3",
"sass": "^1.62.1",
"typescript": "^5.0.4"
"sass": "^1.66.0",
"typescript": "^5.1.6"
}
}
Loading

1 comment on commit 9e04bc7

@vercel
Copy link

@vercel vercel bot commented on 9e04bc7 Aug 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.