From e0b2975ef65ae6a0be0aa0a0df43fb887c665251 Mon Sep 17 00:00:00 2001
From: Tycho
Date: Mon, 29 Jul 2024 10:52:38 +0800
Subject: [PATCH 09/17] fix(types/ref): allow getter and setter types to be
unrelated (#11442)
---
packages/dts-test/ref.test-d.ts | 10 ++++++++++
packages/dts-test/watch.test-d.ts | 8 ++++++++
packages/reactivity/src/ref.ts | 7 ++++---
packages/runtime-core/src/apiWatch.ts | 2 +-
4 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/packages/dts-test/ref.test-d.ts b/packages/dts-test/ref.test-d.ts
index 1456c523239..46d39214b93 100644
--- a/packages/dts-test/ref.test-d.ts
+++ b/packages/dts-test/ref.test-d.ts
@@ -172,6 +172,16 @@ describe('ref with generic', () => {
expectType(ss.value.name)
})
+describe('allow getter and setter types to be unrelated', () => {
+ const a = { b: ref(0) }
+ const c = ref(a)
+ c.value = a
+
+ const d = {} as T
+ const e = ref(d)
+ e.value = d
+})
+
// shallowRef
type Status = 'initial' | 'ready' | 'invalidating'
const shallowStatus = shallowRef('initial')
diff --git a/packages/dts-test/watch.test-d.ts b/packages/dts-test/watch.test-d.ts
index 45c898ef672..6c8576f0c6b 100644
--- a/packages/dts-test/watch.test-d.ts
+++ b/packages/dts-test/watch.test-d.ts
@@ -1,5 +1,6 @@
import {
type ComputedRef,
+ type MaybeRef,
type Ref,
computed,
defineComponent,
@@ -203,3 +204,10 @@ defineComponent({
expectType<{ foo: string }>(value)
})
}
+
+{
+ const css: MaybeRef = ''
+ watch(ref(css), value => {
+ expectType(value)
+ })
+}
diff --git a/packages/reactivity/src/ref.ts b/packages/reactivity/src/ref.ts
index 3e9b05062f3..6e22d1bcd58 100644
--- a/packages/reactivity/src/ref.ts
+++ b/packages/reactivity/src/ref.ts
@@ -30,8 +30,9 @@ import { warn } from './warning'
declare const RefSymbol: unique symbol
export declare const RawSymbol: unique symbol
-export interface Ref {
- value: T
+export interface Ref {
+ get value(): T
+ set value(_: S)
/**
* Type differentiator only.
* We need this to be in public d.ts but don't want it to show up in IDE
@@ -108,7 +109,7 @@ export function isRef(r: any): r is Ref {
* @param value - The object to wrap in the ref.
* @see {@link https://vuejs.org/api/reactivity-core.html#ref}
*/
-export function ref(value: T): Ref>
+export function ref(value: T): Ref, UnwrapRef | T>
export function ref(): Ref
export function ref(value?: unknown) {
return createRef(value, false)
diff --git a/packages/runtime-core/src/apiWatch.ts b/packages/runtime-core/src/apiWatch.ts
index cdf8b8c888f..8b570bc28fa 100644
--- a/packages/runtime-core/src/apiWatch.ts
+++ b/packages/runtime-core/src/apiWatch.ts
@@ -46,7 +46,7 @@ import { useSSRContext } from './helpers/useSsrContext'
export type WatchEffect = (onCleanup: OnCleanup) => void
-export type WatchSource = Ref | ComputedRef | (() => T)
+export type WatchSource = Ref | ComputedRef | (() => T)
export type WatchCallback = (
value: V,
From 5bca503d1ee9842819bf8033492849976e4d2c1c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 29 Jul 2024 20:17:45 +0800
Subject: [PATCH 10/17] chore(deps): update dependency eslint-plugin-import-x
to v3 (#11450)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
package.json | 2 +-
pnpm-lock.yaml | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/package.json b/package.json
index 3a32930e205..64fc33e7f56 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,7 @@
"esbuild": "^0.23.0",
"esbuild-plugin-polyfill-node": "^0.3.0",
"eslint": "^9.8.0",
- "eslint-plugin-import-x": "^0.5.3",
+ "eslint-plugin-import-x": "^3.1.0",
"eslint-plugin-vitest": "^0.5.4",
"estree-walker": "catalog:",
"jsdom": "^24.1.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ad4e1aaec12..f4909b410a1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -84,8 +84,8 @@ importers:
specifier: ^9.8.0
version: 9.8.0
eslint-plugin-import-x:
- specifier: ^0.5.3
- version: 0.5.3(eslint@9.8.0)(typescript@5.4.5)
+ specifier: ^3.1.0
+ version: 3.1.0(eslint@9.8.0)(typescript@5.4.5)
eslint-plugin-vitest:
specifier: ^0.5.4
version: 0.5.4(eslint@9.8.0)(typescript@5.4.5)(vitest@1.6.0(@types/node@20.14.13)(jsdom@24.1.1)(sass@1.77.8)(terser@5.31.1))
@@ -1914,8 +1914,8 @@ packages:
eslint-import-resolver-node@0.3.9:
resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==}
- eslint-plugin-import-x@0.5.3:
- resolution: {integrity: sha512-hJ/wkMcsLQXAZL3+txXIDpbW5cqwdm1rLTqV4VRY03aIbzE3zWE7rPZKW6Gzf7xyl1u3V1iYC6tOG77d9NF4GQ==}
+ eslint-plugin-import-x@3.1.0:
+ resolution: {integrity: sha512-/UbPA+bYY7nIxcjL3kpcDY3UNdoLHFhyBFzHox2M0ypcUoueTn6woZUUmzzi5et/dXChksasYYFeKE2wshOrhg==}
engines: {node: '>=16'}
peerDependencies:
eslint: ^8.56.0 || ^9.0.0-0
@@ -5021,9 +5021,9 @@ snapshots:
transitivePeerDependencies:
- supports-color
- eslint-plugin-import-x@0.5.3(eslint@9.8.0)(typescript@5.4.5):
+ eslint-plugin-import-x@3.1.0(eslint@9.8.0)(typescript@5.4.5):
dependencies:
- '@typescript-eslint/utils': 7.15.0(eslint@9.8.0)(typescript@5.4.5)
+ '@typescript-eslint/utils': 7.17.0(eslint@9.8.0)(typescript@5.4.5)
debug: 4.3.5
doctrine: 3.0.0
eslint: 9.8.0
From 208f5c04e7fb066ac23e2dc2c5c0b7043fcb4464 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 29 Jul 2024 20:18:02 +0800
Subject: [PATCH 11/17] chore(deps): update dependency
conventional-changelog-cli to v5 (#11449)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
package.json | 2 +-
pnpm-lock.yaml | 401 +++++++++++++++++++++----------------------------
2 files changed, 175 insertions(+), 228 deletions(-)
diff --git a/package.json b/package.json
index 64fc33e7f56..80e74ed2089 100644
--- a/package.json
+++ b/package.json
@@ -72,7 +72,7 @@
"@types/semver": "^7.5.8",
"@vitest/coverage-istanbul": "^1.6.0",
"@vue/consolidate": "1.0.0",
- "conventional-changelog-cli": "^4.1.0",
+ "conventional-changelog-cli": "^5.0.0",
"enquirer": "^2.4.1",
"esbuild": "^0.23.0",
"esbuild-plugin-polyfill-node": "^0.3.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f4909b410a1..4b23377766c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -69,8 +69,8 @@ importers:
specifier: 1.0.0
version: 1.0.0
conventional-changelog-cli:
- specifier: ^4.1.0
- version: 4.1.0
+ specifier: ^5.0.0
+ version: 5.0.0(conventional-commits-filter@5.0.0)
enquirer:
specifier: ^2.4.1
version: 2.4.1
@@ -509,6 +509,18 @@ packages:
resolution: {integrity: sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==}
engines: {node: '>=6.9.0'}
+ '@conventional-changelog/git-client@1.0.1':
+ resolution: {integrity: sha512-PJEqBwAleffCMETaVm/fUgHldzBE35JFk3/9LL6NUA5EXa3qednu+UT6M7E5iBu3zIQZCULYIiZ90fBYHt6xUw==}
+ engines: {node: '>=18'}
+ peerDependencies:
+ conventional-commits-filter: ^5.0.0
+ conventional-commits-parser: ^6.0.0
+ peerDependenciesMeta:
+ conventional-commits-filter:
+ optional: true
+ conventional-commits-parser:
+ optional: true
+
'@esbuild/aix-ppc64@0.21.5':
resolution: {integrity: sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==}
engines: {node: '>=12'}
@@ -1333,10 +1345,6 @@ packages:
'@zeit/schemas@2.36.0':
resolution: {integrity: sha512-7kjMwcChYEzMKjeex9ZFXkt1AyNov9R5HZtjBKVsmVpw7pa7ZtlCGvCBC2vnnXctaYN+aRI61HjIqeetZW5ROg==}
- JSONStream@1.3.5:
- resolution: {integrity: sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==}
- hasBin: true
-
accepts@1.3.8:
resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==}
engines: {node: '>= 0.6'}
@@ -1648,71 +1656,71 @@ packages:
resolution: {integrity: sha512-kRGRZw3bLlFISDBgwTSA1TMBFN6J6GWDeubmDE3AF+3+yXL8hTWv8r5rkLbqYXY4RjPk/EzHnClI3zQf1cFmHA==}
engines: {node: '>= 0.6'}
- conventional-changelog-angular@7.0.0:
- resolution: {integrity: sha512-ROjNchA9LgfNMTTFSIWPzebCwOGFdgkEq45EnvvrmSLvCtAw0HSmrCs7/ty+wAeYUZyNay0YMUNYFTRL72PkBQ==}
- engines: {node: '>=16'}
+ conventional-changelog-angular@8.0.0:
+ resolution: {integrity: sha512-CLf+zr6St0wIxos4bmaKHRXWAcsCXrJU6F4VdNDrGRK3B8LDLKoX3zuMV5GhtbGkVR/LohZ6MT6im43vZLSjmA==}
+ engines: {node: '>=18'}
- conventional-changelog-atom@4.0.0:
- resolution: {integrity: sha512-q2YtiN7rnT1TGwPTwjjBSIPIzDJCRE+XAUahWxnh+buKK99Kks4WLMHoexw38GXx9OUxAsrp44f9qXe5VEMYhw==}
- engines: {node: '>=16'}
+ conventional-changelog-atom@5.0.0:
+ resolution: {integrity: sha512-WfzCaAvSCFPkznnLgLnfacRAzjgqjLUjvf3MftfsJzQdDICqkOOpcMtdJF3wTerxSpv2IAAjX8doM3Vozqle3g==}
+ engines: {node: '>=18'}
- conventional-changelog-cli@4.1.0:
- resolution: {integrity: sha512-MscvILWZ6nWOoC+p/3Nn3D2cVLkjeQjyZPUr0bQ+vUORE/SPrkClJh8BOoMNpS4yk+zFJ5LlgXACxH6XGQoRXA==}
- engines: {node: '>=16'}
+ conventional-changelog-cli@5.0.0:
+ resolution: {integrity: sha512-9Y8fucJe18/6ef6ZlyIlT2YQUbczvoQZZuYmDLaGvcSBP+M6h+LAvf7ON7waRxKJemcCII8Yqu5/8HEfskTxJQ==}
+ engines: {node: '>=18'}
hasBin: true
- conventional-changelog-codemirror@4.0.0:
- resolution: {integrity: sha512-hQSojc/5imn1GJK3A75m9hEZZhc3urojA5gMpnar4JHmgLnuM3CUIARPpEk86glEKr3c54Po3WV/vCaO/U8g3Q==}
- engines: {node: '>=16'}
+ conventional-changelog-codemirror@5.0.0:
+ resolution: {integrity: sha512-8gsBDI5Y3vrKUCxN6Ue8xr6occZ5nsDEc4C7jO/EovFGozx8uttCAyfhRrvoUAWi2WMm3OmYs+0mPJU7kQdYWQ==}
+ engines: {node: '>=18'}
- conventional-changelog-conventionalcommits@7.0.2:
- resolution: {integrity: sha512-NKXYmMR/Hr1DevQegFB4MwfM5Vv0m4UIxKZTTYuD98lpTknaZlSRrDOG4X7wIXpGkfsYxZTghUN+Qq+T0YQI7w==}
- engines: {node: '>=16'}
+ conventional-changelog-conventionalcommits@8.0.0:
+ resolution: {integrity: sha512-eOvlTO6OcySPyyyk8pKz2dP4jjElYunj9hn9/s0OB+gapTO8zwS9UQWrZ1pmF2hFs3vw1xhonOLGcGjy/zgsuA==}
+ engines: {node: '>=18'}
- conventional-changelog-core@7.0.0:
- resolution: {integrity: sha512-UYgaB1F/COt7VFjlYKVE/9tTzfU3VUq47r6iWf6lM5T7TlOxr0thI63ojQueRLIpVbrtHK4Ffw+yQGduw2Bhdg==}
- engines: {node: '>=16'}
+ conventional-changelog-core@8.0.0:
+ resolution: {integrity: sha512-EATUx5y9xewpEe10UEGNpbSHRC6cVZgO+hXQjofMqpy+gFIrcGvH3Fl6yk2VFKh7m+ffenup2N7SZJYpyD9evw==}
+ engines: {node: '>=18'}
- conventional-changelog-ember@4.0.0:
- resolution: {integrity: sha512-D0IMhwcJUg1Y8FSry6XAplEJcljkHVlvAZddhhsdbL1rbsqRsMfGx/PIkPYq0ru5aDgn+OxhQ5N5yR7P9mfsvA==}
- engines: {node: '>=16'}
+ conventional-changelog-ember@5.0.0:
+ resolution: {integrity: sha512-RPflVfm5s4cSO33GH/Ey26oxhiC67akcxSKL8CLRT3kQX2W3dbE19sSOM56iFqUJYEwv9mD9r6k79weWe1urfg==}
+ engines: {node: '>=18'}
- conventional-changelog-eslint@5.0.0:
- resolution: {integrity: sha512-6JtLWqAQIeJLn/OzUlYmzd9fKeNSWmQVim9kql+v4GrZwLx807kAJl3IJVc3jTYfVKWLxhC3BGUxYiuVEcVjgA==}
- engines: {node: '>=16'}
+ conventional-changelog-eslint@6.0.0:
+ resolution: {integrity: sha512-eiUyULWjzq+ybPjXwU6NNRflApDWlPEQEHvI8UAItYW/h22RKkMnOAtfCZxMmrcMO1OKUWtcf2MxKYMWe9zJuw==}
+ engines: {node: '>=18'}
- conventional-changelog-express@4.0.0:
- resolution: {integrity: sha512-yWyy5c7raP9v7aTvPAWzqrztACNO9+FEI1FSYh7UP7YT1AkWgv5UspUeB5v3Ibv4/o60zj2o9GF2tqKQ99lIsw==}
- engines: {node: '>=16'}
+ conventional-changelog-express@5.0.0:
+ resolution: {integrity: sha512-D8Q6WctPkQpvr2HNCCmwU5GkX22BVHM0r4EW8vN0230TSyS/d6VQJDAxGb84lbg0dFjpO22MwmsikKL++Oo/oQ==}
+ engines: {node: '>=18'}
- conventional-changelog-jquery@5.0.0:
- resolution: {integrity: sha512-slLjlXLRNa/icMI3+uGLQbtrgEny3RgITeCxevJB+p05ExiTgHACP5p3XiMKzjBn80n+Rzr83XMYfRInEtCPPw==}
- engines: {node: '>=16'}
+ conventional-changelog-jquery@6.0.0:
+ resolution: {integrity: sha512-2kxmVakyehgyrho2ZHBi90v4AHswkGzHuTaoH40bmeNqUt20yEkDOSpw8HlPBfvEQBwGtbE+5HpRwzj6ac2UfA==}
+ engines: {node: '>=18'}
- conventional-changelog-jshint@4.0.0:
- resolution: {integrity: sha512-LyXq1bbl0yG0Ai1SbLxIk8ZxUOe3AjnlwE6sVRQmMgetBk+4gY9EO3d00zlEt8Y8gwsITytDnPORl8al7InTjg==}
- engines: {node: '>=16'}
+ conventional-changelog-jshint@5.0.0:
+ resolution: {integrity: sha512-gGNphSb/opc76n2eWaO6ma4/Wqu3tpa2w7i9WYqI6Cs2fncDSI2/ihOfMvXveeTTeld0oFvwMVNV+IYQIk3F3g==}
+ engines: {node: '>=18'}
- conventional-changelog-preset-loader@4.1.0:
- resolution: {integrity: sha512-HozQjJicZTuRhCRTq4rZbefaiCzRM2pr6u2NL3XhrmQm4RMnDXfESU6JKu/pnKwx5xtdkYfNCsbhN5exhiKGJA==}
- engines: {node: '>=16'}
+ conventional-changelog-preset-loader@5.0.0:
+ resolution: {integrity: sha512-SetDSntXLk8Jh1NOAl1Gu5uLiCNSYenB5tm0YVeZKePRIgDW9lQImromTwLa3c/Gae298tsgOM+/CYT9XAl0NA==}
+ engines: {node: '>=18'}
- conventional-changelog-writer@7.0.1:
- resolution: {integrity: sha512-Uo+R9neH3r/foIvQ0MKcsXkX642hdm9odUp7TqgFS7BsalTcjzRlIfWZrZR1gbxOozKucaKt5KAbjW8J8xRSmA==}
- engines: {node: '>=16'}
+ conventional-changelog-writer@8.0.0:
+ resolution: {integrity: sha512-TQcoYGRatlAnT2qEWDON/XSfnVG38JzA7E0wcGScu7RElQBkg9WWgZd1peCWFcWDh1xfb2CfsrcvOn1bbSzztA==}
+ engines: {node: '>=18'}
hasBin: true
- conventional-changelog@5.1.0:
- resolution: {integrity: sha512-aWyE/P39wGYRPllcCEZDxTVEmhyLzTc9XA6z6rVfkuCD2UBnhV/sgSOKbQrEG5z9mEZJjnopjgQooTKxEg8mAg==}
- engines: {node: '>=16'}
+ conventional-changelog@6.0.0:
+ resolution: {integrity: sha512-tuUH8H/19VjtD9Ig7l6TQRh+Z0Yt0NZ6w/cCkkyzUbGQTnUEmKfGtkC9gGfVgCfOL1Rzno5NgNF4KY8vR+Jo3w==}
+ engines: {node: '>=18'}
- conventional-commits-filter@4.0.0:
- resolution: {integrity: sha512-rnpnibcSOdFcdclpFwWa+pPlZJhXE7l+XK04zxhbWrhgpR96h33QLz8hITTXbcYICxVr3HZFtbtUAQ+4LdBo9A==}
- engines: {node: '>=16'}
+ conventional-commits-filter@5.0.0:
+ resolution: {integrity: sha512-tQMagCOC59EVgNZcC5zl7XqO30Wki9i9J3acbUvkaosCT6JX3EeFwJD7Qqp4MCikRnzS18WXV3BLIQ66ytu6+Q==}
+ engines: {node: '>=18'}
- conventional-commits-parser@5.0.0:
- resolution: {integrity: sha512-ZPMl0ZJbw74iS9LuX9YIAiW8pfM5p3yh2o/NbXHbkFuZzY5jvdi5jFycEOkmBW5H5I7nA+D6f3UcsCLP2vvSEA==}
- engines: {node: '>=16'}
+ conventional-commits-parser@6.0.0:
+ resolution: {integrity: sha512-TbsINLp48XeMXR8EvGjTnKGsZqBemisPoyWESlpRyR8lif0lcwzqz+NMtYSj1ooF/WYjSuu7wX0CtdeeMEQAmA==}
+ engines: {node: '>=18'}
hasBin: true
convert-source-map@2.0.0:
@@ -1746,10 +1754,6 @@ packages:
csstype@3.1.3:
resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
- dargs@8.1.0:
- resolution: {integrity: sha512-wAV9QHOsNbwnWdNW2FYvE1P56wtgSbM+3SZcdGiWQILwVjACCXDCI3Ai8QlCjMDB8YK5zySiXZYBiwGmNY3lnw==}
- engines: {node: '>=12'}
-
data-uri-to-buffer@6.0.2:
resolution: {integrity: sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==}
engines: {node: '>= 14'}
@@ -2033,14 +2037,14 @@ packages:
resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
engines: {node: '>=8'}
+ find-up-simple@1.0.0:
+ resolution: {integrity: sha512-q7Us7kcjj2VMePAa02hDAF6d+MzsdsAWEwYyOpwUtlerRBkOEPBCRZrAV4XfcSN8fHAgaD0hP7miwoay6DCprw==}
+ engines: {node: '>=18'}
+
find-up@5.0.0:
resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
engines: {node: '>=10'}
- find-up@6.3.0:
- resolution: {integrity: sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==}
- engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-
flat-cache@4.0.1:
resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==}
engines: {node: '>=16'}
@@ -2112,14 +2116,14 @@ packages:
resolution: {integrity: sha512-BzUrJBS9EcUb4cFol8r4W3v1cPsSyajLSthNkz5BxbpDcHN5tIrM10E2eNvfnvBn3DaT3DUgx0OpsBKkaOpanw==}
engines: {node: '>= 14'}
- git-raw-commits@4.0.0:
- resolution: {integrity: sha512-ICsMM1Wk8xSGMowkOmPrzo2Fgmfo4bMHLNX6ytHjajRJUqvHOw/TFapQ+QG75c3X/tTDDhOSRPGC52dDbNM8FQ==}
- engines: {node: '>=16'}
+ git-raw-commits@5.0.0:
+ resolution: {integrity: sha512-I2ZXrXeOc0KrCvC7swqtIFXFN+rbjnC7b2T943tvemIOVNl+XP8YnA9UVwqFhzzLClnSA60KR/qEjLpXzs73Qg==}
+ engines: {node: '>=18'}
hasBin: true
- git-semver-tags@7.0.1:
- resolution: {integrity: sha512-NY0ZHjJzyyNXHTDZmj+GG7PyuAKtMsyWSwh07CR2hOZFa+/yoTsXci/nF2obzL8UDhakFNkD9gNdt/Ed+cxh2Q==}
- engines: {node: '>=16'}
+ git-semver-tags@8.0.0:
+ resolution: {integrity: sha512-N7YRIklvPH3wYWAR2vysaqGLPRcpwQ0GKdlqTiVN5w1UmCdaeY3K8s6DMKRCh54DDdzyt/OAB6C8jgVtb7Y2Fg==}
+ engines: {node: '>=18'}
hasBin: true
glob-parent@5.1.2:
@@ -2256,6 +2260,10 @@ packages:
resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
engines: {node: '>=0.8.19'}
+ index-to-position@0.1.2:
+ resolution: {integrity: sha512-MWDKS3AS1bGCHLBA2VLImJz42f7bJh8wQsTGCzI3j519/CASStoDONUBVz2I/VID0MpiX3SGSnbOD2xUalbE5g==}
+ engines: {node: '>=18'}
+
inflight@1.0.6:
resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
deprecated: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.
@@ -2353,10 +2361,6 @@ packages:
resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==}
engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
- is-text-path@2.0.0:
- resolution: {integrity: sha512-+oDTluR6WEjdXEJMnC2z6A4FRwFoYuvShVVEGsS7ewc0UTi2QtAKMDJuL4BDEVt+5T7MjFo12RP8ghOM75oKJw==}
- engines: {node: '>=8'}
-
is-wsl@2.2.0:
resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==}
engines: {node: '>=8'}
@@ -2440,9 +2444,6 @@ packages:
json-stable-stringify-without-jsonify@1.0.1:
resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
- json-stringify-safe@5.0.1:
- resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==}
-
json5@2.2.3:
resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
engines: {node: '>=6'}
@@ -2451,10 +2452,6 @@ packages:
jsonfile@6.1.0:
resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
- jsonparse@1.3.1:
- resolution: {integrity: sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==}
- engines: {'0': node >= 0.2.0}
-
jstransformer@1.0.0:
resolution: {integrity: sha512-C9YK3Rf8q6VAPDCCU9fnqo3mAfOH6vUGnMcP4AQAYIEpWtfGLpwOTmZ+igtdK5y+VvI2n3CyYSzy4Qh34eq24A==}
@@ -2478,10 +2475,6 @@ packages:
lines-and-columns@1.2.4:
resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
- lines-and-columns@2.0.4:
- resolution: {integrity: sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A==}
- engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-
lint-staged@15.2.7:
resolution: {integrity: sha512-+FdVbbCZ+yoh7E/RosSdqKJyUM2OEjTciH0TFNkawKgvFp1zbGlEC39RADg+xKBG1R4mhoH2j85myBQZ5wR+lw==}
engines: {node: '>=18.12.0'}
@@ -2503,10 +2496,6 @@ packages:
resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
engines: {node: '>=10'}
- locate-path@7.2.0:
- resolution: {integrity: sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==}
- engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-
lodash.camelcase@4.3.0:
resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
@@ -2560,9 +2549,9 @@ packages:
resolution: {integrity: sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==}
engines: {node: '>= 0.10.0'}
- meow@12.1.1:
- resolution: {integrity: sha512-BhXM0Au22RwUneMPwSCnyhTOizdWoIEPU9sp0Aqa1PnDMR5Wv2FGXYDjuzJEIX+Eo2Rb8xuYe5jrnm5QowQFkw==}
- engines: {node: '>=16.10'}
+ meow@13.2.0:
+ resolution: {integrity: sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA==}
+ engines: {node: '>=18'}
merge-source-map@1.1.0:
resolution: {integrity: sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==}
@@ -2711,10 +2700,6 @@ packages:
resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
engines: {node: '>=10'}
- p-limit@4.0.0:
- resolution: {integrity: sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==}
- engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-
p-limit@5.0.0:
resolution: {integrity: sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ==}
engines: {node: '>=18'}
@@ -2723,10 +2708,6 @@ packages:
resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
engines: {node: '>=10'}
- p-locate@6.0.0:
- resolution: {integrity: sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==}
- engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-
pac-proxy-agent@7.0.2:
resolution: {integrity: sha512-BFi3vZnO9X5Qt6NRz7ZOaPja3ic0PhlsmCRYLOpN11+mWBCR6XJDqW5RF3j8jm4WGGQZtBA+bTfxYzeKW73eHg==}
engines: {node: '>= 14'}
@@ -2749,9 +2730,9 @@ packages:
resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
engines: {node: '>=8'}
- parse-json@7.1.1:
- resolution: {integrity: sha512-SgOTCX/EZXtZxBE5eJ97P4yGM5n37BwRU+YMsH4vNzFqJV/oWFXXCmwFlgWUM4PrakybVOueJJ6pwHqSVhTFDw==}
- engines: {node: '>=16'}
+ parse-json@8.1.0:
+ resolution: {integrity: sha512-rum1bPifK5SSar35Z6EKZuYPJx85pkNaFrxBK3mwdfSJ1/WKbYrjoW/zTPSjRRamfmVX1ACBIdFAO0VRErW/EA==}
+ engines: {node: '>=18'}
parse5@7.1.2:
resolution: {integrity: sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==}
@@ -2760,10 +2741,6 @@ packages:
resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
engines: {node: '>=8'}
- path-exists@5.0.0:
- resolution: {integrity: sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==}
- engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-
path-is-absolute@1.0.1:
resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
engines: {node: '>=0.10.0'}
@@ -2973,13 +2950,13 @@ packages:
resolution: {integrity: sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==}
engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
- read-pkg-up@10.1.0:
- resolution: {integrity: sha512-aNtBq4jR8NawpKJQldrQcSW9y/d+KWH4v24HWkHljOZ7H0av+YTGANBzRh9A5pw7v/bLVsLVPpOhJ7gHNVy8lA==}
- engines: {node: '>=16'}
+ read-package-up@11.0.0:
+ resolution: {integrity: sha512-MbgfoNPANMdb4oRBNg5eqLbB2t2r+o5Ua1pNt8BqGp4I0FJZhuVSOj3PaBPni4azWuSzEdNn2evevzVmEk1ohQ==}
+ engines: {node: '>=18'}
- read-pkg@8.1.0:
- resolution: {integrity: sha512-PORM8AgzXeskHO/WEv312k9U03B8K9JSiWF/8N9sUuFjBa+9SF2u6K7VClzXwDXab51jCd8Nd36CNM+zR97ScQ==}
- engines: {node: '>=16'}
+ read-pkg@9.0.1:
+ resolution: {integrity: sha512-9viLL4/n1BJUCT1NXVTdS1jtm80yDEgR5T4yCelII49Mbj0v1rZdKqj7zCiYdbB0CuCgdrvHcNogAKTFPBocFA==}
+ engines: {node: '>=18'}
readable-stream@2.3.8:
resolution: {integrity: sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==}
@@ -3189,10 +3166,6 @@ packages:
spdx-license-ids@3.0.18:
resolution: {integrity: sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ==}
- split2@4.2.0:
- resolution: {integrity: sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==}
- engines: {node: '>= 10.x'}
-
sprintf-js@1.1.3:
resolution: {integrity: sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==}
@@ -3298,10 +3271,6 @@ packages:
text-decoder@1.1.1:
resolution: {integrity: sha512-8zll7REEv4GDD3x4/0pW+ppIxSNs7H1J10IKFZsuOMscumCdM2a+toDGLPA3T+1+fLBql4zbt5z83GEQGGV5VA==}
- text-extensions@2.4.0:
- resolution: {integrity: sha512-te/NtwBwfiNRLf9Ijqx3T0nlqZiQ2XrrtBvu+cLL8ZRrGkO0NHTug8MYFKyoSrv/sHTaSKfilUkizV6XhxMJ3g==}
- engines: {node: '>=8'}
-
text-table@0.2.0:
resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
@@ -3368,10 +3337,6 @@ packages:
resolution: {integrity: sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==}
engines: {node: '>=12.20'}
- type-fest@3.13.1:
- resolution: {integrity: sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==}
- engines: {node: '>=14.16'}
-
type-fest@4.21.0:
resolution: {integrity: sha512-ADn2w7hVPcK6w1I0uWnM//y1rLXZhzB9mr0a3OirzclKF1Wp6VzevUmzz/NRAWunOT6E8HrnpGY7xOfc6K57fA==}
engines: {node: '>=16'}
@@ -3405,6 +3370,10 @@ packages:
undici-types@5.26.5:
resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
+ unicorn-magic@0.1.0:
+ resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==}
+ engines: {node: '>=18'}
+
universalify@0.2.0:
resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==}
engines: {node: '>= 4.0.0'}
@@ -3756,6 +3725,14 @@ snapshots:
'@babel/helper-validator-identifier': 7.24.7
to-fast-properties: 2.0.0
+ '@conventional-changelog/git-client@1.0.1(conventional-commits-filter@5.0.0)(conventional-commits-parser@6.0.0)':
+ dependencies:
+ '@types/semver': 7.5.8
+ semver: 7.6.3
+ optionalDependencies:
+ conventional-commits-filter: 5.0.0
+ conventional-commits-parser: 6.0.0
+
'@esbuild/aix-ppc64@0.21.5':
optional: true
@@ -4406,11 +4383,6 @@ snapshots:
'@zeit/schemas@2.36.0': {}
- JSONStream@1.3.5:
- dependencies:
- jsonparse: 1.3.1
- through: 2.3.8
-
accepts@1.3.8:
dependencies:
mime-types: 2.1.35
@@ -4735,83 +4707,85 @@ snapshots:
content-disposition@0.5.2: {}
- conventional-changelog-angular@7.0.0:
+ conventional-changelog-angular@8.0.0:
dependencies:
compare-func: 2.0.0
- conventional-changelog-atom@4.0.0: {}
+ conventional-changelog-atom@5.0.0: {}
- conventional-changelog-cli@4.1.0:
+ conventional-changelog-cli@5.0.0(conventional-commits-filter@5.0.0):
dependencies:
add-stream: 1.0.0
- conventional-changelog: 5.1.0
- meow: 12.1.1
+ conventional-changelog: 6.0.0(conventional-commits-filter@5.0.0)
+ meow: 13.2.0
tempfile: 5.0.0
+ transitivePeerDependencies:
+ - conventional-commits-filter
- conventional-changelog-codemirror@4.0.0: {}
+ conventional-changelog-codemirror@5.0.0: {}
- conventional-changelog-conventionalcommits@7.0.2:
+ conventional-changelog-conventionalcommits@8.0.0:
dependencies:
compare-func: 2.0.0
- conventional-changelog-core@7.0.0:
+ conventional-changelog-core@8.0.0(conventional-commits-filter@5.0.0):
dependencies:
'@hutson/parse-repository-url': 5.0.0
add-stream: 1.0.0
- conventional-changelog-writer: 7.0.1
- conventional-commits-parser: 5.0.0
- git-raw-commits: 4.0.0
- git-semver-tags: 7.0.1
+ conventional-changelog-writer: 8.0.0
+ conventional-commits-parser: 6.0.0
+ git-raw-commits: 5.0.0(conventional-commits-filter@5.0.0)(conventional-commits-parser@6.0.0)
+ git-semver-tags: 8.0.0(conventional-commits-filter@5.0.0)(conventional-commits-parser@6.0.0)
hosted-git-info: 7.0.2
normalize-package-data: 6.0.2
- read-pkg: 8.1.0
- read-pkg-up: 10.1.0
+ read-package-up: 11.0.0
+ read-pkg: 9.0.1
+ transitivePeerDependencies:
+ - conventional-commits-filter
- conventional-changelog-ember@4.0.0: {}
+ conventional-changelog-ember@5.0.0: {}
- conventional-changelog-eslint@5.0.0: {}
+ conventional-changelog-eslint@6.0.0: {}
- conventional-changelog-express@4.0.0: {}
+ conventional-changelog-express@5.0.0: {}
- conventional-changelog-jquery@5.0.0: {}
+ conventional-changelog-jquery@6.0.0: {}
- conventional-changelog-jshint@4.0.0:
+ conventional-changelog-jshint@5.0.0:
dependencies:
compare-func: 2.0.0
- conventional-changelog-preset-loader@4.1.0: {}
+ conventional-changelog-preset-loader@5.0.0: {}
- conventional-changelog-writer@7.0.1:
+ conventional-changelog-writer@8.0.0:
dependencies:
- conventional-commits-filter: 4.0.0
+ '@types/semver': 7.5.8
+ conventional-commits-filter: 5.0.0
handlebars: 4.7.8
- json-stringify-safe: 5.0.1
- meow: 12.1.1
+ meow: 13.2.0
semver: 7.6.3
- split2: 4.2.0
- conventional-changelog@5.1.0:
- dependencies:
- conventional-changelog-angular: 7.0.0
- conventional-changelog-atom: 4.0.0
- conventional-changelog-codemirror: 4.0.0
- conventional-changelog-conventionalcommits: 7.0.2
- conventional-changelog-core: 7.0.0
- conventional-changelog-ember: 4.0.0
- conventional-changelog-eslint: 5.0.0
- conventional-changelog-express: 4.0.0
- conventional-changelog-jquery: 5.0.0
- conventional-changelog-jshint: 4.0.0
- conventional-changelog-preset-loader: 4.1.0
+ conventional-changelog@6.0.0(conventional-commits-filter@5.0.0):
+ dependencies:
+ conventional-changelog-angular: 8.0.0
+ conventional-changelog-atom: 5.0.0
+ conventional-changelog-codemirror: 5.0.0
+ conventional-changelog-conventionalcommits: 8.0.0
+ conventional-changelog-core: 8.0.0(conventional-commits-filter@5.0.0)
+ conventional-changelog-ember: 5.0.0
+ conventional-changelog-eslint: 6.0.0
+ conventional-changelog-express: 5.0.0
+ conventional-changelog-jquery: 6.0.0
+ conventional-changelog-jshint: 5.0.0
+ conventional-changelog-preset-loader: 5.0.0
+ transitivePeerDependencies:
+ - conventional-commits-filter
- conventional-commits-filter@4.0.0: {}
+ conventional-commits-filter@5.0.0: {}
- conventional-commits-parser@5.0.0:
+ conventional-commits-parser@6.0.0:
dependencies:
- JSONStream: 1.3.5
- is-text-path: 2.0.0
- meow: 12.1.1
- split2: 4.2.0
+ meow: 13.2.0
convert-source-map@2.0.0: {}
@@ -4840,8 +4814,6 @@ snapshots:
csstype@3.1.3: {}
- dargs@8.1.0: {}
-
data-uri-to-buffer@6.0.2: {}
data-urls@5.0.0:
@@ -5196,16 +5168,13 @@ snapshots:
dependencies:
to-regex-range: 5.0.1
+ find-up-simple@1.0.0: {}
+
find-up@5.0.0:
dependencies:
locate-path: 6.0.0
path-exists: 4.0.0
- find-up@6.3.0:
- dependencies:
- locate-path: 7.2.0
- path-exists: 5.0.0
-
flat-cache@4.0.1:
dependencies:
flatted: 3.3.1
@@ -5278,16 +5247,21 @@ snapshots:
transitivePeerDependencies:
- supports-color
- git-raw-commits@4.0.0:
+ git-raw-commits@5.0.0(conventional-commits-filter@5.0.0)(conventional-commits-parser@6.0.0):
dependencies:
- dargs: 8.1.0
- meow: 12.1.1
- split2: 4.2.0
+ '@conventional-changelog/git-client': 1.0.1(conventional-commits-filter@5.0.0)(conventional-commits-parser@6.0.0)
+ meow: 13.2.0
+ transitivePeerDependencies:
+ - conventional-commits-filter
+ - conventional-commits-parser
- git-semver-tags@7.0.1:
+ git-semver-tags@8.0.0(conventional-commits-filter@5.0.0)(conventional-commits-parser@6.0.0):
dependencies:
- meow: 12.1.1
- semver: 7.6.3
+ '@conventional-changelog/git-client': 1.0.1(conventional-commits-filter@5.0.0)(conventional-commits-parser@6.0.0)
+ meow: 13.2.0
+ transitivePeerDependencies:
+ - conventional-commits-filter
+ - conventional-commits-parser
glob-parent@5.1.2:
dependencies:
@@ -5420,6 +5394,8 @@ snapshots:
imurmurhash@0.1.4: {}
+ index-to-position@0.1.2: {}
+
inflight@1.0.6:
dependencies:
once: 1.4.0
@@ -5496,10 +5472,6 @@ snapshots:
is-stream@3.0.0: {}
- is-text-path@2.0.0:
- dependencies:
- text-extensions: 2.4.0
-
is-wsl@2.2.0:
dependencies:
is-docker: 2.2.1
@@ -5599,8 +5571,6 @@ snapshots:
json-stable-stringify-without-jsonify@1.0.1: {}
- json-stringify-safe@5.0.1: {}
-
json5@2.2.3: {}
jsonfile@6.1.0:
@@ -5609,8 +5579,6 @@ snapshots:
optionalDependencies:
graceful-fs: 4.2.11
- jsonparse@1.3.1: {}
-
jstransformer@1.0.0:
dependencies:
is-promise: 2.2.2
@@ -5640,8 +5608,6 @@ snapshots:
lines-and-columns@1.2.4: {}
- lines-and-columns@2.0.4: {}
-
lint-staged@15.2.7:
dependencies:
chalk: 5.3.0
@@ -5677,10 +5643,6 @@ snapshots:
dependencies:
p-locate: 5.0.0
- locate-path@7.2.0:
- dependencies:
- p-locate: 6.0.0
-
lodash.camelcase@4.3.0: {}
lodash.merge@4.6.2: {}
@@ -5729,7 +5691,7 @@ snapshots:
memorystream@0.3.1: {}
- meow@12.1.1: {}
+ meow@13.2.0: {}
merge-source-map@1.1.0:
dependencies:
@@ -5860,10 +5822,6 @@ snapshots:
dependencies:
yocto-queue: 0.1.0
- p-limit@4.0.0:
- dependencies:
- yocto-queue: 1.1.1
-
p-limit@5.0.0:
dependencies:
yocto-queue: 1.1.1
@@ -5872,10 +5830,6 @@ snapshots:
dependencies:
p-limit: 3.1.0
- p-locate@6.0.0:
- dependencies:
- p-limit: 4.0.0
-
pac-proxy-agent@7.0.2:
dependencies:
'@tootallnate/quickjs-emscripten': 0.23.0
@@ -5909,13 +5863,11 @@ snapshots:
json-parse-even-better-errors: 2.3.1
lines-and-columns: 1.2.4
- parse-json@7.1.1:
+ parse-json@8.1.0:
dependencies:
'@babel/code-frame': 7.24.7
- error-ex: 1.3.2
- json-parse-even-better-errors: 3.0.2
- lines-and-columns: 2.0.4
- type-fest: 3.13.1
+ index-to-position: 0.1.2
+ type-fest: 4.21.0
parse5@7.1.2:
dependencies:
@@ -5923,8 +5875,6 @@ snapshots:
path-exists@4.0.0: {}
- path-exists@5.0.0: {}
-
path-is-absolute@1.0.1: {}
path-is-inside@1.0.2: {}
@@ -6167,18 +6117,19 @@ snapshots:
json-parse-even-better-errors: 3.0.2
npm-normalize-package-bin: 3.0.1
- read-pkg-up@10.1.0:
+ read-package-up@11.0.0:
dependencies:
- find-up: 6.3.0
- read-pkg: 8.1.0
+ find-up-simple: 1.0.0
+ read-pkg: 9.0.1
type-fest: 4.21.0
- read-pkg@8.1.0:
+ read-pkg@9.0.1:
dependencies:
'@types/normalize-package-data': 2.4.4
normalize-package-data: 6.0.2
- parse-json: 7.1.1
+ parse-json: 8.1.0
type-fest: 4.21.0
+ unicorn-magic: 0.1.0
readable-stream@2.3.8:
dependencies:
@@ -6435,8 +6386,6 @@ snapshots:
spdx-license-ids@3.0.18: {}
- split2@4.2.0: {}
-
sprintf-js@1.1.3: {}
stable-hash@0.0.4: {}
@@ -6549,8 +6498,6 @@ snapshots:
dependencies:
b4a: 1.6.6
- text-extensions@2.4.0: {}
-
text-table@0.2.0: {}
through@2.3.8: {}
@@ -6603,8 +6550,6 @@ snapshots:
type-fest@2.19.0: {}
- type-fest@3.13.1: {}
-
type-fest@4.21.0: {}
typescript-eslint@7.17.0(eslint@9.8.0)(typescript@5.4.5):
@@ -6632,6 +6577,8 @@ snapshots:
undici-types@5.26.5: {}
+ unicorn-magic@0.1.0: {}
+
universalify@0.2.0: {}
universalify@2.0.1: {}
From 87923f6af12f8ede677a3830c269d9486d9d95de Mon Sep 17 00:00:00 2001
From: Tycho
Date: Mon, 29 Jul 2024 21:26:48 +0800
Subject: [PATCH 12/17] chore(types): reuse built-in Iterator type (#11435)
---
packages/reactivity/src/collectionHandlers.ts | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/packages/reactivity/src/collectionHandlers.ts b/packages/reactivity/src/collectionHandlers.ts
index c39e3ed48cd..9098ad4a2e5 100644
--- a/packages/reactivity/src/collectionHandlers.ts
+++ b/packages/reactivity/src/collectionHandlers.ts
@@ -173,19 +173,6 @@ function createForEach(isReadonly: boolean, isShallow: boolean) {
}
}
-interface Iterable {
- [Symbol.iterator](): Iterator
-}
-
-interface Iterator {
- next(value?: any): IterationResult
-}
-
-interface IterationResult {
- value: any
- done: boolean
-}
-
function createIterableMethod(
method: string | symbol,
isReadonly: boolean,
@@ -194,7 +181,7 @@ function createIterableMethod(
return function (
this: IterableCollections,
...args: unknown[]
- ): Iterable & Iterator {
+ ): Iterable & Iterator {
const target = (this as any)[ReactiveFlags.RAW]
const rawTarget = toRaw(target)
const targetIsMap = isMap(rawTarget)
From 5680142e68096c42e66da9f4c6220d040d7c56ba Mon Sep 17 00:00:00 2001
From: skirtle <65301168+skirtles-code@users.noreply.github.com>
Date: Mon, 29 Jul 2024 14:47:23 +0100
Subject: [PATCH 13/17] perf(runtime-core): improve efficiency of
normalizePropsOptions (#11409)
close #9739
---
packages/runtime-core/src/componentProps.ts | 65 +++++++++++----------
1 file changed, 34 insertions(+), 31 deletions(-)
diff --git a/packages/runtime-core/src/componentProps.ts b/packages/runtime-core/src/componentProps.ts
index 9d7b7f0e4a5..ce39f150ef5 100644
--- a/packages/runtime-core/src/componentProps.ts
+++ b/packages/runtime-core/src/componentProps.ts
@@ -174,12 +174,10 @@ export type ExtractDefaultPropTypes = O extends object
{ [K in keyof Pick>]: InferPropType }
: {}
-type NormalizedProp =
- | null
- | (PropOptions & {
- [BooleanFlags.shouldCast]?: boolean
- [BooleanFlags.shouldCastTrue]?: boolean
- })
+type NormalizedProp = PropOptions & {
+ [BooleanFlags.shouldCast]?: boolean
+ [BooleanFlags.shouldCastTrue]?: boolean
+}
// normalized value is a tuple of the actual normalized options
// and an array of prop keys that need value casting (booleans and defaults)
@@ -564,16 +562,36 @@ export function normalizePropsOptions(
const opt = raw[key]
const prop: NormalizedProp = (normalized[normalizedKey] =
isArray(opt) || isFunction(opt) ? { type: opt } : extend({}, opt))
- if (prop) {
- const booleanIndex = getTypeIndex(Boolean, prop.type)
- const stringIndex = getTypeIndex(String, prop.type)
- prop[BooleanFlags.shouldCast] = booleanIndex > -1
- prop[BooleanFlags.shouldCastTrue] =
- stringIndex < 0 || booleanIndex < stringIndex
- // if the prop needs boolean casting or default value
- if (booleanIndex > -1 || hasOwn(prop, 'default')) {
- needCastKeys.push(normalizedKey)
+ const propType = prop.type
+ let shouldCast = false
+ let shouldCastTrue = true
+
+ if (isArray(propType)) {
+ for (let index = 0; index < propType.length; ++index) {
+ const type = propType[index]
+ const typeName = isFunction(type) && type.name
+
+ if (typeName === 'Boolean') {
+ shouldCast = true
+ break
+ } else if (typeName === 'String') {
+ // If we find `String` before `Boolean`, e.g. `[String, Boolean]`,
+ // we need to handle the casting slightly differently. Props
+ // passed as `` or ``
+ // will either be treated as strings or converted to a boolean
+ // `true`, depending on the order of the types.
+ shouldCastTrue = false
+ }
}
+ } else {
+ shouldCast = isFunction(propType) && propType.name === 'Boolean'
+ }
+
+ prop[BooleanFlags.shouldCast] = shouldCast
+ prop[BooleanFlags.shouldCastTrue] = shouldCastTrue
+ // if the prop needs boolean casting or default value
+ if (shouldCast || hasOwn(prop, 'default')) {
+ needCastKeys.push(normalizedKey)
}
}
}
@@ -595,6 +613,7 @@ function validatePropName(key: string) {
return false
}
+// dev only
// use function string name to check type constructors
// so that it works across vms / iframes.
function getType(ctor: Prop): string {
@@ -617,22 +636,6 @@ function getType(ctor: Prop): string {
return ''
}
-function isSameType(a: Prop, b: Prop): boolean {
- return getType(a) === getType(b)
-}
-
-function getTypeIndex(
- type: Prop,
- expectedTypes: PropType | void | null | true,
-): number {
- if (isArray(expectedTypes)) {
- return expectedTypes.findIndex(t => isSameType(t, type))
- } else if (isFunction(expectedTypes)) {
- return isSameType(expectedTypes, type) ? 0 : -1
- }
- return -1
-}
-
/**
* dev only
*/
From af60e3560c84e44136f950fc3d0e39b576098c6c Mon Sep 17 00:00:00 2001
From: Evan You
Date: Mon, 29 Jul 2024 22:07:40 +0800
Subject: [PATCH 14/17] test: make transition tests more stable locally
---
packages/vue/__tests__/e2e/Transition.spec.ts | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/packages/vue/__tests__/e2e/Transition.spec.ts b/packages/vue/__tests__/e2e/Transition.spec.ts
index d005f78b84d..46d865f890e 100644
--- a/packages/vue/__tests__/e2e/Transition.spec.ts
+++ b/packages/vue/__tests__/e2e/Transition.spec.ts
@@ -8,7 +8,7 @@ describe('e2e: Transition', () => {
const baseUrl = `file://${path.resolve(__dirname, './transition.html')}`
const duration = process.env.CI ? 200 : 50
- const buffer = process.env.CI ? 20 : 5
+ const buffer = 20
const transitionFinish = (time = duration) => timeout(time + buffer)
@@ -29,8 +29,6 @@ describe('e2e: Transition', () => {
test(
'basic transition',
async () => {
- await page().goto(baseUrl)
- await page().waitForSelector('#app')
await page().evaluate(() => {
const { createApp, ref } = (window as any).Vue
createApp({
@@ -1296,8 +1294,6 @@ describe('e2e: Transition', () => {
test(
'wrapping transition + fallthrough attrs',
async () => {
- await page().goto(baseUrl)
- await page().waitForSelector('#app')
await page().evaluate(() => {
const { createApp, ref } = (window as any).Vue
createApp({
From 12667da4879f980dcf2c50e36f3642d085a87d71 Mon Sep 17 00:00:00 2001
From: edison
Date: Wed, 31 Jul 2024 15:46:39 +0800
Subject: [PATCH 15/17] fix(Teleport): ensure targetAnchor and targetStart not
null during hydration (#11456)
close #11400
---
.../runtime-core/__tests__/hydration.spec.ts | 112 ++++++++++++++++++
.../runtime-core/src/components/Teleport.ts | 42 +++++--
2 files changed, 144 insertions(+), 10 deletions(-)
diff --git a/packages/runtime-core/__tests__/hydration.spec.ts b/packages/runtime-core/__tests__/hydration.spec.ts
index ea1d626f7c4..9916fafa62c 100644
--- a/packages/runtime-core/__tests__/hydration.spec.ts
+++ b/packages/runtime-core/__tests__/hydration.spec.ts
@@ -512,6 +512,118 @@ describe('SSR hydration', () => {
)
})
+ test('Teleport unmount (full integration)', async () => {
+ const Comp1 = {
+ template: `
+
+ Teleported Comp1
+
+ `,
+ }
+ const Comp2 = {
+ template: `
+ Comp2
+ `,
+ }
+
+ const toggle = ref(true)
+ const App = {
+ template: `
+
+
+
+
+ `,
+ components: {
+ Comp1,
+ Comp2,
+ },
+ setup() {
+ return { toggle }
+ },
+ }
+
+ const container = document.createElement('div')
+ const teleportContainer = document.createElement('div')
+ teleportContainer.id = 'target'
+ document.body.appendChild(teleportContainer)
+
+ // server render
+ container.innerHTML = await renderToString(h(App))
+ expect(container.innerHTML).toBe(
+ '',
+ )
+ expect(teleportContainer.innerHTML).toBe('')
+
+ // hydrate
+ createSSRApp(App).mount(container)
+ expect(container.innerHTML).toBe(
+ '',
+ )
+ expect(teleportContainer.innerHTML).toBe('Teleported Comp1')
+ expect(`Hydration children mismatch`).toHaveBeenWarned()
+
+ toggle.value = false
+ await nextTick()
+ expect(container.innerHTML).toBe('')
+ expect(teleportContainer.innerHTML).toBe('')
+ })
+
+ test('Teleport target change (full integration)', async () => {
+ const target = ref('#target1')
+ const Comp = {
+ template: `
+
+ Teleported
+
+ `,
+ setup() {
+ return { target }
+ },
+ }
+
+ const App = {
+ template: `
+
+
+
+ `,
+ components: {
+ Comp,
+ },
+ }
+
+ const container = document.createElement('div')
+ const teleportContainer1 = document.createElement('div')
+ teleportContainer1.id = 'target1'
+ const teleportContainer2 = document.createElement('div')
+ teleportContainer2.id = 'target2'
+ document.body.appendChild(teleportContainer1)
+ document.body.appendChild(teleportContainer2)
+
+ // server render
+ container.innerHTML = await renderToString(h(App))
+ expect(container.innerHTML).toBe(
+ '',
+ )
+ expect(teleportContainer1.innerHTML).toBe('')
+ expect(teleportContainer2.innerHTML).toBe('')
+
+ // hydrate
+ createSSRApp(App).mount(container)
+ expect(container.innerHTML).toBe(
+ '',
+ )
+ expect(teleportContainer1.innerHTML).toBe('Teleported')
+ expect(teleportContainer2.innerHTML).toBe('')
+ expect(`Hydration children mismatch`).toHaveBeenWarned()
+
+ target.value = '#target2'
+ await nextTick()
+ expect(teleportContainer1.innerHTML).toBe('')
+ expect(teleportContainer2.innerHTML).toBe('Teleported')
+ })
+
// compile SSR + client render fn from the same template & hydrate
test('full compiler integration', async () => {
const mounted: string[] = []
diff --git a/packages/runtime-core/src/components/Teleport.ts b/packages/runtime-core/src/components/Teleport.ts
index 65437300cff..81573cc85a7 100644
--- a/packages/runtime-core/src/components/Teleport.ts
+++ b/packages/runtime-core/src/components/Teleport.ts
@@ -107,17 +107,11 @@ export const TeleportImpl = {
const mainAnchor = (n2.anchor = __DEV__
? createComment('teleport end')
: createText(''))
- const target = (n2.target = resolveTarget(n2.props, querySelector))
- const targetStart = (n2.targetStart = createText(''))
- const targetAnchor = (n2.targetAnchor = createText(''))
insert(placeholder, container, anchor)
insert(mainAnchor, container, anchor)
- // attach a special property so we can skip teleported content in
- // renderer's nextSibling search
- targetStart[TeleportEndKey] = targetAnchor
+ const target = (n2.target = resolveTarget(n2.props, querySelector))
+ const targetAnchor = prepareAnchor(target, n2, createText, insert)
if (target) {
- insert(targetStart, target)
- insert(targetAnchor, target)
// #2652 we could be teleporting from a non-SVG tree into an SVG tree
if (namespace === 'svg' || isTargetSVG(target)) {
namespace = 'svg'
@@ -355,7 +349,7 @@ function hydrateTeleport(
slotScopeIds: string[] | null,
optimized: boolean,
{
- o: { nextSibling, parentNode, querySelector },
+ o: { nextSibling, parentNode, querySelector, insert, createText },
}: RendererInternals,
hydrateChildren: (
node: Node | null,
@@ -387,7 +381,7 @@ function hydrateTeleport(
slotScopeIds,
optimized,
)
- vnode.targetAnchor = targetNode
+ vnode.targetStart = vnode.targetAnchor = targetNode
} else {
vnode.anchor = nextSibling(node)
@@ -409,6 +403,13 @@ function hydrateTeleport(
}
}
+ // #11400 if the HTML corresponding to Teleport is not embedded in the correct position
+ // on the final page during SSR. the targetAnchor will always be null, we need to
+ // manually add targetAnchor to ensure Teleport it can properly unmount or move
+ if (!vnode.targetAnchor) {
+ prepareAnchor(target, vnode, createText, insert)
+ }
+
hydrateChildren(
targetNode,
vnode,
@@ -449,3 +450,24 @@ function updateCssVars(vnode: VNode) {
ctx.ut()
}
}
+
+function prepareAnchor(
+ target: RendererElement | null,
+ vnode: TeleportVNode,
+ createText: RendererOptions['createText'],
+ insert: RendererOptions['insert'],
+) {
+ const targetStart = (vnode.targetStart = createText(''))
+ const targetAnchor = (vnode.targetAnchor = createText(''))
+
+ // attach a special property, so we can skip teleported content in
+ // renderer's nextSibling search
+ targetStart[TeleportEndKey] = targetAnchor
+
+ if (target) {
+ insert(targetStart, target)
+ insert(targetAnchor, target)
+ }
+
+ return targetAnchor
+}
From 7b18cdb0b53a94007ca6a3675bf41b5d3153fec6 Mon Sep 17 00:00:00 2001
From: Evan You
Date: Wed, 31 Jul 2024 16:09:56 +0800
Subject: [PATCH 16/17] fix(teleport/ssr): fix Teleport hydration regression
due to targetStart anchor addition
---
.../runtime-core/__tests__/hydration.spec.ts | 100 +++++++++++++++---
.../runtime-core/src/components/Teleport.ts | 32 +++---
.../__tests__/ssrTeleport.spec.ts | 19 ++--
.../src/helpers/ssrRenderTeleport.ts | 3 +-
4 files changed, 114 insertions(+), 40 deletions(-)
diff --git a/packages/runtime-core/__tests__/hydration.spec.ts b/packages/runtime-core/__tests__/hydration.spec.ts
index 9916fafa62c..c525618b510 100644
--- a/packages/runtime-core/__tests__/hydration.spec.ts
+++ b/packages/runtime-core/__tests__/hydration.spec.ts
@@ -265,7 +265,7 @@ describe('SSR hydration', () => {
const fn = vi.fn()
const teleportContainer = document.createElement('div')
teleportContainer.id = 'teleport'
- teleportContainer.innerHTML = `foo`
+ teleportContainer.innerHTML = `foo`
document.body.appendChild(teleportContainer)
const { vnode, container } = mountWithHydration(
@@ -281,13 +281,14 @@ describe('SSR hydration', () => {
expect(vnode.anchor).toBe(container.lastChild)
expect(vnode.target).toBe(teleportContainer)
+ expect(vnode.targetStart).toBe(teleportContainer.childNodes[0])
expect((vnode.children as VNode[])[0].el).toBe(
- teleportContainer.childNodes[0],
+ teleportContainer.childNodes[1],
)
expect((vnode.children as VNode[])[1].el).toBe(
- teleportContainer.childNodes[1],
+ teleportContainer.childNodes[2],
)
- expect(vnode.targetAnchor).toBe(teleportContainer.childNodes[2])
+ expect(vnode.targetAnchor).toBe(teleportContainer.childNodes[3])
// event handler
triggerEvent('click', teleportContainer.querySelector('.foo')!)
@@ -296,7 +297,7 @@ describe('SSR hydration', () => {
msg.value = 'bar'
await nextTick()
expect(teleportContainer.innerHTML).toBe(
- `bar`,
+ `bar`,
)
})
@@ -326,7 +327,7 @@ describe('SSR hydration', () => {
const teleportHtml = ctx.teleports!['#teleport2']
expect(teleportHtml).toMatchInlineSnapshot(
- `"foofoo2"`,
+ `"foofoo2"`,
)
teleportContainer.innerHTML = teleportHtml
@@ -342,16 +343,18 @@ describe('SSR hydration', () => {
expect(teleportVnode2.anchor).toBe(container.childNodes[4])
expect(teleportVnode1.target).toBe(teleportContainer)
+ expect(teleportVnode1.targetStart).toBe(teleportContainer.childNodes[0])
expect((teleportVnode1 as any).children[0].el).toBe(
- teleportContainer.childNodes[0],
+ teleportContainer.childNodes[1],
)
- expect(teleportVnode1.targetAnchor).toBe(teleportContainer.childNodes[2])
+ expect(teleportVnode1.targetAnchor).toBe(teleportContainer.childNodes[3])
expect(teleportVnode2.target).toBe(teleportContainer)
+ expect(teleportVnode2.targetStart).toBe(teleportContainer.childNodes[4])
expect((teleportVnode2 as any).children[0].el).toBe(
- teleportContainer.childNodes[3],
+ teleportContainer.childNodes[5],
)
- expect(teleportVnode2.targetAnchor).toBe(teleportContainer.childNodes[5])
+ expect(teleportVnode2.targetAnchor).toBe(teleportContainer.childNodes[7])
// // event handler
triggerEvent('click', teleportContainer.querySelector('.foo')!)
@@ -363,7 +366,7 @@ describe('SSR hydration', () => {
msg.value = 'bar'
await nextTick()
expect(teleportContainer.innerHTML).toMatchInlineSnapshot(
- `"barbar2"`,
+ `"barbar2"`,
)
})
@@ -390,7 +393,9 @@ describe('SSR hydration', () => {
)
const teleportHtml = ctx.teleports!['#teleport3']
- expect(teleportHtml).toMatchInlineSnapshot(`""`)
+ expect(teleportHtml).toMatchInlineSnapshot(
+ `""`,
+ )
teleportContainer.innerHTML = teleportHtml
document.body.appendChild(teleportContainer)
@@ -413,7 +418,8 @@ describe('SSR hydration', () => {
expect(children[2].el).toBe(container.childNodes[6])
expect(teleportVnode.target).toBe(teleportContainer)
- expect(teleportVnode.targetAnchor).toBe(teleportContainer.childNodes[0])
+ expect(teleportVnode.targetStart).toBe(teleportContainer.childNodes[0])
+ expect(teleportVnode.targetAnchor).toBe(teleportContainer.childNodes[1])
// // event handler
triggerEvent('click', container.querySelector('.foo')!)
@@ -454,7 +460,7 @@ describe('SSR hydration', () => {
test('Teleport (as component root)', () => {
const teleportContainer = document.createElement('div')
teleportContainer.id = 'teleport4'
- teleportContainer.innerHTML = `hello`
+ teleportContainer.innerHTML = `hello`
document.body.appendChild(teleportContainer)
const wrapper = {
@@ -483,7 +489,7 @@ describe('SSR hydration', () => {
test('Teleport (nested)', () => {
const teleportContainer = document.createElement('div')
teleportContainer.id = 'teleport5'
- teleportContainer.innerHTML = `child
`
+ teleportContainer.innerHTML = `child
`
document.body.appendChild(teleportContainer)
const { vnode, container } = mountWithHydration(
@@ -498,7 +504,7 @@ describe('SSR hydration', () => {
expect(vnode.anchor).toBe(container.lastChild)
const childDivVNode = (vnode as any).children[0]
- const div = teleportContainer.firstChild
+ const div = teleportContainer.childNodes[1]
expect(childDivVNode.el).toBe(div)
expect(vnode.targetAnchor).toBe(div?.nextSibling)
@@ -548,6 +554,66 @@ describe('SSR hydration', () => {
teleportContainer.id = 'target'
document.body.appendChild(teleportContainer)
+ // server render
+ const ctx: SSRContext = {}
+ container.innerHTML = await renderToString(h(App), ctx)
+ expect(container.innerHTML).toBe(
+ '',
+ )
+ teleportContainer.innerHTML = ctx.teleports!['#target']
+
+ // hydrate
+ createSSRApp(App).mount(container)
+ expect(container.innerHTML).toBe(
+ '',
+ )
+ expect(teleportContainer.innerHTML).toBe(
+ 'Teleported Comp1',
+ )
+ expect(`Hydration children mismatch`).not.toHaveBeenWarned()
+
+ toggle.value = false
+ await nextTick()
+ expect(container.innerHTML).toBe('')
+ expect(teleportContainer.innerHTML).toBe('')
+ })
+
+ test('Teleport unmount (mismatch + full integration)', async () => {
+ const Comp1 = {
+ template: `
+
+ Teleported Comp1
+
+ `,
+ }
+ const Comp2 = {
+ template: `
+ Comp2
+ `,
+ }
+
+ const toggle = ref(true)
+ const App = {
+ template: `
+
+
+
+
+ `,
+ components: {
+ Comp1,
+ Comp2,
+ },
+ setup() {
+ return { toggle }
+ },
+ }
+
+ const container = document.createElement('div')
+ const teleportContainer = document.createElement('div')
+ teleportContainer.id = 'target'
+ document.body.appendChild(teleportContainer)
+
// server render
container.innerHTML = await renderToString(h(App))
expect(container.innerHTML).toBe(
@@ -569,7 +635,7 @@ describe('SSR hydration', () => {
expect(teleportContainer.innerHTML).toBe('')
})
- test('Teleport target change (full integration)', async () => {
+ test('Teleport target change (mismatch + full integration)', async () => {
const target = ref('#target1')
const Comp = {
template: `
diff --git a/packages/runtime-core/src/components/Teleport.ts b/packages/runtime-core/src/components/Teleport.ts
index 81573cc85a7..d868fbbc669 100644
--- a/packages/runtime-core/src/components/Teleport.ts
+++ b/packages/runtime-core/src/components/Teleport.ts
@@ -381,7 +381,8 @@ function hydrateTeleport(
slotScopeIds,
optimized,
)
- vnode.targetStart = vnode.targetAnchor = targetNode
+ vnode.targetStart = targetNode
+ vnode.targetAnchor = targetNode && nextSibling(targetNode)
} else {
vnode.anchor = nextSibling(node)
@@ -390,28 +391,29 @@ function hydrateTeleport(
// could be nested teleports
let targetAnchor = targetNode
while (targetAnchor) {
- targetAnchor = nextSibling(targetAnchor)
- if (
- targetAnchor &&
- targetAnchor.nodeType === 8 &&
- (targetAnchor as Comment).data === 'teleport anchor'
- ) {
- vnode.targetAnchor = targetAnchor
- ;(target as TeleportTargetElement)._lpa =
- vnode.targetAnchor && nextSibling(vnode.targetAnchor as Node)
- break
+ if (targetAnchor && targetAnchor.nodeType === 8) {
+ if ((targetAnchor as Comment).data === 'teleport start anchor') {
+ vnode.targetStart = targetAnchor
+ } else if ((targetAnchor as Comment).data === 'teleport anchor') {
+ vnode.targetAnchor = targetAnchor
+ ;(target as TeleportTargetElement)._lpa =
+ vnode.targetAnchor && nextSibling(vnode.targetAnchor as Node)
+ break
+ }
}
+ targetAnchor = nextSibling(targetAnchor)
}
- // #11400 if the HTML corresponding to Teleport is not embedded in the correct position
- // on the final page during SSR. the targetAnchor will always be null, we need to
- // manually add targetAnchor to ensure Teleport it can properly unmount or move
+ // #11400 if the HTML corresponding to Teleport is not embedded in the
+ // correct position on the final page during SSR. the targetAnchor will
+ // always be null, we need to manually add targetAnchor to ensure
+ // Teleport it can properly unmount or move
if (!vnode.targetAnchor) {
prepareAnchor(target, vnode, createText, insert)
}
hydrateChildren(
- targetNode,
+ targetNode && nextSibling(targetNode),
vnode,
target,
parentComponent,
diff --git a/packages/server-renderer/__tests__/ssrTeleport.spec.ts b/packages/server-renderer/__tests__/ssrTeleport.spec.ts
index a0a2f6ae0a1..78c56942636 100644
--- a/packages/server-renderer/__tests__/ssrTeleport.spec.ts
+++ b/packages/server-renderer/__tests__/ssrTeleport.spec.ts
@@ -28,7 +28,7 @@ describe('ssrRenderTeleport', () => {
)
expect(html).toBe('')
expect(ctx.teleports!['#target']).toBe(
- `content
`,
+ `content
`,
)
})
@@ -56,7 +56,9 @@ describe('ssrRenderTeleport', () => {
expect(html).toBe(
'content
',
)
- expect(ctx.teleports!['#target']).toBe(``)
+ expect(ctx.teleports!['#target']).toBe(
+ ``,
+ )
})
test('teleport rendering (vnode)', async () => {
@@ -73,7 +75,7 @@ describe('ssrRenderTeleport', () => {
)
expect(html).toBe('')
expect(ctx.teleports!['#target']).toBe(
- 'hello',
+ 'hello',
)
})
@@ -93,7 +95,9 @@ describe('ssrRenderTeleport', () => {
expect(html).toBe(
'hello',
)
- expect(ctx.teleports!['#target']).toBe(``)
+ expect(ctx.teleports!['#target']).toBe(
+ ``,
+ )
})
test('multiple teleports with same target', async () => {
@@ -115,7 +119,8 @@ describe('ssrRenderTeleport', () => {
'',
)
expect(ctx.teleports!['#target']).toBe(
- 'helloworld',
+ 'hello' +
+ 'world',
)
})
@@ -134,7 +139,7 @@ describe('ssrRenderTeleport', () => {
)
expect(html).toBe('')
expect(ctx.teleports!['#target']).toBe(
- `content
`,
+ `content
`,
)
})
@@ -169,7 +174,7 @@ describe('ssrRenderTeleport', () => {
await p
expect(html).toBe('')
expect(ctx.teleports!['#target']).toBe(
- `content
`,
+ `content
`,
)
})
})
diff --git a/packages/server-renderer/src/helpers/ssrRenderTeleport.ts b/packages/server-renderer/src/helpers/ssrRenderTeleport.ts
index d83af28c131..0806a3927be 100644
--- a/packages/server-renderer/src/helpers/ssrRenderTeleport.ts
+++ b/packages/server-renderer/src/helpers/ssrRenderTeleport.ts
@@ -29,9 +29,10 @@ export function ssrRenderTeleport(
if (disabled) {
contentRenderFn(parentPush)
- teleportContent = ``
+ teleportContent = ``
} else {
const { getBuffer, push } = createBuffer()
+ push(``)
contentRenderFn(push)
push(``)
teleportContent = getBuffer()
From 0b8ba6320eaf8b08e83d7c1e1309254dd0b021da Mon Sep 17 00:00:00 2001
From: Evan You
Date: Wed, 31 Jul 2024 16:42:04 +0800
Subject: [PATCH 17/17] release: v3.4.35
---
CHANGELOG.md | 16 ++++++++++++++++
package.json | 2 +-
packages/compiler-core/package.json | 2 +-
packages/compiler-dom/package.json | 2 +-
packages/compiler-sfc/package.json | 2 +-
packages/compiler-ssr/package.json | 2 +-
packages/reactivity/package.json | 2 +-
packages/runtime-core/package.json | 2 +-
packages/runtime-dom/package.json | 2 +-
packages/server-renderer/package.json | 2 +-
packages/shared/package.json | 2 +-
packages/vue-compat/package.json | 2 +-
packages/vue/package.json | 2 +-
13 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c253a60eb8..70d5e5a1ea4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+## [3.4.35](https://github.com/vuejs/core/compare/v3.4.34...v3.4.35) (2024-07-31)
+
+
+### Bug Fixes
+
+* **teleport/ssr:** fix Teleport hydration regression due to targetStart anchor addition ([7b18cdb](https://github.com/vuejs/core/commit/7b18cdb0b53a94007ca6a3675bf41b5d3153fec6))
+* **teleport/ssr:** ensure targetAnchor and targetStart not null during hydration ([#11456](https://github.com/vuejs/core/issues/11456)) ([12667da](https://github.com/vuejs/core/commit/12667da4879f980dcf2c50e36f3642d085a87d71)), closes [#11400](https://github.com/vuejs/core/issues/11400)
+* **types/ref:** allow getter and setter types to be unrelated ([#11442](https://github.com/vuejs/core/issues/11442)) ([e0b2975](https://github.com/vuejs/core/commit/e0b2975ef65ae6a0be0aa0a0df43fb887c665251))
+
+
+### Performance Improvements
+
+* **runtime-core:** improve efficiency of normalizePropsOptions ([#11409](https://github.com/vuejs/core/issues/11409)) ([5680142](https://github.com/vuejs/core/commit/5680142e68096c42e66da9f4c6220d040d7c56ba)), closes [#9739](https://github.com/vuejs/core/issues/9739)
+
+
+
## [3.4.34](https://github.com/vuejs/core/compare/v3.4.33...v3.4.34) (2024-07-24)
diff --git a/package.json b/package.json
index 80e74ed2089..c2b7b21ec9c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"private": true,
- "version": "3.4.34",
+ "version": "3.4.35",
"packageManager": "pnpm@9.6.0",
"type": "module",
"scripts": {
diff --git a/packages/compiler-core/package.json b/packages/compiler-core/package.json
index 41347148bfd..6237a360dcf 100644
--- a/packages/compiler-core/package.json
+++ b/packages/compiler-core/package.json
@@ -1,6 +1,6 @@
{
"name": "@vue/compiler-core",
- "version": "3.4.34",
+ "version": "3.4.35",
"description": "@vue/compiler-core",
"main": "index.js",
"module": "dist/compiler-core.esm-bundler.js",
diff --git a/packages/compiler-dom/package.json b/packages/compiler-dom/package.json
index 452e57c6707..f988fa1dd70 100644
--- a/packages/compiler-dom/package.json
+++ b/packages/compiler-dom/package.json
@@ -1,6 +1,6 @@
{
"name": "@vue/compiler-dom",
- "version": "3.4.34",
+ "version": "3.4.35",
"description": "@vue/compiler-dom",
"main": "index.js",
"module": "dist/compiler-dom.esm-bundler.js",
diff --git a/packages/compiler-sfc/package.json b/packages/compiler-sfc/package.json
index c9e771abbc7..5f2216dc8a4 100644
--- a/packages/compiler-sfc/package.json
+++ b/packages/compiler-sfc/package.json
@@ -1,6 +1,6 @@
{
"name": "@vue/compiler-sfc",
- "version": "3.4.34",
+ "version": "3.4.35",
"description": "@vue/compiler-sfc",
"main": "dist/compiler-sfc.cjs.js",
"module": "dist/compiler-sfc.esm-browser.js",
diff --git a/packages/compiler-ssr/package.json b/packages/compiler-ssr/package.json
index 27ce3f49509..7876676326a 100644
--- a/packages/compiler-ssr/package.json
+++ b/packages/compiler-ssr/package.json
@@ -1,6 +1,6 @@
{
"name": "@vue/compiler-ssr",
- "version": "3.4.34",
+ "version": "3.4.35",
"description": "@vue/compiler-ssr",
"main": "dist/compiler-ssr.cjs.js",
"types": "dist/compiler-ssr.d.ts",
diff --git a/packages/reactivity/package.json b/packages/reactivity/package.json
index 95413ce3437..9da115b811a 100644
--- a/packages/reactivity/package.json
+++ b/packages/reactivity/package.json
@@ -1,6 +1,6 @@
{
"name": "@vue/reactivity",
- "version": "3.4.34",
+ "version": "3.4.35",
"description": "@vue/reactivity",
"main": "index.js",
"module": "dist/reactivity.esm-bundler.js",
diff --git a/packages/runtime-core/package.json b/packages/runtime-core/package.json
index a590e951995..614f2beb793 100644
--- a/packages/runtime-core/package.json
+++ b/packages/runtime-core/package.json
@@ -1,6 +1,6 @@
{
"name": "@vue/runtime-core",
- "version": "3.4.34",
+ "version": "3.4.35",
"description": "@vue/runtime-core",
"main": "index.js",
"module": "dist/runtime-core.esm-bundler.js",
diff --git a/packages/runtime-dom/package.json b/packages/runtime-dom/package.json
index 51450c5a0fe..f01d252b612 100644
--- a/packages/runtime-dom/package.json
+++ b/packages/runtime-dom/package.json
@@ -1,6 +1,6 @@
{
"name": "@vue/runtime-dom",
- "version": "3.4.34",
+ "version": "3.4.35",
"description": "@vue/runtime-dom",
"main": "index.js",
"module": "dist/runtime-dom.esm-bundler.js",
diff --git a/packages/server-renderer/package.json b/packages/server-renderer/package.json
index 78a8de2fbdd..18d1a92f0d2 100644
--- a/packages/server-renderer/package.json
+++ b/packages/server-renderer/package.json
@@ -1,6 +1,6 @@
{
"name": "@vue/server-renderer",
- "version": "3.4.34",
+ "version": "3.4.35",
"description": "@vue/server-renderer",
"main": "index.js",
"module": "dist/server-renderer.esm-bundler.js",
diff --git a/packages/shared/package.json b/packages/shared/package.json
index 5df49087d2d..f0eadfca16d 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -1,6 +1,6 @@
{
"name": "@vue/shared",
- "version": "3.4.34",
+ "version": "3.4.35",
"description": "internal utils shared across @vue packages",
"main": "index.js",
"module": "dist/shared.esm-bundler.js",
diff --git a/packages/vue-compat/package.json b/packages/vue-compat/package.json
index 41d0a893b51..18d818f3e41 100644
--- a/packages/vue-compat/package.json
+++ b/packages/vue-compat/package.json
@@ -1,6 +1,6 @@
{
"name": "@vue/compat",
- "version": "3.4.34",
+ "version": "3.4.35",
"description": "Vue 3 compatibility build for Vue 2",
"main": "index.js",
"module": "dist/vue.runtime.esm-bundler.js",
diff --git a/packages/vue/package.json b/packages/vue/package.json
index 7171f086447..891900f875e 100644
--- a/packages/vue/package.json
+++ b/packages/vue/package.json
@@ -1,6 +1,6 @@
{
"name": "vue",
- "version": "3.4.34",
+ "version": "3.4.35",
"description": "The progressive JavaScript framework for building modern web UI.",
"main": "index.js",
"module": "dist/vue.runtime.esm-bundler.js",