From bce5f01b21f2dcaeb6b6e6e8bddf5247f3a3ae66 Mon Sep 17 00:00:00 2001 From: Shane Walker Date: Sat, 21 Oct 2023 16:13:27 -0500 Subject: [PATCH] bumped remix to v2.1.0 (#493) * bumped remix to v2.1.0 updated engine to node: 20 * rolled engine version back --- app/components/error-boundary.tsx | 2 +- app/routes/users+/$username.test.tsx | 2 +- package-lock.json | 129 +++++++++++++-------------- package.json | 18 ++-- 4 files changed, 75 insertions(+), 76 deletions(-) diff --git a/app/components/error-boundary.tsx b/app/components/error-boundary.tsx index 12175f31..07a3cba8 100644 --- a/app/components/error-boundary.tsx +++ b/app/components/error-boundary.tsx @@ -1,9 +1,9 @@ import { + type ErrorResponse, isRouteErrorResponse, useParams, useRouteError, } from '@remix-run/react' -import { type ErrorResponse } from '@remix-run/router' import { getErrorMessage } from '#app/utils/misc.tsx' type StatusHandler = (info: { diff --git a/app/routes/users+/$username.test.tsx b/app/routes/users+/$username.test.tsx index 88a7cefa..d0c47a67 100644 --- a/app/routes/users+/$username.test.tsx +++ b/app/routes/users+/$username.test.tsx @@ -2,7 +2,7 @@ * @vitest-environment jsdom */ import { faker } from '@faker-js/faker' -import { unstable_createRemixStub as createRemixStub } from '@remix-run/testing' +import { createRemixStub } from '@remix-run/testing' import { render, screen } from '@testing-library/react' import setCookieParser from 'set-cookie-parser' import { test } from 'vitest' diff --git a/package-lock.json b/package-lock.json index 1053c239..1824415b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,11 +21,11 @@ "@radix-ui/react-toast": "^1.1.5", "@radix-ui/react-tooltip": "^1.0.7", "@react-email/components": "^0.0.7", - "@remix-run/css-bundle": "^2.0.1", - "@remix-run/express": "^2.0.1", - "@remix-run/node": "^2.0.1", - "@remix-run/react": "^2.0.1", - "@remix-run/server-runtime": "^2.0.1", + "@remix-run/css-bundle": "^2.1.0", + "@remix-run/express": "^2.1.0", + "@remix-run/node": "^2.1.0", + "@remix-run/react": "^2.1.0", + "@remix-run/server-runtime": "^2.1.0", "@sentry/remix": "^7.70.0", "address": "^2.0.1", "autoprefixer": "^10.4.16", @@ -74,10 +74,10 @@ "devDependencies": { "@faker-js/faker": "^8.1.0", "@playwright/test": "^1.38.1", - "@remix-run/dev": "^2.0.1", - "@remix-run/eslint-config": "^2.0.1", - "@remix-run/serve": "^2.0.1", - "@remix-run/testing": "^2.0.1", + "@remix-run/dev": "^2.1.0", + "@remix-run/eslint-config": "^2.1.0", + "@remix-run/serve": "^2.1.0", + "@remix-run/testing": "^2.1.0", "@sly-cli/sly": "^1.4.10", "@testing-library/jest-dom": "^6.1.3", "@testing-library/react": "^14.0.0", @@ -122,7 +122,7 @@ "vitest": "^0.34.5" }, "engines": { - "node": "18" + "node": "^18 || ^20" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -2934,17 +2934,17 @@ } }, "node_modules/@remix-run/css-bundle": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@remix-run/css-bundle/-/css-bundle-2.0.1.tgz", - "integrity": "sha512-PDAak97HvrSa6Pu84iN14o8NNitqLeyO0iH9zqWNhrsO2nFELUOzQ/02H/9QWmmIYgVpbUIQxJlp70ZEAV2dyw==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@remix-run/css-bundle/-/css-bundle-2.1.0.tgz", + "integrity": "sha512-HkLQzfJFbg0yLUPvczSsdOHuK1dfTYl+egOSsJ0WYY0PNSKxjlFAI4v1ZKyPrgllVdVeqUWVtmPCjwdcYdlxjw==", "engines": { "node": ">=18.0.0" } }, "node_modules/@remix-run/dev": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@remix-run/dev/-/dev-2.0.1.tgz", - "integrity": "sha512-FxlbgCBXUzKxBSs2OfNoBUadcARr4S7S4JQ28t7MLcIsfJI/uHmGAMXClatsgeZuRvPK/Zx/W3B4uho1FTfQVA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@remix-run/dev/-/dev-2.1.0.tgz", + "integrity": "sha512-Hn5lw46F+a48dp5uHKe68ckaHgdStW4+PmLod+LMFEqrMbkF0j4XD1ousebxlv989o0Uy/OLgfRMgMy4cBOvHg==", "dev": true, "dependencies": { "@babel/core": "^7.21.8", @@ -2956,7 +2956,7 @@ "@babel/traverse": "^7.21.5", "@mdx-js/mdx": "^2.3.0", "@npmcli/package-json": "^4.0.1", - "@remix-run/server-runtime": "2.0.1", + "@remix-run/server-runtime": "2.1.0", "@types/mdx": "^2.0.5", "@vanilla-extract/integration": "^6.2.0", "arg": "^5.0.1", @@ -3003,7 +3003,7 @@ "node": ">=18.0.0" }, "peerDependencies": { - "@remix-run/serve": "^2.0.1", + "@remix-run/serve": "^2.1.0", "typescript": "^5.1.0" }, "peerDependenciesMeta": { @@ -3602,9 +3602,9 @@ } }, "node_modules/@remix-run/eslint-config": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@remix-run/eslint-config/-/eslint-config-2.0.1.tgz", - "integrity": "sha512-XIKnID45O60Vtegsib2qJOVYBCq2VRn+3qaEAX1NtgcQDI1xD7o3k1k3MCdQqaGD9/XmcbJumkmuAIX3Ti6/mA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@remix-run/eslint-config/-/eslint-config-2.1.0.tgz", + "integrity": "sha512-yfeUnHpUG+XveujMi6QODKMGhs5CvKWCKzASU397BPXiPWbMv6r2acfODSWK64ZdBMu9hcLbOb42GBFydVQeHA==", "dev": true, "dependencies": { "@babel/core": "^7.21.8", @@ -3639,11 +3639,11 @@ } }, "node_modules/@remix-run/express": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@remix-run/express/-/express-2.0.1.tgz", - "integrity": "sha512-YwqWF+Se6EoKL7uJhA/55BwP6kxIgDo//kHoh8miaMvVUKa1KMLru79kqU74d7PleYf9Qj4i2cXygz1mMl032w==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@remix-run/express/-/express-2.1.0.tgz", + "integrity": "sha512-R5myPowQx6LYWY3+EqP42q19MOCT3+ZGwb2f0UKNs9a34R8U3nFpGWL7saXryC+To+EasujEScc8rTQw5Pftog==", "dependencies": { - "@remix-run/node": "2.0.1" + "@remix-run/node": "2.1.0" }, "engines": { "node": ">=18.0.0" @@ -3659,11 +3659,11 @@ } }, "node_modules/@remix-run/node": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@remix-run/node/-/node-2.0.1.tgz", - "integrity": "sha512-pWsbmkNRb7azYomh1IGSKeW68hkwBBp6L2AWvfKSq2r2MJXHCzqgAJEc0uWkEUx6OtFbVNOg27g/cMCyKvrjIA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@remix-run/node/-/node-2.1.0.tgz", + "integrity": "sha512-TeSgjXnZUUlmw5FVpBVnXY7MLpracjdnwFNwoJE5NQkiUEFnGD/Yhvk4F2fOCkszqc2Z25KRclc5noweyiFu6Q==", "dependencies": { - "@remix-run/server-runtime": "2.0.1", + "@remix-run/server-runtime": "2.1.0", "@remix-run/web-fetch": "^4.4.1", "@remix-run/web-file": "^3.1.0", "@remix-run/web-stream": "^1.1.0", @@ -3685,13 +3685,13 @@ } }, "node_modules/@remix-run/react": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@remix-run/react/-/react-2.0.1.tgz", - "integrity": "sha512-xZgJcRjzx9gjCzh7dDZGQJcmQPPFisMrDwhUuIzlSHuR2rEQCCGZPBLVCpbD1zhDfbdvOugbf2DLSmP2TEBXNA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@remix-run/react/-/react-2.1.0.tgz", + "integrity": "sha512-DeYgfsvNxHqNn29sGA3XsZCciMKo2EFTQ9hHkuVPTsJXC4ipHr6Dja1j6UzZYPe/ZuKppiuTjueWCQlE2jOe1w==", "dependencies": { - "@remix-run/router": "1.9.0", - "@remix-run/server-runtime": "2.0.1", - "react-router-dom": "6.16.0" + "@remix-run/router": "1.10.0", + "@remix-run/server-runtime": "2.1.0", + "react-router-dom": "6.17.0" }, "engines": { "node": ">=18.0.0" @@ -3708,21 +3708,21 @@ } }, "node_modules/@remix-run/router": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.9.0.tgz", - "integrity": "sha512-bV63itrKBC0zdT27qYm6SDZHlkXwFL1xMBuhkn+X7l0+IIhNaH5wuuvZKp6eKhCD4KFhujhfhCT1YxXW6esUIA==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.10.0.tgz", + "integrity": "sha512-Lm+fYpMfZoEucJ7cMxgt4dYt8jLfbpwRCzAjm9UgSLOkmlqo9gupxt6YX3DY0Fk155NT9l17d/ydi+964uS9Lw==", "engines": { "node": ">=14.0.0" } }, "node_modules/@remix-run/serve": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@remix-run/serve/-/serve-2.0.1.tgz", - "integrity": "sha512-3aljUFhzsIwgGN2SuMgrXQH5TqA8e52afrYAnHR5CpHXxVxkwyDB4BNKng7yLRIywsOi5MHOclu/5preKV8qVA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@remix-run/serve/-/serve-2.1.0.tgz", + "integrity": "sha512-XHI+vPYz217qrg1QcV38TTPlEBTzMJzAt0SImPutyF0S2IBrZGZIFMEsspI0i0wNvdcdQz1IqmSx+mTghzW8eQ==", "dev": true, "dependencies": { - "@remix-run/express": "2.0.1", - "@remix-run/node": "2.0.1", + "@remix-run/express": "2.1.0", + "@remix-run/node": "2.1.0", "chokidar": "^3.5.3", "compression": "^1.7.4", "express": "^4.17.1", @@ -3750,17 +3750,16 @@ } }, "node_modules/@remix-run/server-runtime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@remix-run/server-runtime/-/server-runtime-2.0.1.tgz", - "integrity": "sha512-xCW2aw9EILx7F3orEHN2fcpEkNzZTRU8VzP7gS9pmHP45qteFqsY5Qg2/dnF17royWmeeBNhnXaJOgb76W1KEA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@remix-run/server-runtime/-/server-runtime-2.1.0.tgz", + "integrity": "sha512-Uz69yF4Gu6F3VYQub3JgDo9godN8eDMeZclkadBTAWN7bYLonu0ChR/GlFxS35OLeF7BDgudxOSZob0nE1WHNg==", "dependencies": { - "@remix-run/router": "1.9.0", + "@remix-run/router": "1.10.0", "@types/cookie": "^0.4.1", "@web3-storage/multipart-parser": "^1.0.0", "cookie": "^0.4.1", "set-cookie-parser": "^2.4.8", - "source-map": "^0.7.3", - "type-fest": "^4.0.0" + "source-map": "^0.7.3" }, "engines": { "node": ">=18.0.0" @@ -3788,15 +3787,15 @@ } }, "node_modules/@remix-run/testing": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@remix-run/testing/-/testing-2.0.1.tgz", - "integrity": "sha512-EgiuKzxf1RLhFzXw1W9jGPPbikbSNu9i/9HHukYqPePMlmtWmvSreb+LRAtyyNaxreyav03YoR2UZbpRRjmFYA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@remix-run/testing/-/testing-2.1.0.tgz", + "integrity": "sha512-eLPx4Bmjt243kyRpQTong1eFo6nkvSfCr65bb5PfoF172DKnsSSCYWAmBmB72VwtAPESHxBm3g6AUbhwphkU6A==", "dev": true, "dependencies": { - "@remix-run/node": "2.0.1", - "@remix-run/react": "2.0.1", - "@remix-run/router": "1.9.0", - "react-router-dom": "6.16.0" + "@remix-run/node": "2.1.0", + "@remix-run/react": "2.1.0", + "@remix-run/router": "1.10.0", + "react-router-dom": "6.17.0" }, "engines": { "node": ">=18.0.0" @@ -15149,11 +15148,11 @@ } }, "node_modules/react-router": { - "version": "6.16.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.16.0.tgz", - "integrity": "sha512-VT4Mmc4jj5YyjpOi5jOf0I+TYzGpvzERy4ckNSvSh2RArv8LLoCxlsZ2D+tc7zgjxcY34oTz2hZaeX5RVprKqA==", + "version": "6.17.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.17.0.tgz", + "integrity": "sha512-YJR3OTJzi3zhqeJYADHANCGPUu9J+6fT5GLv82UWRGSxu6oJYCKVmxUcaBQuGm9udpWmPsvpme/CdHumqgsoaA==", "dependencies": { - "@remix-run/router": "1.9.0" + "@remix-run/router": "1.10.0" }, "engines": { "node": ">=14.0.0" @@ -15163,12 +15162,12 @@ } }, "node_modules/react-router-dom": { - "version": "6.16.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.16.0.tgz", - "integrity": "sha512-aTfBLv3mk/gaKLxgRDUPbPw+s4Y/O+ma3rEN1u8EgEpLpPe6gNjIsWt9rxushMHHMb7mSwxRGdGlGdvmFsyPIg==", + "version": "6.17.0", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.17.0.tgz", + "integrity": "sha512-qWHkkbXQX+6li0COUUPKAUkxjNNqPJuiBd27dVwQGDNsuFBdMbrS6UZ0CLYc4CsbdLYTckn4oB4tGDuPZpPhaQ==", "dependencies": { - "@remix-run/router": "1.9.0", - "react-router": "6.16.0" + "@remix-run/router": "1.10.0", + "react-router": "6.17.0" }, "engines": { "node": ">=14.0.0" diff --git a/package.json b/package.json index c70e9f23..be0885fc 100644 --- a/package.json +++ b/package.json @@ -54,11 +54,11 @@ "@radix-ui/react-toast": "^1.1.5", "@radix-ui/react-tooltip": "^1.0.7", "@react-email/components": "^0.0.7", - "@remix-run/css-bundle": "^2.0.1", - "@remix-run/express": "^2.0.1", - "@remix-run/node": "^2.0.1", - "@remix-run/react": "^2.0.1", - "@remix-run/server-runtime": "^2.0.1", + "@remix-run/css-bundle": "^2.1.0", + "@remix-run/express": "^2.1.0", + "@remix-run/node": "^2.1.0", + "@remix-run/react": "^2.1.0", + "@remix-run/server-runtime": "^2.1.0", "@sentry/remix": "^7.70.0", "address": "^2.0.1", "autoprefixer": "^10.4.16", @@ -107,10 +107,10 @@ "devDependencies": { "@faker-js/faker": "^8.1.0", "@playwright/test": "^1.38.1", - "@remix-run/dev": "^2.0.1", - "@remix-run/eslint-config": "^2.0.1", - "@remix-run/serve": "^2.0.1", - "@remix-run/testing": "^2.0.1", + "@remix-run/dev": "^2.1.0", + "@remix-run/eslint-config": "^2.1.0", + "@remix-run/serve": "^2.1.0", + "@remix-run/testing": "^2.1.0", "@sly-cli/sly": "^1.4.10", "@testing-library/jest-dom": "^6.1.3", "@testing-library/react": "^14.0.0",