From 1d8613fe9824b1fe336960f82f0c92bed79e21c6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 16 Aug 2022 18:23:47 +0200
Subject: [PATCH] chore(deps): update dependency es-module-lexer to v1 (#9576)

Co-authored-by: sapphi-red <green@sapphi.red>
---
 packages/vite/package.json                       |  2 +-
 packages/vite/src/node/optimizer/index.ts        |  5 +++--
 packages/vite/src/node/plugins/importAnalysis.ts |  6 +++---
 pnpm-lock.yaml                                   | 12 ++++++------
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/packages/vite/package.json b/packages/vite/package.json
index 2dc0ea376f68bf..3009cc9aebbefb 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -90,7 +90,7 @@
     "debug": "^4.3.4",
     "dotenv": "^14.3.2",
     "dotenv-expand": "^5.1.0",
-    "es-module-lexer": "^0.10.5",
+    "es-module-lexer": "^1.0.3",
     "estree-walker": "^3.0.1",
     "etag": "^1.8.1",
     "fast-glob": "^3.2.11",
diff --git a/packages/vite/src/node/optimizer/index.ts b/packages/vite/src/node/optimizer/index.ts
index b678d983353c8f..891d2dd709833c 100644
--- a/packages/vite/src/node/optimizer/index.ts
+++ b/packages/vite/src/node/optimizer/index.ts
@@ -42,6 +42,7 @@ const jsMapExtensionRE = /\.js\.map$/i
 
 export type ExportsData = {
   hasImports: boolean
+  // exported names (for `export { a as b }`, `b` is exported name)
   exports: readonly string[]
   facade: boolean
   // es-module-lexer has a facade detection but isn't always accurate for our
@@ -941,7 +942,7 @@ export async function extractExportsData(
     const [imports, exports, facade] = parse(result.outputFiles[0].text)
     return {
       hasImports: imports.length > 0,
-      exports,
+      exports: exports.map((e) => e.n),
       facade
     }
   }
@@ -973,7 +974,7 @@ export async function extractExportsData(
   const [imports, exports, facade] = parseResult
   const exportsData: ExportsData = {
     hasImports: imports.length > 0,
-    exports,
+    exports: exports.map((e) => e.n),
     facade,
     hasReExports: imports.some(({ ss, se }) => {
       const exp = entryContent.slice(ss, se)
diff --git a/packages/vite/src/node/plugins/importAnalysis.ts b/packages/vite/src/node/plugins/importAnalysis.ts
index 5041812a96f98e..7f9c6e7a3ac299 100644
--- a/packages/vite/src/node/plugins/importAnalysis.ts
+++ b/packages/vite/src/node/plugins/importAnalysis.ts
@@ -3,7 +3,7 @@ import path from 'node:path'
 import { performance } from 'node:perf_hooks'
 import colors from 'picocolors'
 import MagicString from 'magic-string'
-import type { ImportSpecifier } from 'es-module-lexer'
+import type { ExportSpecifier, ImportSpecifier } from 'es-module-lexer'
 import { init, parse as parseImports } from 'es-module-lexer'
 import { parse as parseJS } from 'acorn'
 import type { Node } from 'estree'
@@ -189,7 +189,7 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
       const start = performance.now()
       await init
       let imports: readonly ImportSpecifier[] = []
-      let exports: readonly string[] = []
+      let exports: readonly ExportSpecifier[] = []
       source = stripBomTag(source)
       try {
         ;[imports, exports] = parseImports(source)
@@ -676,7 +676,7 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
           !isSelfAccepting &&
           isPartiallySelfAccepting &&
           acceptedExports.size >= exports.length &&
-          exports.every((name) => acceptedExports.has(name))
+          exports.every((e) => acceptedExports.has(e.n))
         ) {
           isSelfAccepting = true
         }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9620fbc7b66501..42da11581f51a4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -226,7 +226,7 @@ importers:
       debug: ^4.3.4
       dotenv: ^14.3.2
       dotenv-expand: ^5.1.0
-      es-module-lexer: ^0.10.5
+      es-module-lexer: ^1.0.3
       esbuild: ^0.14.47
       estree-walker: ^3.0.1
       etag: ^1.8.1
@@ -292,7 +292,7 @@ importers:
       debug: 4.3.4
       dotenv: 14.3.2
       dotenv-expand: 5.1.0
-      es-module-lexer: 0.10.5
+      es-module-lexer: 1.0.3
       estree-walker: 3.0.1
       etag: 1.8.1
       fast-glob: 3.2.11
@@ -4304,14 +4304,14 @@ packages:
       unbox-primitive: 1.0.2
     dev: true
 
-  /es-module-lexer/0.10.5:
-    resolution: {integrity: sha512-+7IwY/kiGAacQfY+YBhKMvEmyAJnw5grTUgjG85Pe7vcUI/6b7pZjZG8nQ7+48YhzEAEqrEgD2dCz/JIK+AYvw==}
-    dev: true
-
   /es-module-lexer/0.9.3:
     resolution: {integrity: sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==}
     dev: true
 
+  /es-module-lexer/1.0.3:
+    resolution: {integrity: sha512-iC67eXHToclrlVhQfpRawDiF8D8sQxNxmbqw5oebegOaJkyx/w9C/k57/5e6yJR2zIByRt9OXdqX50DV2t6ZKw==}
+    dev: true
+
   /es-shim-unscopables/1.0.0:
     resolution: {integrity: sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==}
     dependencies: