From: daiwei Date: Wed, 18 Jun 2025 01:30:17 +0000 (+0800) Subject: chore: Merge branch 'minor' into vapor X-Git-Tag: v3.6.0-alpha.1~16^2~23 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0c42ffbbc244698c675413887b51a89f18b1cae;p=thirdparty%2Fvuejs%2Fcore.git chore: Merge branch 'minor' into vapor --- a0c42ffbbc244698c675413887b51a89f18b1cae diff --cc package.json index fb137b5511,3542fe215d..266d47d065 --- a/package.json +++ b/package.json @@@ -69,14 -69,13 +69,14 @@@ "@rollup/plugin-json": "^6.1.0", "@rollup/plugin-node-resolve": "^16.0.1", "@rollup/plugin-replace": "5.0.4", - "@swc/core": "^1.11.13", + "@swc/core": "^1.11.24", "@types/hash-sum": "^1.0.2", - "@types/node": "^22.13.14", + "@types/node": "^22.14.1", "@types/semver": "^7.7.0", "@types/serve-handler": "^6.1.4", + "@vitest/ui": "^3.0.2", - "@vitest/coverage-v8": "^3.0.9", - "@vitest/eslint-plugin": "^1.1.38", + "@vitest/coverage-v8": "^3.1.3", + "@vitest/eslint-plugin": "^1.1.44", "@vue/consolidate": "1.0.0", "conventional-changelog-cli": "^5.0.0", "enquirer": "^2.4.1", diff --cc packages/runtime-core/src/component.ts index f6ff8803c8,5b094a0d61..39e66a4b4d --- a/packages/runtime-core/src/component.ts +++ b/packages/runtime-core/src/component.ts @@@ -829,16 -803,10 +829,16 @@@ export function setupComponent ): Promise | undefined { isSSR && setInSSRSetupState(isSSR) - const { props, children } = instance.vnode + const { props, children, vi } = instance.vnode const isStateful = isStatefulComponent(instance) - initProps(instance, props, isStateful, isSSR) - initSlots(instance, children, optimized || isSSR) + + if (vi) { + // Vapor interop override - use Vapor props/attrs proxy + vi(instance) + } else { + initProps(instance, props, isStateful, isSSR) - initSlots(instance, children, optimized) ++ initSlots(instance, children, optimized || isSSR) + } const setupResult = isStateful ? setupStatefulComponent(instance, isSSR) diff --cc packages/runtime-core/src/componentSlots.ts index 66b7a0f9df,3812695431..d0ff166fb3 --- a/packages/runtime-core/src/componentSlots.ts +++ b/packages/runtime-core/src/componentSlots.ts @@@ -97,8 -106,8 +106,9 @@@ const normalizeSlot = if ( __DEV__ && currentInstance && + !currentInstance.vapor && - (!ctx || ctx.root === (currentInstance as ComponentInternalInstance).root) + !(ctx === null && currentRenderingInstance) && + !(ctx && ctx.root !== currentInstance.root) ) { warn( `Slot "${key}" invoked outside of the render function: ` + diff --cc packages/runtime-core/src/renderer.ts index 5a18d62a8e,7b73d0f770..3d02c65c16 --- a/packages/runtime-core/src/renderer.ts +++ b/packages/runtime-core/src/renderer.ts @@@ -2352,6 -2284,13 +2364,13 @@@ function baseCreateRenderer invokeArrayFns(bum) } + // remove slots content from parent renderCache + if (parent && isArray(slotCacheKeys)) { + slotCacheKeys.forEach(v => { - parent.renderCache[v] = undefined ++ ;(parent as ComponentInternalInstance).renderCache[v] = undefined + }) + } + if ( __COMPAT__ && isCompatEnabled(DeprecationTypes.INSTANCE_EVENT_HOOKS, instance) @@@ -2482,45 -2423,6 +2501,48 @@@ ) } + const mountApp: AppMountFn = ( + app, + container, + isHydrate, + namespace, + ) => { + const vnode = app._ceVNode || createVNode(app._component, app._props) + // store app context on the root VNode. + // this will be set on the root instance on initial mount. + vnode.appContext = app._context + + if (namespace === true) { + namespace = 'svg' + } else if (namespace === false) { + namespace = undefined + } + + // HMR root reload + if (__DEV__) { + app._context.reload = () => { ++ const cloned = cloneVNode(vnode) ++ // avoid hydration for hmr updating ++ cloned.el = null + // casting to ElementNamespace because TS doesn't guarantee type narrowing + // over function boundaries - render(cloneVNode(vnode), container, namespace as ElementNamespace) ++ render(cloned, container, namespace as ElementNamespace) + } + } + + if (isHydrate && hydrate) { + hydrate(vnode as VNode, container as any) + } else { + render(vnode, container, namespace) + } + + return vnode.component! + } + + const unmountApp: AppUnmountFn = app => { + render(null, app._container) + } + return { render, hydrate, diff --cc pnpm-lock.yaml index b011963929,a4e06007ae..fb8e48f5f1 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@@ -7,14 -7,14 +7,14 @@@ settings catalogs: default: '@babel/parser': - specifier: ^7.27.0 + specifier: ^7.27.2 - version: 7.27.2 + version: 7.27.5 '@babel/types': - specifier: ^7.27.0 + specifier: ^7.27.1 - version: 7.27.1 + version: 7.27.6 '@vitejs/plugin-vue': - specifier: https://pkg.pr.new/@vitejs/plugin-vue@c156992 - version: 5.2.1 + specifier: ^5.2.4 + version: 5.2.4 estree-walker: specifier: ^2.0.2 version: 2.0.2 @@@ -34,34 -34,34 +34,34 @@@ importers devDependencies: '@babel/parser': specifier: 'catalog:' - version: 7.27.2 + version: 7.27.5 '@babel/types': specifier: 'catalog:' - version: 7.27.1 + version: 7.27.6 '@rollup/plugin-alias': specifier: ^5.1.1 - version: 5.1.1(rollup@4.40.2) + version: 5.1.1(rollup@4.43.0) '@rollup/plugin-commonjs': specifier: ^28.0.3 - version: 28.0.3(rollup@4.40.2) + version: 28.0.6(rollup@4.43.0) '@rollup/plugin-json': specifier: ^6.1.0 - version: 6.1.0(rollup@4.40.2) + version: 6.1.0(rollup@4.43.0) '@rollup/plugin-node-resolve': specifier: ^16.0.1 - version: 16.0.1(rollup@4.40.2) + version: 16.0.1(rollup@4.43.0) '@rollup/plugin-replace': specifier: 5.0.4 - version: 5.0.4(rollup@4.40.2) + version: 5.0.4(rollup@4.43.0) '@swc/core': - specifier: ^1.11.13 + specifier: ^1.11.24 - version: 1.11.24 + version: 1.12.1 '@types/hash-sum': specifier: ^1.0.2 version: 1.0.2 '@types/node': - specifier: ^22.13.14 + specifier: ^22.14.1 - version: 22.14.1 + version: 22.15.32 '@types/semver': specifier: ^7.7.0 version: 7.7.0 @@@ -69,14 -69,11 +69,14 @@@ specifier: ^6.1.4 version: 6.1.4 '@vitest/coverage-v8': - specifier: ^3.0.9 + specifier: ^3.1.3 - version: 3.1.3(vitest@3.1.3(@types/node@22.14.1)(jsdom@26.1.0)(sass@1.87.0)) + version: 3.2.4(vitest@3.2.4) '@vitest/eslint-plugin': - specifier: ^1.1.38 + specifier: ^1.1.44 - version: 1.1.44(@typescript-eslint/utils@8.31.1(eslint@9.25.1)(typescript@5.6.3))(eslint@9.25.1)(typescript@5.6.3)(vitest@3.1.3(@types/node@22.14.1)(jsdom@26.1.0)(sass@1.87.0)) + version: 1.2.7(eslint@9.29.0)(typescript@5.6.3)(vitest@3.2.4) + '@vitest/ui': + specifier: ^3.0.2 + version: 3.2.4(vitest@3.2.4) '@vue/consolidate': specifier: 1.0.0 version: 1.0.0 @@@ -87,26 -84,26 +87,26 @@@ specifier: ^2.4.1 version: 2.4.1 esbuild: - specifier: ^0.25.2 + specifier: ^0.25.4 - version: 0.25.4 + version: 0.25.5 esbuild-plugin-polyfill-node: specifier: ^0.3.0 - version: 0.3.0(esbuild@0.25.4) + version: 0.3.0(esbuild@0.25.5) eslint: - specifier: ^9.23.0 + specifier: ^9.25.1 - version: 9.25.1 + version: 9.29.0 eslint-plugin-import-x: - specifier: ^4.9.4 + specifier: ^4.11.0 - version: 4.11.0(eslint@9.25.1)(typescript@5.6.3) + version: 4.15.2(@typescript-eslint/utils@8.34.1(eslint@9.29.0)(typescript@5.6.3))(eslint@9.29.0) estree-walker: specifier: 'catalog:' version: 2.0.2 jsdom: - specifier: ^26.0.0 + specifier: ^26.1.0 version: 26.1.0 lint-staged: - specifier: ^15.5.0 + specifier: ^15.5.1 - version: 15.5.1 + version: 15.5.2 lodash: specifier: ^4.17.21 version: 4.17.21 @@@ -141,20 -138,20 +141,20 @@@ specifier: ^6.0.1 version: 6.0.1 rollup: - specifier: ^4.38.0 + specifier: ^4.40.2 - version: 4.40.2 + version: 4.43.0 rollup-plugin-dts: specifier: ^6.2.1 - version: 6.2.1(rollup@4.40.2)(typescript@5.6.3) + version: 6.2.1(rollup@4.43.0)(typescript@5.6.3) rollup-plugin-esbuild: specifier: ^6.2.1 - version: 6.2.1(esbuild@0.25.4)(rollup@4.40.2) + version: 6.2.1(esbuild@0.25.5)(rollup@4.43.0) rollup-plugin-polyfill-node: specifier: ^0.13.0 - version: 0.13.0(rollup@4.40.2) + version: 0.13.0(rollup@4.43.0) semver: specifier: ^7.7.1 - version: 7.7.1 + version: 7.7.2 serve: specifier: ^14.2.4 version: 14.2.4 @@@ -174,33 -171,14 +174,33 @@@ specifier: ~5.6.2 version: 5.6.3 typescript-eslint: - specifier: ^8.28.0 + specifier: ^8.31.1 - version: 8.31.1(eslint@9.25.1)(typescript@5.6.3) + version: 8.34.1(eslint@9.29.0)(typescript@5.6.3) vite: specifier: 'catalog:' - version: 5.4.15(@types/node@22.14.1)(sass@1.87.0) + version: 6.3.5(@types/node@22.15.32)(sass@1.89.2)(yaml@2.8.0) vitest: - specifier: ^3.0.9 + specifier: ^3.1.3 - version: 3.1.3(@types/node@22.14.1)(jsdom@26.1.0)(sass@1.87.0) + version: 3.2.4(@types/node@22.15.32)(@vitest/ui@3.2.4)(jsdom@26.1.0)(sass@1.89.2)(yaml@2.8.0) + + packages-private/benchmark: + dependencies: + '@vitejs/plugin-vue': + specifier: 'catalog:' - version: https://pkg.pr.new/@vitejs/plugin-vue@c156992(vite@6.3.5(@types/node@22.15.32)(sass@1.89.2)(yaml@2.8.0))(vue@3.5.13(typescript@5.6.3)) ++ version: 5.2.4(vite@6.3.5(@types/node@22.15.32)(sass@1.89.2)(yaml@2.8.0))(vue@3.5.14(typescript@5.6.3)) + connect: + specifier: ^3.7.0 + version: 3.7.0 + sirv: + specifier: ^2.0.4 + version: 2.0.4 + vite: + specifier: 'catalog:' + version: 6.3.5(@types/node@22.15.32)(sass@1.89.2)(yaml@2.8.0) + devDependencies: + '@types/connect': + specifier: ^3.4.38 + version: 3.4.38 packages-private/dts-built-test: dependencies: @@@ -223,31 -201,6 +223,31 @@@ specifier: workspace:* version: link:../../packages/vue + packages-private/local-playground: + dependencies: + '@vueuse/core': + specifier: ^11.1.0 + version: 11.3.0(vue@packages+vue) + vue: + specifier: workspace:* + version: link:../../packages/vue + devDependencies: + '@vitejs/plugin-vue': + specifier: 'catalog:' - version: https://pkg.pr.new/@vitejs/plugin-vue@c156992(vite@6.3.5(@types/node@22.15.32)(sass@1.89.2)(yaml@2.8.0))(vue@packages+vue) ++ version: 5.2.4(vite@6.3.5(@types/node@22.15.32)(sass@1.89.2)(yaml@2.8.0))(vue@packages+vue) + '@vue/compiler-sfc': + specifier: workspace:* + version: link:../../packages/compiler-sfc + vite: + specifier: 'catalog:' + version: 6.3.5(@types/node@22.15.32)(sass@1.89.2)(yaml@2.8.0) + vite-hyper-config: + specifier: ^0.4.0 + version: 0.4.1(@types/node@22.15.32)(sass@1.89.2)(vite@6.3.5(@types/node@22.15.32)(sass@1.89.2)(yaml@2.8.0)) + vite-plugin-inspect: + specifier: ^0.8.7 + version: 0.8.9(rollup@4.43.0)(vite@6.3.5(@types/node@22.15.32)(sass@1.89.2)(yaml@2.8.0)) + packages-private/sfc-playground: dependencies: '@vue/repl': @@@ -265,10 -218,10 +265,10 @@@ devDependencies: '@vitejs/plugin-vue': specifier: 'catalog:' - version: https://pkg.pr.new/@vitejs/plugin-vue@c156992(vite@6.3.5(@types/node@22.15.32)(sass@1.89.2)(yaml@2.8.0))(vue@packages+vue) - version: 5.2.4(vite@5.4.15(@types/node@22.14.1)(sass@1.87.0))(vue@packages+vue) ++ version: 5.2.4(vite@6.3.5(@types/node@22.15.32)(sass@1.89.2)(yaml@2.8.0))(vue@packages+vue) vite: specifier: 'catalog:' - version: 5.4.15(@types/node@22.14.1)(sass@1.87.0) + version: 6.3.5(@types/node@22.15.32)(sass@1.89.2)(yaml@2.8.0) packages-private/template-explorer: dependencies: @@@ -282,35 -232,14 +282,35 @@@ specifier: ^1.2.1 version: 1.2.1 + packages-private/vapor-e2e-test: + devDependencies: + '@types/connect': + specifier: ^3.4.38 + version: 3.4.38 + '@vitejs/plugin-vue': + specifier: 'catalog:' - version: https://pkg.pr.new/@vitejs/plugin-vue@c156992(vite@6.3.5(@types/node@22.15.32)(sass@1.89.2)(yaml@2.8.0))(vue@packages+vue) ++ version: 5.2.4(vite@6.3.5(@types/node@22.15.32)(sass@1.89.2)(yaml@2.8.0))(vue@packages+vue) + connect: + specifier: ^3.7.0 + version: 3.7.0 + sirv: + specifier: ^2.0.4 + version: 2.0.4 + vite: + specifier: 'catalog:' + version: 6.3.5(@types/node@22.15.32)(sass@1.89.2)(yaml@2.8.0) + vue: + specifier: workspace:* + version: link:../../packages/vue + packages-private/vite-debug: devDependencies: '@vitejs/plugin-vue': specifier: 'catalog:' - version: https://pkg.pr.new/@vitejs/plugin-vue@c156992(vite@6.3.5(@types/node@22.15.32)(sass@1.89.2)(yaml@2.8.0))(vue@packages+vue) - version: 5.2.4(vite@5.4.15(@types/node@22.14.1)(sass@1.87.0))(vue@packages+vue) ++ version: 5.2.4(vite@6.3.5(@types/node@22.15.32)(sass@1.89.2)(yaml@2.8.0))(vue@packages+vue) vite: specifier: 'catalog:' - version: 5.4.15(@types/node@22.14.1)(sass@1.87.0) + version: 6.3.5(@types/node@22.15.32)(sass@1.89.2)(yaml@2.8.0) vue: specifier: workspace:* version: link:../../packages/vue @@@ -407,8 -333,8 +407,8 @@@ specifier: ^3.0.3 version: 3.0.3 sass: - specifier: ^1.86.0 + specifier: ^1.86.3 - version: 1.87.0 + version: 1.89.2 packages/compiler-ssr: dependencies: @@@ -1117,11 -999,8 +1117,11 @@@ packages resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} engines: {node: '>=14'} + '@polka/url@1.0.0-next.29': + resolution: {integrity: sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==} + - '@puppeteer/browsers@2.8.0': - resolution: {integrity: sha512-yTwt2KWRmCQAfhvbCRjebaSX8pV1//I0Y3g+A7f/eS7gf0l4eRJoUCvcYdVtboeU4CTOZQuqYbZNS8aBYb8ROQ==} + '@puppeteer/browsers@2.10.4': + resolution: {integrity: sha512-9DxbZx+XGMNdjBynIs4BRSz+M3iRDeB7qRcAr6UORFLphCIM2x3DXgOucvADiifcqCE4XePFUKcnaAMyGbrDlQ==} engines: {node: '>=18'} hasBin: true @@@ -1611,70 -1581,27 +1610,70 @@@ vite: optional: true - '@vitest/pretty-format@3.1.3': - resolution: {integrity: sha512-i6FDiBeJUGLDKADw2Gb01UtUNb12yyXAqC/mmRWuYl+m/U9GS7s8us5ONmGkGpUUo7/iAYzI2ePVfOZTYvUifA==} + '@vitest/pretty-format@3.2.4': + resolution: {integrity: sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==} + + '@vitest/runner@3.2.4': + resolution: {integrity: sha512-oukfKT9Mk41LreEW09vt45f8wx7DordoWUZMYdY/cyAk7w5TWkTRCNZYF7sX7n2wB7jyGAl74OxgwhPgKaqDMQ==} + + '@vitest/snapshot@3.2.4': + resolution: {integrity: sha512-dEYtS7qQP2CjU27QBC5oUOxLE/v5eLkGqPE0ZKEIDGMs4vKWe7IjgLOeauHsR0D5YuuycGRO5oSRXnwnmA78fQ==} + + '@vitest/spy@3.2.4': + resolution: {integrity: sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==} - '@vitest/runner@3.1.3': - resolution: {integrity: sha512-Tae+ogtlNfFei5DggOsSUvkIaSuVywujMj6HzR97AHK6XK8i3BuVyIifWAm/sE3a15lF5RH9yQIrbXYuo0IFyA==} + '@vitest/ui@3.2.4': + resolution: {integrity: sha512-hGISOaP18plkzbWEcP/QvtRW1xDXF2+96HbEX6byqQhAUbiS5oH6/9JwW+QsQCIYON2bI6QZBF+2PvOmrRZ9wA==} + peerDependencies: + vitest: 3.2.4 + + '@vitest/utils@3.2.4': + resolution: {integrity: sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==} - '@vue/compiler-core@3.5.13': - resolution: {integrity: sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==} - '@vitest/snapshot@3.1.3': - resolution: {integrity: sha512-XVa5OPNTYUsyqG9skuUkFzAeFnEzDp8hQu7kZ0N25B1+6KjGm4hWLtURyBbsIAOekfWQ7Wuz/N/XXzgYO3deWQ==} ++ '@vue/compiler-core@3.5.14': ++ resolution: {integrity: sha512-k7qMHMbKvoCXIxPhquKQVw3Twid3Kg4s7+oYURxLGRd56LiuHJVrvFKI4fm2AM3c8apqODPfVJGoh8nePbXMRA==} - '@vue/compiler-dom@3.5.13': - resolution: {integrity: sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==} - '@vitest/spy@3.1.3': - resolution: {integrity: sha512-x6w+ctOEmEXdWaa6TO4ilb7l9DxPR5bwEb6hILKuxfU1NqWT2mpJD9NJN7t3OTfxmVlOMrvtoFJGdgyzZ605lQ==} ++ '@vue/compiler-dom@3.5.14': ++ resolution: {integrity: sha512-1aOCSqxGOea5I80U2hQJvXYpPm/aXo95xL/m/mMhgyPUsKe9jhjwWpziNAw7tYRnbz1I61rd9Mld4W9KmmRoug==} - '@vue/compiler-sfc@3.5.13': - resolution: {integrity: sha512-6VdaljMpD82w6c2749Zhf5T9u5uLBWKnVue6XWxprDobftnletJ8+oel7sexFfM3qIxNmVE7LSFGTpv6obNyaQ==} - '@vitest/utils@3.1.3': - resolution: {integrity: sha512-2Ltrpht4OmHO9+c/nmHtF09HWiyWdworqnHIwjfvDyWjuwKbdkcS9AnhsDn+8E2RM4x++foD1/tNuLPVvWG1Rg==} ++ '@vue/compiler-sfc@3.5.14': ++ resolution: {integrity: sha512-9T6m/9mMr81Lj58JpzsiSIjBgv2LiVoWjIVa7kuXHICUi8LiDSIotMpPRXYJsXKqyARrzjT24NAwttrMnMaCXA==} + - '@vue/compiler-ssr@3.5.13': - resolution: {integrity: sha512-wMH6vrYHxQl/IybKJagqbquvxpWCuVYpoUJfCqFZwa/JY1GdATAQ+TgVtgrwwMZ0D07QhA99rs/EAAWfvG6KpA==} ++ '@vue/compiler-ssr@3.5.14': ++ resolution: {integrity: sha512-Y0G7PcBxr1yllnHuS/NxNCSPWnRGH4Ogrp0tsLA5QemDZuJLs99YjAKQ7KqkHE0vCg4QTKlQzXLKCMF7WPSl7Q==} '@vue/consolidate@1.0.0': resolution: {integrity: sha512-oTyUE+QHIzLw2PpV14GD/c7EohDyP64xCniWTcqcEmTd699eFqTIwOmtDYjcO1j3QgdXoJEoWv1/cCdLrRoOfg==} engines: {node: '>= 0.12.0'} - '@vue/reactivity@3.5.13': - resolution: {integrity: sha512-NaCwtw8o48B9I6L1zl2p41OHo/2Z4wqYGGIK1Khu5T7yxrn+ATOixn/Udn2m+6kZKB/J7cuT9DbWWhRxqixACg==} - '@vue/repl@4.5.1': - resolution: {integrity: sha512-YYXvFue2GOrZ6EWnoA8yQVKzdCIn45+tpwJHzMof1uwrgyYAVY9ynxCsDYeAuWcpaAeylg/nybhFuqiFy2uvYA==} ++ '@vue/reactivity@3.5.14': ++ resolution: {integrity: sha512-7cK1Hp343Fu/SUCCO52vCabjvsYu7ZkOqyYu7bXV9P2yyfjUMUXHZafEbq244sP7gf+EZEz+77QixBTuEqkQQw==} + + '@vue/repl@4.6.1': + resolution: {integrity: sha512-tgeEa+QXzqbFsAIbq/dCXzOJxIW2Nq1F79KXRjbKyPt1ODpCx86bDbFgNzFcBEK3In2/mjPTMpN7fSD6Ig0Qsw==} + - '@vue/runtime-core@3.5.13': - resolution: {integrity: sha512-Fj4YRQ3Az0WTZw1sFe+QDb0aXCerigEpw418pw1HBUKFtnQHWzwojaukAs2X/c9DQz4MQ4bsXTGlcpGxU/RCIw==} ++ '@vue/runtime-core@3.5.14': ++ resolution: {integrity: sha512-w9JWEANwHXNgieAhxPpEpJa+0V5G0hz3NmjAZwlOebtfKyp2hKxKF0+qSh0Xs6/PhfGihuSdqMprMVcQU/E6ag==} + - '@vue/runtime-dom@3.5.13': - resolution: {integrity: sha512-dLaj94s93NYLqjLiyFzVs9X6dWhTdAlEAciC3Moq7gzAc13VJUdCnjjRurNM6uTLFATRHexHCTu/Xp3eW6yoog==} ++ '@vue/runtime-dom@3.5.14': ++ resolution: {integrity: sha512-lCfR++IakeI35TVR80QgOelsUIdcKjd65rWAMfdSlCYnaEY5t3hYwru7vvcWaqmrK+LpI7ZDDYiGU5V3xjMacw==} + - '@vue/server-renderer@3.5.13': - resolution: {integrity: sha512-wAi4IRJV/2SAW3htkTlB+dHeRmpTiVIK1OGLWV1yeStVSebSQQOwGwIq0D3ZIoBj2C2qpgz5+vX9iEBkTdk5YA==} ++ '@vue/server-renderer@3.5.14': ++ resolution: {integrity: sha512-Rf/ISLqokIvcySIYnv3tNWq40PLpNLDLSJwwVWzG6MNtyIhfbcrAxo5ZL9nARJhqjZyWWa40oRb2IDuejeuv6w==} + peerDependencies: - vue: 3.5.13 ++ vue: 3.5.14 + - '@vue/shared@3.5.13': - resolution: {integrity: sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==} ++ '@vue/shared@3.5.14': ++ resolution: {integrity: sha512-oXTwNxVfc9EtP1zzXAlSlgARLXNC84frFYkS0HHz0h3E4WZSP9sywqjqzGCP9Y34M8ipNmd380pVgmMuwELDyQ==} + + '@vueuse/core@11.3.0': + resolution: {integrity: sha512-7OC4Rl1f9G8IT6rUfi9JrKiXy4bfmHhZ5x2Ceojy0jnd3mHNEvV4JaRygH362ror6/NZ+Nl+n13LPzGiPN8cKA==} + + '@vueuse/metadata@11.3.0': + resolution: {integrity: sha512-pwDnDspTqtTo2HwfLw4Rp6yywuuBdYnPYDq+mO38ZYKGebCUQC/nVj/PXSiK9HX5otxLz8Fn7ECPbjiRz2CC3g==} + + '@vueuse/shared@11.3.0': + resolution: {integrity: sha512-P8gSSWQeucH5821ek2mn/ciCk+MS/zoRKqdQIM3bHq6p7GXDAJLmnRRKmF5F65sAVJIfzQlwR3aDzwCn10s8hA==} '@zeit/schemas@2.36.0': resolution: {integrity: sha512-7kjMwcChYEzMKjeex9ZFXkt1AyNov9R5HZtjBKVsmVpw7pa7ZtlCGvCBC2vnnXctaYN+aRI61HjIqeetZW5ROg==} @@@ -1883,12 -1790,12 +1882,12 @@@ resolution: {integrity: sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==} engines: {node: '>= 16'} - chokidar@4.0.1: - resolution: {integrity: sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==} + chokidar@4.0.3: + resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==} engines: {node: '>= 14.16.0'} - chromium-bidi@2.1.2: - resolution: {integrity: sha512-vtRWBK2uImo5/W2oG6/cDkkHSm+2t6VHgnj+Rcwhb0pP74OoUb4GipyRX/T/y39gYQPhioP0DPShn+A7P6CHNw==} + chromium-bidi@5.1.0: + resolution: {integrity: sha512-9MSRhWRVoRPDG0TgzkHrshFSJJNZzfY5UFqUMuksg7zL1yoZIZ3jLB0YAgHclbiAxPI86pBnwDX1tbzoiV8aFw==} peerDependencies: devtools-protocol: '*' @@@ -3818,25 -3598,6 +3817,25 @@@ resolution: {integrity: sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==} engines: {node: '>=0.10.0'} + vue-demi@0.14.10: + resolution: {integrity: sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==} + engines: {node: '>=12'} + hasBin: true + peerDependencies: + '@vue/composition-api': ^1.0.0-rc.1 + vue: ^3.0.0-0 || ^2.6.0 + peerDependenciesMeta: + '@vue/composition-api': + optional: true + - vue@3.5.13: - resolution: {integrity: sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==} ++ vue@3.5.14: ++ resolution: {integrity: sha512-LbOm50/vZFG6Mhy6KscQYXZMQ0LMCC/y40HDJPPvGFQ+i/lUH+PJHR6C3assgOQiXdl6tAfsXHbXYVBZZu65ew==} + peerDependencies: + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + w3c-xmlserializer@5.0.0: resolution: {integrity: sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==} engines: {node: '>=18'} @@@ -4356,11 -4115,9 +4355,11 @@@ snapshots '@pkgjs/parseargs@0.11.0': optional: true + '@polka/url@1.0.0-next.29': {} + - '@puppeteer/browsers@2.8.0': + '@puppeteer/browsers@2.10.4': dependencies: - debug: 4.4.0 + debug: 4.4.1 extract-zip: 2.0.1 progress: 2.0.3 proxy-agent: 6.5.0 @@@ -4673,81 -4483,86 +4672,81 @@@ transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.31.1(eslint@9.25.1)(typescript@5.6.3)': + '@typescript-eslint/visitor-keys@8.34.1': dependencies: - '@eslint-community/eslint-utils': 4.6.1(eslint@9.25.1) - '@typescript-eslint/scope-manager': 8.31.1 - '@typescript-eslint/types': 8.31.1 - '@typescript-eslint/typescript-estree': 8.31.1(typescript@5.6.3) - eslint: 9.25.1 - typescript: 5.6.3 - transitivePeerDependencies: - - supports-color + '@typescript-eslint/types': 8.34.1 + eslint-visitor-keys: 4.2.1 - '@typescript-eslint/visitor-keys@8.31.0': - dependencies: - '@typescript-eslint/types': 8.31.0 - eslint-visitor-keys: 4.2.0 + '@unrs/resolver-binding-android-arm-eabi@1.9.0': + optional: true - '@typescript-eslint/visitor-keys@8.31.1': - dependencies: - '@typescript-eslint/types': 8.31.1 - eslint-visitor-keys: 4.2.0 + '@unrs/resolver-binding-android-arm64@1.9.0': + optional: true - '@unrs/resolver-binding-darwin-arm64@1.7.2': + '@unrs/resolver-binding-darwin-arm64@1.9.0': optional: true - '@unrs/resolver-binding-darwin-x64@1.7.2': + '@unrs/resolver-binding-darwin-x64@1.9.0': optional: true - '@unrs/resolver-binding-freebsd-x64@1.7.2': + '@unrs/resolver-binding-freebsd-x64@1.9.0': optional: true - '@unrs/resolver-binding-linux-arm-gnueabihf@1.7.2': + '@unrs/resolver-binding-linux-arm-gnueabihf@1.9.0': optional: true - '@unrs/resolver-binding-linux-arm-musleabihf@1.7.2': + '@unrs/resolver-binding-linux-arm-musleabihf@1.9.0': optional: true - '@unrs/resolver-binding-linux-arm64-gnu@1.7.2': + '@unrs/resolver-binding-linux-arm64-gnu@1.9.0': optional: true - '@unrs/resolver-binding-linux-arm64-musl@1.7.2': + '@unrs/resolver-binding-linux-arm64-musl@1.9.0': optional: true - '@unrs/resolver-binding-linux-ppc64-gnu@1.7.2': + '@unrs/resolver-binding-linux-ppc64-gnu@1.9.0': optional: true - '@unrs/resolver-binding-linux-riscv64-gnu@1.7.2': + '@unrs/resolver-binding-linux-riscv64-gnu@1.9.0': optional: true - '@unrs/resolver-binding-linux-riscv64-musl@1.7.2': + '@unrs/resolver-binding-linux-riscv64-musl@1.9.0': optional: true - '@unrs/resolver-binding-linux-s390x-gnu@1.7.2': + '@unrs/resolver-binding-linux-s390x-gnu@1.9.0': optional: true - '@unrs/resolver-binding-linux-x64-gnu@1.7.2': + '@unrs/resolver-binding-linux-x64-gnu@1.9.0': optional: true - '@unrs/resolver-binding-linux-x64-musl@1.7.2': + '@unrs/resolver-binding-linux-x64-musl@1.9.0': optional: true - '@unrs/resolver-binding-wasm32-wasi@1.7.2': + '@unrs/resolver-binding-wasm32-wasi@1.9.0': dependencies: - '@napi-rs/wasm-runtime': 0.2.9 + '@napi-rs/wasm-runtime': 0.2.11 optional: true - '@unrs/resolver-binding-win32-arm64-msvc@1.7.2': + '@unrs/resolver-binding-win32-arm64-msvc@1.9.0': optional: true - '@unrs/resolver-binding-win32-ia32-msvc@1.7.2': + '@unrs/resolver-binding-win32-ia32-msvc@1.9.0': optional: true - '@unrs/resolver-binding-win32-x64-msvc@1.7.2': + '@unrs/resolver-binding-win32-x64-msvc@1.9.0': optional: true - '@vitejs/plugin-vue@https://pkg.pr.new/@vitejs/plugin-vue@c156992(vite@6.3.5(@types/node@22.15.32)(sass@1.89.2)(yaml@2.8.0))(vue@3.5.13(typescript@5.6.3))': - '@vitejs/plugin-vue@5.2.4(vite@5.4.15(@types/node@22.14.1)(sass@1.87.0))(vue@packages+vue)': ++ '@vitejs/plugin-vue@5.2.4(vite@6.3.5(@types/node@22.15.32)(sass@1.89.2)(yaml@2.8.0))(vue@3.5.14(typescript@5.6.3))': dependencies: - vite: 5.4.15(@types/node@22.14.1)(sass@1.87.0) + vite: 6.3.5(@types/node@22.15.32)(sass@1.89.2)(yaml@2.8.0) - vue: 3.5.13(typescript@5.6.3) ++ vue: 3.5.14(typescript@5.6.3) + - '@vitejs/plugin-vue@https://pkg.pr.new/@vitejs/plugin-vue@c156992(vite@6.3.5(@types/node@22.15.32)(sass@1.89.2)(yaml@2.8.0))(vue@packages+vue)': ++ '@vitejs/plugin-vue@5.2.4(vite@6.3.5(@types/node@22.15.32)(sass@1.89.2)(yaml@2.8.0))(vue@packages+vue)': + dependencies: + vite: 6.3.5(@types/node@22.15.32)(sass@1.89.2)(yaml@2.8.0) vue: link:packages/vue - '@vitest/coverage-v8@3.1.3(vitest@3.1.3(@types/node@22.14.1)(jsdom@26.1.0)(sass@1.87.0))': + '@vitest/coverage-v8@3.2.4(vitest@3.2.4)': dependencies: '@ampproject/remapping': 2.3.0 '@bcoe/v8-coverage': 1.0.2 @@@ -4808,103 -4618,19 +4807,103 @@@ magic-string: 0.30.17 pathe: 2.0.3 - '@vitest/spy@3.1.3': + '@vitest/spy@3.2.4': + dependencies: + tinyspy: 4.0.3 + + '@vitest/ui@3.2.4(vitest@3.2.4)': dependencies: - tinyspy: 3.0.2 + '@vitest/utils': 3.2.4 + fflate: 0.8.2 + flatted: 3.3.3 + pathe: 2.0.3 + sirv: 3.0.1 + tinyglobby: 0.2.14 + tinyrainbow: 2.0.0 + vitest: 3.2.4(@types/node@22.15.32)(@vitest/ui@3.2.4)(jsdom@26.1.0)(sass@1.89.2)(yaml@2.8.0) - '@vitest/utils@3.1.3': + '@vitest/utils@3.2.4': dependencies: - '@vitest/pretty-format': 3.1.3 - loupe: 3.1.3 + '@vitest/pretty-format': 3.2.4 + loupe: 3.1.4 tinyrainbow: 2.0.0 - '@vue/compiler-core@3.5.13': ++ '@vue/compiler-core@3.5.14': + dependencies: + '@babel/parser': 7.27.5 - '@vue/shared': 3.5.13 ++ '@vue/shared': 3.5.14 + entities: 4.5.0 + estree-walker: 2.0.2 + source-map-js: 1.2.1 + - '@vue/compiler-dom@3.5.13': ++ '@vue/compiler-dom@3.5.14': + dependencies: - '@vue/compiler-core': 3.5.13 - '@vue/shared': 3.5.13 ++ '@vue/compiler-core': 3.5.14 ++ '@vue/shared': 3.5.14 + - '@vue/compiler-sfc@3.5.13': ++ '@vue/compiler-sfc@3.5.14': + dependencies: + '@babel/parser': 7.27.5 - '@vue/compiler-core': 3.5.13 - '@vue/compiler-dom': 3.5.13 - '@vue/compiler-ssr': 3.5.13 - '@vue/shared': 3.5.13 ++ '@vue/compiler-core': 3.5.14 ++ '@vue/compiler-dom': 3.5.14 ++ '@vue/compiler-ssr': 3.5.14 ++ '@vue/shared': 3.5.14 + estree-walker: 2.0.2 + magic-string: 0.30.17 + postcss: 8.5.6 + source-map-js: 1.2.1 + - '@vue/compiler-ssr@3.5.13': ++ '@vue/compiler-ssr@3.5.14': + dependencies: - '@vue/compiler-dom': 3.5.13 - '@vue/shared': 3.5.13 ++ '@vue/compiler-dom': 3.5.14 ++ '@vue/shared': 3.5.14 + '@vue/consolidate@1.0.0': {} - '@vue/reactivity@3.5.13': - '@vue/repl@4.5.1': {} ++ '@vue/reactivity@3.5.14': + dependencies: - '@vue/shared': 3.5.13 ++ '@vue/shared': 3.5.14 + + '@vue/repl@4.6.1': {} + - '@vue/runtime-core@3.5.13': ++ '@vue/runtime-core@3.5.14': + dependencies: - '@vue/reactivity': 3.5.13 - '@vue/shared': 3.5.13 ++ '@vue/reactivity': 3.5.14 ++ '@vue/shared': 3.5.14 + - '@vue/runtime-dom@3.5.13': ++ '@vue/runtime-dom@3.5.14': + dependencies: - '@vue/reactivity': 3.5.13 - '@vue/runtime-core': 3.5.13 - '@vue/shared': 3.5.13 ++ '@vue/reactivity': 3.5.14 ++ '@vue/runtime-core': 3.5.14 ++ '@vue/shared': 3.5.14 + csstype: 3.1.3 + - '@vue/server-renderer@3.5.13(vue@3.5.13(typescript@5.6.3))': ++ '@vue/server-renderer@3.5.14(vue@3.5.14(typescript@5.6.3))': + dependencies: - '@vue/compiler-ssr': 3.5.13 - '@vue/shared': 3.5.13 - vue: 3.5.13(typescript@5.6.3) ++ '@vue/compiler-ssr': 3.5.14 ++ '@vue/shared': 3.5.14 ++ vue: 3.5.14(typescript@5.6.3) + - '@vue/shared@3.5.13': {} ++ '@vue/shared@3.5.14': {} + + '@vueuse/core@11.3.0(vue@packages+vue)': + dependencies: + '@types/web-bluetooth': 0.0.20 + '@vueuse/metadata': 11.3.0 + '@vueuse/shared': 11.3.0(vue@packages+vue) + vue-demi: 0.14.10(vue@packages+vue) + transitivePeerDependencies: + - '@vue/composition-api' + - vue + + '@vueuse/metadata@11.3.0': {} + + '@vueuse/shared@11.3.0(vue@packages+vue)': + dependencies: + vue-demi: 0.14.10(vue@packages+vue) + transitivePeerDependencies: + - '@vue/composition-api' + - vue '@zeit/schemas@2.36.0': {} @@@ -5093,15 -4807,15 +5092,15 @@@ check-error@2.1.1: {} - chokidar@4.0.1: + chokidar@4.0.3: dependencies: - readdirp: 4.0.1 + readdirp: 4.1.2 - chromium-bidi@2.1.2(devtools-protocol@0.0.1413902): + chromium-bidi@5.1.0(devtools-protocol@0.0.1439962): dependencies: - devtools-protocol: 0.0.1413902 + devtools-protocol: 0.0.1439962 mitt: 3.0.1 - zod: 3.24.1 + zod: 3.25.67 cli-boxes@3.0.0: {} @@@ -6516,12 -6170,12 +6515,12 @@@ punycode@2.3.1: {} - puppeteer-core@24.4.0: + puppeteer-core@24.8.2: dependencies: - '@puppeteer/browsers': 2.8.0 - chromium-bidi: 2.1.2(devtools-protocol@0.0.1413902) + '@puppeteer/browsers': 2.10.4 + chromium-bidi: 5.1.0(devtools-protocol@0.0.1439962) - debug: 4.4.0 + debug: 4.4.1 - devtools-protocol: 0.0.1413902 + devtools-protocol: 0.0.1439962 typed-query-selector: 2.12.0 ws: 8.18.2 transitivePeerDependencies: @@@ -6530,16 -6183,15 +6529,16 @@@ - supports-color - utf-8-validate - puppeteer@24.4.0(typescript@5.6.3): + puppeteer@24.8.2(typescript@5.6.3): dependencies: - '@puppeteer/browsers': 2.8.0 - chromium-bidi: 2.1.2(devtools-protocol@0.0.1413902) + '@puppeteer/browsers': 2.10.4 + chromium-bidi: 5.1.0(devtools-protocol@0.0.1439962) cosmiconfig: 9.0.0(typescript@5.6.3) - devtools-protocol: 0.0.1413902 - puppeteer-core: 24.4.0 + devtools-protocol: 0.0.1439962 + puppeteer-core: 24.8.2 typed-query-selector: 2.12.0 transitivePeerDependencies: + - bare-buffer - bufferutil - supports-color - typescript @@@ -7172,20 -6768,6 +7171,20 @@@ void-elements@3.1.0: {} + vue-demi@0.14.10(vue@packages+vue): + dependencies: + vue: link:packages/vue + - vue@3.5.13(typescript@5.6.3): ++ vue@3.5.14(typescript@5.6.3): + dependencies: - '@vue/compiler-dom': 3.5.13 - '@vue/compiler-sfc': 3.5.13 - '@vue/runtime-dom': 3.5.13 - '@vue/server-renderer': 3.5.13(vue@3.5.13(typescript@5.6.3)) - '@vue/shared': 3.5.13 ++ '@vue/compiler-dom': 3.5.14 ++ '@vue/compiler-sfc': 3.5.14 ++ '@vue/runtime-dom': 3.5.14 ++ '@vue/server-renderer': 3.5.14(vue@3.5.14(typescript@5.6.3)) ++ '@vue/shared': 3.5.14 + optionalDependencies: + typescript: 5.6.3 + w3c-xmlserializer@5.0.0: dependencies: xml-name-validator: 5.0.0 diff --cc pnpm-workspace.yaml index f4714d50ac,10d239c9c0..8a050b7620 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@@ -3,10 -3,25 +3,25 @@@ packages - 'packages-private/*' catalog: - '@babel/parser': ^7.27.0 - '@babel/types': ^7.27.0 + '@babel/parser': ^7.27.2 + '@babel/types': ^7.27.1 'estree-walker': ^2.0.2 + 'vite': ^6.1.0 - '@vitejs/plugin-vue': https://pkg.pr.new/@vitejs/plugin-vue@c156992 ++ '@vitejs/plugin-vue': ^5.2.4 'magic-string': ^0.30.17 'source-map-js': ^1.2.1 - 'vite': ^5.4.15 - '@vitejs/plugin-vue': ^5.2.4 + + onlyBuiltDependencies: + - '@swc/core' + - 'esbuild' + - 'puppeteer' + - 'simple-git-hooks' + - 'unrs-resolver' + + peerDependencyRules: + allowedVersions: + 'typescript-eslint>eslint': '^9.0.0' + '@typescript-eslint/eslint-plugin>eslint': '^9.0.0' + '@typescript-eslint/parser>eslint': '^9.0.0' + '@typescript-eslint/type-utils>eslint': '^9.0.0' + '@typescript-eslint/utils>eslint': '^9.0.0'