Update Remix to 2.x

dcramer · Sep 23, 2023 · b74a46b · b74a46b
1 parent af32277
commit b74a46b
Show file tree

Hide file tree

Showing 11 changed files with 1,276 additions and 3,016 deletions.
diff --git a/apps/api/package.json b/apps/api/package.json
@@ -16,8 +16,8 @@
     "test:ci": "dotenv -e .env.test -- vitest --no-threads --coverage"
   },
   "dependencies": {
-    "@faker-js/faker": "^8.0.2",
-    "@fastify/cors": "^8.3.0",
+    "@faker-js/faker": "^8.1.0",
+    "@fastify/cors": "^8.4.0",
     "@fastify/helmet": "^10.1.1",
     "@fastify/multipart": "^7.7.3",
     "@fastify/one-line-logger": "^1.2.0",
@@ -26,23 +26,23 @@
     "@peated/design": "workspace:*",
     "@peated/shared": "workspace:*",
     "@peated/tsconfig": "workspace:*",
-    "@sentry/node-experimental": "^7.69.0",
+    "@sentry/node-experimental": "^7.70.0",
     "@sentry/profiling-node": "^1.2.1",
-    "@sentry/utils": "^7.69.0",
+    "@sentry/utils": "^7.70.0",
     "@types/bcrypt": "^5.0.0",
-    "@types/jsonwebtoken": "^9.0.2",
+    "@types/jsonwebtoken": "^9.0.3",
     "@types/mime-types": "^2.1.1",
-    "@types/node": "^18.17.15",
-    "@types/nodemailer": "^6.4.10",
+    "@types/node": "^18.17.19",
+    "@types/nodemailer": "^6.4.11",
     "@types/pg": "^8.10.2",
-    "@vitest/coverage-v8": "^0.34.4",
+    "@vitest/coverage-v8": "^0.34.5",
     "bcrypt": "^5.1.1",
     "commander": "^10.0.1",
     "dotenv": "^16.3.1",
     "dotenv-cli": "^7.3.0",
     "drizzle-kit": "^0.19.13",
     "drizzle-orm": "^0.28.6",
-    "fastify": "^4.23.1",
+    "fastify": "^4.23.2",
     "fastify-plugin": "^4.5.1",
     "form-data-encoder": "^3.0.0",
     "formdata-node": "^5.0.1",
@@ -55,11 +55,11 @@
     "pg": "^8.11.3",
     "pino-pretty": "^10.2.0",
     "regenerator-runtime": "^0.13.11",
-    "sharp": "^0.32.5",
+    "sharp": "^0.32.6",
     "ts-node": "^10.9.1",
     "typescript": "^5.2.2",
     "vite-tsconfig-paths": "^4.2.1",
-    "vitest": "^0.34.4",
+    "vitest": "^0.34.5",
     "zod": "^3.22.2",
     "zod-to-json-schema": "^3.21.4"
   }

diff --git a/apps/scraper/package.json b/apps/scraper/package.json
@@ -18,12 +18,12 @@
   "dependencies": {
     "@peated/shared": "workspace:*",
     "@peated/tsconfig": "workspace:*",
-    "@sentry/node-experimental": "^7.69.0",
+    "@sentry/node-experimental": "^7.70.0",
     "@sentry/profiling-node": "^1.2.1",
-    "@swc/core": "^1.3.82",
+    "@swc/core": "^1.3.87",
     "@types/cheerio": "^0.22.32",
-    "@types/node-schedule": "^2.1.0",
-    "@vitest/coverage-v8": "^0.34.4",
+    "@types/node-schedule": "^2.1.1",
+    "@vitest/coverage-v8": "^0.34.5",
     "axios": "^1.5.0",
     "cheerio": "1.0.0-rc.12",
     "croner": "^7.0.1",
@@ -32,7 +32,7 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.2.2",
     "vite-tsconfig-paths": "^4.2.1",
-    "vitest": "^0.34.4",
+    "vitest": "^0.34.5",
     "vitest-mock-axios": "^0.1.0"
   }
 }
diff --git a/apps/web/app/components/searchPanel.tsx b/apps/web/app/components/searchPanel.tsx
@@ -372,7 +372,7 @@ export default function SearchPanel({ onClose, onQueryChange }: Props) {
                         Can't find a bottle?
                       </Link>
                     </div>
-                    <div className="text-light mt-1 flex gap-x-1 leading-5">
+                    <div className="text-highlight-dark mt-1 flex gap-x-1 leading-5">
                       {query !== "" ? (
                         <span>
                           Tap here to add{" "}

diff --git a/apps/web/app/entry.server.tsx b/apps/web/app/entry.server.tsx
@@ -1,7 +1,9 @@
 import { PassThrough } from "stream";
 
-import type { EntryContext } from "@remix-run/node";
-import { Response } from "@remix-run/node";
+import {
+  createReadableStreamFromReadable,
+  type EntryContext,
+} from "@remix-run/node";
 import { RemixServer } from "@remix-run/react";
 import isbot from "isbot";
 import { renderToPipeableStream } from "react-dom/server";
@@ -54,11 +56,12 @@ function handleBotRequest(
       {
         onAllReady() {
           const body = new PassThrough();
+          const stream = createReadableStreamFromReadable(body);
 
           responseHeaders.set("Content-Type", "text/html");
 
           resolve(
-            new Response(body, {
+            new Response(stream, {
               headers: responseHeaders,
               status: responseStatusCode,
             }),
@@ -96,11 +99,12 @@ function handleBrowserRequest(
       {
         onShellReady() {
           const body = new PassThrough();
+          const stream = createReadableStreamFromReadable(body);
 
           responseHeaders.set("Content-Type", "text/html");
 
           resolve(
-            new Response(body, {
+            new Response(stream, {
               headers: responseHeaders,
               status: responseStatusCode,
             }),

diff --git a/apps/web/package.json b/apps/web/package.json
@@ -25,38 +25,36 @@
     "@peated/shared": "workspace:*",
     "@peated/tsconfig": "workspace:*",
     "@react-oauth/google": "^0.11.1",
-    "@remix-run/css-bundle": "^1.19.3",
-    "@remix-run/dev": "^1.19.3",
-    "@remix-run/eslint-config": "^1.19.3",
-    "@remix-run/express": "^1.19.3",
-    "@remix-run/node": "^1.19.3",
-    "@remix-run/react": "^1.19.3",
-    "@remix-run/serve": "^1.19.3",
+    "@remix-run/css-bundle": "^2.0.1",
+    "@remix-run/dev": "^2.0.1",
+    "@remix-run/eslint-config": "^2.0.1",
+    "@remix-run/express": "^2.0.1",
+    "@remix-run/node": "^2.0.1",
+    "@remix-run/react": "^2.0.1",
+    "@remix-run/serve": "^2.0.1",
     "@rollup/plugin-replace": "^5.0.2",
-    "@sentry/react": "^7.69.0",
-    "@sentry/remix": "^7.69.0",
+    "@sentry/react": "^7.70.0",
+    "@sentry/remix": "^7.70.0",
     "@sentry/vite-plugin": "^2.7.1",
     "@svgr/cli": "^8.1.0",
     "@svgr/plugin-jsx": "^8.1.0",
-    "@svgr/plugin-prettier": "^8.1.0",
     "@svgr/plugin-svgo": "^8.1.0",
     "@tailwindcss/forms": "^0.5.6",
     "@tailwindcss/typography": "^0.5.10",
-    "@tanstack/react-query": "^4.35.0",
+    "@tanstack/react-query": "^4.35.3",
     "@types/compression": "^1.7.3",
-    "@types/d3": "^7.4.0",
-    "@types/express": "^4.17.17",
-    "@types/leaflet": "^1.9.4",
+    "@types/express": "^4.17.18",
+    "@types/leaflet": "^1.9.5",
     "@types/morgan": "^1.9.5",
     "@types/pica": "^9.0.1",
-    "@types/react": "^18.2.21",
+    "@types/react": "^18.2.22",
     "@types/react-avatar-editor": "^13.0.0",
     "@types/react-dom": "^18.2.7",
     "@types/react-router-dom": "^5.3.3",
-    "autoprefixer": "^10.4.15",
+    "autoprefixer": "^10.4.16",
     "compression": "^1.7.4",
     "cross-env": "^7.0.3",
-    "dayjs": "^1.11.9",
+    "dayjs": "^1.11.10",
     "dotenv": "^16.3.1",
     "esbuild": "^0.18.20",
     "express": "^4.18.2",
@@ -68,19 +66,18 @@
     "npm-run-all": "^4.1.5",
     "npm-watch": "^0.11.0",
     "pica": "^9.0.1",
-    "postcss": "^8.4.29",
-    "prettier-plugin-tailwindcss": "^0.3.0",
+    "postcss": "^8.4.30",
     "prom-client": "^14.2.0",
     "react": "^18.2.0",
     "react-avatar-editor": "^13.0.0",
     "react-dom": "^18.2.0",
     "react-error-boundary": "^4.0.11",
-    "react-hook-form": "^7.46.1",
+    "react-hook-form": "^7.46.2",
     "react-leaflet": "^4.2.1",
-    "react-router-dom": "^6.15.0",
+    "react-router-dom": "^6.16.0",
     "remix-auth": "^3.5.1",
     "remix-auth-form": "^1.3.0",
-    "remix-hook-form": "^1.2.3",
+    "remix-hook-form": "^2.0.1",
     "tailwindcss": "^3.3.3",
     "tiny-invariant": "^1.3.1",
     "typescript": "^5.2.2",

diff --git a/apps/web/remix.config.js b/apps/web/remix.config.js
@@ -1,13 +1,5 @@
 /** @type {import('@remix-run/dev').AppConfig} */
 module.exports = {
-  future: {
-    v2_errorBoundary: true,
-    v2_headers: true,
-    v2_meta: true,
-    v2_normalizeFormMethod: true,
-    v2_routeConvention: true,
-    v2_dev: true,
-  },
   ignoredRouteFiles: ["**/.*"],
   appDirectory: "app",
   assetsBuildDirectory: "public/build",

diff --git a/apps/web/svgr.config.js b/apps/web/svgr.config.js
@@ -1,4 +1,4 @@
 module.exports = {
-  plugins: ["@svgr/plugin-svgo", "@svgr/plugin-jsx", "@svgr/plugin-prettier"],
+  plugins: ["@svgr/plugin-svgo", "@svgr/plugin-jsx"],
   typescript: true,
 };
diff --git a/package.json b/package.json
@@ -33,14 +33,14 @@
     "@typescript-eslint/parser": "^5.62.0",
     "dotenv": "^16.3.1",
     "dotenv-cli": "^7.3.0",
-    "eslint": "^8.49.0",
+    "eslint": "^8.50.0",
     "eslint-plugin-react": "^7.33.2",
     "foreman": "^3.0.1",
-    "lint-staged": "^13.3.0",
-    "pnpm": "^8.7.5",
-    "prettier": "^2.8.8",
+    "lint-staged": "^14.0.1",
+    "pnpm": "^8.7.6",
+    "prettier": "^3.0.3",
     "prettier-plugin-organize-imports": "^3.2.3",
-    "prettier-plugin-tailwindcss": "^0.3.0",
+    "prettier-plugin-tailwindcss": "^0.5.4",
     "simple-git-hooks": "^2.9.0"
   },
   "engines": {

diff --git a/packages/design/package.json b/packages/design/package.json
@@ -12,6 +12,7 @@
     "@peated/tsconfig": "workspace:*",
     "@tailwindcss/forms": "^0.5.6",
     "@tailwindcss/typography": "^0.5.10",
+    "prettier-plugin-tailwindcss": "^0.5.4",
     "tailwindcss": "^3.3.3",
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^4.2.0",

diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -17,11 +17,11 @@
   ],
   "dependencies": {
     "@peated/tsconfig": "workspace:*",
-    "@vitest/coverage-v8": "^0.34.4",
+    "@vitest/coverage-v8": "^0.34.5",
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5.2.2",
     "vite-tsconfig-paths": "^4.2.1",
-    "vitest": "^0.34.4",
+    "vitest": "^0.34.5",
     "zod": "^3.22.2"
   }
 }