Cleanup

Author: onurtemizkan

packages/remix/src/server/errors.ts

@@ -4,7 +4,6 @@ import type {
   HandleDocumentRequestFunction,
   LoaderFunctionArgs,
 } from '@remix-run/node';
-import type { ActionFunction, LoaderFunction } from '@remix-run/server-runtime';
 import type { RequestEventData, Span } from '@sentry/core';
 import {
   addExceptionMechanism,
@@ -17,11 +16,10 @@ import {
 } from '@sentry/core';
 import { DEBUG_BUILD } from '../utils/debug-build';
 import type { RemixOptions } from '../utils/remixOptions';
+import type { DataFunction } from '../utils/types';
 import { storeFormDataKeys } from '../utils/utils';
 import { extractData, isResponse, isRouteErrorResponse } from '../utils/vendor/response';
 
-type DataFunction = LoaderFunction | ActionFunction;
-
 /**
  * Captures an exception happened in the Remix server.
  *

packages/remix/src/server/instrumentServer.ts

@@ -1,13 +1,10 @@
 /* eslint-disable max-lines */
+import type { UNSAFE_DeferredData as DeferredData } from '@remix-run/router';
 import type {
-  ActionFunction,
-  ActionFunctionArgs,
   AppLoadContext,
   CreateRequestHandlerFunction,
   EntryContext,
   HandleDocumentRequestFunction,
-  LoaderFunction,
-  LoaderFunctionArgs,
   RequestHandler,
   ServerBuild,
 } from '@remix-run/server-runtime';
@@ -33,14 +30,11 @@ import {
   withIsolationScope,
 } from '@sentry/core';
 import { DEBUG_BUILD } from '../utils/debug-build';
-import type { DeferredData, Route, ServerRouteManifest } from '../utils/types';
+import type { AppData, DataFunction, DataFunctionArgs, Route, ServerRouteManifest } from '../utils/types';
 import { createRoutes, getTransactionName } from '../utils/utils';
 import { extractData, isDeferredData, isResponse, isRouteErrorResponse, json } from '../utils/vendor/response';
 import { captureRemixServerException, errorHandleDataFunction, errorHandleDocumentRequestFunction } from './errors';
 
-type DataFunction = LoaderFunction | ActionFunction;
-type DataFunctionArgs = LoaderFunctionArgs | ActionFunctionArgs;
-
 const redirectStatusCodes = new Set([301, 302, 303, 307, 308]);
 function isRedirectResponse(response: Response): boolean {
   return redirectStatusCodes.has(response.status);
@@ -165,7 +159,7 @@ function makeWrappedDataFunction(
   name: 'action' | 'loader',
   instrumentTracing?: boolean,
 ): DataFunction {
-  return async function (this: unknown, args: DataFunctionArgs): Promise<Response> {
+  return async function (this: unknown, args: DataFunctionArgs): Promise<Response | AppData> {
     if (instrumentTracing) {
       return startSpan(
         {
@@ -200,7 +194,7 @@ const makeWrappedLoader =
 
 function makeWrappedRootLoader() {
   return function (origLoader: DataFunction): DataFunction {
-    return async function (this: unknown, args: DataFunctionArgs): Promise<Response | DeferredData> {
+    return async function (this: unknown, args: DataFunctionArgs): Promise<Response | AppData> {
       const res = await origLoader.call(this, args);
       const traceAndBaggage = getTraceAndBaggage();
 

packages/remix/src/utils/types.ts

@@ -1,18 +1,12 @@
+import type { ActionFunction, ActionFunctionArgs, LoaderFunction, LoaderFunctionArgs } from '@remix-run/server-runtime';
+
 export type SentryMetaArgs<MetaFN extends (...args: any) => any> = Parameters<MetaFN>[0] & {
   data: {
     sentryTrace: string;
     sentryBaggage: string;
   };
 };
 
-export type DeferredData = {
-  data: Record<string, unknown>;
-  deferredKeys: string[];
-  subscribe(fn: (aborted: boolean, settledKey?: string) => void): () => boolean;
-  cancel(): void;
-  resolveData(signal: AbortSignal): Promise<boolean>;
-};
-
 export interface RouteManifest<Route> {
   [routeId: string]: Route;
 }
@@ -30,3 +24,7 @@ export interface Route {
   parentId?: string;
   path?: string;
 }
+
+export type DataFunction = LoaderFunction | ActionFunction;
+export type DataFunctionArgs = LoaderFunctionArgs | ActionFunctionArgs;
+export type AppData = unknown;

packages/remix/src/utils/vendor/response.ts

@@ -6,9 +6,14 @@
 //
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import type { AgnosticRouteMatch, AgnosticRouteObject, ErrorResponse } from '@remix-run/router';
+import type {
+  AgnosticRouteMatch,
+  AgnosticRouteObject,
+  ErrorResponse,
+  UNSAFE_DeferredData as DeferredData,
+} from '@remix-run/router';
 import { matchRoutes } from '@remix-run/router';
-import type { DeferredData, Route } from '../types';
+import type { Route } from '../types';
 
 /**
  * Based on Remix Implementation