Clean up

Author: onurtemizkan

packages/e2e-tests/Dockerfile.publish-packages

@@ -1,5 +1,5 @@
 # This Dockerfile exists for the purpose of using a specific node/npm version (ie. the same we use in CI) to run npm publish with
-ARG NODE_VERSION=18.17.0
+ARG NODE_VERSION=16.19.0
 FROM node:${NODE_VERSION}
 
 WORKDIR /sentry-javascript/packages/e2e-tests

packages/e2e-tests/test-applications/create-remix-app-v2/app/entry.server.tsx

@@ -6,7 +6,7 @@
 
 import { PassThrough } from 'node:stream';
 
-import type { AppLoadContext, EntryContext } from '@remix-run/node';
+import type { AppLoadContext, EntryContext, DataFunctionArgs } from '@remix-run/node';
 import { Response } from '@remix-run/node';
 import { RemixServer } from '@remix-run/react';
 import isbot from 'isbot';
@@ -22,6 +22,14 @@ Sentry.init({
   isRemixV2: true,
 });
 
+export function handleError(error: unknown, { request }: DataFunctionArgs): void {
+  if (error instanceof Error) {
+    Sentry.captureRemixServerException(error, 'remix.server', request);
+  } else {
+    Sentry.captureException(error);
+  }
+}
+
 export default function handleRequest(
   request: Request,
   responseStatusCode: number,
@@ -41,12 +49,10 @@ function handleBotRequest(
   remixContext: EntryContext,
 ) {
   return new Promise((resolve, reject) => {
-    let shellRendered = false;
     const { pipe, abort } = renderToPipeableStream(
       <RemixServer context={remixContext} url={request.url} abortDelay={ABORT_DELAY} />,
       {
         onAllReady() {
-          shellRendered = true;
           const body = new PassThrough();
 
           responseHeaders.set('Content-Type', 'text/html');
@@ -65,12 +71,7 @@ function handleBotRequest(
         },
         onError(error: unknown) {
           responseStatusCode = 500;
-          // Log streaming rendering errors from inside the shell.  Don't log
-          // errors encountered during initial shell rendering since they'll
-          // reject and get logged in handleDocumentRequest.
-          if (shellRendered) {
-            console.error(error);
-          }
+          console.error(error);
         },
       },
     );
@@ -86,12 +87,10 @@ function handleBrowserRequest(
   remixContext: EntryContext,
 ) {
   return new Promise((resolve, reject) => {
-    let shellRendered = false;
     const { pipe, abort } = renderToPipeableStream(
       <RemixServer context={remixContext} url={request.url} abortDelay={ABORT_DELAY} />,
       {
         onShellReady() {
-          shellRendered = true;
           const body = new PassThrough();
 
           responseHeaders.set('Content-Type', 'text/html');
@@ -109,13 +108,8 @@ function handleBrowserRequest(
           reject(error);
         },
         onError(error: unknown) {
+          console.error(error);
           responseStatusCode = 500;
-          // Log streaming rendering errors from inside the shell.  Don't log
-          // errors encountered during initial shell rendering since they'll
-          // reject and get logged in handleDocumentRequest.
-          if (shellRendered) {
-            console.error(error);
-          }
         },
       },
     );

packages/e2e-tests/test-applications/create-remix-app-v2/app/root.tsx

@@ -22,8 +22,8 @@ export const loader = () => {
   });
 };
 
-export const ErrorBoundary = () => {
-  const error = useRouteError() as { eventId?: string | Promise<string> | undefined };
+export function ErrorBoundary() {
+  const error = useRouteError();
   const eventId = captureRemixErrorBoundaryError(error);
 
   return (
@@ -32,7 +32,7 @@ export const ErrorBoundary = () => {
       <span id="event-id">{eventId}</span>
     </div>
   );
-};
+}
 
 function App() {
   const { ENV } = useLoaderData();

packages/e2e-tests/test-applications/create-remix-app-v2/package.json

@@ -4,7 +4,7 @@
   "scripts": {
     "build": "remix build",
     "dev": "remix dev",
-    "start": "remix dev -c \"remix-serve ./build/index.js\"",
+    "start": "remix-serve build/index.js",
     "typecheck": "tsc",
     "clean": "npx rimraf node_modules,pnpm-lock.yaml",
     "test:build": "pnpm install && npx playwright install && pnpm build",
@@ -27,7 +27,7 @@
     "@types/react": "^18.0.35",
     "@types/react-dom": "^18.0.11",
     "eslint": "^8.38.0",
-    "typescript": "^5.1.0"
+    "typescript": "^5.0.4"
   },
   "engines": {
     "node": ">=18.0.0"

packages/e2e-tests/test-applications/create-remix-app-v2/remix.config.js

@@ -1,9 +1,17 @@
 /** @type {import('@remix-run/dev').AppConfig} */
 module.exports = {
   ignoredRouteFiles: ['**/.*'],
-  appDirectory: 'app',
-  assetsBuildDirectory: 'public/build',
-  serverBuildPath: 'build/index.js',
-  publicPath: '/build/',
+  // appDirectory: 'app',
+  // assetsBuildDirectory: 'public/build',
+  // serverBuildPath: 'build/index.js',
+  // publicPath: '/build/',
   serverModuleFormat: 'cjs',
+  future: {
+    v2_dev: true,
+    v2_headers: true,
+    v2_errorBoundary: true,
+    v2_meta: true,
+    v2_normalizeFormMethod: true,
+    v2_routeConvention: true,
+  },
 };

packages/e2e-tests/test-applications/create-remix-app/app/entry.server.tsx

@@ -23,12 +23,8 @@ Sentry.init({
 
 export function handleError(error: unknown, { request }: DataFunctionArgs): void {
   if (error instanceof Error) {
-    // @ts-ignore
-    // Injecting the event ID into the error context allows us to reference it for E2E testing
     Sentry.captureRemixServerException(error, 'remix.server', request);
   } else {
-    // @ts-ignore
-    // Injecting the event ID into the error context allows us to reference it for E2E testing
     Sentry.captureException(error);
   }
 }

packages/e2e-tests/test-applications/create-remix-app/app/root.tsx

@@ -23,7 +23,7 @@ export const loader = () => {
 };
 
 export function ErrorBoundary() {
-  const error = useRouteError() as { eventId?: string | Promise<string> | undefined };
+  const error = useRouteError();
   const eventId = captureRemixErrorBoundaryError(error);
 
   return (