From 31f5ff3ef9ee071afa8cc66870e13e9753c3ab93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=A3=E9=87=8C=E5=A5=BD=E8=84=8F=E4=B8=8D=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5?= <gaosheng08@meituan.com>
Date: Wed, 7 Sep 2022 00:57:10 +0800
Subject: [PATCH] refactor: optimize `async` and `await` in code (#9854)

---
 packages/vite/src/node/optimizer/optimizer.ts    | 2 +-
 packages/vite/src/node/plugins/importAnalysis.ts | 2 +-
 playground/assets/__tests__/assets.spec.ts       | 2 +-
 playground/ssr-vue/src/entry-server.js           | 2 +-
 playground/vitestGlobalSetup.ts                  | 2 +-
 playground/vitestSetup.ts                        | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/vite/src/node/optimizer/optimizer.ts b/packages/vite/src/node/optimizer/optimizer.ts
index 9bf03aa88005b0..0f32d70300dfb7 100644
--- a/packages/vite/src/node/optimizer/optimizer.ts
+++ b/packages/vite/src/node/optimizer/optimizer.ts
@@ -232,7 +232,7 @@ async function createDepsOptimizer(
     }
   }
 
-  async function startNextDiscoveredBatch() {
+  function startNextDiscoveredBatch() {
     newDepsDiscovered = false
 
     // Add the current depOptimizationProcessing to the queue, these
diff --git a/packages/vite/src/node/plugins/importAnalysis.ts b/packages/vite/src/node/plugins/importAnalysis.ts
index f1356d5c7f879e..80204c17a65091 100644
--- a/packages/vite/src/node/plugins/importAnalysis.ts
+++ b/packages/vite/src/node/plugins/importAnalysis.ts
@@ -87,7 +87,7 @@ function markExplicitImport(url: string) {
   return url
 }
 
-async function extractImportedBindings(
+function extractImportedBindings(
   id: string,
   source: string,
   importSpec: ImportSpecifier,
diff --git a/playground/assets/__tests__/assets.spec.ts b/playground/assets/__tests__/assets.spec.ts
index ceb259102d4031..affe284fb62d75 100644
--- a/playground/assets/__tests__/assets.spec.ts
+++ b/playground/assets/__tests__/assets.spec.ts
@@ -272,7 +272,7 @@ describe.runIf(isBuild)('encodeURI', () => {
   test('img src with encodeURI', async () => {
     const img = await page.$('.encodeURI')
     expect(
-      await (await img.getAttribute('src')).startsWith('data:image/png;base64')
+      (await img.getAttribute('src')).startsWith('data:image/png;base64')
     ).toBe(true)
   })
 })
diff --git a/playground/ssr-vue/src/entry-server.js b/playground/ssr-vue/src/entry-server.js
index ec0810f885863f..e44c9abd3eb114 100644
--- a/playground/ssr-vue/src/entry-server.js
+++ b/playground/ssr-vue/src/entry-server.js
@@ -6,7 +6,7 @@ export async function render(url, manifest) {
   const { app, router } = createApp()
 
   // set the router to the desired URL before rendering
-  router.push(url)
+  await router.push(url)
   await router.isReady()
 
   // passing SSR context object which will be available via useSSRContext()
diff --git a/playground/vitestGlobalSetup.ts b/playground/vitestGlobalSetup.ts
index 05bbf767423487..611b32064971c0 100644
--- a/playground/vitestGlobalSetup.ts
+++ b/playground/vitestGlobalSetup.ts
@@ -42,7 +42,7 @@ export async function setup(): Promise<void> {
 }
 
 export async function teardown(): Promise<void> {
-  browserServer?.close()
+  await browserServer?.close()
   if (!process.env.VITE_PRESERVE_BUILD_ARTIFACTS) {
     fs.removeSync(path.resolve(__dirname, '../playground-temp'))
   }
diff --git a/playground/vitestSetup.ts b/playground/vitestSetup.ts
index 57d44f9a91c898..f7c2629daa8f45 100644
--- a/playground/vitestSetup.ts
+++ b/playground/vitestSetup.ts
@@ -172,7 +172,7 @@ beforeAll(async (s) => {
     serverLogs.length = 0
     await page?.close()
     await server?.close()
-    watcher?.close()
+    await watcher?.close()
     if (browser) {
       await browser.close()
     }