Merge branch 'main' into feat/support-headers-configurable

vitejs · Nov 26, 2021 · 9b0707f · 9b0707f
2 parents e5e8cd2 + 4d0453d
commit 9b0707f
Show file tree

Hide file tree

Showing 19 changed files with 158 additions and 102 deletions.
diff --git a/packages/create-vite/template-vue-ts/package.json b/packages/create-vite/template-vue-ts/package.json
@@ -7,7 +7,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "vue": "^3.2.20"
+    "vue": "^3.2.23"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^1.9.4",

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

diff --git a/packages/playground/alias/package.json b/packages/playground/alias/package.json
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "aliased-module": "file:./dir/module",
-    "vue": "^3.2.21"
+    "vue": "^3.2.23"
   },
   "devDependencies": {
     "resolve-linked": "workspace:*"

diff --git a/packages/playground/extensions/package.json b/packages/playground/extensions/package.json
@@ -9,6 +9,6 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "vue": "^3.2.21"
+    "vue": "^3.2.23"
   }
 }
diff --git a/packages/playground/json/package.json b/packages/playground/json/package.json
@@ -9,6 +9,6 @@
     "preview": "vite preview"
   },
   "devDependencies": {
-    "vue": "^3.2.21"
+    "vue": "^3.2.23"
   }
 }
diff --git a/packages/playground/optimize-deps/package.json b/packages/playground/optimize-deps/package.json
@@ -23,7 +23,7 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "resolve-linked": "workspace:0.0.0",
-    "vue": "^3.2.21",
+    "vue": "^3.2.23",
     "vuex": "^4.0.0"
   },
   "devDependencies": {

diff --git a/packages/playground/preload/package.json b/packages/playground/preload/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "vue": "^3.2.21",
+    "vue": "^3.2.23",
     "vue-router": "^4.0.0"
   },
   "devDependencies": {

diff --git a/packages/playground/ssr-vue/package.json b/packages/playground/ssr-vue/package.json
@@ -16,7 +16,7 @@
   "dependencies": {
     "bcrypt": "^5.0.1",
     "example-external-component": "file:example-external-component",
-    "vue": "^3.2.21",
+    "vue": "^3.2.23",
     "vue-router": "^4.0.0",
     "vuex": "^4.0.2"
   },

diff --git a/packages/playground/tailwind/package.json b/packages/playground/tailwind/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "autoprefixer": "^10.4.0",
     "tailwindcss": "^2.2.19",
-    "vue": "^3.2.21",
+    "vue": "^3.2.23",
     "vue-router": "^4.0.0"
   },
   "devDependencies": {

diff --git a/packages/playground/vue-jsx/package.json b/packages/playground/vue-jsx/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "vue": "^3.2.21"
+    "vue": "^3.2.23"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "workspace:*",

diff --git a/packages/playground/vue/Hmr.vue b/packages/playground/vue/Hmr.vue
@@ -6,6 +6,7 @@
 
 <script setup lang="ts">
 import { ref } from 'vue'
+import Node from './Node.vue'
 
 let foo: number = 0
 

diff --git a/packages/playground/vue/Node.vue b/packages/playground/vue/Node.vue
@@ -0,0 +1,3 @@
+<template>
+  <div class="node">this is node</div>
+</template>
diff --git a/packages/playground/vue/__tests__/vue.spec.ts b/packages/playground/vue/__tests__/vue.spec.ts
@@ -157,6 +157,13 @@ describe('hmr', () => {
     await untilUpdated(() => page.textContent('.hmr-inc'), 'count is 100')
   })
 
+  test('global hmr for some scenarios', async () => {
+    editFile('Hmr.vue', (code) =>
+      code.replace('</template>', '  <Node/>\n' + '</template>')
+    )
+    await untilUpdated(() => page.innerHTML('.node'), 'this is node')
+  })
+
   test('should re-render when template is emptied', async () => {
     editFile('Hmr.vue', () => '')
     await untilUpdated(() => page.innerHTML('.hmr-block'), '<!---->')

diff --git a/packages/playground/vue/package.json b/packages/playground/vue/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "lodash-es": "^4.17.21",
-    "vue": "^3.2.21"
+    "vue": "^3.2.23"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "workspace:*",

diff --git a/packages/plugin-vue/CHANGELOG.md b/packages/plugin-vue/CHANGELOG.md
@@ -1,3 +1,12 @@
+## [1.10.1](https://github.com/vitejs/vite/compare/plugin-vue@1.10.0...plugin-vue@1.10.1) (2021-11-26)
+
+
+### Bug Fixes
+
+* **plugin-vue:** fix hmr issue in vuejs/vue-next[#4358](https://github.com/vitejs/vite/issues/4358) ([709e4b0](https://github.com/vitejs/vite/commit/709e4b0428d8cdc8299b22898c76e58d66ca92c9))
+
+
+
 # [1.10.0](https://github.com/vitejs/vite/compare/plugin-vue@1.10.0-beta.1...plugin-vue@1.10.0) (2021-11-22)
 
 

diff --git a/packages/plugin-vue/package.json b/packages/plugin-vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-vue",
-  "version": "1.10.0",
+  "version": "1.10.1",
   "license": "MIT",
   "author": "Evan You",
   "files": [
@@ -36,12 +36,12 @@
   "devDependencies": {
     "@rollup/pluginutils": "^4.1.1",
     "@types/hash-sum": "^1.0.0",
-    "@vue/compiler-sfc": "^3.2.22",
+    "@vue/compiler-sfc": "^3.2.23",
     "debug": "^4.3.2",
     "hash-sum": "^2.0.0",
     "rollup": "^2.59.0",
     "slash": "^4.0.0",
     "source-map": "^0.6.1",
-    "vue": "^3.2.22"
+    "vue": "^3.2.23"
   }
 }
diff --git a/packages/plugin-vue/src/handleHotUpdate.ts b/packages/plugin-vue/src/handleHotUpdate.ts
@@ -38,10 +38,7 @@ export async function handleHotUpdate(
   )
   const templateModule = modules.find((m) => /type=template/.test(m.url))
 
-  if (
-    !isEqualBlock(descriptor.script, prevDescriptor.script) ||
-    !isEqualBlock(descriptor.scriptSetup, prevDescriptor.scriptSetup)
-  ) {
+  if (hasScriptChanged(prevDescriptor, descriptor)) {
     let scriptModule: ModuleNode | undefined
     if (descriptor.script?.lang && !descriptor.script.src) {
       const scriptModuleRE = new RegExp(
@@ -174,11 +171,32 @@ export function isOnlyTemplateChanged(
   next: SFCDescriptor
 ): boolean {
   return (
-    isEqualBlock(prev.script, next.script) &&
-    isEqualBlock(prev.scriptSetup, next.scriptSetup) &&
+    !hasScriptChanged(prev, next) &&
     prev.styles.length === next.styles.length &&
     prev.styles.every((s, i) => isEqualBlock(s, next.styles[i])) &&
     prev.customBlocks.length === next.customBlocks.length &&
     prev.customBlocks.every((s, i) => isEqualBlock(s, next.customBlocks[i]))
   )
 }
+
+function hasScriptChanged(prev: SFCDescriptor, next: SFCDescriptor): boolean {
+  if (!isEqualBlock(prev.script, next.script)) {
+    return true
+  }
+  if (!isEqualBlock(prev.scriptSetup, next.scriptSetup)) {
+    return true
+  }
+
+  // vue core #3176
+  // <script setup lang="ts"> prunes non-unused imports
+  // the imports pruning depends on template, so script may need to re-compile
+  // based on template changes
+  const prevResolvedScript = getResolvedScript(prev, false)
+  // this is only available in vue@^3.2.23
+  const prevImports = prevResolvedScript?.imports
+  if (prevImports) {
+    return next.shouldForceReload(prevImports)
+  }
+
+  return false
+}
diff --git a/packages/plugin-vue/src/script.ts b/packages/plugin-vue/src/script.ts
@@ -56,7 +56,6 @@ export function resolveScript(
     inlineTemplate: isUseInlineTemplate(descriptor, !options.devServer),
     refTransform: options.refTransform !== false,
     templateOptions: resolveTemplateCompilerOptions(descriptor, options, ssr),
-    // @ts-ignore TODO remove ignore when we support this in @vue/compiler-sfc
     sourceMap: options.sourceMap
   })