Merge branch 'main' into custom-comp-id

Author: Jinjiang

package.json

@@ -36,34 +36,34 @@
     "ci-publish": "tsx scripts/publishCI.ts"
   },
   "devDependencies": {
-    "@babel/types": "^7.25.6",
-    "@eslint/js": "^9.9.1",
+    "@babel/types": "^7.26.0",
+    "@eslint/js": "^9.14.0",
     "@types/babel__core": "^7.20.5",
     "@types/convert-source-map": "^2.0.3",
     "@types/debug": "^4.1.12",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^22.5.1",
+    "@types/node": "^22.9.0",
     "@vitejs/release-scripts": "^1.3.2",
     "conventional-changelog-cli": "^5.0.0",
-    "eslint": "^9.9.1",
-    "eslint-plugin-import-x": "^4.1.1",
-    "eslint-plugin-n": "^17.10.2",
+    "eslint": "^9.14.0",
+    "eslint-plugin-import-x": "^4.4.0",
+    "eslint-plugin-n": "^17.13.1",
     "eslint-plugin-regexp": "^2.6.0",
-    "execa": "^9.3.1",
+    "execa": "^9.5.1",
     "fs-extra": "^11.2.0",
-    "lint-staged": "^15.2.9",
-    "npm-run-all2": "^6.2.2",
-    "picocolors": "^1.0.1",
-    "playwright-chromium": "^1.46.1",
+    "lint-staged": "^15.2.10",
+    "npm-run-all2": "^7.0.1",
+    "picocolors": "^1.1.1",
+    "playwright-chromium": "^1.48.2",
     "prettier": "3.3.3",
-    "rollup": "^4.24.0",
+    "rollup": "^4.25.0",
     "simple-git-hooks": "^2.11.1",
-    "tsx": "^4.19.0",
-    "typescript": "^5.5.4",
-    "typescript-eslint": "^8.3.0",
+    "tsx": "^4.19.2",
+    "typescript": "^5.6.3",
+    "typescript-eslint": "^8.13.0",
     "unbuild": "2.0.0",
     "vite": "catalog:",
-    "vitest": "^2.0.5",
+    "vitest": "^2.1.4",
     "vue": "catalog:"
   },
   "simple-git-hooks": {
@@ -83,7 +83,7 @@
       "eslint --cache --fix"
     ]
   },
-  "packageManager": "pnpm@9.9.0",
+  "packageManager": "pnpm@9.12.3",
   "pnpm": {
     "overrides": {
       "@vitejs/plugin-vue": "workspace:*"

packages/plugin-vue-jsx/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 4.1.0 (2024-11-11)
+
+* feat: support tsPluginOptions (#445) ([fdb3590](https://github.com/vitejs/vite-plugin-vue/commit/fdb3590)), closes [#445](https://github.com/vitejs/vite-plugin-vue/issues/445)
+* fix(deps): update all non-major dependencies (#421) ([e3a7fec](https://github.com/vitejs/vite-plugin-vue/commit/e3a7fec)), closes [#421](https://github.com/vitejs/vite-plugin-vue/issues/421)
+* fix(deps): update all non-major dependencies (#439) ([e432bcb](https://github.com/vitejs/vite-plugin-vue/commit/e432bcb)), closes [#439](https://github.com/vitejs/vite-plugin-vue/issues/439)
+* fix(plugin-jsx): work around bun bug for ssrRegisterHelper (#380) ([9c2b620](https://github.com/vitejs/vite-plugin-vue/commit/9c2b620)), closes [#380](https://github.com/vitejs/vite-plugin-vue/issues/380) [#376](https://github.com/vitejs/vite-plugin-vue/issues/376)
+* perf: use `hash` to replace `createHash` (#460) ([de88394](https://github.com/vitejs/vite-plugin-vue/commit/de88394)), closes [#460](https://github.com/vitejs/vite-plugin-vue/issues/460)
+* refactor(vue-jsx): remove extraneous import ([ab2516a](https://github.com/vitejs/vite-plugin-vue/commit/ab2516a))
+
+
+
 ## <small>4.0.1 (2024-08-14)</small>
 
 * chore: use pnpm catalog for shared deps ([0735e18](https://github.com/vitejs/vite-plugin-vue/commit/0735e18))

packages/plugin-vue-jsx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-vue-jsx",
-  "version": "4.0.1",
+  "version": "4.1.0",
   "type": "commonjs",
   "license": "MIT",
   "author": "Evan You",
@@ -35,9 +35,9 @@
   },
   "homepage": "https://github.com/vitejs/vite-plugin-vue/tree/main/packages/plugin-vue-jsx#readme",
   "dependencies": {
-    "@babel/core": "^7.25.2",
-    "@babel/plugin-transform-typescript": "^7.25.2",
-    "@vue/babel-plugin-jsx": "^1.2.2"
+    "@babel/core": "^7.26.0",
+    "@babel/plugin-transform-typescript": "^7.25.9",
+    "@vue/babel-plugin-jsx": "^1.2.5"
   },
   "devDependencies": {
     "vite": "catalog:"

packages/plugin-vue-jsx/src/index.ts

@@ -13,7 +13,10 @@ export * from './types'
 const ssrRegisterHelperId = '/__vue-jsx-ssr-register-helper'
 const ssrRegisterHelperCode =
   `import { useSSRContext } from "vue"\n` +
-  `export ${ssrRegisterHelper.toString()}`
+  // the const here is just to work around the Bun bug where
+  // Function.toString() isn't working as intended
+  // https://github.com/oven-sh/bun/issues/9543
+  `export const ssrRegisterHelper = ${ssrRegisterHelper.toString()}`
 
 /**
  * This function is serialized with toString() and evaluated as a virtual
@@ -41,6 +44,7 @@ function vueJsxPlugin(options: Options = {}): Plugin {
     exclude,
     babelPlugins = [],
     defineComponentName = ['defineComponent'],
+    tsPluginOptions = {},
     ...babelPluginOptions
   } = options
   const filter = createFilter(include || /\.[jt]sx$/, exclude)
@@ -97,7 +101,7 @@ function vueJsxPlugin(options: Options = {}): Plugin {
               (r) => r.default,
             ),
             // @ts-ignore
-            { isTSX: true, allowExtensions: true },
+            { ...tsPluginOptions, isTSX: true, allowExtensions: true },
           ])
         }
 

packages/plugin-vue-jsx/src/types.ts

@@ -10,4 +10,5 @@ export interface Options extends VueJSXPluginOptions, FilterOptions {
   babelPlugins?: any[]
   /** @default ['defineComponent'] */
   defineComponentName?: string[]
+  tsPluginOptions?: any
 }

packages/plugin-vue/CHANGELOG.md

@@ -1,3 +1,16 @@
+## <small>5.1.5 (2024-11-11)</small>
+
+* chore: fix typo (#464) ([4a811b0](https://github.com/vitejs/vite-plugin-vue/commit/4a811b0)), closes [#464](https://github.com/vitejs/vite-plugin-vue/issues/464)
+* chore(deps): update dependency rollup to ^4.24.0 (#448) ([0fc9cd0](https://github.com/vitejs/vite-plugin-vue/commit/0fc9cd0)), closes [#448](https://github.com/vitejs/vite-plugin-vue/issues/448)
+* chore(deps): update dependency rollup to ^4.25.0 (#472) ([91210cc](https://github.com/vitejs/vite-plugin-vue/commit/91210cc)), closes [#472](https://github.com/vitejs/vite-plugin-vue/issues/472)
+* chore(deps): update upstream (#462) ([5625fc9](https://github.com/vitejs/vite-plugin-vue/commit/5625fc9)), closes [#462](https://github.com/vitejs/vite-plugin-vue/issues/462)
+* fix(deps): update all non-major dependencies (#439) ([e432bcb](https://github.com/vitejs/vite-plugin-vue/commit/e432bcb)), closes [#439](https://github.com/vitejs/vite-plugin-vue/issues/439)
+* fix(hmr): re-resolve script after type dep changed (#446) ([8f9c624](https://github.com/vitejs/vite-plugin-vue/commit/8f9c624)), closes [#446](https://github.com/vitejs/vite-plugin-vue/issues/446)
+* fix(hmr): should reload if relies file changed after re-render (#471) ([62b17f3](https://github.com/vitejs/vite-plugin-vue/commit/62b17f3)), closes [#471](https://github.com/vitejs/vite-plugin-vue/issues/471)
+* perf: use `hash` to replace `createHash` (#460) ([de88394](https://github.com/vitejs/vite-plugin-vue/commit/de88394)), closes [#460](https://github.com/vitejs/vite-plugin-vue/issues/460)
+
+
+
 ## <small>5.1.4 (2024-09-16)</small>
 
 * chore: format ([07b29a6](https://github.com/vitejs/vite-plugin-vue/commit/07b29a6))

packages/plugin-vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-vue",
-  "version": "5.1.4",
+  "version": "5.1.5",
   "type": "commonjs",
   "license": "MIT",
   "author": "Evan You",
@@ -41,10 +41,10 @@
   "devDependencies": {
     "@jridgewell/gen-mapping": "^0.3.5",
     "@jridgewell/trace-mapping": "^0.3.25",
-    "debug": "^4.3.6",
-    "rollup": "^4.24.0",
+    "debug": "^4.3.7",
+    "rollup": "^4.25.0",
     "slash": "^5.1.0",
-    "source-map-js": "^1.2.0",
+    "source-map-js": "^1.2.1",
     "vite": "catalog:",
     "vue": "catalog:"
   }

packages/plugin-vue/src/index.ts

@@ -1,6 +1,6 @@
 import fs from 'node:fs'
 import type { Plugin, ViteDevServer } from 'vite'
-import { createFilter } from 'vite'
+import { createFilter, normalizePath } from 'vite'
 /* eslint-disable import/no-duplicates */
 import type {
   SFCBlock,
@@ -19,7 +19,7 @@ import {
   getSrcDescriptor,
   getTempSrcDescriptor,
 } from './utils/descriptorCache'
-import { clearScriptCache, getResolvedScript, typeDepToSFCMap } from './script'
+import { clearScriptCache, resolveScript, typeDepToSFCMap } from './script'
 import { transformMain } from './main'
 import { handleHotUpdate, handleTypeDepChange } from './handleHotUpdate'
 import { transformTemplateAsModule } from './template'
@@ -217,6 +217,12 @@ export default function vuePlugin(rawOptions: Options = {}): Plugin<Api> {
     },
 
     handleHotUpdate(ctx) {
+      ctx.server.ws.send({
+        type: 'custom',
+        event: 'file-changed',
+        data: { file: normalizePath(ctx.file) },
+      })
+
       if (options.value.compiler.invalidateTypeCache) {
         options.value.compiler.invalidateTypeCache(ctx.file)
       }
@@ -317,7 +323,12 @@ export default function vuePlugin(rawOptions: Options = {}): Plugin<Api> {
         let block: SFCBlock | null | undefined
         if (query.type === 'script') {
           // handle <script> + <script setup> merge via compileScript()
-          block = getResolvedScript(descriptor, ssr)
+          block = resolveScript(
+            descriptor,
+            options.value,
+            ssr,
+            customElementFilter.value(filename),
+          )
         } else if (query.type === 'template') {
           block = descriptor.template!
         } else if (query.type === 'style') {

packages/plugin-vue/src/main.ts

@@ -50,7 +50,7 @@ export async function transformMain(
       // for vue files, create descriptor from fs read to be consistent with
       // logic in handleHotUpdate()
       // for non vue files, e.g. md files in vitepress, we assume
-      // `hmrContext.read` is overwriten so handleHotUpdate() is dealing with
+      // `hmrContext.read` is overwritten so handleHotUpdate() is dealing with
       // post-transform code, so we populate the descriptor with post-transform
       // code here as well.
       filename.endsWith('.vue') ? undefined : code,
@@ -148,9 +148,20 @@ export async function transformMain(
       `typeof __VUE_HMR_RUNTIME__ !== 'undefined' && ` +
         `__VUE_HMR_RUNTIME__.createRecord(_sfc_main.__hmrId, _sfc_main)`,
     )
+    output.push(
+      `import.meta.hot.on('file-changed', ({ file }) => {`,
+      `  __VUE_HMR_RUNTIME__.CHANGED_FILE = file`,
+      `})`,
+    )
     // check if the template is the only thing that changed
     if (prevDescriptor && isOnlyTemplateChanged(prevDescriptor, descriptor)) {
-      output.push(`export const _rerender_only = true`)
+      // #7 only consider re-render if the HMR is triggered by the current component,
+      // otherwise reload. Due to vite will cache the transform result. If the HMR
+      // is triggered by other files that the current component relies on, a reload
+      // is required.
+      output.push(
+        `export const _rerender_only = __VUE_HMR_RUNTIME__.CHANGED_FILE === ${JSON.stringify(normalizePath(filename))}`,
+      )
     }
     output.push(
       `import.meta.hot.accept(mod => {`,

playground/package.json

@@ -2,8 +2,9 @@
   "name": "@vitejs/vite-playground",
   "private": true,
   "version": "1.0.0",
+  "type": "module",
   "devDependencies": {
-    "@types/node": "^22.5.1",
+    "@types/node": "^22.9.0",
     "convert-source-map": "^2.0.0",
     "css-color-names": "^1.0.1",
     "kill-port": "^1.6.1",