Move ci-info utility to be under the server folder (#70514)

This is because CI info will be used by other modules of the server, not just Telemetry. This refactoring doesn't change any functionalities.
vercel · Sep 26, 2024 · 0b926ff · 0b926ff
1 parent 3ed9f4b
commit 0b926ff
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 13 deletions.
diff --git a/packages/next/src/build/collect-build-traces.ts b/packages/next/src/build/collect-build-traces.ts
@@ -17,7 +17,7 @@ import path from 'path'
 import fs from 'fs/promises'
 import { loadBindings } from './swc'
 import { nonNullable } from '../lib/non-nullable'
-import * as ciEnvironment from '../telemetry/ci-info'
+import * as ciEnvironment from '../server/ci-info'
 import debugOriginal from 'next/dist/compiled/debug'
 import picomatch from 'next/dist/compiled/picomatch'
 import { defaultOverrides } from '../server/require-hook'

diff --git a/packages/next/src/build/index.ts b/packages/next/src/build/index.ts
@@ -86,7 +86,7 @@ import loadConfig from '../server/config'
 import type { BuildManifest } from '../server/get-page-files'
 import { normalizePagePath } from '../shared/lib/page-path/normalize-page-path'
 import { getPagePath } from '../server/require'
-import * as ciEnvironment from '../telemetry/ci-info'
+import * as ciEnvironment from '../server/ci-info'
 import {
   turborepoTraceAccess,
   TurborepoAccessTraceResult,

diff --git a/packages/next/src/build/utils.ts b/packages/next/src/build/utils.ts
@@ -79,7 +79,7 @@ import { isClientReference } from '../lib/client-reference'
 import { withStaticGenerationStore } from '../server/async-storage/with-static-generation-store'
 import { IncrementalCache } from '../server/lib/incremental-cache'
 import { nodeFs } from '../server/lib/node-fs-methods'
-import * as ciEnvironment from '../telemetry/ci-info'
+import * as ciEnvironment from '../server/ci-info'
 import { normalizeAppPath } from '../shared/lib/router/utils/app-paths'
 import { denormalizeAppPagePath } from '../shared/lib/page-path/denormalize-app-path'
 import { RouteKind } from '../server/route-kind'

diff --git a/packages/next/src/export/helpers/create-incremental-cache.ts b/packages/next/src/export/helpers/create-incremental-cache.ts
@@ -1,6 +1,6 @@
 import path from 'path'
 import { IncrementalCache } from '../../server/lib/incremental-cache'
-import { hasNextSupport } from '../../telemetry/ci-info'
+import { hasNextSupport } from '../../server/ci-info'
 import { nodeFs } from '../../server/lib/node-fs-methods'
 import { interopDefault } from '../../lib/interop-default'
 import { formatDynamicImportPath } from '../../lib/format-dynamic-import-path'

diff --git a/packages/next/src/export/index.ts b/packages/next/src/export/index.ts
@@ -36,7 +36,7 @@ import {
 import loadConfig from '../server/config'
 import type { ExportPathMap } from '../server/config-shared'
 import { eventCliSession } from '../telemetry/events'
-import { hasNextSupport } from '../telemetry/ci-info'
+import { hasNextSupport } from '../server/ci-info'
 import { Telemetry } from '../telemetry/storage'
 import { normalizePagePath } from '../shared/lib/page-path/normalize-page-path'
 import { denormalizePagePath } from '../shared/lib/page-path/denormalize-page-path'

diff --git a/packages/next/src/export/routes/app-page.ts b/packages/next/src/export/routes/app-page.ts
@@ -15,7 +15,7 @@ import {
   RSC_PREFETCH_SUFFIX,
   RSC_SUFFIX,
 } from '../../lib/constants'
-import { hasNextSupport } from '../../telemetry/ci-info'
+import { hasNextSupport } from '../../server/ci-info'
 import { lazyRenderAppPage } from '../../server/route-modules/app-page/module.render'
 import { isBailoutToCSRError } from '../../shared/lib/lazy-dynamic/bailout-to-csr'
 import { NodeNextRequest, NodeNextResponse } from '../../server/base-http/node'

diff --git a/packages/next/src/export/routes/app-route.ts b/packages/next/src/export/routes/app-route.ts
@@ -22,7 +22,7 @@ import type {
 } from '../../server/lib/mock-request'
 import { isDynamicUsageError } from '../helpers/is-dynamic-usage-error'
 import { SERVER_DIRECTORY } from '../../shared/lib/constants'
-import { hasNextSupport } from '../../telemetry/ci-info'
+import { hasNextSupport } from '../../server/ci-info'
 import { isStaticGenEnabled } from '../../server/route-modules/app-route/helpers/is-static-gen-enabled'
 import type { ExperimentalConfig } from '../../server/config-shared'
 import { isMetadataRouteFile } from '../../lib/metadata/is-metadata-route'

diff --git a/packages/next/src/export/worker.ts b/packages/next/src/export/worker.ts
@@ -27,7 +27,7 @@ import { normalizeAppPath } from '../shared/lib/router/utils/app-paths'
 
 import { createRequestResponseMocks } from '../server/lib/mock-request'
 import { isAppRouteRoute } from '../lib/is-app-route-route'
-import { hasNextSupport } from '../telemetry/ci-info'
+import { hasNextSupport } from '../server/ci-info'
 import { exportAppRoute } from './routes/app-route'
 import { exportAppPage } from './routes/app-page'
 import { exportPagesPage } from './routes/pages'

diff --git a/packages/next/src/lib/patch-incorrect-lockfile.ts b/packages/next/src/lib/patch-incorrect-lockfile.ts
@@ -4,7 +4,7 @@ import findUp from 'next/dist/compiled/find-up'
 // @ts-ignore no-json types
 import nextPkgJson from 'next/package.json'
 import type { UnwrapPromise } from './coalesced-function'
-import { isCI } from '../telemetry/ci-info'
+import { isCI } from '../server/ci-info'
 import { getRegistry } from './helpers/get-registry'
 
 let registry: string | undefined

diff --git a/packages/next/src/lib/verify-typescript-setup.ts b/packages/next/src/lib/verify-typescript-setup.ts
@@ -12,7 +12,7 @@ import type { TypeCheckResult } from './typescript/runTypeCheck'
 import { writeAppTypeDeclarations } from './typescript/writeAppTypeDeclarations'
 import { writeConfigurationDefaults } from './typescript/writeConfigurationDefaults'
 import { installDependencies } from './install-dependencies'
-import { isCI } from '../telemetry/ci-info'
+import { isCI } from '../server/ci-info'
 import { missingDepsError } from './typescript/missingDependencyError'
 
 const requiredPackages = [

diff --git a/packages/next/src/telemetry/ci-info.ts → packages/next/src/server/ci-info.ts b/packages/next/src/telemetry/ci-info.ts → packages/next/src/server/ci-info.ts
diff --git a/packages/next/src/server/config.ts b/packages/next/src/server/config.ts
@@ -24,7 +24,7 @@ import { matchRemotePattern } from '../shared/lib/match-remote-pattern'
 
 import { ZodParsedType, util as ZodUtil } from 'next/dist/compiled/zod'
 import type { ZodError, ZodIssue } from 'next/dist/compiled/zod'
-import { hasNextSupport } from '../telemetry/ci-info'
+import { hasNextSupport } from '../server/ci-info'
 import { transpileConfig } from '../build/next-config-ts/transpile-config'
 import { dset } from '../shared/lib/dset'
 

diff --git a/packages/next/src/telemetry/anonymous-meta.ts b/packages/next/src/telemetry/anonymous-meta.ts
@@ -2,7 +2,7 @@ import isDockerFunction from 'next/dist/compiled/is-docker'
 import isWslBoolean from 'next/dist/compiled/is-wsl'
 import os from 'os'
 
-import * as ciEnvironment from './ci-info'
+import * as ciEnvironment from '../server/ci-info'
 
 type AnonymousMeta = {
   systemPlatform: NodeJS.Platform

diff --git a/packages/next/src/telemetry/storage.ts b/packages/next/src/telemetry/storage.ts
@@ -6,7 +6,7 @@ import isDockerFunction from 'next/dist/compiled/is-docker'
 import path from 'path'
 
 import { getAnonymousMeta } from './anonymous-meta'
-import * as ciEnvironment from './ci-info'
+import * as ciEnvironment from '../server/ci-info'
 import { _postPayload } from './post-payload'
 import { getRawProjectId } from './project-id'
 import { AbortController } from 'next/dist/compiled/@edge-runtime/ponyfill'