From ca72e94e3c70d81adc8c6c55f68ff2426cf5cd88 Mon Sep 17 00:00:00 2001 From: Niccolo Borgioli Date: Fri, 23 Aug 2024 11:02:30 +0200 Subject: [PATCH] update node and playwright --- .nvmrc | 2 +- Dockerfile | 2 +- README.md | 6 +-- package.json | 6 +-- packages/cli/build.js | 2 +- playwright.config.ts | 5 ++- pnpm-lock.yaml | 91 +++++++++++++++++++++++-------------------- 7 files changed, 60 insertions(+), 54 deletions(-) diff --git a/.nvmrc b/.nvmrc index ee09fac..751f4c9 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v20.11.1 +v22.7.0 diff --git a/Dockerfile b/Dockerfile index 51bbcd6..84bd134 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # FRONTEND -FROM node:20-alpine as client +FROM node:22-alpine as client ENV PNPM_HOME="/pnpm" ENV PATH="$PNPM_HOME:$PATH" RUN corepack enable diff --git a/README.md b/README.md index 464a60c..9fb2666 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@

-EN | [简体中文](README_zh-CN.md) | [ES](README_ES.md) +EN | [简体中文](README_zh-CN.md) | [ES](README_ES.md) ## About? @@ -149,8 +149,8 @@ There is a [guide](https://mariushosting.com/how-to-install-cryptgeon-on-your-sy **Requirements** -- `pnpm`: `>=6` -- `node`: `>=18` +- `pnpm`: `>=9` +- `node`: `>=22` - `rust`: edition `2021` **Install** diff --git a/package.json b/package.json index ce8a6b4..228df77 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "scripts": { - "dev:docker": "docker-compose -f docker-compose.dev.yaml up redis", + "dev:docker": "docker compose -f docker-compose.dev.yaml up redis", "dev:packages": "pnpm --parallel run dev", "dev": "run-p dev:*", "docker:up": "docker compose -f docker-compose.dev.yaml up", @@ -12,8 +12,8 @@ "build": "pnpm run --recursive --filter=!@cryptgeon/backend build" }, "devDependencies": { - "@playwright/test": "^1.42.1", - "@types/node": "^20.11.28", + "@playwright/test": "^1.46.1", + "@types/node": "^22.5.0", "npm-run-all": "^4.1.5", "shelljs": "^0.8.5" }, diff --git a/packages/cli/build.js b/packages/cli/build.js index a640484..7a81d9d 100644 --- a/packages/cli/build.js +++ b/packages/cli/build.js @@ -1,4 +1,4 @@ -import pkg from './package.json' assert { type: 'json' } +import pkg from './package.json' with { type: 'json' } import { build } from 'tsup' const watch = process.argv.slice(2)[0] === '--watch' diff --git a/playwright.config.ts b/playwright.config.ts index 7618e7e..4a71394 100644 --- a/playwright.config.ts +++ b/playwright.config.ts @@ -4,12 +4,13 @@ const config: PlaywrightTestConfig = { use: { video: 'retain-on-failure', baseURL: 'http://localhost:1234', - actionTimeout: 60_000, + actionTimeout: 10_000, }, outputDir: './test-results', testDir: './test', - timeout: 60_000, + timeout: 10_000, + fullyParallel: true, webServer: { command: 'docker compose -f docker-compose.dev.yaml up', diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9802800..a518c31 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,11 +9,11 @@ importers: .: devDependencies: '@playwright/test': - specifier: ^1.42.1 - version: 1.42.1 + specifier: ^1.46.1 + version: 1.46.1 '@types/node': - specifier: ^20.11.28 - version: 20.11.28 + specifier: ^22.5.0 + version: 22.5.0 npm-run-all: specifier: ^4.1.5 version: 4.1.5 @@ -91,13 +91,13 @@ importers: version: 12.1.0 '@sveltejs/adapter-static': specifier: ^3.0.1 - version: 3.0.1(@sveltejs/kit@2.5.2(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.1.7(@types/node@20.11.28)))(svelte@4.2.12)(vite@5.1.7(@types/node@20.11.28))) + version: 3.0.1(@sveltejs/kit@2.5.2(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.1.7(@types/node@22.5.0)))(svelte@4.2.12)(vite@5.1.7(@types/node@22.5.0))) '@sveltejs/kit': specifier: ^2.5.2 - version: 2.5.2(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.1.7(@types/node@20.11.28)))(svelte@4.2.12)(vite@5.1.7(@types/node@20.11.28)) + version: 2.5.2(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.1.7(@types/node@22.5.0)))(svelte@4.2.12)(vite@5.1.7(@types/node@22.5.0)) '@sveltejs/vite-plugin-svelte': specifier: ^3.0.2 - version: 3.0.2(svelte@4.2.12)(vite@5.1.7(@types/node@20.11.28)) + version: 3.0.2(svelte@4.2.12)(vite@5.1.7(@types/node@22.5.0)) '@types/file-saver': specifier: ^2.0.7 version: 2.0.7 @@ -127,7 +127,7 @@ importers: version: 5.3.3 vite: specifier: ^5.1.7 - version: 5.1.7(@types/node@20.11.28) + version: 5.1.7(@types/node@22.5.0) packages/proxy: dependencies: @@ -590,9 +590,9 @@ packages: resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} engines: {node: '>=14'} - '@playwright/test@1.42.1': - resolution: {integrity: sha512-Gq9rmS54mjBL/7/MvBaNOBwbfnh7beHvS6oS4srqXFcQHpQCV1+c8JXWE8VLPyRDhgS3H8x8A7hztqI9VnwrAQ==} - engines: {node: '>=16'} + '@playwright/test@1.46.1': + resolution: {integrity: sha512-Fq6SwLujA/DOIvNC2EL/SojJnkKf/rAwJ//APpJJHRyMi1PdKrY3Az+4XNQ51N4RTbItbIByQ0jgd1tayq1aeA==} + engines: {node: '>=18'} hasBin: true '@polka/url@1.0.0-next.24': @@ -790,8 +790,8 @@ packages: '@types/node@20.11.24': resolution: {integrity: sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==} - '@types/node@20.11.28': - resolution: {integrity: sha512-M/GPWVS2wLkSkNHVeLkrF2fD5Lx5UC4PxA0uZcKc6QqbIQUJyW1jVjueJYi1z8n0I5PxYrtpnPnWglE+y9A0KA==} + '@types/node@22.5.0': + resolution: {integrity: sha512-DkFrJOe+rfdHTqqMg0bSNlGlQ85hSoh2TPzZyhHsXnMtligRWpxUySiyw8FY14ITt24HVCiQPWxS3KO/QlGmWg==} '@types/pug@2.0.10': resolution: {integrity: sha512-Sk/uYFOBAB7mb74XcpizmH0KOR2Pv3D2Hmrh1Dmy5BmK3MpdSa5kqZcg6EKBdklU0bFXX9gCfzvpnyUehrPIuA==} @@ -1705,14 +1705,14 @@ packages: resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==} engines: {node: '>= 6'} - playwright-core@1.42.1: - resolution: {integrity: sha512-mxz6zclokgrke9p1vtdy/COWBH+eOZgYUVVU34C73M+4j4HLlQJHtfcqiqqxpP0o8HhMkflvfbquLX5dg6wlfA==} - engines: {node: '>=16'} + playwright-core@1.46.1: + resolution: {integrity: sha512-h9LqIQaAv+CYvWzsZ+h3RsrqCStkBHlgo6/TJlFst3cOTlLghBQlJwPOZKQJTKNaD3QIB7aAVQ+gfWbN3NXB7A==} + engines: {node: '>=18'} hasBin: true - playwright@1.42.1: - resolution: {integrity: sha512-PgwB03s2DZBcNRoW+1w9E+VkLBxweib6KTXM0M3tkiT4jVxKSi6PmVJ591J+0u10LUrgxB7dLRbiJqO5s2QPMg==} - engines: {node: '>=16'} + playwright@1.46.1: + resolution: {integrity: sha512-oPcr1yqoXLCkgKtD5eNUPLiN40rYEM39odNpIb6VE6S7/15gJmA1NzVv6zJYusV0e7tzvkU/utBFNa/Kpxmwng==} + engines: {node: '>=18'} hasBin: true possible-typed-array-names@1.0.0: @@ -2149,6 +2149,9 @@ packages: undici-types@5.26.5: resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} + undici-types@6.19.8: + resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==} + update-browserslist-db@1.0.13: resolution: {integrity: sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==} hasBin: true @@ -2588,9 +2591,9 @@ snapshots: '@pkgjs/parseargs@0.11.0': optional: true - '@playwright/test@1.42.1': + '@playwright/test@1.46.1': dependencies: - playwright: 1.42.1 + playwright: 1.46.1 '@polka/url@1.0.0-next.24': {} @@ -2681,13 +2684,13 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.21.0': optional: true - '@sveltejs/adapter-static@3.0.1(@sveltejs/kit@2.5.2(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.1.7(@types/node@20.11.28)))(svelte@4.2.12)(vite@5.1.7(@types/node@20.11.28)))': + '@sveltejs/adapter-static@3.0.1(@sveltejs/kit@2.5.2(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.1.7(@types/node@22.5.0)))(svelte@4.2.12)(vite@5.1.7(@types/node@22.5.0)))': dependencies: - '@sveltejs/kit': 2.5.2(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.1.7(@types/node@20.11.28)))(svelte@4.2.12)(vite@5.1.7(@types/node@20.11.28)) + '@sveltejs/kit': 2.5.2(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.1.7(@types/node@22.5.0)))(svelte@4.2.12)(vite@5.1.7(@types/node@22.5.0)) - '@sveltejs/kit@2.5.2(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.1.7(@types/node@20.11.28)))(svelte@4.2.12)(vite@5.1.7(@types/node@20.11.28))': + '@sveltejs/kit@2.5.2(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.1.7(@types/node@22.5.0)))(svelte@4.2.12)(vite@5.1.7(@types/node@22.5.0))': dependencies: - '@sveltejs/vite-plugin-svelte': 3.0.2(svelte@4.2.12)(vite@5.1.7(@types/node@20.11.28)) + '@sveltejs/vite-plugin-svelte': 3.0.2(svelte@4.2.12)(vite@5.1.7(@types/node@22.5.0)) '@types/cookie': 0.6.0 cookie: 0.6.0 devalue: 4.3.2 @@ -2701,28 +2704,28 @@ snapshots: sirv: 2.0.4 svelte: 4.2.12 tiny-glob: 0.2.9 - vite: 5.1.7(@types/node@20.11.28) + vite: 5.1.7(@types/node@22.5.0) - '@sveltejs/vite-plugin-svelte-inspector@2.0.0(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.1.7(@types/node@20.11.28)))(svelte@4.2.12)(vite@5.1.7(@types/node@20.11.28))': + '@sveltejs/vite-plugin-svelte-inspector@2.0.0(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.1.7(@types/node@22.5.0)))(svelte@4.2.12)(vite@5.1.7(@types/node@22.5.0))': dependencies: - '@sveltejs/vite-plugin-svelte': 3.0.2(svelte@4.2.12)(vite@5.1.7(@types/node@20.11.28)) + '@sveltejs/vite-plugin-svelte': 3.0.2(svelte@4.2.12)(vite@5.1.7(@types/node@22.5.0)) debug: 4.3.4 svelte: 4.2.12 - vite: 5.1.7(@types/node@20.11.28) + vite: 5.1.7(@types/node@22.5.0) transitivePeerDependencies: - supports-color - '@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.1.7(@types/node@20.11.28))': + '@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.1.7(@types/node@22.5.0))': dependencies: - '@sveltejs/vite-plugin-svelte-inspector': 2.0.0(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.1.7(@types/node@20.11.28)))(svelte@4.2.12)(vite@5.1.7(@types/node@20.11.28)) + '@sveltejs/vite-plugin-svelte-inspector': 2.0.0(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.1.7(@types/node@22.5.0)))(svelte@4.2.12)(vite@5.1.7(@types/node@22.5.0)) debug: 4.3.4 deepmerge: 4.3.1 kleur: 4.1.5 magic-string: 0.30.7 svelte: 4.2.12 svelte-hmr: 0.15.3(svelte@4.2.12) - vite: 5.1.7(@types/node@20.11.28) - vitefu: 0.2.5(vite@5.1.7(@types/node@20.11.28)) + vite: 5.1.7(@types/node@22.5.0) + vitefu: 0.2.5(vite@5.1.7(@types/node@22.5.0)) transitivePeerDependencies: - supports-color @@ -2743,15 +2746,15 @@ snapshots: dependencies: undici-types: 5.26.5 - '@types/node@20.11.28': + '@types/node@22.5.0': dependencies: - undici-types: 5.26.5 + undici-types: 6.19.8 '@types/pug@2.0.10': {} '@types/through@0.0.33': dependencies: - '@types/node': 20.11.24 + '@types/node': 22.5.0 '@zerodevx/svelte-toast@0.9.5(svelte@4.2.12)': dependencies: @@ -3694,11 +3697,11 @@ snapshots: pirates@4.0.6: {} - playwright-core@1.42.1: {} + playwright-core@1.46.1: {} - playwright@1.42.1: + playwright@1.46.1: dependencies: - playwright-core: 1.42.1 + playwright-core: 1.46.1 optionalDependencies: fsevents: 2.3.2 @@ -4200,6 +4203,8 @@ snapshots: undici-types@5.26.5: {} + undici-types@6.19.8: {} + update-browserslist-db@1.0.13(browserslist@4.23.0): dependencies: browserslist: 4.23.0 @@ -4213,18 +4218,18 @@ snapshots: spdx-correct: 3.2.0 spdx-expression-parse: 3.0.1 - vite@5.1.7(@types/node@20.11.28): + vite@5.1.7(@types/node@22.5.0): dependencies: esbuild: 0.19.12 postcss: 8.4.35 rollup: 4.12.0 optionalDependencies: - '@types/node': 20.11.28 + '@types/node': 22.5.0 fsevents: 2.3.3 - vitefu@0.2.5(vite@5.1.7(@types/node@20.11.28)): + vitefu@0.2.5(vite@5.1.7(@types/node@22.5.0)): optionalDependencies: - vite: 5.1.7(@types/node@20.11.28) + vite: 5.1.7(@types/node@22.5.0) wcwidth@1.0.1: dependencies: