chore: merge main

vitejs · Aug 13, 2024 · 55af5bd · 55af5bd
2 parents c91dd47 + 6700594
commit 55af5bd
Show file tree

Hide file tree

Showing 38 changed files with 760 additions and 439 deletions.
diff --git a/docs/guide/api-plugin.md b/docs/guide/api-plugin.md
@@ -432,7 +432,6 @@ Vite plugins can also provide hooks that serve Vite-specific purposes. These hoo
 
     ```js
     handleHotUpdate({ server, modules, timestamp }) {
-      server.ws.send({ type: 'full-reload' })
       // Invalidate modules manually
       const invalidatedModules = new Set()
       for (const mod of modules) {
@@ -443,6 +442,7 @@ Vite plugins can also provide hooks that serve Vite-specific purposes. These hoo
           true
         )
       }
+      server.ws.send({ type: 'full-reload' })
       return []
     }
     ```

diff --git a/docs/package.json b/docs/package.json
@@ -11,7 +11,7 @@
     "@shikijs/vitepress-twoslash": "^1.12.1",
     "@types/express": "^4.17.21",
     "feed": "^4.2.2",
-    "vitepress": "1.3.1",
-    "vue": "^3.4.35"
+    "vitepress": "1.3.2",
+    "vue": "^3.4.37"
   }
 }
diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
     "ci-docs": "run-s build docs-build"
   },
   "devDependencies": {
-    "@eslint/js": "^9.8.0",
+    "@eslint/js": "^9.9.0",
     "@types/babel__core": "^7.20.5",
     "@types/babel__preset-env": "^7.9.7",
     "@types/convert-source-map": "^2.0.3",
@@ -50,13 +50,13 @@
     "@types/etag": "^1.8.3",
     "@types/less": "^3.0.6",
     "@types/micromatch": "^4.0.9",
-    "@types/node": "^20.14.14",
-    "@types/picomatch": "^3.0.0",
+    "@types/node": "^20.14.15",
+    "@types/picomatch": "^3.0.1",
     "@types/stylus": "^0.48.42",
     "@types/ws": "^8.5.12",
     "@vitejs/release-scripts": "^1.3.2",
     "conventional-changelog-cli": "^5.0.0",
-    "eslint": "^9.8.0",
+    "eslint": "^9.9.0",
     "eslint-plugin-import-x": "^3.1.0",
     "eslint-plugin-n": "^17.10.2",
     "eslint-plugin-regexp": "^2.6.0",
@@ -65,16 +65,16 @@
     "lint-staged": "^15.2.8",
     "npm-run-all2": "^6.2.2",
     "picocolors": "^1.0.1",
-    "playwright-chromium": "^1.45.3",
+    "playwright-chromium": "^1.46.0",
     "prettier": "3.3.3",
     "rimraf": "^5.0.10",
     "rollup": "^4.20.0",
     "rollup-plugin-esbuild": "^6.1.1",
     "simple-git-hooks": "^2.11.1",
     "tslib": "^2.6.3",
-    "tsx": "^4.16.5",
+    "tsx": "^4.17.0",
     "typescript": "^5.5.3",
-    "typescript-eslint": "^8.0.0",
+    "typescript-eslint": "^8.0.1",
     "vite": "workspace:*",
     "vitest": "^2.0.5"
   },
@@ -95,7 +95,7 @@
       "eslint --cache --fix"
     ]
   },
-  "packageManager": "pnpm@9.6.0",
+  "packageManager": "pnpm@9.7.0",
   "pnpm": {
     "overrides": {
       "vite": "workspace:*"

diff --git a/packages/create-vite/template-lit-ts/package.json b/packages/create-vite/template-lit-ts/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "lit": "^3.1.4"
+    "lit": "^3.2.0"
   },
   "devDependencies": {
     "typescript": "^5.5.3",

diff --git a/packages/create-vite/template-lit/package.json b/packages/create-vite/template-lit/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "lit": "^3.1.4"
+    "lit": "^3.2.0"
   },
   "devDependencies": {
     "vite": "^5.4.0"

diff --git a/packages/create-vite/template-qwik-ts/package.json b/packages/create-vite/template-qwik-ts/package.json
@@ -14,6 +14,6 @@
     "vite": "^5.4.0"
   },
   "dependencies": {
-    "@builder.io/qwik": "^1.7.3"
+    "@builder.io/qwik": "^1.8.0"
   }
 }
diff --git a/packages/create-vite/template-qwik/package.json b/packages/create-vite/template-qwik/package.json
@@ -13,6 +13,6 @@
     "vite": "^5.4.0"
   },
   "dependencies": {
-    "@builder.io/qwik": "^1.7.3"
+    "@builder.io/qwik": "^1.8.0"
   }
 }
diff --git a/packages/create-vite/template-react-ts/package.json b/packages/create-vite/template-react-ts/package.json
@@ -14,16 +14,16 @@
     "react-dom": "^18.3.1"
   },
   "devDependencies": {
-    "@eslint/js": "^9.8.0",
+    "@eslint/js": "^9.9.0",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
     "@vitejs/plugin-react": "^4.3.1",
-    "eslint": "^9.8.0",
+    "eslint": "^9.9.0",
     "eslint-plugin-react-hooks": "^5.1.0-rc.0",
     "eslint-plugin-react-refresh": "^0.4.9",
     "globals": "^15.9.0",
     "typescript": "^5.5.3",
-    "typescript-eslint": "^8.0.0",
+    "typescript-eslint": "^8.0.1",
     "vite": "^5.4.0"
   }
 }
diff --git a/packages/create-vite/template-react/package.json b/packages/create-vite/template-react/package.json
@@ -14,11 +14,11 @@
     "react-dom": "^18.3.1"
   },
   "devDependencies": {
-    "@eslint/js": "^9.8.0",
+    "@eslint/js": "^9.9.0",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
     "@vitejs/plugin-react": "^4.3.1",
-    "eslint": "^9.8.0",
+    "eslint": "^9.9.0",
     "eslint-plugin-react": "^7.35.0",
     "eslint-plugin-react-hooks": "^5.1.0-rc.0",
     "eslint-plugin-react-refresh": "^0.4.9",

diff --git a/packages/create-vite/template-solid-ts/package.json b/packages/create-vite/template-solid-ts/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "solid-js": "^1.8.19"
+    "solid-js": "^1.8.20"
   },
   "devDependencies": {
     "typescript": "^5.5.3",

diff --git a/packages/create-vite/template-solid/package.json b/packages/create-vite/template-solid/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "solid-js": "^1.8.19"
+    "solid-js": "^1.8.20"
   },
   "devDependencies": {
     "vite": "^5.4.0",

diff --git a/packages/create-vite/template-vue-ts/package.json b/packages/create-vite/template-vue-ts/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "vue": "^3.4.35"
+    "vue": "^3.4.37"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^5.1.2",

diff --git a/packages/create-vite/template-vue/package.json b/packages/create-vite/template-vue/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "vue": "^3.4.35"
+    "vue": "^3.4.37"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^5.1.2",

diff --git a/packages/vite/client.d.ts b/packages/vite/client.d.ts
@@ -251,15 +251,6 @@ declare interface VitePreloadErrorEvent extends Event {
   payload: Error
 }
 
-declare interface Window {
-  addEventListener(
-    type: 'vite:preloadError',
-    listener: (this: Window, ev: VitePreloadErrorEvent) => unknown,
-    options?: boolean | AddEventListenerOptions,
-  ): void
-  removeEventListener(
-    type: 'vite:preloadError',
-    listener: (this: Window, ev: VitePreloadErrorEvent) => unknown,
-    options?: boolean | EventListenerOptions,
-  ): void
+declare interface WindowEventMap {
+  'vite:preloadError': VitePreloadErrorEvent
 }
diff --git a/packages/vite/package.json b/packages/vite/package.json
@@ -86,7 +86,7 @@
   "//": "READ CONTRIBUTING.md to understand what to put under deps vs. devDeps!",
   "dependencies": {
     "esbuild": "^0.21.3",
-    "postcss": "^8.4.40",
+    "postcss": "^8.4.41",
     "rollup": "^4.20.0"
   },
   "optionalDependencies": {
@@ -123,7 +123,7 @@
     "fast-glob": "^3.3.2",
     "http-proxy": "^1.18.1",
     "launch-editor-middleware": "^2.8.1",
-    "lightningcss": "^1.25.1",
+    "lightningcss": "^1.26.0",
     "magic-string": "^0.30.11",
     "micromatch": "^4.0.7",
     "mlly": "^1.7.1",

diff --git a/packages/vite/src/node/plugins/css.ts b/packages/vite/src/node/plugins/css.ts
@@ -3012,7 +3012,7 @@ async function compileLightningCSS(
         }
         deps.add(dep.url)
         if (urlReplacer) {
-          const replaceUrl = await urlReplacer(dep.url, id)
+          const replaceUrl = await urlReplacer(dep.url, dep.loc.filePath)
           css = css.replace(dep.placeholder, () => replaceUrl)
         } else {
           css = css.replace(dep.placeholder, () => dep.url)

diff --git a/playground/alias/package.json b/playground/alias/package.json
@@ -11,8 +11,8 @@
   },
   "dependencies": {
     "aliased-module": "file:./dir/module",
-    "vue": "^3.4.35",
-    "@vue/shared": "^3.4.35"
+    "vue": "^3.4.37",
+    "@vue/shared": "^3.4.37"
   },
   "devDependencies": {
     "@vitejs/test-resolve-linked": "workspace:*"

diff --git a/playground/backend-integration/package.json b/playground/backend-integration/package.json
@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "sass": "^1.77.8",
-    "tailwindcss": "^3.4.7",
+    "tailwindcss": "^3.4.9",
     "fast-glob": "^3.3.2"
   }
 }
diff --git a/playground/css-lightningcss-proxy/package.json b/playground/css-lightningcss-proxy/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "devDependencies": {
-    "lightningcss": "^1.25.1",
+    "lightningcss": "^1.26.0",
     "express": "^4.19.2"
   }
 }
diff --git a/playground/css-lightningcss/__tests__/css-lightningcss.spec.ts b/playground/css-lightningcss/__tests__/css-lightningcss.spec.ts
@@ -7,6 +7,7 @@ import {
   isBuild,
   page,
   untilUpdated,
+  viteTestUrl,
 } from '~utils'
 
 // note: tests should retrieve the element at the beginning of test and reuse it
@@ -71,3 +72,10 @@ test('css with external url', async () => {
   const css = await page.$('.external')
   expect(await getBg(css)).toMatch('url("https://vitejs.dev/logo.svg")')
 })
+
+test('nested css with relative asset', async () => {
+  const css = await page.$('.nested-css-relative-asset')
+  expect(await getBg(css)).toMatch(
+    isBuild ? /ok-[-\w]+\.png/ : `${viteTestUrl}/ok.png`,
+  )
+})
diff --git a/playground/css-lightningcss/imported.css b/playground/css-lightningcss/imported.css
@@ -1,3 +1,4 @@
+@import url('./nested/nested.css');
 @import './imported-at-import.css';
 
 .imported {

diff --git a/playground/css-lightningcss/index.html b/playground/css-lightningcss/index.html
@@ -26,6 +26,9 @@ <h1>Lightning CSS</h1>
 
   <p>External URL</p>
   <div class="external"></div>
+
+  <p>Assets relative to nested CSS</p>
+  <div class="nested-css-relative-asset"></div>
 </div>
 
 <script type="module" src="./main.js"></script>
diff --git a/playground/css-lightningcss/nested/nested.css b/playground/css-lightningcss/nested/nested.css
@@ -0,0 +1,5 @@
+.nested-css-relative-asset {
+  background-image: url('../ok.png');
+  width: 50px;
+  height: 50px;
+}
diff --git a/playground/css-lightningcss/package.json b/playground/css-lightningcss/package.json
@@ -9,6 +9,6 @@
     "preview": "vite preview"
   },
   "devDependencies": {
-    "lightningcss": "^1.25.1"
+    "lightningcss": "^1.26.0"
   }
 }
diff --git a/playground/extensions/package.json b/playground/extensions/package.json
@@ -10,6 +10,6 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "vue": "^3.4.35"
+    "vue": "^3.4.37"
   }
 }
diff --git a/playground/external/dep-that-imports/package.json b/playground/external/dep-that-imports/package.json
@@ -5,6 +5,6 @@
   "dependencies": {
     "slash3": "npm:slash@^3.0.0",
     "slash5": "npm:slash@^5.1.0",
-    "vue": "^3.4.35"
+    "vue": "^3.4.37"
   }
 }
diff --git a/playground/external/dep-that-requires/package.json b/playground/external/dep-that-requires/package.json
@@ -5,6 +5,6 @@
   "dependencies": {
     "slash3": "npm:slash@^3.0.0",
     "slash5": "npm:slash@^5.1.0",
-    "vue": "^3.4.35"
+    "vue": "^3.4.37"
   }
 }
diff --git a/playground/external/package.json b/playground/external/package.json
@@ -17,7 +17,7 @@
     "slash3": "npm:slash@^3.0.0",
     "slash5": "npm:slash@^5.1.0",
     "vite": "workspace:*",
-    "vue": "^3.4.35",
+    "vue": "^3.4.37",
     "vue32": "npm:vue@~3.2.0"
   }
 }
diff --git a/playground/json/package.json b/playground/json/package.json
@@ -15,6 +15,6 @@
   "devDependencies": {
     "@vitejs/test-json-module": "file:./json-module",
     "express": "^4.19.2",
-    "vue": "^3.4.35"
+    "vue": "^3.4.37"
   }
 }
diff --git a/playground/legacy/package.json b/playground/legacy/package.json
@@ -18,6 +18,6 @@
     "vite": "workspace:*",
     "@vitejs/plugin-legacy": "workspace:*",
     "express": "^4.19.2",
-    "terser": "^5.31.3"
+    "terser": "^5.31.5"
   }
 }
diff --git a/playground/object-hooks/package.json b/playground/object-hooks/package.json
@@ -10,6 +10,6 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "vue": "^3.4.35"
+    "vue": "^3.4.37"
   }
 }
diff --git a/playground/optimize-deps-no-discovery/package.json b/playground/optimize-deps-no-discovery/package.json
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@vitejs/test-dep-no-discovery": "file:./dep-no-discovery",
-    "vue": "^3.4.35",
+    "vue": "^3.4.37",
     "vuex": "^4.1.0"
   }
 }
diff --git a/playground/optimize-deps/package.json b/playground/optimize-deps/package.json
@@ -44,7 +44,7 @@
     "react-dom": "^18.3.1",
     "@vitejs/test-resolve-linked": "workspace:0.0.0",
     "url": "^0.11.4",
-    "vue": "^3.4.35",
+    "vue": "^3.4.37",
     "vuex": "^4.1.0",
     "lodash": "^4.17.21",
     "lodash.clonedeep": "^4.5.0"

diff --git a/playground/preload/package.json b/playground/preload/package.json
@@ -18,7 +18,7 @@
     "preview:preload-disabled": "vite preview --config vite.config-preload-disabled.ts"
   },
   "devDependencies": {
-    "terser": "^5.31.3",
+    "terser": "^5.31.5",
     "@vitejs/test-dep-a": "file:./dep-a",
     "@vitejs/test-dep-including-a": "file:./dep-including-a"
   }

diff --git a/playground/ssr-webworker/package.json b/playground/ssr-webworker/package.json
@@ -13,7 +13,7 @@
     "@vitejs/test-worker-exports": "file:./worker-exports"
   },
   "devDependencies": {
-    "miniflare": "^3.20240725.0",
+    "miniflare": "^3.20240806.0",
     "@vitejs/test-resolve-linked": "workspace:*"
   }
 }