Skip to content

Commit

Permalink
move to yarn4, bump deps
Browse files Browse the repository at this point in the history
  • Loading branch information
jonluca committed Nov 3, 2023
1 parent 11516fb commit 23b550a
Show file tree
Hide file tree
Showing 14 changed files with 7,923 additions and 4,434 deletions.
25 changes: 0 additions & 25 deletions .eslintrc.js

This file was deleted.

24 changes: 24 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"env": {
"browser": true,
"node": true,
"es2021": true
},
"extends": ["plugin:react/recommended", "prettier", "eslint:recommended"],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": 12,
"sourceType": "module"
},
"plugins": ["react", "@typescript-eslint", "react-hooks"],
"rules": {
"no-use-before-define": "off",
"no-unused-vars": "off",
"@typescript-eslint/no-use-before-define": ["error"],
"react-hooks/rules-of-hooks": "error",
"react-hooks/exhaustive-deps": "warn"
}
}
6 changes: 3 additions & 3 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Use Node.js 18
- name: Use Node.js 19
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 19
- name: yarn install, build, and test
run: |
yarn --frozen-lockfile
yarn install --immutable
yarn build
yarn typecheck
yarn test
Expand Down
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,10 @@ Thumbs.db
# Ignore built ts files
dist/**/*

.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v19
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ dist
build
node_modules
.github
.yarn
9 changes: 0 additions & 9 deletions .prettierrc.js

This file was deleted.

893 changes: 893 additions & 0 deletions .yarn/releases/yarn-4.0.1.cjs

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
yarnPath: .yarn/releases/yarn-4.0.1.cjs
45 changes: 28 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,36 +23,38 @@
"serve:local": "vite serve",
"clean": "rimraf dist/",
"copy-files": "copyfiles \"public/**/*\" dist && copyfiles -u 2 \"dist/client/**/*\" dist && copyfiles -u 2 \"dist/client/assets/**/*\" dist/public",
"format": "prettier --write ."
"format": "prettier --write src types"
},
"dependencies": {
"@types/serve-static": "^1.15.4",
"autoprefixer": "^10.4.16",
"compression": "1.7.4",
"cross-env": "^7.0.3",
"express": "4.18.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.16.0",
"react-router-dom": "^6.18.0",
"serve-static": "^1.15.0",
"tsx": "^3.13.0"
"tsx": "^3.14.0"
},
"devDependencies": {
"@testing-library/jest-dom": "^6.1.3",
"@testing-library/jest-dom": "^6.1.4",
"@testing-library/react": "^14.0.0",
"@types/compression": "1.7.3",
"@types/compression": "1.7.4",
"@types/concurrently": "6.4.0",
"@types/eslint": "8.44.3",
"@types/express": "^4.17.18",
"@types/node": "20.8.2",
"@types/react": "^18.2.24",
"@types/react-dom": "^18.2.8",
"@types/eslint": "8.44.6",
"@types/express": "^4.17.20",
"@types/node": "20.8.10",
"@types/react": "^18.2.34",
"@types/react-dom": "^18.2.14",
"@types/react-router-dom": "^5.3.3",
"@typescript-eslint/eslint-plugin": "^6.7.4",
"@typescript-eslint/parser": "^6.7.4",
"@vitejs/plugin-react": "^4.1.0",
"concurrently": "8.2.1",
"@typescript-eslint/eslint-plugin": "^6.9.1",
"@typescript-eslint/parser": "^6.9.1",
"@vitejs/plugin-react": "^4.1.1",
"@vitest/coverage-v8": "^0.34.6",
"concurrently": "8.2.2",
"copyfiles": "^2.4.1",
"eslint": "^8.50.0",
"eslint": "^8.52.0",
"eslint-config-prettier": "^9.0.0",
"eslint-config-standard": "^17.1.0",
"eslint-plugin-react": "^7.33.2",
Expand All @@ -61,9 +63,18 @@
"postcss": "8.4.31",
"prettier": "^3.0.3",
"rimraf": "^5.0.5",
"tailwindcss": "3.3.3",
"tailwindcss": "3.3.5",
"typescript": "5.2.2",
"vite": "4.4.10",
"vite": "4.5.0",
"vitest": "^0.34.6"
},
"packageManager": "[email protected]",
"prettier": {
"printWidth": 120,
"semi": true,
"singleQuote": false,
"trailingComma": "all",
"bracketSpacing": true,
"arrowParens": "avoid"
}
}
12 changes: 11 additions & 1 deletion public/site.webmanifest
Original file line number Diff line number Diff line change
@@ -1 +1,11 @@
{"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"}
{
"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 change: 0 additions & 1 deletion src/server/routes/api.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
"use strict";
import { Request, Response } from "express";

/**
Expand Down
3 changes: 2 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"moduleResolution": "Node",
"skipLibCheck": true,
"sourceMap": true,
"target": "ES2017"
"target": "ES2017",
"types": ["vite/client"]
},
"include": ["src/**/*", "types/*", "server.ts", "node_modules/vite/types/*"],
"ts-node": {
Expand Down
Loading

1 comment on commit 23b550a

@vercel
Copy link

@vercel vercel bot commented on 23b550a Nov 3, 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.