Skip to content

Commit 0b926ff

Browse files
authored
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.
1 parent 3ed9f4b commit 0b926ff

File tree

14 files changed

+13
-13
lines changed

14 files changed

+13
-13
lines changed

packages/next/src/build/collect-build-traces.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import path from 'path'
1717
import fs from 'fs/promises'
1818
import { loadBindings } from './swc'
1919
import { nonNullable } from '../lib/non-nullable'
20-
import * as ciEnvironment from '../telemetry/ci-info'
20+
import * as ciEnvironment from '../server/ci-info'
2121
import debugOriginal from 'next/dist/compiled/debug'
2222
import picomatch from 'next/dist/compiled/picomatch'
2323
import { defaultOverrides } from '../server/require-hook'

packages/next/src/build/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ import loadConfig from '../server/config'
8686
import type { BuildManifest } from '../server/get-page-files'
8787
import { normalizePagePath } from '../shared/lib/page-path/normalize-page-path'
8888
import { getPagePath } from '../server/require'
89-
import * as ciEnvironment from '../telemetry/ci-info'
89+
import * as ciEnvironment from '../server/ci-info'
9090
import {
9191
turborepoTraceAccess,
9292
TurborepoAccessTraceResult,

packages/next/src/build/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ import { isClientReference } from '../lib/client-reference'
7979
import { withStaticGenerationStore } from '../server/async-storage/with-static-generation-store'
8080
import { IncrementalCache } from '../server/lib/incremental-cache'
8181
import { nodeFs } from '../server/lib/node-fs-methods'
82-
import * as ciEnvironment from '../telemetry/ci-info'
82+
import * as ciEnvironment from '../server/ci-info'
8383
import { normalizeAppPath } from '../shared/lib/router/utils/app-paths'
8484
import { denormalizeAppPagePath } from '../shared/lib/page-path/denormalize-app-path'
8585
import { RouteKind } from '../server/route-kind'

packages/next/src/export/helpers/create-incremental-cache.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import path from 'path'
22
import { IncrementalCache } from '../../server/lib/incremental-cache'
3-
import { hasNextSupport } from '../../telemetry/ci-info'
3+
import { hasNextSupport } from '../../server/ci-info'
44
import { nodeFs } from '../../server/lib/node-fs-methods'
55
import { interopDefault } from '../../lib/interop-default'
66
import { formatDynamicImportPath } from '../../lib/format-dynamic-import-path'

packages/next/src/export/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import {
3636
import loadConfig from '../server/config'
3737
import type { ExportPathMap } from '../server/config-shared'
3838
import { eventCliSession } from '../telemetry/events'
39-
import { hasNextSupport } from '../telemetry/ci-info'
39+
import { hasNextSupport } from '../server/ci-info'
4040
import { Telemetry } from '../telemetry/storage'
4141
import { normalizePagePath } from '../shared/lib/page-path/normalize-page-path'
4242
import { denormalizePagePath } from '../shared/lib/page-path/denormalize-page-path'

packages/next/src/export/routes/app-page.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
RSC_PREFETCH_SUFFIX,
1616
RSC_SUFFIX,
1717
} from '../../lib/constants'
18-
import { hasNextSupport } from '../../telemetry/ci-info'
18+
import { hasNextSupport } from '../../server/ci-info'
1919
import { lazyRenderAppPage } from '../../server/route-modules/app-page/module.render'
2020
import { isBailoutToCSRError } from '../../shared/lib/lazy-dynamic/bailout-to-csr'
2121
import { NodeNextRequest, NodeNextResponse } from '../../server/base-http/node'

packages/next/src/export/routes/app-route.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import type {
2222
} from '../../server/lib/mock-request'
2323
import { isDynamicUsageError } from '../helpers/is-dynamic-usage-error'
2424
import { SERVER_DIRECTORY } from '../../shared/lib/constants'
25-
import { hasNextSupport } from '../../telemetry/ci-info'
25+
import { hasNextSupport } from '../../server/ci-info'
2626
import { isStaticGenEnabled } from '../../server/route-modules/app-route/helpers/is-static-gen-enabled'
2727
import type { ExperimentalConfig } from '../../server/config-shared'
2828
import { isMetadataRouteFile } from '../../lib/metadata/is-metadata-route'

packages/next/src/export/worker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import { normalizeAppPath } from '../shared/lib/router/utils/app-paths'
2727

2828
import { createRequestResponseMocks } from '../server/lib/mock-request'
2929
import { isAppRouteRoute } from '../lib/is-app-route-route'
30-
import { hasNextSupport } from '../telemetry/ci-info'
30+
import { hasNextSupport } from '../server/ci-info'
3131
import { exportAppRoute } from './routes/app-route'
3232
import { exportAppPage } from './routes/app-page'
3333
import { exportPagesPage } from './routes/pages'

packages/next/src/lib/patch-incorrect-lockfile.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import findUp from 'next/dist/compiled/find-up'
44
// @ts-ignore no-json types
55
import nextPkgJson from 'next/package.json'
66
import type { UnwrapPromise } from './coalesced-function'
7-
import { isCI } from '../telemetry/ci-info'
7+
import { isCI } from '../server/ci-info'
88
import { getRegistry } from './helpers/get-registry'
99

1010
let registry: string | undefined

packages/next/src/lib/verify-typescript-setup.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import type { TypeCheckResult } from './typescript/runTypeCheck'
1212
import { writeAppTypeDeclarations } from './typescript/writeAppTypeDeclarations'
1313
import { writeConfigurationDefaults } from './typescript/writeConfigurationDefaults'
1414
import { installDependencies } from './install-dependencies'
15-
import { isCI } from '../telemetry/ci-info'
15+
import { isCI } from '../server/ci-info'
1616
import { missingDepsError } from './typescript/missingDependencyError'
1717

1818
const requiredPackages = [

0 commit comments

Comments
 (0)