From e012d71efe9ccb7337cad25f095522a2098ba38d Mon Sep 17 00:00:00 2001 From: Arthur Green Date: Wed, 4 Dec 2024 19:07:43 +0400 Subject: [PATCH] ci: bump node version (#408) * chore: ts fixes * ci: bump node version --- .github/workflows/deploy-to-gh-pages.yml | 2 +- .github/workflows/format.yml | 2 +- .github/workflows/lighthouse.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/playwright.yml | 2 +- .github/workflows/test.yml | 2 +- .gitignore | 2 ++ .vscode/settings.json | 3 ++- package.json | 5 ++-- pnpm-lock.yaml | 31 +++++++++++++++++++----- src/layouts/base-layout.tsx | 0 tsconfig.json | 2 +- vite-env.d.ts | 1 + 13 files changed, 39 insertions(+), 17 deletions(-) create mode 100644 src/layouts/base-layout.tsx diff --git a/.github/workflows/deploy-to-gh-pages.yml b/.github/workflows/deploy-to-gh-pages.yml index dd92ba28..0762c8b0 100644 --- a/.github/workflows/deploy-to-gh-pages.yml +++ b/.github/workflows/deploy-to-gh-pages.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [20] + node-version: [22] steps: - uses: actions/checkout@v4 - uses: pnpm/action-setup@v4 diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index f4e67ad0..813b37bb 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [20] + node-version: [22] steps: - uses: actions/checkout@v4 - uses: pnpm/action-setup@v4 diff --git a/.github/workflows/lighthouse.yml b/.github/workflows/lighthouse.yml index 9af48ee4..1beb5b90 100644 --- a/.github/workflows/lighthouse.yml +++ b/.github/workflows/lighthouse.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [20] + node-version: [22] steps: - uses: actions/checkout@v4 - uses: pnpm/action-setup@v4 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index ce1a43ad..187b3db6 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [20] + node-version: [22] steps: - uses: actions/checkout@v4 - uses: pnpm/action-setup@v4 diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml index 6bc99a3f..567071f9 100644 --- a/.github/workflows/playwright.yml +++ b/.github/workflows/playwright.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [20] + node-version: [22] env: CI: true DEBUG: pw:webserver diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 751c785d..0366e6b4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [20] + node-version: [22] steps: - uses: actions/checkout@v4 - uses: pnpm/action-setup@v4 diff --git a/.gitignore b/.gitignore index ff1ef05f..dcbe5fdf 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,8 @@ storybook-static/ # Test Coverage coverage/ +.react-router/ + # Playwright /test-results/ /playwright-report/ diff --git a/.vscode/settings.json b/.vscode/settings.json index 4bd8fb4b..899d7976 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,6 @@ { "editor.formatOnSave": true, "editor.defaultFormatter": "esbenp.prettier-vscode", - "npm.packageManager": "pnpm" + "npm.packageManager": "pnpm", + "typescript.preferences.preferTypeOnlyAutoImports": true } diff --git a/package.json b/package.json index 391f6fd5..98ddafe0 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "dev": "vite serve", "build": "vite build", "preview": "vite preview", + "typecheck": "tsc -b", "test": "vitest", "coverage": "vitest run --coverage", "e2e": "playwright test", @@ -18,7 +19,6 @@ "lint": "eslint src/ --ext .tsx,.jsx,.js,.ts", "storybook": "storybook dev -p 6006", "build-storybook": "storybook build", - "build-typescript": "tsc -b", "format:check": "prettier --check .", "format:write": "prettier --write ." }, @@ -72,7 +72,6 @@ "eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-storybook": "^0.6.15", "eslint-plugin-unicorn": "^55.0.0", - "lightningcss": "^1.22.0", "msw": "^1.3.3", "nx": "20.1.4", "postcss": "^8.4.41", @@ -96,7 +95,7 @@ "dexie-react-hooks": "^1.1.7", "react": "^18.3.1", "react-dom": "^18.3.1", - "react-router": "^7.0.1", + "react-router": "^7.0.2", "theme-change": "^2.5.0", "uuid": "^9.0.0" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b22744e7..84445655 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -30,8 +30,8 @@ importers: specifier: ^18.3.1 version: 18.3.1(react@18.3.1) react-router: - specifier: ^7.0.1 - version: 7.0.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^7.0.2 + version: 7.0.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) theme-change: specifier: ^2.5.0 version: 2.5.0 @@ -159,9 +159,6 @@ importers: eslint-plugin-unicorn: specifier: ^55.0.0 version: 55.0.0(eslint@8.57.0) - lightningcss: - specifier: ^1.22.0 - version: 1.22.0 msw: specifier: ^1.3.3 version: 1.3.3(typescript@5.7.2) @@ -8345,6 +8342,16 @@ packages: react-dom: optional: true + react-router@7.0.2: + resolution: {integrity: sha512-m5AcPfTRUcjwmhBzOJGEl6Y7+Crqyju0+TgTQxoS4SO+BkWbhOrcfZNq6wSWdl2BBbJbsAoBUb8ZacOFT+/JlA==} + engines: {node: '>=20.0.0'} + peerDependencies: + react: '>=18' + react-dom: '>=18' + peerDependenciesMeta: + react-dom: + optional: true + react-style-singleton@2.2.1: resolution: {integrity: sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==} engines: {node: '>=10'} @@ -16060,7 +16067,8 @@ snapshots: detect-indent@6.1.0: {} - detect-libc@1.0.3: {} + detect-libc@1.0.3: + optional: true detect-newline@3.1.0: {} @@ -18181,6 +18189,7 @@ snapshots: lightningcss-linux-x64-gnu: 1.22.0 lightningcss-linux-x64-musl: 1.22.0 lightningcss-win32-x64-msvc: 1.22.0 + optional: true lilconfig@2.1.0: {} @@ -19896,6 +19905,16 @@ snapshots: optionalDependencies: react-dom: 18.3.1(react@18.3.1) + react-router@7.0.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + dependencies: + '@types/cookie': 0.6.0 + cookie: 1.0.2 + react: 18.3.1 + set-cookie-parser: 2.7.1 + turbo-stream: 2.4.0 + optionalDependencies: + react-dom: 18.3.1(react@18.3.1) + react-style-singleton@2.2.1(@types/react@18.3.4)(react@18.3.1): dependencies: get-nonce: 1.0.1 diff --git a/src/layouts/base-layout.tsx b/src/layouts/base-layout.tsx new file mode 100644 index 00000000..e69de29b diff --git a/tsconfig.json b/tsconfig.json index f010fa5a..dda1df27 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -22,5 +22,5 @@ "noImplicitAny": true, "skipLibCheck": true }, - "include": ["src"] + "include": ["src", "vite-env.d.ts"] } diff --git a/vite-env.d.ts b/vite-env.d.ts index 85ad244c..f79cebf1 100644 --- a/vite-env.d.ts +++ b/vite-env.d.ts @@ -1,2 +1,3 @@ /// +/// declare const APP_VERSION;