chore: merge main

vitejs · May 2, 2024 · cf9a79c · cf9a79c
2 parents 1ec07a4 + 2bc5d3d
commit cf9a79c
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/packages/vite/CHANGELOG.md b/packages/vite/CHANGELOG.md
@@ -205,6 +205,20 @@
 
 
 
+## <small>5.2.11 (2024-05-02)</small>
+
+* feat: improve dynamic import variable failure error message (#16519) ([f8feeea](https://github.com/vitejs/vite/commit/f8feeea)), closes [#16519](https://github.com/vitejs/vite/issues/16519)
+* fix: dynamic-import-vars plugin normalize path issue (#16518) ([f71ba5b](https://github.com/vitejs/vite/commit/f71ba5b)), closes [#16518](https://github.com/vitejs/vite/issues/16518)
+* fix: scripts and styles were missing from built HTML on Windows (#16421) ([0e93f58](https://github.com/vitejs/vite/commit/0e93f58)), closes [#16421](https://github.com/vitejs/vite/issues/16421)
+* fix(deps): update all non-major dependencies (#16488) ([2d50be2](https://github.com/vitejs/vite/commit/2d50be2)), closes [#16488](https://github.com/vitejs/vite/issues/16488)
+* fix(deps): update all non-major dependencies (#16549) ([2d6a13b](https://github.com/vitejs/vite/commit/2d6a13b)), closes [#16549](https://github.com/vitejs/vite/issues/16549)
+* fix(dev): watch publicDir explicitly to include it outside the root (#16502) ([4d83eb5](https://github.com/vitejs/vite/commit/4d83eb5)), closes [#16502](https://github.com/vitejs/vite/issues/16502)
+* fix(preload): skip preload for non-static urls (#16556) ([bb79c9b](https://github.com/vitejs/vite/commit/bb79c9b)), closes [#16556](https://github.com/vitejs/vite/issues/16556)
+* fix(ssr): handle class declaration and expression name scoping (#16569) ([c071eb3](https://github.com/vitejs/vite/commit/c071eb3)), closes [#16569](https://github.com/vitejs/vite/issues/16569)
+* fix(ssr): handle function expression name scoping (#16563) ([02db947](https://github.com/vitejs/vite/commit/02db947)), closes [#16563](https://github.com/vitejs/vite/issues/16563)
+
+
+
 ## <small>5.2.10 (2024-04-20)</small>
 
 * revert: perf: use workspace root for fs cache (#15712) (#16476) ([77e7359](https://github.com/vitejs/vite/commit/77e7359)), closes [#15712](https://github.com/vitejs/vite/issues/15712) [#16476](https://github.com/vitejs/vite/issues/16476)

diff --git a/packages/vite/src/node/plugins/dynamicImportVars.ts b/packages/vite/src/node/plugins/dynamicImportVars.ts
@@ -42,14 +42,27 @@ interface DynamicImportPattern {
  rawPattern: string
 }
 
-const dynamicImportHelper = (glob: Record<string, any>, path: string) => {
+const dynamicImportHelper = (
+ glob: Record<string, any>,
+ path: string,
+ segs: number,
+) => {
  const v = glob[path]
  if (v) {
  return typeof v === 'function' ? v() : Promise.resolve(v)
  }
  return new Promise((_, reject) => {
  ;(typeof queueMicrotask === 'function' ? queueMicrotask : setTimeout)(
- reject.bind(null, new Error('Unknown variable dynamic import: ' + path)),
+ reject.bind(
+ null,
+ new Error(
+ 'Unknown variable dynamic import: ' +
+ path +
+ (path.split('/').length !== segs
+ ? '. Note that variables only represent file names one level deep.'
+ : ''),
+ ),
+ ),
  )
  })
 }
@@ -255,7 +268,7 @@ export function dynamicImportVarsPlugin(config: ResolvedConfig): Plugin {
  s.overwrite(
  expStart,
  expEnd,
- `__variableDynamicImportRuntimeHelper(${glob}, \`${rawPattern}\`)`,
+ `__variableDynamicImportRuntimeHelper(${glob}, \`${rawPattern}\`, ${rawPattern.split('/').length})`,
  )
  }