From 86d9726216a8a3cdbd9d353e1d5ec7c7e65f2411 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= Date: Wed, 10 Jul 2024 20:29:38 +0200 Subject: [PATCH] chore: update dependencies --- .eslintrc.js | 2 +- .github/workflows/deploy.yml | 2 +- cypress/support/delete-user.ts | 2 +- package.json | 81 +++++++++++++++++----------------- prettier.config.js | 4 ++ remix.init/package.json | 4 +- vitest.config.ts | 5 --- 7 files changed, 49 insertions(+), 51 deletions(-) create mode 100644 prettier.config.js diff --git a/.eslintrc.js b/.eslintrc.js index f691fd19..7c1ad563 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -92,7 +92,7 @@ module.exports = { { files: ["**/*.md"], plugins: ["markdown"], - extends: ["plugin:markdown/recommended", "prettier"], + extends: ["plugin:markdown/recommended-legacy", "prettier"], }, // Jest/Vitest diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 77ce839f..9170c488 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -135,7 +135,7 @@ jobs: field: app - name: 🎈 Setup Fly - uses: superfly/flyctl-actions/setup-flyctl@v2 + uses: superfly/flyctl-actions/setup-flyctl@v1 - name: 🚀 Deploy Staging if: ${{ github.ref == 'refs/heads/dev' }} diff --git a/cypress/support/delete-user.ts b/cypress/support/delete-user.ts index d618f329..70c0c02d 100644 --- a/cypress/support/delete-user.ts +++ b/cypress/support/delete-user.ts @@ -3,7 +3,7 @@ // npx ts-node -r tsconfig-paths/register ./cypress/support/delete-user.ts username@example.com // and that user will get deleted -import { PrismaClientKnownRequestError } from "@prisma/client/runtime"; +import { PrismaClientKnownRequestError } from "@prisma/client/runtime/library"; import { installGlobals } from "@remix-run/node"; import { prisma } from "~/db.server"; diff --git a/package.json b/package.json index 2e9fa0fc..9e05bc6e 100644 --- a/package.json +++ b/package.json @@ -3,10 +3,10 @@ "private": true, "sideEffects": false, "scripts": { - "build": "run-s build:*", + "build": "npm-run-all --sequential build:*", "build:remix": "remix build", "build:server": "esbuild --platform=node --format=cjs ./server.ts --outdir=build --bundle --external:fsevents", - "dev": "run-p dev:*", + "dev": "npm-run-all --parallel dev:*", "dev:server": "cross-env NODE_ENV=development npm run build:server -- --watch", "dev:remix": "remix dev --manual -c \"node --require ./mocks --watch-path ./build/server.js --watch ./build/server.js\"", "docker": "docker compose up -d", @@ -21,9 +21,8 @@ "pretest:e2e:run": "npm run build", "test:e2e:run": "cross-env PORT=8811 start-server-and-test start:mocks http://localhost:8811 \"npx cypress run\"", "typecheck": "tsc && tsc -p cypress", - "validate": "run-p \"test -- --run\" lint typecheck test:e2e:run" + "validate": "npm-run-all --parallel \"test -- --run\" lint typecheck test:e2e:run" }, - "prettier": {}, "eslintIgnore": [ "/node_modules", "/build", @@ -32,7 +31,7 @@ ], "dependencies": { "@isaacs/express-prometheus-middleware": "^1.2.1", - "@prisma/client": "^4.16.2", + "@prisma/client": "^5.19.1", "@remix-run/css-bundle": "*", "@remix-run/express": "*", "@remix-run/node": "*", @@ -41,66 +40,66 @@ "chokidar": "^3.6.0", "compression": "^1.7.4", "cross-env": "^7.0.3", - "express": "^4.19.2", - "isbot": "^4.4.0", + "express": "^4.20.0", + "isbot": "^5.1.17", "morgan": "^1.10.0", - "prom-client": "^15.1.2", + "prom-client": "^15.1.3", "react": "^18.3.1", "react-dom": "^18.3.1", "source-map-support": "^0.5.21", "tiny-invariant": "^1.3.3" }, "devDependencies": { - "@faker-js/faker": "^8.4.1", + "@faker-js/faker": "^9.0.0", "@remix-run/dev": "*", - "@testing-library/cypress": "^10.0.1", - "@testing-library/jest-dom": "^6.4.2", + "@testing-library/cypress": "^10.0.2", + "@testing-library/jest-dom": "^6.5.0", "@types/bcryptjs": "^2.4.6", "@types/compression": "^1.7.5", "@types/cookie": "^0.6.0", - "@types/eslint": "^8.56.10", + "@types/eslint": "^8.56.12", "@types/express": "^4.17.21", "@types/morgan": "^1.9.9", - "@types/node": "^18.19.31", - "@types/react": "^18.3.1", + "@types/node": "^20.16.5", + "@types/react": "^18.3.5", "@types/react-dom": "^18.3.0", "@types/source-map-support": "^0.5.10", - "@typescript-eslint/eslint-plugin": "^6.21.0", - "@typescript-eslint/parser": "^6.21.0", - "@vitejs/plugin-react": "^4.2.1", - "@vitest/coverage-v8": "^1.5.3", - "autoprefixer": "^10.4.19", + "@typescript-eslint/eslint-plugin": "^7.18.0", + "@typescript-eslint/parser": "^7.18.0", + "@vitejs/plugin-react": "^4.3.1", + "@vitest/coverage-v8": "^2.0.5", + "autoprefixer": "^10.4.20", "cookie": "^0.6.0", - "cypress": "^13.8.1", + "cypress": "^13.14.2", "dotenv": "^16.4.5", - "esbuild": "^0.20.2", + "esbuild": "^0.23.1", "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", - "eslint-import-resolver-typescript": "^3.6.1", - "eslint-plugin-cypress": "^2.15.2", - "eslint-plugin-import": "^2.29.1", - "eslint-plugin-jest": "^27.9.0", + "eslint-import-resolver-typescript": "^3.6.3", + "eslint-plugin-cypress": "^3.5.0", + "eslint-plugin-import": "^2.30.0", + "eslint-plugin-jest": "^28.8.3", "eslint-plugin-jest-dom": "^5.4.0", - "eslint-plugin-jsx-a11y": "^6.8.0", - "eslint-plugin-markdown": "^3.0.1", - "eslint-plugin-react": "^7.34.1", + "eslint-plugin-jsx-a11y": "^6.10.0", + "eslint-plugin-markdown": "^5.1.0", + "eslint-plugin-react": "^7.35.2", "eslint-plugin-react-hooks": "^4.6.2", - "eslint-plugin-testing-library": "^6.2.2", - "happy-dom": "^14.7.1", - "msw": "^2.2.14", - "npm-run-all": "^4.1.5", - "postcss": "^8.4.38", - "prettier": "3.2.5", - "prettier-plugin-tailwindcss": "^0.5.14", - "prisma": "^4.16.2", - "start-server-and-test": "^2.0.3", - "tailwindcss": "^3.4.3", + "eslint-plugin-testing-library": "^6.3.0", + "happy-dom": "^15.7.3", + "msw": "^2.4.4", + "npm-run-all2": "^6.2.2", + "postcss": "^8.4.45", + "prettier": "3.3.3", + "prettier-plugin-tailwindcss": "^0.6.6", + "prisma": "^5.19.1", + "start-server-and-test": "^2.0.7", + "tailwindcss": "^3.4.10", "ts-node": "^10.9.2", "tsconfig-paths": "^4.2.0", - "typescript": "^5.4.5", - "vite": "^5.2.11", + "typescript": "^5.6.2", + "vite": "^5.4.3", "vite-tsconfig-paths": "^4.3.2", - "vitest": "^1.5.3" + "vitest": "^2.0.5" }, "engines": { "node": ">=18.0.0" diff --git a/prettier.config.js b/prettier.config.js new file mode 100644 index 00000000..776594f0 --- /dev/null +++ b/prettier.config.js @@ -0,0 +1,4 @@ +/** @type {import("prettier").Config} */ +module.exports = { + plugins: ["prettier-plugin-tailwindcss"], +}; diff --git a/remix.init/package.json b/remix.init/package.json index 1a82a5cb..79f5d425 100644 --- a/remix.init/package.json +++ b/remix.init/package.json @@ -5,7 +5,7 @@ "license": "MIT", "dependencies": { "@iarna/toml": "^2.2.5", - "@npmcli/package-json": "^5.1.0", - "semver": "^7.6.0" + "@npmcli/package-json": "^5.2.0", + "semver": "^7.6.3" } } diff --git a/vitest.config.ts b/vitest.config.ts index 997dc440..6c967986 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -12,10 +12,5 @@ export default defineConfig({ environment: "happy-dom", setupFiles: ["./test/setup-test-env.ts"], include: ["./app/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}"], - watchExclude: [ - ".*\\/node_modules\\/.*", - ".*\\/build\\/.*", - ".*\\/postgres-data\\/.*", - ], }, });