wip: use parse function from rollup

packages/vite/LICENSE.md

@@ -566,35 +566,6 @@ Repository: https://github.com/acornjs/acorn.git
 
 ---------------------------------------
 
-## acorn-import-attributes
-License: MIT
-By: Sven Sauleau
-Repository: https://github.com/xtuc/acorn-import-attributes
-
-> MIT License
-> 
-> Copyright (c) 2023 Sven Sauleau
-> 
-> Permission is hereby granted, free of charge, to any person obtaining a copy
-> of this software and associated documentation files (the "Software"), to deal
-> in the Software without restriction, including without limitation the rights
-> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-> copies of the Software, and to permit persons to whom the Software is
-> furnished to do so, subject to the following conditions:
-> 
-> The above copyright notice and this permission notice shall be included in all
-> copies or substantial portions of the Software.
-> 
-> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-> SOFTWARE.
-
----------------------------------------
-
 ## acorn-walk
 License: MIT
 By: Marijn Haverbeke, Ingvar Stepanyan, Adrian Heine

packages/vite/package.json

@@ -98,7 +98,6 @@
     "@types/escape-html": "^1.0.2",
     "@types/pnpapi": "^0.0.3",
     "acorn": "^8.10.0",
-    "acorn-import-attributes": "^1.9.2",
     "acorn-walk": "^8.2.0",
     "cac": "^6.7.14",
     "chokidar": "^3.5.3",

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

@@ -32,8 +32,9 @@ SOFTWARE.
 import fs from 'node:fs'
 import { join } from 'node:path'
 import { performance } from 'node:perf_hooks'
-import { VERSION as rollupVersion } from 'rollup'
+import { rollup, VERSION as rollupVersion } from 'rollup'
 import type {
+  AstNode,
   AsyncPluginHooks,
   CustomPluginOptions,
   EmittedFile,
@@ -56,11 +57,8 @@ import type {
   SourceMap,
   TransformResult,
 } from 'rollup'
-import * as acorn from 'acorn'
 import type { RawSourceMap } from '@ampproject/remapping'
 import { TraceMap, originalPositionFor } from '@jridgewell/trace-mapping'
-// @ts-expect-error untyped
-import { importAttributes } from 'acorn-import-attributes'
 import MagicString from 'magic-string'
 import type { FSWatcher } from 'chokidar'
 import colors from 'picocolors'
@@ -149,7 +147,32 @@ type PluginContext = Omit<
   'cache'
 >
 
-export const parser = acorn.Parser.extend(importAttributes)
+export type RollupParseFunc = (
+  input: string,
+  options?: { allowReturnOutsideFunction?: boolean },
+) => AstNode
+
+export const getRollupParseFunc = async (): Promise<RollupParseFunc> => {
+  let rollupParse!: RollupParseFunc
+  await rollup({
+    input: 'dummy',
+    plugins: [
+      {
+        name: 'get-parse',
+        resolveId(id) {
+          return id
+        },
+        load(id) {
+          return ''
+        },
+        transform(code, id) {
+          rollupParse = this.parse
+        },
+      },
+    ],
+  })
+  return rollupParse
+}
 
 export async function createPluginContainer(
   config: ResolvedConfig,
@@ -274,6 +297,8 @@ export async function createPluginContainer(
     }
   }
 
+  const rollupParseFunc = await getRollupParseFunc()
+
   // we should create a new context for each async hook pipeline so that the
   // active plugin in that pipeline can be tracked in a concurrency-safe manner.
   // using a class to make creating new contexts more efficient
@@ -291,13 +316,8 @@ export async function createPluginContainer(
       this._activePlugin = initialPlugin || null
     }
 
-    parse(code: string, opts: any = {}) {
-      return parser.parse(code, {
-        sourceType: 'module',
-        ecmaVersion: 'latest',
-        locations: true,
-        ...opts,
-      })
+    parse(code: string, opts: any) {
+      return rollupParseFunc(code, opts)
     }
 
     async resolve(

packages/vite/src/node/ssr/ssrTransform.ts

@@ -13,7 +13,8 @@ import { extract_names as extractNames } from 'periscopic'
 import { walk as eswalk } from 'estree-walker'
 import type { RawSourceMap } from '@ampproject/remapping'
 import type { TransformResult } from '../server/transformRequest'
-import { parser } from '../server/pluginContainer'
+import type { RollupParseFunc } from '../server/pluginContainer'
+import { getRollupParseFunc } from '../server/pluginContainer'
 import { combineSourcemaps } from '../utils'
 import { isJSONRequest } from '../plugins/json'
 
@@ -61,6 +62,8 @@ async function ssrTransformJSON(
   }
 }
 
+let rollupParseFunc: RollupParseFunc | undefined
+
 async function ssrTransformScript(
   code: string,
   inMap: SourceMap | { mappings: '' } | null,
@@ -69,14 +72,13 @@ async function ssrTransformScript(
 ): Promise<TransformResult | null> {
   const s = new MagicString(code)
 
+  if (!rollupParseFunc) {
+    rollupParseFunc = await getRollupParseFunc()
+  }
+
   let ast: any
   try {
-    ast = parser.parse(code, {
-      sourceType: 'module',
-      ecmaVersion: 'latest',
-      locations: true,
-      allowHashBang: true,
-    })
+    ast = rollupParseFunc(code)
   } catch (err) {
     if (!err.loc || !err.loc.line) throw err
     const line = err.loc.line
@@ -377,7 +379,7 @@ function walk(
   }
 
   ;(eswalk as any)(root, {
-    enter(node: Node, parent: Node | null) {
+    enter(node: Node, parent: Node | null, prop: string) {
       if (node.type === 'ImportDeclaration') {
         return this.skip()
       }
@@ -405,7 +407,7 @@ function walk(
       if (node.type === 'Identifier') {
         if (
           !isInScope(node.name, parentStack) &&
-          isRefIdentifier(node, parent!, parentStack)
+          isRefIdentifier(node, parent!, parentStack, prop)
         ) {
           // record the identifier, for DFS -> BFS
           identifiers.push([node, parentStack.slice(0)])
@@ -427,7 +429,7 @@ function walk(
             return
           }
           ;(eswalk as any)(p.type === 'AssignmentPattern' ? p.left : p, {
-            enter(child: Node, parent: Node) {
+            enter(child: Node, parent: Node, prop: string) {
               // skip params default value of destructure
               if (
                 parent?.type === 'AssignmentPattern' &&
@@ -437,7 +439,7 @@ function walk(
               }
               if (child.type !== 'Identifier') return
               // do not record as scope variable if is a destructuring keyword
-              if (isStaticPropertyKey(child, parent)) return
+              if (isStaticPropertyKey(child, parent, prop)) return
               // do not record if this is a default value
               // assignment of a destructuring variable
               if (
@@ -489,7 +491,12 @@ function walk(
   })
 }
 
-function isRefIdentifier(id: Identifier, parent: _Node, parentStack: _Node[]) {
+function isRefIdentifier(
+  id: Identifier,
+  parent: _Node,
+  parentStack: _Node[],
+  prop: string,
+) {
   // declaration id
   if (
     parent.type === 'CatchClause' ||
@@ -517,7 +524,7 @@ function isRefIdentifier(id: Identifier, parent: _Node, parentStack: _Node[]) {
   }
 
   // property key
-  if (isStaticPropertyKey(id, parent)) {
+  if (isStaticPropertyKey(id, parent, prop)) {
     return false
   }
 
@@ -558,8 +565,8 @@ function isRefIdentifier(id: Identifier, parent: _Node, parentStack: _Node[]) {
 const isStaticProperty = (node: _Node): node is Property =>
   node && node.type === 'Property' && !node.computed
 
-const isStaticPropertyKey = (node: _Node, parent: _Node) =>
-  isStaticProperty(parent) && parent.key === node
+const isStaticPropertyKey = (node: _Node, parent: _Node, prop: string) =>
+  isStaticProperty(parent) && prop === 'key' && parent.key === node
 
 const functionNodeTypeRE = /Function(?:Expression|Declaration)$|Method$/
 function isFunction(node: _Node): node is FunctionNode {