Skip to content

Commit 23b550a

Browse files
committed
move to yarn4, bump deps
1 parent 11516fb commit 23b550a

File tree

14 files changed

+7923
-4434
lines changed

14 files changed

+7923
-4434
lines changed

.eslintrc.js

-25
This file was deleted.

.eslintrc.json

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"env": {
3+
"browser": true,
4+
"node": true,
5+
"es2021": true
6+
},
7+
"extends": ["plugin:react/recommended", "prettier", "eslint:recommended"],
8+
"parser": "@typescript-eslint/parser",
9+
"parserOptions": {
10+
"ecmaFeatures": {
11+
"jsx": true
12+
},
13+
"ecmaVersion": 12,
14+
"sourceType": "module"
15+
},
16+
"plugins": ["react", "@typescript-eslint", "react-hooks"],
17+
"rules": {
18+
"no-use-before-define": "off",
19+
"no-unused-vars": "off",
20+
"@typescript-eslint/no-use-before-define": ["error"],
21+
"react-hooks/rules-of-hooks": "error",
22+
"react-hooks/exhaustive-deps": "warn"
23+
}
24+
}

.github/workflows/nodejs.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ jobs:
88

99
steps:
1010
- uses: actions/checkout@v3
11-
- name: Use Node.js 18
11+
- name: Use Node.js 19
1212
uses: actions/setup-node@v3
1313
with:
14-
node-version: 18
14+
node-version: 19
1515
- name: yarn install, build, and test
1616
run: |
17-
yarn --frozen-lockfile
17+
yarn install --immutable
1818
yarn build
1919
yarn typecheck
2020
yarn test

.gitignore

+7
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,10 @@ Thumbs.db
3737
# Ignore built ts files
3838
dist/**/*
3939

40+
.pnp.*
41+
.yarn/*
42+
!.yarn/patches
43+
!.yarn/plugins
44+
!.yarn/releases
45+
!.yarn/sdks
46+
!.yarn/versions

.nvmrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v19

.prettierignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ dist
22
build
33
node_modules
44
.github
5+
.yarn

.prettierrc.js

-9
This file was deleted.

.yarn/releases/yarn-4.0.1.cjs

+893
Large diffs are not rendered by default.

.yarnrc.yml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
yarnPath: .yarn/releases/yarn-4.0.1.cjs

package.json

+28-17
Original file line numberDiff line numberDiff line change
@@ -23,36 +23,38 @@
2323
"serve:local": "vite serve",
2424
"clean": "rimraf dist/",
2525
"copy-files": "copyfiles \"public/**/*\" dist && copyfiles -u 2 \"dist/client/**/*\" dist && copyfiles -u 2 \"dist/client/assets/**/*\" dist/public",
26-
"format": "prettier --write ."
26+
"format": "prettier --write src types"
2727
},
2828
"dependencies": {
29+
"@types/serve-static": "^1.15.4",
2930
"autoprefixer": "^10.4.16",
3031
"compression": "1.7.4",
3132
"cross-env": "^7.0.3",
3233
"express": "4.18.2",
3334
"react": "^18.2.0",
3435
"react-dom": "^18.2.0",
35-
"react-router-dom": "^6.16.0",
36+
"react-router-dom": "^6.18.0",
3637
"serve-static": "^1.15.0",
37-
"tsx": "^3.13.0"
38+
"tsx": "^3.14.0"
3839
},
3940
"devDependencies": {
40-
"@testing-library/jest-dom": "^6.1.3",
41+
"@testing-library/jest-dom": "^6.1.4",
4142
"@testing-library/react": "^14.0.0",
42-
"@types/compression": "1.7.3",
43+
"@types/compression": "1.7.4",
4344
"@types/concurrently": "6.4.0",
44-
"@types/eslint": "8.44.3",
45-
"@types/express": "^4.17.18",
46-
"@types/node": "20.8.2",
47-
"@types/react": "^18.2.24",
48-
"@types/react-dom": "^18.2.8",
45+
"@types/eslint": "8.44.6",
46+
"@types/express": "^4.17.20",
47+
"@types/node": "20.8.10",
48+
"@types/react": "^18.2.34",
49+
"@types/react-dom": "^18.2.14",
4950
"@types/react-router-dom": "^5.3.3",
50-
"@typescript-eslint/eslint-plugin": "^6.7.4",
51-
"@typescript-eslint/parser": "^6.7.4",
52-
"@vitejs/plugin-react": "^4.1.0",
53-
"concurrently": "8.2.1",
51+
"@typescript-eslint/eslint-plugin": "^6.9.1",
52+
"@typescript-eslint/parser": "^6.9.1",
53+
"@vitejs/plugin-react": "^4.1.1",
54+
"@vitest/coverage-v8": "^0.34.6",
55+
"concurrently": "8.2.2",
5456
"copyfiles": "^2.4.1",
55-
"eslint": "^8.50.0",
57+
"eslint": "^8.52.0",
5658
"eslint-config-prettier": "^9.0.0",
5759
"eslint-config-standard": "^17.1.0",
5860
"eslint-plugin-react": "^7.33.2",
@@ -61,9 +63,18 @@
6163
"postcss": "8.4.31",
6264
"prettier": "^3.0.3",
6365
"rimraf": "^5.0.5",
64-
"tailwindcss": "3.3.3",
66+
"tailwindcss": "3.3.5",
6567
"typescript": "5.2.2",
66-
"vite": "4.4.10",
68+
"vite": "4.5.0",
6769
"vitest": "^0.34.6"
70+
},
71+
"packageManager": "[email protected]",
72+
"prettier": {
73+
"printWidth": 120,
74+
"semi": true,
75+
"singleQuote": false,
76+
"trailingComma": "all",
77+
"bracketSpacing": true,
78+
"arrowParens": "avoid"
6879
}
6980
}

public/site.webmanifest

+11-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,11 @@
1-
{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}
1+
{
2+
"name": "",
3+
"short_name": "",
4+
"icons": [
5+
{ "src": "/android-chrome-192x192.png", "sizes": "192x192", "type": "image/png" },
6+
{ "src": "/android-chrome-512x512.png", "sizes": "512x512", "type": "image/png" }
7+
],
8+
"theme_color": "#ffffff",
9+
"background_color": "#ffffff",
10+
"display": "standalone"
11+
}

src/server/routes/api.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
"use strict";
21
import { Request, Response } from "express";
32

43
/**

tsconfig.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
"moduleResolution": "Node",
1919
"skipLibCheck": true,
2020
"sourceMap": true,
21-
"target": "ES2017"
21+
"target": "ES2017",
22+
"types": ["vite/client"]
2223
},
2324
"include": ["src/**/*", "types/*", "server.ts", "node_modules/vite/types/*"],
2425
"ts-node": {

0 commit comments

Comments
 (0)