Unverified Commit 0b926ff4 authored by Shu Ding's avatar Shu Ding Committed by GitHub

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.
parent 3ed9f4b3
...@@ -17,7 +17,7 @@ import path from 'path' ...@@ -17,7 +17,7 @@ import path from 'path'
import fs from 'fs/promises' import fs from 'fs/promises'
import { loadBindings } from './swc' import { loadBindings } from './swc'
import { nonNullable } from '../lib/non-nullable' 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 debugOriginal from 'next/dist/compiled/debug'
import picomatch from 'next/dist/compiled/picomatch' import picomatch from 'next/dist/compiled/picomatch'
import { defaultOverrides } from '../server/require-hook' import { defaultOverrides } from '../server/require-hook'
......
...@@ -86,7 +86,7 @@ import loadConfig from '../server/config' ...@@ -86,7 +86,7 @@ import loadConfig from '../server/config'
import type { BuildManifest } from '../server/get-page-files' import type { BuildManifest } from '../server/get-page-files'
import { normalizePagePath } from '../shared/lib/page-path/normalize-page-path' import { normalizePagePath } from '../shared/lib/page-path/normalize-page-path'
import { getPagePath } from '../server/require' import { getPagePath } from '../server/require'
import * as ciEnvironment from '../telemetry/ci-info' import * as ciEnvironment from '../server/ci-info'
import { import {
turborepoTraceAccess, turborepoTraceAccess,
TurborepoAccessTraceResult, TurborepoAccessTraceResult,
......
...@@ -79,7 +79,7 @@ import { isClientReference } from '../lib/client-reference' ...@@ -79,7 +79,7 @@ import { isClientReference } from '../lib/client-reference'
import { withStaticGenerationStore } from '../server/async-storage/with-static-generation-store' import { withStaticGenerationStore } from '../server/async-storage/with-static-generation-store'
import { IncrementalCache } from '../server/lib/incremental-cache' import { IncrementalCache } from '../server/lib/incremental-cache'
import { nodeFs } from '../server/lib/node-fs-methods' 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 { normalizeAppPath } from '../shared/lib/router/utils/app-paths'
import { denormalizeAppPagePath } from '../shared/lib/page-path/denormalize-app-path' import { denormalizeAppPagePath } from '../shared/lib/page-path/denormalize-app-path'
import { RouteKind } from '../server/route-kind' import { RouteKind } from '../server/route-kind'
......
import path from 'path' import path from 'path'
import { IncrementalCache } from '../../server/lib/incremental-cache' 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 { nodeFs } from '../../server/lib/node-fs-methods'
import { interopDefault } from '../../lib/interop-default' import { interopDefault } from '../../lib/interop-default'
import { formatDynamicImportPath } from '../../lib/format-dynamic-import-path' import { formatDynamicImportPath } from '../../lib/format-dynamic-import-path'
......
...@@ -36,7 +36,7 @@ import { ...@@ -36,7 +36,7 @@ import {
import loadConfig from '../server/config' import loadConfig from '../server/config'
import type { ExportPathMap } from '../server/config-shared' import type { ExportPathMap } from '../server/config-shared'
import { eventCliSession } from '../telemetry/events' import { eventCliSession } from '../telemetry/events'
import { hasNextSupport } from '../telemetry/ci-info' import { hasNextSupport } from '../server/ci-info'
import { Telemetry } from '../telemetry/storage' import { Telemetry } from '../telemetry/storage'
import { normalizePagePath } from '../shared/lib/page-path/normalize-page-path' import { normalizePagePath } from '../shared/lib/page-path/normalize-page-path'
import { denormalizePagePath } from '../shared/lib/page-path/denormalize-page-path' import { denormalizePagePath } from '../shared/lib/page-path/denormalize-page-path'
......
...@@ -15,7 +15,7 @@ import { ...@@ -15,7 +15,7 @@ import {
RSC_PREFETCH_SUFFIX, RSC_PREFETCH_SUFFIX,
RSC_SUFFIX, RSC_SUFFIX,
} from '../../lib/constants' } 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 { lazyRenderAppPage } from '../../server/route-modules/app-page/module.render'
import { isBailoutToCSRError } from '../../shared/lib/lazy-dynamic/bailout-to-csr' import { isBailoutToCSRError } from '../../shared/lib/lazy-dynamic/bailout-to-csr'
import { NodeNextRequest, NodeNextResponse } from '../../server/base-http/node' import { NodeNextRequest, NodeNextResponse } from '../../server/base-http/node'
......
...@@ -22,7 +22,7 @@ import type { ...@@ -22,7 +22,7 @@ import type {
} from '../../server/lib/mock-request' } from '../../server/lib/mock-request'
import { isDynamicUsageError } from '../helpers/is-dynamic-usage-error' import { isDynamicUsageError } from '../helpers/is-dynamic-usage-error'
import { SERVER_DIRECTORY } from '../../shared/lib/constants' 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 { isStaticGenEnabled } from '../../server/route-modules/app-route/helpers/is-static-gen-enabled'
import type { ExperimentalConfig } from '../../server/config-shared' import type { ExperimentalConfig } from '../../server/config-shared'
import { isMetadataRouteFile } from '../../lib/metadata/is-metadata-route' import { isMetadataRouteFile } from '../../lib/metadata/is-metadata-route'
......
...@@ -27,7 +27,7 @@ import { normalizeAppPath } from '../shared/lib/router/utils/app-paths' ...@@ -27,7 +27,7 @@ import { normalizeAppPath } from '../shared/lib/router/utils/app-paths'
import { createRequestResponseMocks } from '../server/lib/mock-request' import { createRequestResponseMocks } from '../server/lib/mock-request'
import { isAppRouteRoute } from '../lib/is-app-route-route' 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 { exportAppRoute } from './routes/app-route'
import { exportAppPage } from './routes/app-page' import { exportAppPage } from './routes/app-page'
import { exportPagesPage } from './routes/pages' import { exportPagesPage } from './routes/pages'
......
...@@ -4,7 +4,7 @@ import findUp from 'next/dist/compiled/find-up' ...@@ -4,7 +4,7 @@ import findUp from 'next/dist/compiled/find-up'
// @ts-ignore no-json types // @ts-ignore no-json types
import nextPkgJson from 'next/package.json' import nextPkgJson from 'next/package.json'
import type { UnwrapPromise } from './coalesced-function' import type { UnwrapPromise } from './coalesced-function'
import { isCI } from '../telemetry/ci-info' import { isCI } from '../server/ci-info'
import { getRegistry } from './helpers/get-registry' import { getRegistry } from './helpers/get-registry'
let registry: string | undefined let registry: string | undefined
......
...@@ -12,7 +12,7 @@ import type { TypeCheckResult } from './typescript/runTypeCheck' ...@@ -12,7 +12,7 @@ import type { TypeCheckResult } from './typescript/runTypeCheck'
import { writeAppTypeDeclarations } from './typescript/writeAppTypeDeclarations' import { writeAppTypeDeclarations } from './typescript/writeAppTypeDeclarations'
import { writeConfigurationDefaults } from './typescript/writeConfigurationDefaults' import { writeConfigurationDefaults } from './typescript/writeConfigurationDefaults'
import { installDependencies } from './install-dependencies' import { installDependencies } from './install-dependencies'
import { isCI } from '../telemetry/ci-info' import { isCI } from '../server/ci-info'
import { missingDepsError } from './typescript/missingDependencyError' import { missingDepsError } from './typescript/missingDependencyError'
const requiredPackages = [ const requiredPackages = [
......
...@@ -24,7 +24,7 @@ import { matchRemotePattern } from '../shared/lib/match-remote-pattern' ...@@ -24,7 +24,7 @@ import { matchRemotePattern } from '../shared/lib/match-remote-pattern'
import { ZodParsedType, util as ZodUtil } from 'next/dist/compiled/zod' import { ZodParsedType, util as ZodUtil } from 'next/dist/compiled/zod'
import type { ZodError, ZodIssue } 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 { transpileConfig } from '../build/next-config-ts/transpile-config'
import { dset } from '../shared/lib/dset' import { dset } from '../shared/lib/dset'
......
...@@ -2,7 +2,7 @@ import isDockerFunction from 'next/dist/compiled/is-docker' ...@@ -2,7 +2,7 @@ import isDockerFunction from 'next/dist/compiled/is-docker'
import isWslBoolean from 'next/dist/compiled/is-wsl' import isWslBoolean from 'next/dist/compiled/is-wsl'
import os from 'os' import os from 'os'
import * as ciEnvironment from './ci-info' import * as ciEnvironment from '../server/ci-info'
type AnonymousMeta = { type AnonymousMeta = {
systemPlatform: NodeJS.Platform systemPlatform: NodeJS.Platform
......
...@@ -6,7 +6,7 @@ import isDockerFunction from 'next/dist/compiled/is-docker' ...@@ -6,7 +6,7 @@ import isDockerFunction from 'next/dist/compiled/is-docker'
import path from 'path' import path from 'path'
import { getAnonymousMeta } from './anonymous-meta' import { getAnonymousMeta } from './anonymous-meta'
import * as ciEnvironment from './ci-info' import * as ciEnvironment from '../server/ci-info'
import { _postPayload } from './post-payload' import { _postPayload } from './post-payload'
import { getRawProjectId } from './project-id' import { getRawProjectId } from './project-id'
import { AbortController } from 'next/dist/compiled/@edge-runtime/ponyfill' import { AbortController } from 'next/dist/compiled/@edge-runtime/ponyfill'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment