remove unnecessary "../server" in the server directory

lubieowoce · lubieowoce · commit 96fc439dc709 · 2024-10-10T00:58:07.000+02:00
diff --git a/packages/next/src/server/after/after-context.test.ts b/packages/next/src/server/after/after-context.test.ts
@@ -1,14 +1,13 @@
 import { DetachedPromise } from '../../lib/detached-promise'
 import { AsyncLocalStorage } from 'async_hooks'
 
-import type { WorkStore } from '../../server/app-render/work-async-storage.external'
+import type { WorkStore } from '../app-render/work-async-storage.external'
 import type { AfterContext } from './after-context'
 
 describe('AfterContext', () => {
   // 'async-local-storage.ts' needs `AsyncLocalStorage` on `globalThis` at import time,
   // so we have to do some contortions here to set it up before running anything else
-  type WASMod =
-    typeof import('../../server/app-render/work-async-storage.external')
+  type WASMod = typeof import('../app-render/work-async-storage.external')
   type AfterMod = typeof import('./after')
   type AfterContextMod = typeof import('./after-context')
 
@@ -20,9 +19,7 @@ describe('AfterContext', () => {
     // @ts-expect-error
     globalThis.AsyncLocalStorage = AsyncLocalStorage
 
-    const WASMod = await import(
-      '../../server/app-render/work-async-storage.external'
-    )
+    const WASMod = await import('../app-render/work-async-storage.external')
     workAsyncStorage = WASMod.workAsyncStorage
 
     const AfterContextMod = await import('./after-context')
diff --git a/packages/next/src/server/after/after-context.ts b/packages/next/src/server/after/after-context.ts
@@ -3,9 +3,9 @@ import type { RequestLifecycleOpts } from '../base-server'
 import type { AfterCallback, AfterTask } from './after'
 import { InvariantError } from '../../shared/lib/invariant-error'
 import { isThenable } from '../../shared/lib/is-thenable'
-import { workAsyncStorage } from '../../server/app-render/work-async-storage.external'
+import { workAsyncStorage } from '../app-render/work-async-storage.external'
 import { withExecuteRevalidates } from './revalidation-utils'
-import { bindSnapshot } from '../../server/app-render/async-local-storage'
+import { bindSnapshot } from '../app-render/async-local-storage'
 
 export type AfterContextOpts = {
   waitUntil: RequestLifecycleOpts['waitUntil'] | undefined
diff --git a/packages/next/src/server/after/after.ts b/packages/next/src/server/after/after.ts
@@ -1,5 +1,5 @@
-import { workAsyncStorage } from '../../server/app-render/work-async-storage.external'
-import { workUnitAsyncStorage } from '../../server/app-render/work-unit-async-storage.external'
+import { workAsyncStorage } from '../app-render/work-async-storage.external'
+import { workUnitAsyncStorage } from '../app-render/work-unit-async-storage.external'
 import { StaticGenBailoutError } from '../../client/components/static-generation-bailout'
 
 import { markCurrentScopeAsDynamic } from '../app-render/dynamic-rendering'
diff --git a/packages/next/src/server/after/revalidation-utils.ts b/packages/next/src/server/after/revalidation-utils.ts
@@ -1,4 +1,4 @@
-import type { WorkStore } from '../../server/app-render/work-async-storage.external'
+import type { WorkStore } from '../app-render/work-async-storage.external'
 
 /** Run a callback, and execute any *new* revalidations added during its runtime. */
 export async function withExecuteRevalidates<T>(
diff --git a/packages/next/src/server/app-render/action-handler.ts b/packages/next/src/server/app-render/action-handler.ts
@@ -1,8 +1,8 @@
 import type { IncomingHttpHeaders, OutgoingHttpHeaders } from 'http'
 import type { SizeLimit } from '../../types'
-import type { RequestStore } from '../../server/app-render/work-unit-async-storage.external'
+import type { RequestStore } from '../app-render/work-unit-async-storage.external'
 import type { AppRenderContext, GenerateFlight } from './app-render'
-import type { AppPageModule } from '../../server/route-modules/app-page/module'
+import type { AppPageModule } from '../route-modules/app-page/module'
 import type { BaseNextRequest, BaseNextResponse } from '../base-http'
 
 import {
@@ -19,7 +19,7 @@ import {
   type RedirectType,
 } from '../../client/components/redirect'
 import RenderResult from '../render-result'
-import type { WorkStore } from '../../server/app-render/work-async-storage.external'
+import type { WorkStore } from '../app-render/work-async-storage.external'
 import { FlightRenderResult } from './flight-render-result'
 import {
   filterReqHeaders,
diff --git a/packages/next/src/server/app-render/app-render.tsx b/packages/next/src/server/app-render/app-render.tsx
@@ -11,8 +11,8 @@ import type {
   FlightData,
   InitialRSCPayload,
 } from './types'
-import type { WorkStore } from '../../server/app-render/work-async-storage.external'
-import type { RequestStore } from '../../server/app-render/work-unit-async-storage.external'
+import type { WorkStore } from '../app-render/work-async-storage.external'
+import type { RequestStore } from '../app-render/work-unit-async-storage.external'
 import type { NextParsedUrlQuery } from '../request-meta'
 import type { LoaderTree } from '../lib/app-dir-module'
 import type { AppPageModule } from '../route-modules/app-page/module'
diff --git a/packages/next/src/server/app-render/clean-async-snapshot-instance.ts b/packages/next/src/server/app-render/clean-async-snapshot-instance.ts
@@ -1,4 +1,4 @@
-import { createSnapshot } from '../../server/app-render/async-local-storage'
+import { createSnapshot } from '../app-render/async-local-storage'
 
 export const runInCleanSnapshot: <R, TArgs extends any[]>(
   fn: (...args: TArgs) => R,
diff --git a/packages/next/src/server/app-render/dynamic-rendering.ts b/packages/next/src/server/app-render/dynamic-rendering.ts
@@ -20,8 +20,8 @@
  * read that data outside the cache and pass it in as an argument to the cached function.
  */
 
-import type { WorkStore } from '../../server/app-render/work-async-storage.external'
-import type { WorkUnitStore } from '../../server/app-render/work-unit-async-storage.external'
+import type { WorkStore } from '../app-render/work-async-storage.external'
+import type { WorkUnitStore } from '../app-render/work-unit-async-storage.external'
 
 // Once postpone is in stable we should switch to importing the postpone export directly
 import React from 'react'
@@ -33,7 +33,7 @@ import {
   type PrerenderStoreLegacy,
   type PrerenderStoreModern,
 } from './work-unit-async-storage.external'
-import { workAsyncStorage } from '../../server/app-render/work-async-storage.external'
+import { workAsyncStorage } from '../app-render/work-async-storage.external'
 import { makeHangingPromise } from '../dynamic-rendering-utils'
 import {
   METADATA_BOUNDARY_NAME,
diff --git a/packages/next/src/server/app-render/entry-base.ts b/packages/next/src/server/app-render/entry-base.ts
@@ -11,9 +11,9 @@ export { prerender } from 'react-server-dom-webpack/static.edge'
 
 import LayoutRouter from '../../client/components/layout-router'
 import RenderFromTemplateContext from '../../client/components/render-from-template-context'
-import { workAsyncStorage } from '../../server/app-render/work-async-storage.external'
+import { workAsyncStorage } from '../app-render/work-async-storage.external'
 import { workUnitAsyncStorage } from './work-unit-async-storage.external'
-import { actionAsyncStorage } from '../../server/app-render/action-async-storage.external'
+import { actionAsyncStorage } from '../app-render/action-async-storage.external'
 import { ClientPageRoot } from '../../client/components/client-page'
 import { ClientSegmentRoot } from '../../client/components/client-segment'
 import {
diff --git a/packages/next/src/server/app-render/work-async-storage.external.ts b/packages/next/src/server/app-render/work-async-storage.external.ts
@@ -1,12 +1,12 @@
 import type { AsyncLocalStorage } from 'async_hooks'
-import type { IncrementalCache } from '../../server/lib/incremental-cache'
+import type { IncrementalCache } from '../lib/incremental-cache'
 import type { DynamicServerError } from '../../client/components/hooks-server-context'
-import type { FetchMetrics } from '../../server/base-http'
-import type { Revalidate } from '../../server/lib/revalidate'
-import type { FallbackRouteParams } from '../../server/request/fallback-params'
+import type { FetchMetrics } from '../base-http'
+import type { Revalidate } from '../lib/revalidate'
+import type { FallbackRouteParams } from '../request/fallback-params'
 import type { DeepReadonly } from '../../shared/lib/deep-readonly'
 import type { AppSegmentConfig } from '../../build/segment-config/app/app-segment-config'
-import type { AfterContext } from '../../server/after/after-context'
+import type { AfterContext } from '../after/after-context'
 
 // Share the instance module in the next-shared layer
 import { workAsyncStorage } from './work-async-storage-instance' with { 'turbopack-transition': 'next-shared' }
diff --git a/packages/next/src/server/app-render/work-unit-async-storage.external.ts b/packages/next/src/server/app-render/work-unit-async-storage.external.ts
@@ -1,14 +1,14 @@
 import type { AsyncLocalStorage } from 'async_hooks'
-import type { DraftModeProvider } from '../../server/async-storage/draft-mode-provider'
-import type { ResponseCookies } from '../../server/web/spec-extension/cookies'
-import type { ReadonlyHeaders } from '../../server/web/spec-extension/adapters/headers'
-import type { ReadonlyRequestCookies } from '../../server/web/spec-extension/adapters/request-cookies'
+import type { DraftModeProvider } from '../async-storage/draft-mode-provider'
+import type { ResponseCookies } from '../web/spec-extension/cookies'
+import type { ReadonlyHeaders } from '../web/spec-extension/adapters/headers'
+import type { ReadonlyRequestCookies } from '../web/spec-extension/adapters/request-cookies'
 import type { CacheSignal } from './cache-signal'
 import type { DynamicTrackingState } from './dynamic-rendering'
 
 // Share the instance module in the next-shared layer
 import { workUnitAsyncStorage } from './work-unit-async-storage-instance' with { 'turbopack-transition': 'next-shared' }
-import type { ServerComponentsHmrCache } from '../../server/response-cache'
+import type { ServerComponentsHmrCache } from '../response-cache'
 
 export type RequestStore = {
   type: 'request'
diff --git a/packages/next/src/server/async-storage/cache-scope.ts b/packages/next/src/server/async-storage/cache-scope.ts
@@ -1,4 +1,4 @@
-import { createAsyncLocalStorage } from '../../server/app-render/async-local-storage'
+import { createAsyncLocalStorage } from '../app-render/async-local-storage'
 
 export interface CacheScopeStore {
   cache?: Map<string, any>
diff --git a/packages/next/src/server/async-storage/with-request-store.ts b/packages/next/src/server/async-storage/with-request-store.ts
@@ -4,7 +4,7 @@ import type { AsyncLocalStorage } from 'async_hooks'
 import type {
   RequestStore,
   WorkUnitStore,
-} from '../../server/app-render/work-unit-async-storage.external'
+} from '../app-render/work-unit-async-storage.external'
 import type { RenderOpts } from '../app-render/types'
 import type { WithStore } from './with-store'
 import type { NextRequest } from '../web/spec-extension/request'
diff --git a/packages/next/src/server/async-storage/with-work-store.ts b/packages/next/src/server/async-storage/with-work-store.ts
@@ -1,5 +1,5 @@
 import type { WithStore } from './with-store'
-import type { WorkStore } from '../../server/app-render/work-async-storage.external'
+import type { WorkStore } from '../app-render/work-async-storage.external'
 import type { AsyncLocalStorage } from 'async_hooks'
 import type { IncrementalCache } from '../lib/incremental-cache'
 import type { RenderOpts } from '../app-render/types'
diff --git a/packages/next/src/server/lib/patch-fetch.test.ts b/packages/next/src/server/lib/patch-fetch.test.ts
@@ -1,6 +1,6 @@
 import { AsyncLocalStorage } from 'node:async_hooks'
-import type { WorkUnitStore } from '../../server/app-render/work-unit-async-storage.external'
-import type { WorkStore } from '../../server/app-render/work-async-storage.external'
+import type { WorkUnitStore } from '../app-render/work-unit-async-storage.external'
+import type { WorkStore } from '../app-render/work-async-storage.external'
 import type { IncrementalCache } from './incremental-cache'
 import { createPatchedFetcher } from './patch-fetch'
 
diff --git a/packages/next/src/server/lib/patch-fetch.ts b/packages/next/src/server/lib/patch-fetch.ts
@@ -1,7 +1,7 @@
 import type {
   WorkAsyncStorage,
   WorkStore,
-} from '../../server/app-render/work-async-storage.external'
+} from '../app-render/work-async-storage.external'
 
 import { AppRenderSpan, NextNodeServerSpan } from './trace/constants'
 import { getTracer, SpanKind } from './trace/tracer'
@@ -18,7 +18,7 @@ import type {
   WorkUnitAsyncStorage,
   WorkUnitStore,
   RequestStore,
-} from '../../server/app-render/work-unit-async-storage.external'
+} from '../app-render/work-unit-async-storage.external'
 import {
   CachedRouteKind,
   IncrementalCacheKind,
diff --git a/packages/next/src/server/request/connection.ts b/packages/next/src/server/request/connection.ts
@@ -1,4 +1,4 @@
-import { workAsyncStorage } from '../../server/app-render/work-async-storage.external'
+import { workAsyncStorage } from '../app-render/work-async-storage.external'
 import { workUnitAsyncStorage } from '../app-render/work-unit-async-storage.external'
 import {
   postponeWithTracking,
diff --git a/packages/next/src/server/request/cookies.ts b/packages/next/src/server/request/cookies.ts
@@ -2,9 +2,9 @@ import {
   type ReadonlyRequestCookies,
   type ResponseCookies,
   RequestCookiesAdapter,
-} from '../../server/web/spec-extension/adapters/request-cookies'
-import { RequestCookies } from '../../server/web/spec-extension/cookies'
-import { workAsyncStorage } from '../../server/app-render/work-async-storage.external'
+} from '../web/spec-extension/adapters/request-cookies'
+import { RequestCookies } from '../web/spec-extension/cookies'
+import { workAsyncStorage } from '../app-render/work-async-storage.external'
 import {
   workUnitAsyncStorage,
   type PrerenderStoreModern,
@@ -14,9 +14,9 @@ import {
   abortAndThrowOnSynchronousDynamicDataAccess,
   throwToInterruptStaticGeneration,
   trackDynamicDataInDynamicRender,
-} from '../../server/app-render/dynamic-rendering'
-import { getExpectedRequestStore } from '../../server/app-render/work-unit-async-storage.external'
-import { actionAsyncStorage } from '../../server/app-render/action-async-storage.external'
+} from '../app-render/dynamic-rendering'
+import { getExpectedRequestStore } from '../app-render/work-unit-async-storage.external'
+import { actionAsyncStorage } from '../app-render/action-async-storage.external'
 import { StaticGenBailoutError } from '../../client/components/static-generation-bailout'
 import { makeResolvedReactPromise } from './utils'
 import { makeHangingPromise } from '../dynamic-rendering-utils'
diff --git a/packages/next/src/server/request/draft-mode.ts b/packages/next/src/server/request/draft-mode.ts
@@ -1,8 +1,8 @@
-import { getExpectedRequestStore } from '../../server/app-render/work-unit-async-storage.external'
+import { getExpectedRequestStore } from '../app-render/work-unit-async-storage.external'
 
-import type { DraftModeProvider } from '../../server/async-storage/draft-mode-provider'
+import type { DraftModeProvider } from '../async-storage/draft-mode-provider'
 
-import { workAsyncStorage } from '../../server/app-render/work-async-storage.external'
+import { workAsyncStorage } from '../app-render/work-async-storage.external'
 import { workUnitAsyncStorage } from '../app-render/work-unit-async-storage.external'
 import { trackDynamicDataAccessed } from '../app-render/dynamic-rendering'
 import { createDedupedByCallsiteServerErrorLoggerDev } from '../create-deduped-by-callsite-server-error-loger'
diff --git a/packages/next/src/server/request/headers.ts b/packages/next/src/server/request/headers.ts
@@ -1,8 +1,8 @@
 import {
   HeadersAdapter,
   type ReadonlyHeaders,
-} from '../../server/web/spec-extension/adapters/headers'
-import { workAsyncStorage } from '../../server/app-render/work-async-storage.external'
+} from '../web/spec-extension/adapters/headers'
+import { workAsyncStorage } from '../app-render/work-async-storage.external'
 import { getExpectedRequestStore } from '../app-render/work-unit-async-storage.external'
 import {
   workUnitAsyncStorage,
diff --git a/packages/next/src/server/request/params.ts b/packages/next/src/server/request/params.ts
@@ -1,4 +1,4 @@
-import type { WorkStore } from '../../server/app-render/work-async-storage.external'
+import type { WorkStore } from '../app-render/work-async-storage.external'
 import type { FallbackRouteParams } from './fallback-params'
 
 import { ReflectAdapter } from '../web/spec-extension/adapters/reflect'
diff --git a/packages/next/src/server/request/search-params.ts b/packages/next/src/server/request/search-params.ts
@@ -1,4 +1,4 @@
-import type { WorkStore } from '../../server/app-render/work-async-storage.external'
+import type { WorkStore } from '../app-render/work-async-storage.external'
 
 import { ReflectAdapter } from '../web/spec-extension/adapters/reflect'
 import {
diff --git a/packages/next/src/server/route-modules/app-route/module.ts b/packages/next/src/server/route-modules/app-route/module.ts
@@ -40,7 +40,7 @@ import { DynamicServerError } from '../../../client/components/hooks-server-cont
 import {
   workAsyncStorage,
   type WorkStore,
-} from '../../../server/app-render/work-async-storage.external'
+} from '../../app-render/work-async-storage.external'
 import {
   workUnitAsyncStorage,
   type WorkUnitStore,
@@ -49,7 +49,7 @@ import {
 import {
   actionAsyncStorage,
   type ActionStore,
-} from '../../../server/app-render/action-async-storage.external'
+} from '../../app-render/action-async-storage.external'
 import * as sharedModules from './shared-modules'
 import { getIsServerAction } from '../../lib/server-action-request-meta'
 import { RequestCookies } from 'next/dist/compiled/@edge-runtime/cookies'
diff --git a/packages/next/src/server/use-cache/use-cache-wrapper.ts b/packages/next/src/server/use-cache/use-cache-wrapper.ts
@@ -12,8 +12,8 @@ import {
   createTemporaryReferenceSet as createClientTemporaryReferenceSet,
 } from 'react-server-dom-webpack/client.edge'
 
-import type { WorkStore } from '../../server/app-render/work-async-storage.external'
-import { workAsyncStorage } from '../../server/app-render/work-async-storage.external'
+import type { WorkStore } from '../app-render/work-async-storage.external'
+import { workAsyncStorage } from '../app-render/work-async-storage.external'
 import type { UseCacheStore } from '../app-render/work-unit-async-storage.external'
 import { workUnitAsyncStorage } from '../app-render/work-unit-async-storage.external'
 import { runInCleanSnapshot } from '../app-render/clean-async-snapshot.external'
diff --git a/packages/next/src/server/web/adapter.ts b/packages/next/src/server/web/adapter.ts
@@ -13,12 +13,12 @@ import { normalizeRscURL } from '../../shared/lib/router/utils/app-paths'
 import { FLIGHT_HEADERS } from '../../client/components/app-router-headers'
 import { ensureInstrumentationRegistered } from './globals'
 import { withRequestStore } from '../async-storage/with-request-store'
-import { workUnitAsyncStorage } from '../../server/app-render/work-unit-async-storage.external'
+import { workUnitAsyncStorage } from '../app-render/work-unit-async-storage.external'
 import {
   withWorkStore,
   type WorkStoreContext,
 } from '../async-storage/with-work-store'
-import { workAsyncStorage } from '../../server/app-render/work-async-storage.external'
+import { workAsyncStorage } from '../app-render/work-async-storage.external'
 import { NEXT_ROUTER_PREFETCH_HEADER } from '../../client/components/app-router-headers'
 import { getTracer } from '../lib/trace/tracer'
 import type { TextMapGetter } from 'next/dist/compiled/@opentelemetry/api'
diff --git a/packages/next/src/server/web/spec-extension/adapters/request-cookies.ts b/packages/next/src/server/web/spec-extension/adapters/request-cookies.ts
@@ -2,7 +2,7 @@ import type { RequestCookies } from '../cookies'
 
 import { ResponseCookies } from '../cookies'
 import { ReflectAdapter } from './reflect'
-import { workAsyncStorage } from '../../../../server/app-render/work-async-storage.external'
+import { workAsyncStorage } from '../../../app-render/work-async-storage.external'
 
 /**
  * @internal
diff --git a/packages/next/src/server/web/spec-extension/revalidate.ts b/packages/next/src/server/web/spec-extension/revalidate.ts
@@ -4,8 +4,8 @@ import {
   NEXT_CACHE_IMPLICIT_TAG_ID,
   NEXT_CACHE_SOFT_TAG_MAX_LENGTH,
 } from '../../../lib/constants'
-import { workAsyncStorage } from '../../../server/app-render/work-async-storage.external'
-import { workUnitAsyncStorage } from '../../../server/app-render/work-unit-async-storage.external'
+import { workAsyncStorage } from '../../app-render/work-async-storage.external'
+import { workUnitAsyncStorage } from '../../app-render/work-unit-async-storage.external'
 
 /**
  * This function allows you to purge [cached data](https://nextjs.org/docs/app/building-your-application/caching) on-demand for a specific cache tag.
diff --git a/packages/next/src/server/web/spec-extension/unstable-cache.ts b/packages/next/src/server/web/spec-extension/unstable-cache.ts
@@ -6,7 +6,7 @@ import {
   validateRevalidate,
   validateTags,
 } from '../../lib/patch-fetch'
-import { workAsyncStorage } from '../../../server/app-render/work-async-storage.external'
+import { workAsyncStorage } from '../../app-render/work-async-storage.external'
 import { workUnitAsyncStorage } from '../../app-render/work-unit-async-storage.external'
 import {
   CachedRouteKind,
diff --git a/packages/next/src/server/web/spec-extension/unstable-no-store.ts b/packages/next/src/server/web/spec-extension/unstable-no-store.ts
@@ -1,5 +1,5 @@
-import { workAsyncStorage } from '../../../server/app-render/work-async-storage.external'
-import { workUnitAsyncStorage } from '../../../server/app-render/work-unit-async-storage.external'
+import { workAsyncStorage } from '../../app-render/work-async-storage.external'
+import { workUnitAsyncStorage } from '../../app-render/work-unit-async-storage.external'
 import { markCurrentScopeAsDynamic } from '../../app-render/dynamic-rendering'
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { WorkStore } from '../../server/app-render/work-async-storage.external'`
	`1`	`+import type { WorkStore } from '../app-render/work-async-storage.external'`
`2`	`2`
`3`	`3`	`/** Run a callback, and execute any new revalidations added during its runtime. */`
`4`	`4`	`export async function withExecuteRevalidates<T>(`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { createSnapshot } from '../../server/app-render/async-local-storage'`
	`1`	`+import { createSnapshot } from '../app-render/async-local-storage'`
`2`	`2`
`3`	`3`	`export const runInCleanSnapshot: <R, TArgs extends any[]>(`
`4`	`4`	`fn: (...args: TArgs) => R,`