diff --git a/app/components/list/list.tsx b/app/components/list/list.tsx index 856ecdc66..b8a6a0a48 100644 --- a/app/components/list/list.tsx +++ b/app/components/list/list.tsx @@ -11,9 +11,6 @@ import { Pagination } from "./pagination"; import { Table } from "../table"; /** - * List components takes advantage use `useFetcher()` - * to get the data of the parent route. - * * The route is required to export {@link IndexResponse} */ export const List = ({ diff --git a/app/components/shared/file-dropzone/status-message.tsx b/app/components/shared/file-dropzone/status-message.tsx index 84103453d..8bf7b11cc 100644 --- a/app/components/shared/file-dropzone/status-message.tsx +++ b/app/components/shared/file-dropzone/status-message.tsx @@ -1,7 +1,7 @@ import { useMemo } from "react"; import type { Fetcher } from "@remix-run/react"; import { CheckmarkIcon, ImageFileIcon } from "~/components/icons/library"; -import { tw } from "~/utils"; +import { isFormProcessing, tw } from "~/utils"; import { Spinner } from "../spinner"; export interface StatusMessageProps { @@ -21,11 +21,12 @@ export function StatusMessage({ /** Indicates if tehre was a front-end error with the dropzone */ error: boolean; }) { - const { data, type } = fetcher; + const { data, state } = fetcher; const isError = data?.error || error; - const isPending = ["actionSubmission", "loaderSubmission"].includes(type); - const isDone = type === "done"; + const isPending = isFormProcessing(state); + + const isDone = state === "idle" && data != null; const styles = useMemo( () => diff --git a/app/components/user/password-reset-form.tsx b/app/components/user/password-reset-form.tsx index d65ce01f2..fc4b68a84 100644 --- a/app/components/user/password-reset-form.tsx +++ b/app/components/user/password-reset-form.tsx @@ -17,7 +17,7 @@ export default function PasswordResetForm({ userEmail }: Props) { return (
- +

Use the link to send yourself a password reset email. You will be diff --git a/app/modules/auth/components/continue-with-email-form.tsx b/app/modules/auth/components/continue-with-email-form.tsx index f75a81848..52a4709df 100644 --- a/app/modules/auth/components/continue-with-email-form.tsx +++ b/app/modules/auth/components/continue-with-email-form.tsx @@ -11,8 +11,8 @@ export function ContinueWithEmailForm() { const { isResend } = useLoaderData(); const sendMagicLink = useTypedFetcher(); - const { data, state, type } = sendMagicLink; - const isSuccessFull = type === "done" && !data?.error; + const { data, state } = sendMagicLink; + const isSuccessFull = state === "idle" && data != null && !data?.error; const isLoading = state === "submitting" || state === "loading"; const buttonLabel = isLoading ? "Sending you a link..." diff --git a/package-lock.json b/package-lock.json index 74226b941..3e522c36e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,10 +16,10 @@ "@radix-ui/react-select": "1.2.1", "@radix-ui/react-tabs": "1.0.3", "@radix-ui/react-toast": "1.1.3", - "@remix-run/css-bundle": "^1.18.1", - "@remix-run/node": "^1.18.1", - "@remix-run/react": "^1.18.1", - "@remix-run/serve": "^1.18.1", + "@remix-run/css-bundle": "^1.19.1", + "@remix-run/node": "^1.19.1", + "@remix-run/react": "^1.19.1", + "@remix-run/serve": "^1.19.1", "@supabase/supabase-js": "^2.26.0", "cookie": "^0.5.0", "crisp-sdk-web": "^1.0.19", @@ -50,8 +50,8 @@ "devDependencies": { "@faker-js/faker": "^7.6.0", "@playwright/test": "^1.34.3", - "@remix-run/dev": "^1.18.1", - "@remix-run/eslint-config": "^1.18.1", + "@remix-run/dev": "^1.19.1", + "@remix-run/eslint-config": "^1.19.1", "@tailwindcss/aspect-ratio": "^0.4.2", "@tailwindcss/forms": "^0.5.3", "@tailwindcss/typography": "^0.5.9", @@ -4084,17 +4084,17 @@ } }, "node_modules/@remix-run/css-bundle": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@remix-run/css-bundle/-/css-bundle-1.18.1.tgz", - "integrity": "sha512-j6CflpY3fmMb1chZLBvNPifLmAVWexXJ+tiiZKwXC/eVIrbKADlQCsWmTdYPjsMP+OkZja7TGdSivqQOjCAu0Q==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/@remix-run/css-bundle/-/css-bundle-1.19.1.tgz", + "integrity": "sha512-KHIgRlhVm5MFgZgwhKiPm9mkGPy9Bg1YJpDTGqI64OXR193S9uOw89//Nd5ypvsb7EokPzY70YtbbsZWDbh8+A==", "engines": { "node": ">=14.0.0" } }, "node_modules/@remix-run/dev": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@remix-run/dev/-/dev-1.18.1.tgz", - "integrity": "sha512-uT+YRGiR17p51y284MvEZMpkFkIykJ0uTVP3hepW0fvtoD+dt09DFVk1AQkJhEKlIVECkyR9lrOtceP/2qML6w==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/@remix-run/dev/-/dev-1.19.1.tgz", + "integrity": "sha512-Piv/neRW1yMscvDpg8RZnyFzEYHT0etr3DYvBbSSe3wOWlXRItUFaXdn8I4ecp4gBkaNJmCni8ueYsk8FeqoBw==", "dev": true, "dependencies": { "@babel/core": "^7.21.8", @@ -4107,7 +4107,7 @@ "@babel/traverse": "^7.21.5", "@babel/types": "^7.21.5", "@npmcli/package-json": "^2.0.0", - "@remix-run/server-runtime": "1.18.1", + "@remix-run/server-runtime": "1.19.1", "@vanilla-extract/integration": "^6.2.0", "arg": "^5.0.1", "cacache": "^15.0.5", @@ -4115,7 +4115,7 @@ "chokidar": "^3.5.1", "dotenv": "^16.0.0", "esbuild": "0.17.6", - "esbuild-plugins-node-modules-polyfill": "^1.0.16", + "esbuild-plugins-node-modules-polyfill": "^1.3.0", "execa": "5.1.1", "exit-hook": "2.2.1", "express": "^4.17.1", @@ -4159,7 +4159,7 @@ "node": ">=14.0.0" }, "peerDependencies": { - "@remix-run/serve": "^1.18.1" + "@remix-run/serve": "^1.19.1" }, "peerDependenciesMeta": { "@remix-run/serve": { @@ -4168,9 +4168,9 @@ } }, "node_modules/@remix-run/eslint-config": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@remix-run/eslint-config/-/eslint-config-1.18.1.tgz", - "integrity": "sha512-r0vjv+//isRseRShZ6RbX2bJSjQzfE7R2KOf4v1v+EVQZ59Vk0cR6UPwlxHN4Wc3jtTa2yBlLCm1H24ImKLQ4Q==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/@remix-run/eslint-config/-/eslint-config-1.19.1.tgz", + "integrity": "sha512-N4/IrN3Z6Rq+lB6zHbiqpA0XuP2fC+rRAi3jUsZvx0PppnKSNPW8f/qR9dD92RGxRAMOiv+ZLrrKBAwwfzPJ2w==", "dev": true, "dependencies": { "@babel/core": "^7.21.8", @@ -4205,11 +4205,11 @@ } }, "node_modules/@remix-run/express": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@remix-run/express/-/express-1.18.1.tgz", - "integrity": "sha512-jI751cvY2pi4ZD7/+5qAC1Xyt049EM3baNhm5VATsVaTNVOJbNxazOvKflv+bLbpw1lV9sF3MAAMnig5YqStMg==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/@remix-run/express/-/express-1.19.1.tgz", + "integrity": "sha512-Db5jj9qjHh4xVzN3JmO7zBWB7vJeRSUJSBwYIZBJVpTzuyfWm6whE2ms752hHRcON5FSCEEJhnUvfZCO7JMKLw==", "dependencies": { - "@remix-run/node": "1.18.1" + "@remix-run/node": "1.19.1" }, "engines": { "node": ">=14.0.0" @@ -4219,12 +4219,12 @@ } }, "node_modules/@remix-run/node": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@remix-run/node/-/node-1.18.1.tgz", - "integrity": "sha512-Civ8hQGdQKxmYtDvzV+8sYOPiLfH2FtT35iSwEqDN49uraInljoWngSwzrRmKkilhI4eABSN9fv0trUDyOTBrQ==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/@remix-run/node/-/node-1.19.1.tgz", + "integrity": "sha512-7RbuaG3PMkit04xhu+RdOLHbLj7rhPVJwLeMXAYreQ0D9hvssWNt2lPGEowLd//2IGthU8OvNpb1rB+vyFuF1Q==", "dependencies": { - "@remix-run/server-runtime": "1.18.1", - "@remix-run/web-fetch": "^4.3.4", + "@remix-run/server-runtime": "1.19.1", + "@remix-run/web-fetch": "^4.3.5", "@remix-run/web-file": "^3.0.2", "@remix-run/web-stream": "^1.0.3", "@web3-storage/multipart-parser": "^1.0.0", @@ -4238,12 +4238,12 @@ } }, "node_modules/@remix-run/react": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@remix-run/react/-/react-1.18.1.tgz", - "integrity": "sha512-vs94AxXXaXU0K3W4zQ05hR9R1+Ief9oq5JZOZKdeFoM2dgdSb6u/ovRNyQK1ukzjIBO9vARpNC0HMeqN/eGhtw==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/@remix-run/react/-/react-1.19.1.tgz", + "integrity": "sha512-VrNkI4wt8K+7QKVll/lkNzWwmg2v7LHhUjCWpYhYtmYiyDitl0n6t7pWysWbp+EYwlRUHr4JgHtBgEekhkd7/w==", "dependencies": { - "@remix-run/router": "1.7.1", - "react-router-dom": "6.14.1" + "@remix-run/router": "1.7.2", + "react-router-dom": "6.14.2" }, "engines": { "node": ">=14.0.0" @@ -4254,20 +4254,20 @@ } }, "node_modules/@remix-run/router": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.7.1.tgz", - "integrity": "sha512-bgVQM4ZJ2u2CM8k1ey70o1ePFXsEzYVZoWghh6WjM8p59jQ7HxzbHW4SbnWFG7V9ig9chLawQxDTZ3xzOF8MkQ==", + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.7.2.tgz", + "integrity": "sha512-7Lcn7IqGMV+vizMPoEl5F0XDshcdDYtMI6uJLQdQz5CfZAwy3vvGKYSUk789qndt5dEC4HfSjviSYlSoHGL2+A==", "engines": { "node": ">=14" } }, "node_modules/@remix-run/serve": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@remix-run/serve/-/serve-1.18.1.tgz", - "integrity": "sha512-u3SFXjUYmm3RV02QMGfCrjw7qMxg7y3wpnDf9RWfZtZG6oQEHpGkJeUXdSJjVGCmGQlWtGoVaFZ0fOQllu9G4g==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/@remix-run/serve/-/serve-1.19.1.tgz", + "integrity": "sha512-ebymSwdykLH+Dtyg7RQDfL0g6Mh2ev/aiMYVPHVJewQmuThDJUmvASFG6uEqY9znDgi4yiBSywbRen89uuilSg==", "dependencies": { - "@remix-run/express": "1.18.1", - "@remix-run/node": "1.18.1", + "@remix-run/express": "1.19.1", + "@remix-run/node": "1.19.1", "compression": "^1.7.4", "express": "^4.17.1", "morgan": "^1.10.0" @@ -4280,11 +4280,11 @@ } }, "node_modules/@remix-run/server-runtime": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@remix-run/server-runtime/-/server-runtime-1.18.1.tgz", - "integrity": "sha512-E0sQlgUQG2ytFmUH7zRH7n2MufnP6WWWq1KpRoiuwJZxfTFIzaiCCIiNqbP/uXGWDGcwEevpawNUzzszL1tT0w==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/@remix-run/server-runtime/-/server-runtime-1.19.1.tgz", + "integrity": "sha512-sRTx/Ibl8HSLGhEr73YTZz3GzO5eZRCusfSJ8MBh1Kq0Mo571W9g4AJ/qJsF3G/wKTKxU2n75MVo0nIfTh4oZQ==", "dependencies": { - "@remix-run/router": "1.7.1", + "@remix-run/router": "1.7.2", "@types/cookie": "^0.4.1", "@web3-storage/multipart-parser": "^1.0.0", "cookie": "^0.4.1", @@ -4340,9 +4340,9 @@ } }, "node_modules/@remix-run/web-fetch": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/@remix-run/web-fetch/-/web-fetch-4.3.4.tgz", - "integrity": "sha512-AUM1XBa4hcgeNt2CD86OlB5aDLlqdMl0uJ+89R8dPGx07I5BwMXnbopCaPAkvSBIoHeT/IoLWIuZrLi7RvXS+Q==", + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/@remix-run/web-fetch/-/web-fetch-4.3.5.tgz", + "integrity": "sha512-cLLeNLvLRyFRhJLulzS98bb07kJ+ENkGaqUkBisdG4FNEoZF6tXtrTGLWJNJa1nAP/wFkMKEDxIP77LgAPyeow==", "dependencies": { "@remix-run/web-blob": "^3.0.4", "@remix-run/web-form-data": "^3.0.3", @@ -8051,9 +8051,9 @@ } }, "node_modules/esbuild-plugins-node-modules-polyfill": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/esbuild-plugins-node-modules-polyfill/-/esbuild-plugins-node-modules-polyfill-1.1.3.tgz", - "integrity": "sha512-h5gubIqBcAPQ3052rDxjHh8XAM5pSMGHlTNpDRt6GHsIX5V7eKjlK8R9CMpfqX76nQQG5A9o3ZHfnZDlf7WG4g==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/esbuild-plugins-node-modules-polyfill/-/esbuild-plugins-node-modules-polyfill-1.3.0.tgz", + "integrity": "sha512-r/aNOvAlIaIzqJwvFHWhDGrPF/Aj5qI1zKVeHbCFpKH+bnKW1BG2LGixMd3s6hyWcZHcfdl2QZRucVuOLzFRrA==", "dev": true, "dependencies": { "@jspm/core": "^2.0.1", @@ -15025,11 +15025,11 @@ } }, "node_modules/react-router": { - "version": "6.14.1", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.14.1.tgz", - "integrity": "sha512-U4PfgvG55LdvbQjg5Y9QRWyVxIdO1LlpYT7x+tMAxd9/vmiPuJhIwdxZuIQLN/9e3O4KFDHYfR9gzGeYMasW8g==", + "version": "6.14.2", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.14.2.tgz", + "integrity": "sha512-09Zss2dE2z+T1D03IheqAFtK4UzQyX8nFPWx6jkwdYzGLXd5ie06A6ezS2fO6zJfEb/SpG6UocN2O1hfD+2urQ==", "dependencies": { - "@remix-run/router": "1.7.1" + "@remix-run/router": "1.7.2" }, "engines": { "node": ">=14" @@ -15039,12 +15039,12 @@ } }, "node_modules/react-router-dom": { - "version": "6.14.1", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.14.1.tgz", - "integrity": "sha512-ssF6M5UkQjHK70fgukCJyjlda0Dgono2QGwqGvuk7D+EDGHdacEN3Yke2LTMjkrpHuFwBfDFsEjGVXBDmL+bWw==", + "version": "6.14.2", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.14.2.tgz", + "integrity": "sha512-5pWX0jdKR48XFZBuJqHosX3AAHjRAzygouMTyimnBPOLdY3WjzUSKhus2FVMihUFWzeLebDgr4r8UeQFAct7Bg==", "dependencies": { - "@remix-run/router": "1.7.1", - "react-router": "6.14.1" + "@remix-run/router": "1.7.2", + "react-router": "6.14.2" }, "engines": { "node": ">=14" @@ -21200,14 +21200,14 @@ } }, "@remix-run/css-bundle": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@remix-run/css-bundle/-/css-bundle-1.18.1.tgz", - "integrity": "sha512-j6CflpY3fmMb1chZLBvNPifLmAVWexXJ+tiiZKwXC/eVIrbKADlQCsWmTdYPjsMP+OkZja7TGdSivqQOjCAu0Q==" + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/@remix-run/css-bundle/-/css-bundle-1.19.1.tgz", + "integrity": "sha512-KHIgRlhVm5MFgZgwhKiPm9mkGPy9Bg1YJpDTGqI64OXR193S9uOw89//Nd5ypvsb7EokPzY70YtbbsZWDbh8+A==" }, "@remix-run/dev": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@remix-run/dev/-/dev-1.18.1.tgz", - "integrity": "sha512-uT+YRGiR17p51y284MvEZMpkFkIykJ0uTVP3hepW0fvtoD+dt09DFVk1AQkJhEKlIVECkyR9lrOtceP/2qML6w==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/@remix-run/dev/-/dev-1.19.1.tgz", + "integrity": "sha512-Piv/neRW1yMscvDpg8RZnyFzEYHT0etr3DYvBbSSe3wOWlXRItUFaXdn8I4ecp4gBkaNJmCni8ueYsk8FeqoBw==", "dev": true, "requires": { "@babel/core": "^7.21.8", @@ -21220,7 +21220,7 @@ "@babel/traverse": "^7.21.5", "@babel/types": "^7.21.5", "@npmcli/package-json": "^2.0.0", - "@remix-run/server-runtime": "1.18.1", + "@remix-run/server-runtime": "1.19.1", "@vanilla-extract/integration": "^6.2.0", "arg": "^5.0.1", "cacache": "^15.0.5", @@ -21228,7 +21228,7 @@ "chokidar": "^3.5.1", "dotenv": "^16.0.0", "esbuild": "0.17.6", - "esbuild-plugins-node-modules-polyfill": "^1.0.16", + "esbuild-plugins-node-modules-polyfill": "^1.3.0", "execa": "5.1.1", "exit-hook": "2.2.1", "express": "^4.17.1", @@ -21267,9 +21267,9 @@ } }, "@remix-run/eslint-config": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@remix-run/eslint-config/-/eslint-config-1.18.1.tgz", - "integrity": "sha512-r0vjv+//isRseRShZ6RbX2bJSjQzfE7R2KOf4v1v+EVQZ59Vk0cR6UPwlxHN4Wc3jtTa2yBlLCm1H24ImKLQ4Q==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/@remix-run/eslint-config/-/eslint-config-1.19.1.tgz", + "integrity": "sha512-N4/IrN3Z6Rq+lB6zHbiqpA0XuP2fC+rRAi3jUsZvx0PppnKSNPW8f/qR9dD92RGxRAMOiv+ZLrrKBAwwfzPJ2w==", "dev": true, "requires": { "@babel/core": "^7.21.8", @@ -21291,20 +21291,20 @@ } }, "@remix-run/express": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@remix-run/express/-/express-1.18.1.tgz", - "integrity": "sha512-jI751cvY2pi4ZD7/+5qAC1Xyt049EM3baNhm5VATsVaTNVOJbNxazOvKflv+bLbpw1lV9sF3MAAMnig5YqStMg==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/@remix-run/express/-/express-1.19.1.tgz", + "integrity": "sha512-Db5jj9qjHh4xVzN3JmO7zBWB7vJeRSUJSBwYIZBJVpTzuyfWm6whE2ms752hHRcON5FSCEEJhnUvfZCO7JMKLw==", "requires": { - "@remix-run/node": "1.18.1" + "@remix-run/node": "1.19.1" } }, "@remix-run/node": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@remix-run/node/-/node-1.18.1.tgz", - "integrity": "sha512-Civ8hQGdQKxmYtDvzV+8sYOPiLfH2FtT35iSwEqDN49uraInljoWngSwzrRmKkilhI4eABSN9fv0trUDyOTBrQ==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/@remix-run/node/-/node-1.19.1.tgz", + "integrity": "sha512-7RbuaG3PMkit04xhu+RdOLHbLj7rhPVJwLeMXAYreQ0D9hvssWNt2lPGEowLd//2IGthU8OvNpb1rB+vyFuF1Q==", "requires": { - "@remix-run/server-runtime": "1.18.1", - "@remix-run/web-fetch": "^4.3.4", + "@remix-run/server-runtime": "1.19.1", + "@remix-run/web-fetch": "^4.3.5", "@remix-run/web-file": "^3.0.2", "@remix-run/web-stream": "^1.0.3", "@web3-storage/multipart-parser": "^1.0.0", @@ -21315,37 +21315,37 @@ } }, "@remix-run/react": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@remix-run/react/-/react-1.18.1.tgz", - "integrity": "sha512-vs94AxXXaXU0K3W4zQ05hR9R1+Ief9oq5JZOZKdeFoM2dgdSb6u/ovRNyQK1ukzjIBO9vARpNC0HMeqN/eGhtw==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/@remix-run/react/-/react-1.19.1.tgz", + "integrity": "sha512-VrNkI4wt8K+7QKVll/lkNzWwmg2v7LHhUjCWpYhYtmYiyDitl0n6t7pWysWbp+EYwlRUHr4JgHtBgEekhkd7/w==", "requires": { - "@remix-run/router": "1.7.1", - "react-router-dom": "6.14.1" + "@remix-run/router": "1.7.2", + "react-router-dom": "6.14.2" } }, "@remix-run/router": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.7.1.tgz", - "integrity": "sha512-bgVQM4ZJ2u2CM8k1ey70o1ePFXsEzYVZoWghh6WjM8p59jQ7HxzbHW4SbnWFG7V9ig9chLawQxDTZ3xzOF8MkQ==" + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.7.2.tgz", + "integrity": "sha512-7Lcn7IqGMV+vizMPoEl5F0XDshcdDYtMI6uJLQdQz5CfZAwy3vvGKYSUk789qndt5dEC4HfSjviSYlSoHGL2+A==" }, "@remix-run/serve": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@remix-run/serve/-/serve-1.18.1.tgz", - "integrity": "sha512-u3SFXjUYmm3RV02QMGfCrjw7qMxg7y3wpnDf9RWfZtZG6oQEHpGkJeUXdSJjVGCmGQlWtGoVaFZ0fOQllu9G4g==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/@remix-run/serve/-/serve-1.19.1.tgz", + "integrity": "sha512-ebymSwdykLH+Dtyg7RQDfL0g6Mh2ev/aiMYVPHVJewQmuThDJUmvASFG6uEqY9znDgi4yiBSywbRen89uuilSg==", "requires": { - "@remix-run/express": "1.18.1", - "@remix-run/node": "1.18.1", + "@remix-run/express": "1.19.1", + "@remix-run/node": "1.19.1", "compression": "^1.7.4", "express": "^4.17.1", "morgan": "^1.10.0" } }, "@remix-run/server-runtime": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@remix-run/server-runtime/-/server-runtime-1.18.1.tgz", - "integrity": "sha512-E0sQlgUQG2ytFmUH7zRH7n2MufnP6WWWq1KpRoiuwJZxfTFIzaiCCIiNqbP/uXGWDGcwEevpawNUzzszL1tT0w==", + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/@remix-run/server-runtime/-/server-runtime-1.19.1.tgz", + "integrity": "sha512-sRTx/Ibl8HSLGhEr73YTZz3GzO5eZRCusfSJ8MBh1Kq0Mo571W9g4AJ/qJsF3G/wKTKxU2n75MVo0nIfTh4oZQ==", "requires": { - "@remix-run/router": "1.7.1", + "@remix-run/router": "1.7.2", "@types/cookie": "^0.4.1", "@web3-storage/multipart-parser": "^1.0.0", "cookie": "^0.4.1", @@ -21390,9 +21390,9 @@ } }, "@remix-run/web-fetch": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/@remix-run/web-fetch/-/web-fetch-4.3.4.tgz", - "integrity": "sha512-AUM1XBa4hcgeNt2CD86OlB5aDLlqdMl0uJ+89R8dPGx07I5BwMXnbopCaPAkvSBIoHeT/IoLWIuZrLi7RvXS+Q==", + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/@remix-run/web-fetch/-/web-fetch-4.3.5.tgz", + "integrity": "sha512-cLLeNLvLRyFRhJLulzS98bb07kJ+ENkGaqUkBisdG4FNEoZF6tXtrTGLWJNJa1nAP/wFkMKEDxIP77LgAPyeow==", "requires": { "@remix-run/web-blob": "^3.0.4", "@remix-run/web-form-data": "^3.0.3", @@ -24138,9 +24138,9 @@ "optional": true }, "esbuild-plugins-node-modules-polyfill": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/esbuild-plugins-node-modules-polyfill/-/esbuild-plugins-node-modules-polyfill-1.1.3.tgz", - "integrity": "sha512-h5gubIqBcAPQ3052rDxjHh8XAM5pSMGHlTNpDRt6GHsIX5V7eKjlK8R9CMpfqX76nQQG5A9o3ZHfnZDlf7WG4g==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/esbuild-plugins-node-modules-polyfill/-/esbuild-plugins-node-modules-polyfill-1.3.0.tgz", + "integrity": "sha512-r/aNOvAlIaIzqJwvFHWhDGrPF/Aj5qI1zKVeHbCFpKH+bnKW1BG2LGixMd3s6hyWcZHcfdl2QZRucVuOLzFRrA==", "dev": true, "requires": { "@jspm/core": "^2.0.1", @@ -29116,20 +29116,20 @@ } }, "react-router": { - "version": "6.14.1", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.14.1.tgz", - "integrity": "sha512-U4PfgvG55LdvbQjg5Y9QRWyVxIdO1LlpYT7x+tMAxd9/vmiPuJhIwdxZuIQLN/9e3O4KFDHYfR9gzGeYMasW8g==", + "version": "6.14.2", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.14.2.tgz", + "integrity": "sha512-09Zss2dE2z+T1D03IheqAFtK4UzQyX8nFPWx6jkwdYzGLXd5ie06A6ezS2fO6zJfEb/SpG6UocN2O1hfD+2urQ==", "requires": { - "@remix-run/router": "1.7.1" + "@remix-run/router": "1.7.2" } }, "react-router-dom": { - "version": "6.14.1", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.14.1.tgz", - "integrity": "sha512-ssF6M5UkQjHK70fgukCJyjlda0Dgono2QGwqGvuk7D+EDGHdacEN3Yke2LTMjkrpHuFwBfDFsEjGVXBDmL+bWw==", + "version": "6.14.2", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.14.2.tgz", + "integrity": "sha512-5pWX0jdKR48XFZBuJqHosX3AAHjRAzygouMTyimnBPOLdY3WjzUSKhus2FVMihUFWzeLebDgr4r8UeQFAct7Bg==", "requires": { - "@remix-run/router": "1.7.1", - "react-router": "6.14.1" + "@remix-run/router": "1.7.2", + "react-router": "6.14.2" } }, "react-style-singleton": { diff --git a/package.json b/package.json index a0f91cdbd..02e722b18 100644 --- a/package.json +++ b/package.json @@ -39,10 +39,10 @@ "@radix-ui/react-select": "1.2.1", "@radix-ui/react-tabs": "1.0.3", "@radix-ui/react-toast": "1.1.3", - "@remix-run/css-bundle": "^1.18.1", - "@remix-run/node": "^1.18.1", - "@remix-run/react": "^1.18.1", - "@remix-run/serve": "^1.18.1", + "@remix-run/css-bundle": "^1.19.1", + "@remix-run/node": "^1.19.1", + "@remix-run/react": "^1.19.1", + "@remix-run/serve": "^1.19.1", "@supabase/supabase-js": "^2.26.0", "cookie": "^0.5.0", "crisp-sdk-web": "^1.0.19", @@ -73,8 +73,8 @@ "devDependencies": { "@faker-js/faker": "^7.6.0", "@playwright/test": "^1.34.3", - "@remix-run/dev": "^1.18.1", - "@remix-run/eslint-config": "^1.18.1", + "@remix-run/dev": "^1.19.1", + "@remix-run/eslint-config": "^1.19.1", "@tailwindcss/aspect-ratio": "^0.4.2", "@tailwindcss/forms": "^0.5.3", "@tailwindcss/typography": "^0.5.9", diff --git a/remix.config.js b/remix.config.js index e0fd2dfba..4922ece66 100644 --- a/remix.config.js +++ b/remix.config.js @@ -5,6 +5,7 @@ const { flatRoutes } = require("remix-flat-routes"); module.exports = { ignoredRouteFiles: ["**/.*"], + serverModuleFormat: "cjs", serverDependenciesToBundle: ["maplibre-gl"], routes: async (defineRoutes) => { return flatRoutes("routes", defineRoutes); @@ -13,7 +14,9 @@ module.exports = { future: { v2_dev: true, v2_meta: true, + v2_headers: true, v2_routeConvention: true, v2_errorBoundary: true, + v2_normalizeFormMethod: true, }, };