chore: minor config.logger refactor (#17770)

vitejs · Jul 27, 2024 · b947fdc · b947fdc
1 parent 4407839
commit b947fdc
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/packages/vite/src/node/build.ts b/packages/vite/src/node/build.ts
@@ -474,10 +474,11 @@ export async function build(
     'production',
   )
   const options = config.build
+  const { logger } = config
   const ssr = !!options.ssr
   const libOptions = options.lib
 
-  config.logger.info(
+  logger.info(
     colors.cyan(
       `vite v${VERSION} ${colors.green(
         `building ${ssr ? `SSR bundle ` : ``}for ${config.mode}...`,
@@ -602,7 +603,7 @@ export async function build(
   const outputBuildError = (e: RollupError) => {
     enhanceRollupError(e)
     clearLine()
-    config.logger.error(e.message, { error: e })
+    logger.error(e.message, { error: e })
   }
 
   let bundle: RollupBuild | undefined
@@ -611,7 +612,7 @@ export async function build(
     const buildOutputOptions = (output: OutputOptions = {}): OutputOptions => {
       // @ts-expect-error See https://github.com/vitejs/vite/issues/5812#issuecomment-984345618
       if (output.output) {
-        config.logger.warn(
+        logger.warn(
           `You've set "rollupOptions.output.output" in your config. ` +
             `This is deprecated and will override all Vite.js default output options. ` +
             `Please use "rollupOptions.output" instead.`,
@@ -624,7 +625,7 @@ export async function build(
         )
       }
       if (output.sourcemap) {
-        config.logger.warnOnce(
+        logger.warnOnce(
           colors.yellow(
             `Vite does not support "rollupOptions.output.sourcemap". ` +
               `Please use "build.sourcemap" instead.`,
@@ -688,7 +689,7 @@ export async function build(
     const outputs = resolveBuildOutputs(
       options.rollupOptions?.output,
       libOptions,
-      config.logger,
+      logger,
     )
     const normalizedOutputs: OutputOptions[] = []
 
@@ -709,12 +710,12 @@ export async function build(
       options.emptyOutDir,
       config.root,
       resolvedOutDirs,
-      config.logger,
+      logger,
     )
 
     // watch file changes with rollup
     if (config.build.watch) {
-      config.logger.info(colors.cyan(`\nwatching for file changes...`))
+      logger.info(colors.cyan(`\nwatching for file changes...`))
 
       const resolvedChokidarOptions = resolveChokidarOptions(
         config,
@@ -735,13 +736,13 @@ export async function build(
 
       watcher.on('event', (event) => {
         if (event.code === 'BUNDLE_START') {
-          config.logger.info(colors.cyan(`\nbuild started...`))
+          logger.info(colors.cyan(`\nbuild started...`))
           if (options.write) {
             prepareOutDir(resolvedOutDirs, emptyOutDir, config)
           }
         } else if (event.code === 'BUNDLE_END') {
           event.result.close()
-          config.logger.info(colors.cyan(`built in ${event.duration}ms.`))
+          logger.info(colors.cyan(`built in ${event.duration}ms.`))
         } else if (event.code === 'ERROR') {
           outputBuildError(event.error)
         }
@@ -763,15 +764,15 @@ export async function build(
     for (const output of normalizedOutputs) {
       res.push(await bundle[options.write ? 'write' : 'generate'](output))
     }
-    config.logger.info(
+    logger.info(
       `${colors.green(`✓ built in ${displayTime(Date.now() - startTime)}`)}`,
     )
     return Array.isArray(outputs) ? res : res[0]
   } catch (e) {
     enhanceRollupError(e)
     clearLine()
     if (startTime) {
-      config.logger.error(
+      logger.error(
         `${colors.red('x')} Build failed in ${displayTime(Date.now() - startTime)}`,
       )
       startTime = undefined

diff --git a/packages/vite/src/node/optimizer/optimizer.ts b/packages/vite/src/node/optimizer/optimizer.ts
@@ -117,7 +117,7 @@ async function createDepsOptimizer(
   let newDepsToLogHandle: NodeJS.Timeout | undefined
   const logNewlyDiscoveredDeps = () => {
     if (newDepsToLog.length) {
-      config.logger.info(
+      logger.info(
         colors.green(
           `✨ new dependencies optimized: ${depsLogString(newDepsToLog)}`,
         ),
@@ -132,7 +132,7 @@ async function createDepsOptimizer(
   let discoveredDepsWhileScanning: string[] = []
   const logDiscoveredDepsWhileScanning = () => {
     if (discoveredDepsWhileScanning.length) {
-      config.logger.info(
+      logger.info(
         colors.green(
           `✨ discovered while scanning: ${depsLogString(
             discoveredDepsWhileScanning,
@@ -443,7 +443,7 @@ async function createDepsOptimizer(
             logNewlyDiscoveredDeps()
             if (warnAboutMissedDependencies) {
               logDiscoveredDepsWhileScanning()
-              config.logger.info(
+              logger.info(
                 colors.magenta(
                   `❗ add these dependencies to optimizeDeps.include to speed up cold start`,
                 ),
@@ -485,7 +485,7 @@ async function createDepsOptimizer(
             logNewlyDiscoveredDeps()
             if (warnAboutMissedDependencies) {
               logDiscoveredDepsWhileScanning()
-              config.logger.info(
+              logger.info(
                 colors.magenta(
                   `❗ add these dependencies to optimizeDeps.include to avoid a full page reload during cold start`,
                 ),
@@ -502,7 +502,7 @@ async function createDepsOptimizer(
             },
           )
           if (needsInteropMismatch.length > 0) {
-            config.logger.warn(
+            logger.warn(
               `Mixed ESM and CJS detected in ${colors.yellow(
                 needsInteropMismatch.join(', '),
               )}, add ${