Stop importing from src in tests

5x more imports of dist than src

Importing from src doesn't typecheck.

Author: eps1lon

packages/next/src/server/config-schema.ts

@@ -27,7 +27,6 @@ const zSizeLimit = z.custom<SizeLimit>((val) => {
   return false
 })
 
-// @ts-ignore ts check incompatible due to `strictNullChecks: false`
 const zExportMap: zod.ZodType<ExportPathMap> = z.record(
   z.string(),
   z.object({
@@ -40,7 +39,6 @@ const zExportMap: zod.ZodType<ExportPathMap> = z.record(
   })
 )
 
-// @ts-ignore ts check incompatible due to `strictNullChecks: false`
 const zRouteHas: zod.ZodType<RouteHas> = z.union([
   z.object({
     type: z.enum(['header', 'query', 'cookie']),
@@ -54,7 +52,6 @@ const zRouteHas: zod.ZodType<RouteHas> = z.union([
   }),
 ])
 
-// @ts-ignore ts check incompatible due to `strictNullChecks: false`
 const zRewrite: zod.ZodType<Rewrite> = z.object({
   source: z.string(),
   destination: z.string(),
@@ -65,7 +62,6 @@ const zRewrite: zod.ZodType<Rewrite> = z.object({
   internal: z.boolean().optional(),
 })
 
-// @ts-ignore ts check incompatible due to `strictNullChecks: false`
 const zRedirect: zod.ZodType<Redirect> = z
   .object({
     source: z.string(),
@@ -89,7 +85,6 @@ const zRedirect: zod.ZodType<Redirect> = z
     ])
   )
 
-// @ts-ignore ts check incompatible due to `strictNullChecks: false`
 const zHeader: zod.ZodType<Header> = z.object({
   source: z.string(),
   basePath: z.literal(false).optional(),
@@ -101,7 +96,6 @@ const zHeader: zod.ZodType<Header> = z.object({
   internal: z.boolean().optional(),
 })
 
-// @ts-ignore ts check incompatible due to `strictNullChecks: false`
 const zTurboLoaderItem: zod.ZodType<TurboLoaderItem> = z.union([
   z.string(),
   z.object({
@@ -111,7 +105,6 @@ const zTurboLoaderItem: zod.ZodType<TurboLoaderItem> = z.union([
   }),
 ])
 
-// @ts-ignore ts check incompatible due to `strictNullChecks: false`
 const zTurboRuleConfigItemOptions: zod.ZodType<TurboRuleConfigItemOptions> =
   z.object({
     loaders: z.array(zTurboLoaderItem),
@@ -130,7 +123,6 @@ const zTurboRuleConfigItem: zod.ZodType<TurboRuleConfigItem> = z.union([
 const zTurboRuleConfigItemOrShortcut: zod.ZodType<TurboRuleConfigItemOrShortcut> =
   z.union([z.array(zTurboLoaderItem), zTurboRuleConfigItem])
 
-// @ts-ignore ts check incompatible due to `strictNullChecks: false`
 export const configSchema: zod.ZodType<NextConfig> = z.lazy(() =>
   z.strictObject({
     amp: z

test/development/basic/next-rs-api.test.ts

@@ -1,5 +1,5 @@
 import { NextInstance, createNext } from 'e2e-utils'
-import { trace } from 'next/src/trace'
+import { trace } from 'next/dist/trace'
 import { PHASE_DEVELOPMENT_SERVER } from 'next/constants'
 import {
   createDefineEnv,
@@ -11,8 +11,8 @@ import {
   StyledString,
   TurbopackResult,
   UpdateInfo,
-} from 'next/src/build/swc'
-import loadConfig from 'next/src/server/config'
+} from 'next/dist/build/swc'
+import loadConfig from 'next/dist/server/config'
 import path from 'path'
 
 function normalizePath(path: string) {

test/e2e/ignore-invalid-popstateevent/with-i18n.test.ts

@@ -4,7 +4,7 @@ import { NextInstance } from 'e2e-utils'
 import { check, waitFor } from 'next-test-utils'
 import webdriver, { BrowserInterface } from 'next-webdriver'
 
-import type { HistoryState } from '../../../packages/next/src/shared/lib/router/router'
+import type { HistoryState } from 'next/dist/shared/lib/router/router'
 
 const emitPopsStateEvent = (browser: BrowserInterface, state: HistoryState) =>
   browser.eval(

test/e2e/ignore-invalid-popstateevent/without-i18n.test.ts

@@ -4,7 +4,7 @@ import { NextInstance } from 'e2e-utils'
 import { check, waitFor } from 'next-test-utils'
 import webdriver, { BrowserInterface } from 'next-webdriver'
 
-import type { HistoryState } from '../../../packages/next/src/shared/lib/router/router'
+import type { HistoryState } from 'next/dist/shared/lib/router/router'
 
 const emitPopsStateEvent = (browser: BrowserInterface, state: HistoryState) =>
   browser.eval(

test/lib/e2e-utils.ts

@@ -1,6 +1,6 @@
 import path from 'path'
 import assert from 'assert'
-import { flushAllTraces, setGlobal, trace } from 'next/src/trace'
+import { flushAllTraces, setGlobal, trace } from 'next/dist/trace'
 import { PHASE_DEVELOPMENT_SERVER } from 'next/constants'
 import { NextInstance, NextInstanceOpts } from './next-modes/base'
 import { NextDevInstance } from './next-modes/next-dev'

test/lib/next-modes/base.ts

@@ -6,7 +6,7 @@ import type { NextConfig } from 'next'
 import { FileRef, isNextDeploy, isNextDev } from '../e2e-utils'
 import { ChildProcess } from 'child_process'
 import { createNextInstall } from '../create-next-install'
-import { Span } from 'next/src/trace'
+import { Span } from 'next/dist/trace'
 import webdriver from '../next-webdriver'
 import { renderViaHTTP, fetchViaHTTP, waitFor } from 'next-test-utils'
 import cheerio from 'cheerio'

test/lib/next-modes/next-deploy.ts

@@ -9,7 +9,7 @@ import {
   TEST_TOKEN,
 } from '../../../scripts/reset-project.mjs'
 import fetch from 'node-fetch'
-import { Span } from 'next/src/trace'
+import { Span } from 'next/dist/trace'
 
 export class NextDeployInstance extends NextInstance {
   private _cliOutput: string

test/lib/next-modes/next-dev.ts

@@ -1,5 +1,5 @@
 import spawn from 'cross-spawn'
-import { Span } from 'next/src/trace'
+import { Span } from 'next/dist/trace'
 import { NextInstance } from './base'
 import { getTurbopackFlag } from '../turbo'
 import stripAnsi from 'strip-ansi'

test/lib/next-modes/next-start.ts

@@ -2,7 +2,7 @@ import path from 'path'
 import fs from 'fs-extra'
 import { NextInstance } from './base'
 import spawn from 'cross-spawn'
-import { Span } from 'next/src/trace'
+import { Span } from 'next/dist/trace'
 import stripAnsi from 'strip-ansi'
 
 export class NextStartInstance extends NextInstance {

test/unit/cssnano-simple/cssnano-simple/basic.test.ts

@@ -1,6 +1,6 @@
 import postcss from 'postcss'
 
-import mod from 'next/src/bundles/cssnano-simple/index'
+import mod from 'next/dist/compiled/cssnano-simple/index'
 import css from '../noop-template'
 
 describe('basic test', () => {

test/unit/cssnano-simple/cssnano-simple/exclude-all.test.ts

@@ -1,6 +1,6 @@
 import postcss from 'postcss'
 
-import mod from 'next/src/bundles/cssnano-simple/index'
+import mod from 'next/dist/compiled/cssnano-simple/index'
 import css from '../noop-template'
 
 describe('exclude all test', () => {

test/unit/cssnano-simple/cssnano-simple/plugin-config.test.ts

@@ -1,6 +1,6 @@
 import postcss from 'postcss'
 
-import mod from 'next/src/bundles/cssnano-simple/index'
+import mod from 'next/dist/compiled/cssnano-simple'
 import css from '../noop-template'
 
 describe('accepts plugin configuration', () => {

test/unit/web-runtime/next-request.test.ts

@@ -3,7 +3,7 @@
  */
 
 import { expectTypeOf } from 'expect-type'
-import { NextRequest } from 'next/src/server/web/spec-extension/request'
+import { NextRequest } from 'next/dist/server/web/spec-extension/request'
 
 it('should have 1 required parameter for constructor', () => {
   expect(NextRequest.length).toBe(1)

test/unit/web-runtime/next-response-cookies.test.ts

@@ -2,7 +2,7 @@
  * @jest-environment @edge-runtime/jest-environment
  */
 
-import { NextResponse } from 'next/src/server/web/spec-extension/response'
+import { NextResponse } from 'next/dist/server/web/spec-extension/response'
 
 it('reflect .set into `set-cookie`', async () => {
   const response = new NextResponse()

test/unit/web-runtime/next-response.test.ts

@@ -2,7 +2,7 @@
  * @jest-environment @edge-runtime/jest-environment
  */
 
-import { NextResponse } from 'next/src/server/web/spec-extension/response'
+import { NextResponse } from 'next/dist/server/web/spec-extension/response'
 
 const toJSON = async (response: Response) => ({
   body: await response.json(),