fix(build): skip preload treeshaking for nested braces (#17687)

vitejs · Jul 15, 2024 · 4be96b4 · 4be96b4
1 parent b723a75
commit 4be96b4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/packages/vite/src/node/plugins/importAnalysisBuild.ts b/packages/vite/src/node/plugins/importAnalysisBuild.ts
@@ -42,7 +42,7 @@ const preloadMarkerRE = new RegExp(preloadMarker, 'g')
 const dynamicImportPrefixRE = /import\s*\(/
 
 const dynamicImportTreeshakenRE =
-  /((?:\bconst\s+|\blet\s+|\bvar\s+|,\s*)(\{[^}.=]+\})\s*=\s*await\s+import\([^)]+\))|(\(\s*await\s+import\([^)]+\)\s*\)(\??\.[\w$]+))|\bimport\([^)]+\)(\s*\.then\(\s*(?:function\s*)?\(\s*\{([^}.=]+)\}\))/g
+  /((?:\bconst\s+|\blet\s+|\bvar\s+|,\s*)(\{[^{}.=]+\})\s*=\s*await\s+import\([^)]+\))|(\(\s*await\s+import\([^)]+\)\s*\)(\??\.[\w$]+))|\bimport\([^)]+\)(\s*\.then\(\s*(?:function\s*)?\(\s*\{([^{}.=]+)\}\))/g
 
 function toRelativePath(filename: string, importer: string) {
   const relPath = path.posix.relative(path.posix.dirname(importer), filename)

diff --git a/playground/dynamic-import/nested/index.js b/playground/dynamic-import/nested/index.js
@@ -175,11 +175,21 @@ import(`../nested/nested/${base}.js`).then((mod) => {
     ({ foo = {} }) => foo,
   )
   await import('./treeshaken/syntax.js').then((mod) => mod.foo({ foo }))
+  const obj = [
+    '',
+    {
+      async lazy() {
+        const { foo } = await import('./treeshaken/treeshaken.js')
+        return { foo: aaa(foo) }
+      },
+    },
+  ]
   default1()
   default2()
   other()
   foo()
   foo2()
+  obj[1].lazy()
 })()
 
 import(`../nested/static.js`).then((mod) => {