chore: reduce diffs with v6 branch (#17942)

patak-cat · web-flow · commit bf9065aa13da · 2024-08-24T19:40:24.000+02:00
diff --git a/packages/vite/src/node/build.ts b/packages/vite/src/node/build.ts
@@ -474,7 +474,7 @@ export async function build(
     'production',
   )
   const options = config.build
-  const { logger } = config
+  const { root, logger, packageCache } = config
   const ssr = !!options.ssr
   const libOptions = options.lib
 
@@ -486,7 +486,7 @@ export async function build(
     ),
   )
 
-  const resolve = (p: string) => path.resolve(config.root, p)
+  const resolve = (p: string) => path.resolve(root, p)
   const input = libOptions
     ? options.rollupOptions?.input ||
       (typeof libOptions.entry === 'string'
@@ -641,8 +641,7 @@ export async function build(
         ssrNodeBuild || libOptions
           ? resolveOutputJsExtension(
               format,
-              findNearestPackageData(config.root, config.packageCache)?.data
-                .type,
+              findNearestPackageData(root, packageCache)?.data.type,
             )
           : 'js'
       return {
@@ -665,9 +664,9 @@ export async function build(
                   libOptions,
                   format,
                   name,
-                  config.root,
+                  root,
                   jsExt,
-                  config.packageCache,
+                  packageCache,
                 )
             : path.posix.join(options.assetsDir, `[name]-[hash].${jsExt}`),
         chunkFileNames: libOptions
@@ -702,13 +701,13 @@ export async function build(
     }
 
     const resolvedOutDirs = getResolvedOutDirs(
-      config.root,
+      root,
       options.outDir,
       options.rollupOptions?.output,
     )
     const emptyOutDir = resolveEmptyOutDir(
       options.emptyOutDir,
-      config.root,
+      root,
       resolvedOutDirs,
       logger,
     )
@@ -718,10 +717,10 @@ export async function build(
       logger.info(colors.cyan(`\nwatching for file changes...`))
 
       const resolvedChokidarOptions = resolveChokidarOptions(
-        config,
         config.build.watch.chokidar,
         resolvedOutDirs,
         emptyOutDir,
+        config.cacheDir,
       )
 
       const { watch } = await import('rollup')
diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts
@@ -451,13 +451,13 @@ export async function _createServer(
     resolvedOutDirs,
   )
   const resolvedWatchOptions = resolveChokidarOptions(
-    config,
     {
       disableGlobbing: true,
       ...serverConfig.watch,
     },
     resolvedOutDirs,
     emptyOutDir,
+    config.cacheDir,
   )
 
   const middlewares = connect() as Connect.Server
diff --git a/packages/vite/src/node/watch.ts b/packages/vite/src/node/watch.ts
@@ -6,7 +6,6 @@ import type { OutputOptions } from 'rollup'
 import colors from 'picocolors'
 import { withTrailingSlash } from '../shared/utils'
 import { arraify, normalizePath } from './utils'
-import type { ResolvedConfig } from './config'
 import type { Logger } from './logger'
 
 export function getResolvedOutDirs(
@@ -50,17 +49,17 @@ export function resolveEmptyOutDir(
 }
 
 export function resolveChokidarOptions(
-  config: ResolvedConfig,
   options: WatchOptions | undefined,
   resolvedOutDirs: Set<string>,
   emptyOutDir: boolean,
+  cacheDir: string,
 ): WatchOptions {
   const { ignored: ignoredList, ...otherOptions } = options ?? {}
   const ignored: WatchOptions['ignored'] = [
     '**/.git/**',
     '**/node_modules/**',
     '**/test-results/**', // Playwright
-    glob.escapePath(config.cacheDir) + '/**',
+    glob.escapePath(cacheDir) + '/**',
     ...arraify(ignoredList || []),
   ]
   if (emptyOutDir) {
diff --git a/vitest.config.e2e.ts b/vitest.config.e2e.ts
@@ -1,7 +1,7 @@
 import { resolve } from 'node:path'
 import { defineConfig } from 'vitest/config'
 
-const timeout = process.env.CI ? 50000 : 30000
+const timeout = process.env.PWDEBUG ? Infinity : process.env.CI ? 50000 : 30000
 
 export default defineConfig({
   resolve: {

Original file line number	Diff line number	Diff line change
`@@ -451,13 +451,13 @@ export async function _createServer(`
`451`	`451`	`resolvedOutDirs,`
`452`	`452`	`)`
`453`	`453`	`const resolvedWatchOptions = resolveChokidarOptions(`
`454`		`- config,`
`455`	`454`	`{`
`456`	`455`	`disableGlobbing: true,`
`457`	`456`	`...serverConfig.watch,`
`458`	`457`	`},`
`459`	`458`	`resolvedOutDirs,`
`460`	`459`	`emptyOutDir,`
	`460`	`+ config.cacheDir,`
`461`	`461`	`)`
`462`	`462`
`463`	`463`	`const middlewares = connect() as Connect.Server`