Skip to content

Commit 1d8613f

Browse files
chore(deps): update dependency es-module-lexer to v1 (#9576)
Co-authored-by: sapphi-red <[email protected]>
1 parent 3bffd14 commit 1d8613f

File tree

4 files changed

+13
-12
lines changed

4 files changed

+13
-12
lines changed

packages/vite/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
"debug": "^4.3.4",
9191
"dotenv": "^14.3.2",
9292
"dotenv-expand": "^5.1.0",
93-
"es-module-lexer": "^0.10.5",
93+
"es-module-lexer": "^1.0.3",
9494
"estree-walker": "^3.0.1",
9595
"etag": "^1.8.1",
9696
"fast-glob": "^3.2.11",

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ const jsMapExtensionRE = /\.js\.map$/i
4242

4343
export type ExportsData = {
4444
hasImports: boolean
45+
// exported names (for `export { a as b }`, `b` is exported name)
4546
exports: readonly string[]
4647
facade: boolean
4748
// es-module-lexer has a facade detection but isn't always accurate for our
@@ -941,7 +942,7 @@ export async function extractExportsData(
941942
const [imports, exports, facade] = parse(result.outputFiles[0].text)
942943
return {
943944
hasImports: imports.length > 0,
944-
exports,
945+
exports: exports.map((e) => e.n),
945946
facade
946947
}
947948
}
@@ -973,7 +974,7 @@ export async function extractExportsData(
973974
const [imports, exports, facade] = parseResult
974975
const exportsData: ExportsData = {
975976
hasImports: imports.length > 0,
976-
exports,
977+
exports: exports.map((e) => e.n),
977978
facade,
978979
hasReExports: imports.some(({ ss, se }) => {
979980
const exp = entryContent.slice(ss, se)

packages/vite/src/node/plugins/importAnalysis.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import path from 'node:path'
33
import { performance } from 'node:perf_hooks'
44
import colors from 'picocolors'
55
import MagicString from 'magic-string'
6-
import type { ImportSpecifier } from 'es-module-lexer'
6+
import type { ExportSpecifier, ImportSpecifier } from 'es-module-lexer'
77
import { init, parse as parseImports } from 'es-module-lexer'
88
import { parse as parseJS } from 'acorn'
99
import type { Node } from 'estree'
@@ -189,7 +189,7 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
189189
const start = performance.now()
190190
await init
191191
let imports: readonly ImportSpecifier[] = []
192-
let exports: readonly string[] = []
192+
let exports: readonly ExportSpecifier[] = []
193193
source = stripBomTag(source)
194194
try {
195195
;[imports, exports] = parseImports(source)
@@ -676,7 +676,7 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
676676
!isSelfAccepting &&
677677
isPartiallySelfAccepting &&
678678
acceptedExports.size >= exports.length &&
679-
exports.every((name) => acceptedExports.has(name))
679+
exports.every((e) => acceptedExports.has(e.n))
680680
) {
681681
isSelfAccepting = true
682682
}

pnpm-lock.yaml

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)