Merge branch 'vuejs:main' into fix/withdefaults

yangxiuxiu1115 · Jan 9, 2024 · ccf1e74 · ccf1e74
2 parents 7354938 + 7976f70
commit ccf1e74
Show file tree

Hide file tree

Showing 19 changed files with 45 additions and 149 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,18 @@
+## [3.4.6](https://github.com/vuejs/core/compare/v3.4.5...v3.4.6) (2024-01-08)
+
+
+### Bug Fixes
+
+* **build:** revert "build: add production/development export conditions ([#9977](https://github.com/vuejs/core/issues/9977))" ([7bd4e90](https://github.com/vuejs/core/commit/7bd4e90506547c42234165776b01793abd37b148)), closes [#10012](https://github.com/vuejs/core/issues/10012) [#10020](https://github.com/vuejs/core/issues/10020)
+* fix post watcher fire timing on nested app mounts ([3c3561e](https://github.com/vuejs/core/commit/3c3561e7203091f49d57f1da6d822c91e462bc46)), closes [#10005](https://github.com/vuejs/core/issues/10005)
+* **hydration:** avoid hydration mismatch warning for styles with different order ([#10011](https://github.com/vuejs/core/issues/10011)) ([2701355](https://github.com/vuejs/core/commit/2701355e8eb07ab664e398d9fc05d6c4e2e9b20e)), closes [#10000](https://github.com/vuejs/core/issues/10000) [#10006](https://github.com/vuejs/core/issues/10006)
+* **runtime-core:** handle fragment with null children ([#10010](https://github.com/vuejs/core/issues/10010)) ([3bf34b7](https://github.com/vuejs/core/commit/3bf34b767e4dd3cf6a974301ecf0363ae4dda4ec)), closes [#10007](https://github.com/vuejs/core/issues/10007)
+* **scheduler:** sort nested postFlushCbs ([d9162df](https://github.com/vuejs/core/commit/d9162dfc2ee0c3a369fb9bf32ff413e74761bee6)), closes [#10003](https://github.com/vuejs/core/issues/10003)
+* **suspense:** fix anchor for suspense with transition out-in ([#9999](https://github.com/vuejs/core/issues/9999)) ([a3fbf21](https://github.com/vuejs/core/commit/a3fbf2132b0cd3655e969e290548c8fabc08fd33)), closes [#9996](https://github.com/vuejs/core/issues/9996)
+* **types:** allow `null` type for textarea value ([#9997](https://github.com/vuejs/core/issues/9997)) ([c379bc2](https://github.com/vuejs/core/commit/c379bc29efc70d6ac5840de10c357ee3dad998c0)), closes [#9904](https://github.com/vuejs/core/issues/9904)
+
+
+
 ## [3.4.5](https://github.com/vuejs/core/compare/v3.4.4...v3.4.5) (2024-01-04)
 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "3.4.5",
+  "version": "3.4.6",
   "packageManager": "[email protected]",
   "type": "module",
   "scripts": {

diff --git a/packages/compiler-core/package.json b/packages/compiler-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/compiler-core",
-  "version": "3.4.5",
+  "version": "3.4.6",
   "description": "@vue/compiler-core",
   "main": "index.js",
   "module": "dist/compiler-core.esm-bundler.js",
@@ -9,19 +9,6 @@
     "index.js",
     "dist"
   ],
-  "exports": {
-    ".": {
-      "types": "./dist/compiler-core.d.ts",
-      "node": {
-        "production": "./dist/compiler-core.cjs.prod.js",
-        "development": "./dist/compiler-core.cjs.js",
-        "default": "./index.js"
-      },
-      "import": "./dist/compiler-core.esm-bundler.js",
-      "require": "./index.js"
-    },
-    "./*": "./*"
-  },
   "buildOptions": {
     "name": "VueCompilerCore",
     "compat": true,

diff --git a/packages/compiler-dom/package.json b/packages/compiler-dom/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/compiler-dom",
-  "version": "3.4.5",
+  "version": "3.4.6",
   "description": "@vue/compiler-dom",
   "main": "index.js",
   "module": "dist/compiler-dom.esm-bundler.js",
@@ -11,19 +11,6 @@
     "index.js",
     "dist"
   ],
-  "exports": {
-    ".": {
-      "types": "./dist/compiler-dom.d.ts",
-      "node": {
-        "production": "./dist/compiler-dom.cjs.prod.js",
-        "development": "./dist/compiler-dom.cjs.js",
-        "default": "./index.js"
-      },
-      "import": "./dist/compiler-dom.esm-bundler.js",
-      "require": "./index.js"
-    },
-    "./*": "./*"
-  },
   "sideEffects": false,
   "buildOptions": {
     "name": "VueCompilerDOM",

diff --git a/packages/compiler-sfc/package.json b/packages/compiler-sfc/package.json
@@ -1,22 +1,13 @@
 {
   "name": "@vue/compiler-sfc",
-  "version": "3.4.5",
+  "version": "3.4.6",
   "description": "@vue/compiler-sfc",
   "main": "dist/compiler-sfc.cjs.js",
   "module": "dist/compiler-sfc.esm-browser.js",
   "types": "dist/compiler-sfc.d.ts",
   "files": [
     "dist"
   ],
-  "exports": {
-    ".": {
-      "types": "./dist/compiler-sfc.d.ts",
-      "node": "./dist/compiler-sfc.cjs.js",
-      "import": "./dist/compiler-sfc.esm-browser.js",
-      "require": "./dist/compiler-sfc.cjs.js"
-    },
-    "./*": "./*"
-  },
   "buildOptions": {
     "name": "VueCompilerSFC",
     "formats": [

diff --git a/packages/compiler-ssr/package.json b/packages/compiler-ssr/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/compiler-ssr",
-  "version": "3.4.5",
+  "version": "3.4.6",
   "description": "@vue/compiler-ssr",
   "main": "dist/compiler-ssr.cjs.js",
   "types": "dist/compiler-ssr.d.ts",

diff --git a/packages/dts-test/tsx.test-d.tsx b/packages/dts-test/tsx.test-d.tsx
@@ -7,6 +7,7 @@ expectType<JSX.Element>(<div />)
 expectType<JSX.Element>(<div id="foo" />)
 expectType<JSX.Element>(<div>hello</div>)
 expectType<JSX.Element>(<input value="foo" />)
+expectType<JSX.Element>(<textarea value={null} />)
 
 // @ts-expect-error style css property validation
 ;<div style={{ unknown: 123 }} />

diff --git a/packages/reactivity/package.json b/packages/reactivity/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/reactivity",
-  "version": "3.4.5",
+  "version": "3.4.6",
   "description": "@vue/reactivity",
   "main": "index.js",
   "module": "dist/reactivity.esm-bundler.js",
@@ -11,19 +11,6 @@
     "index.js",
     "dist"
   ],
-  "exports": {
-    ".": {
-      "types": "./dist/reactivity.d.ts",
-      "node": {
-        "production": "./dist/reactivity.cjs.prod.js",
-        "development": "./dist/reactivity.cjs.js",
-        "default": "./index.js"
-      },
-      "import": "./dist/reactivity.esm-bundler.js",
-      "require": "./index.js"
-    },
-    "./*": "./*"
-  },
   "sideEffects": false,
   "repository": {
     "type": "git",

diff --git a/packages/runtime-core/package.json b/packages/runtime-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/runtime-core",
-  "version": "3.4.5",
+  "version": "3.4.6",
   "description": "@vue/runtime-core",
   "main": "index.js",
   "module": "dist/runtime-core.esm-bundler.js",
@@ -9,19 +9,6 @@
     "index.js",
     "dist"
   ],
-  "exports": {
-    ".": {
-      "types": "./dist/runtime-core.d.ts",
-      "node": {
-        "production": "./dist/runtime-core.cjs.prod.js",
-        "development": "./dist/runtime-core.cjs.js",
-        "default": "./index.js"
-      },
-      "import": "./dist/runtime-core.esm-bundler.js",
-      "require": "./index.js"
-    },
-    "./*": "./*"
-  },
   "buildOptions": {
     "name": "VueRuntimeCore",
     "formats": [

diff --git a/packages/runtime-core/src/apiLifecycle.ts b/packages/runtime-core/src/apiLifecycle.ts
@@ -3,7 +3,6 @@ import {
   currentInstance,
   isInSSRComponentSetup,
   setCurrentInstance,
-  unsetCurrentInstance,
 } from './component'
 import type { ComponentPublicInstance } from './componentPublicInstance'
 import { ErrorTypeStrings, callWithAsyncErrorHandling } from './errorHandling'
@@ -41,9 +40,9 @@ export function injectHook(
         // Set currentInstance during hook invocation.
         // This assumes the hook does not synchronously trigger other hooks, which
         // can only be false when the user does something really funky.
-        setCurrentInstance(target)
+        const reset = setCurrentInstance(target)
         const res = callWithAsyncErrorHandling(hook, target, type, args)
-        unsetCurrentInstance()
+        reset()
         resetTracking()
         return res
       })

diff --git a/packages/runtime-core/src/apiWatch.ts b/packages/runtime-core/src/apiWatch.ts
@@ -30,7 +30,6 @@ import {
   currentInstance,
   isInSSRComponentSetup,
   setCurrentInstance,
-  unsetCurrentInstance,
 } from './component'
 import {
   ErrorCodes,
@@ -448,14 +447,9 @@ export function instanceWatch(
     cb = value.handler as Function
     options = value
   }
-  const cur = currentInstance
-  setCurrentInstance(this)
+  const reset = setCurrentInstance(this)
   const res = doWatch(getter, cb.bind(publicThis), options)
-  if (cur) {
-    setCurrentInstance(cur)
-  } else {
-    unsetCurrentInstance()
-  }
+  reset()
   return res
 }
 

diff --git a/packages/runtime-core/src/component.ts b/packages/runtime-core/src/component.ts
@@ -696,8 +696,13 @@ if (__SSR__) {
 }
 
 export const setCurrentInstance = (instance: ComponentInternalInstance) => {
+  const prev = currentInstance
   internalSetCurrentInstance(instance)
   instance.scope.on()
+  return () => {
+    instance.scope.off()
+    internalSetCurrentInstance(prev)
+  }
 }
 
 export const unsetCurrentInstance = () => {
@@ -785,7 +790,7 @@ function setupStatefulComponent(
     const setupContext = (instance.setupContext =
       setup.length > 1 ? createSetupContext(instance) : null)
 
-    setCurrentInstance(instance)
+    const reset = setCurrentInstance(instance)
     pauseTracking()
     const setupResult = callWithErrorHandling(
       setup,
@@ -797,7 +802,7 @@ function setupStatefulComponent(
       ],
     )
     resetTracking()
-    unsetCurrentInstance()
+    reset()
 
     if (isPromise(setupResult)) {
       setupResult.then(unsetCurrentInstance, unsetCurrentInstance)
@@ -972,13 +977,13 @@ export function finishComponentSetup(
 
   // support for 2.x options
   if (__FEATURE_OPTIONS_API__ && !(__COMPAT__ && skipOptions)) {
-    setCurrentInstance(instance)
+    const reset = setCurrentInstance(instance)
     pauseTracking()
     try {
       applyOptions(instance)
     } finally {
       resetTracking()
-      unsetCurrentInstance()
+      reset()
     }
   }
 

diff --git a/packages/runtime-core/src/componentProps.ts b/packages/runtime-core/src/componentProps.ts
@@ -32,7 +32,6 @@ import {
   type ConcreteComponent,
   type Data,
   setCurrentInstance,
-  unsetCurrentInstance,
 } from './component'
 import { isEmitListener } from './componentEmits'
 import { InternalObjectKey } from './vnode'
@@ -470,15 +469,15 @@ function resolvePropValue(
         if (key in propsDefaults) {
           value = propsDefaults[key]
         } else {
-          setCurrentInstance(instance)
+          const reset = setCurrentInstance(instance)
           value = propsDefaults[key] = defaultValue.call(
             __COMPAT__ &&
               isCompatEnabled(DeprecationTypes.PROPS_DEFAULT_THIS, instance)
               ? createPropsDefaultThis(instance, props, key)
               : null,
             props,
           )
-          unsetCurrentInstance()
+          reset()
         }
       } else {
         value = defaultValue

diff --git a/packages/runtime-dom/package.json b/packages/runtime-dom/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/runtime-dom",
-  "version": "3.4.5",
+  "version": "3.4.6",
   "description": "@vue/runtime-dom",
   "main": "index.js",
   "module": "dist/runtime-dom.esm-bundler.js",
@@ -10,19 +10,6 @@
     "index.js",
     "dist"
   ],
-  "exports": {
-    ".": {
-      "types": "./dist/runtime-dom.d.ts",
-      "node": {
-        "production": "./dist/runtime-dom.cjs.prod.js",
-        "development": "./dist/runtime-dom.cjs.js",
-        "default": "./index.js"
-      },
-      "import": "./dist/runtime-dom.esm-bundler.js",
-      "require": "./index.js"
-    },
-    "./*": "./*"
-  },
   "sideEffects": false,
   "buildOptions": {
     "name": "VueRuntimeDOM",

diff --git a/packages/runtime-dom/src/jsx.ts b/packages/runtime-dom/src/jsx.ts
@@ -739,7 +739,7 @@ export interface TextareaHTMLAttributes extends HTMLAttributes {
   readonly?: Booleanish
   required?: Booleanish
   rows?: Numberish
-  value?: string | ReadonlyArray<string> | number
+  value?: string | ReadonlyArray<string> | number | null
   wrap?: string
 }
 

diff --git a/packages/server-renderer/package.json b/packages/server-renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/server-renderer",
-  "version": "3.4.5",
+  "version": "3.4.6",
   "description": "@vue/server-renderer",
   "main": "index.js",
   "module": "dist/server-renderer.esm-bundler.js",
@@ -9,19 +9,6 @@
     "index.js",
     "dist"
   ],
-  "exports": {
-    ".": {
-      "types": "./dist/server-renderer.d.ts",
-      "node": {
-        "production": "./dist/server-renderer.cjs.prod.js",
-        "development": "./dist/server-renderer.cjs.js",
-        "default": "./index.js"
-      },
-      "import": "./dist/server-renderer.esm-bundler.js",
-      "require": "./index.js"
-    },
-    "./*": "./*"
-  },
   "buildOptions": {
     "name": "VueServerRenderer",
     "formats": [

diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue/shared",
-  "version": "3.4.5",
+  "version": "3.4.6",
   "description": "internal utils shared across @vue packages",
   "main": "index.js",
   "module": "dist/shared.esm-bundler.js",
@@ -9,19 +9,6 @@
     "index.js",
     "dist"
   ],
-  "exports": {
-    ".": {
-      "types": "./dist/shared.d.ts",
-      "node": {
-        "production": "./dist/shared.cjs.prod.js",
-        "development": "./dist/shared.cjs.js",
-        "default": "./index.js"
-      },
-      "import": "./dist/shared.esm-bundler.js",
-      "require": "./index.js"
-    },
-    "./*": "./*"
-  },
   "sideEffects": false,
   "buildOptions": {
     "formats": [