Move types.ts to vendor sub-directory.

getsentry · Jul 6, 2023 · 6f14958 · 6f14958
1 parent decae61
commit 6f14958
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/packages/remix/src/client/errors.tsx b/packages/remix/src/client/errors.tsx
@@ -1,7 +1,7 @@
 import { captureException, withScope } from '@sentry/core';
 import { addExceptionMechanism, isNodeEnv, isString } from '@sentry/utils';
 
-import type { ErrorResponse } from '../utils/types';
+import type { ErrorResponse } from '../utils/vendor/types';
 
 /**
  * Checks whether the given error is an ErrorResponse.

diff --git a/packages/remix/src/utils/futureFlags.ts b/packages/remix/src/utils/futureFlags.ts
@@ -1,6 +1,6 @@
 import { GLOBAL_OBJ } from '@sentry/utils';
 
-import type { FutureConfig, ServerBuild } from './types';
+import type { FutureConfig, ServerBuild } from './vendor/types';
 
 export type EnhancedGlobal = typeof GLOBAL_OBJ & {
  __remixContext?: {

diff --git a/packages/remix/src/utils/instrumentServer.ts b/packages/remix/src/utils/instrumentServer.ts
@@ -14,6 +14,7 @@ import {
 } from '@sentry/utils';
 
 import { getFutureFlagsServer } from './futureFlags';
+import { extractData, getRequestMatch, isDeferredData, isResponse, json, matchServerRoutes } from './vendor/response';
 import type {
  AppData,
  CreateRequestHandlerFunction,
@@ -28,8 +29,7 @@ import type {
  ServerBuild,
  ServerRoute,
  ServerRouteManifest,
-} from './types';
-import { extractData, getRequestMatch, isDeferredData, isResponse, json, matchServerRoutes } from './vendor/response';
+} from './vendor/types';
 import { normalizeRemixRequest } from './web-fetch';
 
 let FUTURE_FLAGS: FutureConfig | undefined;

diff --git a/packages/remix/src/utils/serverAdapters/express.ts b/packages/remix/src/utils/serverAdapters/express.ts
@@ -20,7 +20,7 @@ import type {
  ExpressResponse,
  ReactRouterDomPkg,
  ServerBuild,
-} from '../types';
+} from '../vendor/types';
 
 let pkg: ReactRouterDomPkg;
 

diff --git a/packages/remix/src/utils/vendor/response.ts b/packages/remix/src/utils/vendor/response.ts
@@ -6,7 +6,7 @@
 //
 // 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 { DeferredData, ReactRouterDomPkg, RouteMatch, ServerRoute } from '../types';
+import type { DeferredData, ReactRouterDomPkg, RouteMatch, ServerRoute } from './types';
 
 /**
  * Based on Remix Implementation

diff --git a/packages/remix/src/utils/types.ts → packages/remix/src/utils/vendor/types.ts b/packages/remix/src/utils/types.ts → packages/remix/src/utils/vendor/types.ts
diff --git a/packages/remix/src/utils/web-fetch.ts b/packages/remix/src/utils/web-fetch.ts
@@ -24,8 +24,8 @@
 
 import { logger } from '@sentry/utils';
 
-import type { RemixRequest } from './types';
 import { getClientIPAddress } from './vendor/getIpAddress';
+import type { RemixRequest } from './vendor/types';
 
 /*
  * Symbol extractor utility to be able to access internal fields of Remix requests.