Skip to content

Commit bf9065a

Browse files
authored
chore: reduce diffs with v6 branch (#17942)
1 parent 561b940 commit bf9065a

File tree

4 files changed

+12
-14
lines changed

4 files changed

+12
-14
lines changed

packages/vite/src/node/build.ts

+8-9
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ export async function build(
474474
'production',
475475
)
476476
const options = config.build
477-
const { logger } = config
477+
const { root, logger, packageCache } = config
478478
const ssr = !!options.ssr
479479
const libOptions = options.lib
480480

@@ -486,7 +486,7 @@ export async function build(
486486
),
487487
)
488488

489-
const resolve = (p: string) => path.resolve(config.root, p)
489+
const resolve = (p: string) => path.resolve(root, p)
490490
const input = libOptions
491491
? options.rollupOptions?.input ||
492492
(typeof libOptions.entry === 'string'
@@ -641,8 +641,7 @@ export async function build(
641641
ssrNodeBuild || libOptions
642642
? resolveOutputJsExtension(
643643
format,
644-
findNearestPackageData(config.root, config.packageCache)?.data
645-
.type,
644+
findNearestPackageData(root, packageCache)?.data.type,
646645
)
647646
: 'js'
648647
return {
@@ -665,9 +664,9 @@ export async function build(
665664
libOptions,
666665
format,
667666
name,
668-
config.root,
667+
root,
669668
jsExt,
670-
config.packageCache,
669+
packageCache,
671670
)
672671
: path.posix.join(options.assetsDir, `[name]-[hash].${jsExt}`),
673672
chunkFileNames: libOptions
@@ -702,13 +701,13 @@ export async function build(
702701
}
703702

704703
const resolvedOutDirs = getResolvedOutDirs(
705-
config.root,
704+
root,
706705
options.outDir,
707706
options.rollupOptions?.output,
708707
)
709708
const emptyOutDir = resolveEmptyOutDir(
710709
options.emptyOutDir,
711-
config.root,
710+
root,
712711
resolvedOutDirs,
713712
logger,
714713
)
@@ -718,10 +717,10 @@ export async function build(
718717
logger.info(colors.cyan(`\nwatching for file changes...`))
719718

720719
const resolvedChokidarOptions = resolveChokidarOptions(
721-
config,
722720
config.build.watch.chokidar,
723721
resolvedOutDirs,
724722
emptyOutDir,
723+
config.cacheDir,
725724
)
726725

727726
const { watch } = await import('rollup')

packages/vite/src/node/server/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -451,13 +451,13 @@ export async function _createServer(
451451
resolvedOutDirs,
452452
)
453453
const resolvedWatchOptions = resolveChokidarOptions(
454-
config,
455454
{
456455
disableGlobbing: true,
457456
...serverConfig.watch,
458457
},
459458
resolvedOutDirs,
460459
emptyOutDir,
460+
config.cacheDir,
461461
)
462462

463463
const middlewares = connect() as Connect.Server

packages/vite/src/node/watch.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import type { OutputOptions } from 'rollup'
66
import colors from 'picocolors'
77
import { withTrailingSlash } from '../shared/utils'
88
import { arraify, normalizePath } from './utils'
9-
import type { ResolvedConfig } from './config'
109
import type { Logger } from './logger'
1110

1211
export function getResolvedOutDirs(
@@ -50,17 +49,17 @@ export function resolveEmptyOutDir(
5049
}
5150

5251
export function resolveChokidarOptions(
53-
config: ResolvedConfig,
5452
options: WatchOptions | undefined,
5553
resolvedOutDirs: Set<string>,
5654
emptyOutDir: boolean,
55+
cacheDir: string,
5756
): WatchOptions {
5857
const { ignored: ignoredList, ...otherOptions } = options ?? {}
5958
const ignored: WatchOptions['ignored'] = [
6059
'**/.git/**',
6160
'**/node_modules/**',
6261
'**/test-results/**', // Playwright
63-
glob.escapePath(config.cacheDir) + '/**',
62+
glob.escapePath(cacheDir) + '/**',
6463
...arraify(ignoredList || []),
6564
]
6665
if (emptyOutDir) {

vitest.config.e2e.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { resolve } from 'node:path'
22
import { defineConfig } from 'vitest/config'
33

4-
const timeout = process.env.CI ? 50000 : 30000
4+
const timeout = process.env.PWDEBUG ? Infinity : process.env.CI ? 50000 : 30000
55

66
export default defineConfig({
77
resolve: {

0 commit comments

Comments
 (0)