From d24cba0b3dbfb00052404f52186c15fb74699c37 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Nov 2026 10:04:32 +0000 Subject: [PATCH 1/2] build(deps-dev): bump the testing group across 1 directory with 2 updates Bumps the testing group with 2 updates in the / directory: [@vitest/ui](https://github.com/vitest-dev/vitest/tree/HEAD/packages/ui) and [vitest](https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest). Updates `@vitest/ui` from 5.0.5 to 5.1.0 - [Release notes](https://github.com/vitest-dev/vitest/releases) - [Changelog](https://github.com/vitest-dev/vitest/blob/main/docs/releases.md) - [Commits](https://github.com/vitest-dev/vitest/commits/v5.1.0/packages/ui) Updates `vitest` from 5.0.5 to 5.1.0 - [Release notes](https://github.com/vitest-dev/vitest/releases) - [Changelog](https://github.com/vitest-dev/vitest/blob/main/docs/releases.md) - [Commits](https://github.com/vitest-dev/vitest/commits/v5.1.0/packages/vitest) --- updated-dependencies: - dependency-name: "@vitest/ui" dependency-version: 5.1.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: testing - dependency-name: vitest dependency-version: 5.1.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: testing ... Signed-off-by: dependabot[bot] --- package.json | 4 +-- pnpm-lock.yaml | 68 +++++++++++++++++++++++++------------------------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/package.json b/package.json index 68a1037a..8de1a9c3 100644 --- a/package.json +++ b/package.json @@ -113,7 +113,7 @@ "@types/node": "26.6.6", "@vitejs/plugin-vue": "6.0.10", "@vitejs/plugin-vue-jsx": "5.1.6", - "@vitest/ui": "5.0.5", + "@vitest/ui": "5.1.0", "@vue/test-utils": "2.5.1", "autoprefixer": "10.6.2", "eslint": "10.14.0", @@ -139,7 +139,7 @@ "vite-plugin-ejs": "2.0.0", "vite-plugin-inspect": "12.1.0", "vite-svg-loader": "5.1.3", - "vitest": "5.0.5", + "vitest": "5.1.0", "vue-eslint-parser": "10.4.1", "vue-tsc": "3.3.14", "yaml": "2.9.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0b87609e..f2a93e19 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -318,8 +318,8 @@ importers: specifier: 5.1.6 version: 5.1.6(vite@8.3.5(@types/node@26.6.6)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.107.1)(yaml@2.9.1))(vue@3.5.45(typescript@6.0.3)) '@vitest/ui': - specifier: 5.0.5 - version: 5.0.5(vitest@5.0.5) + specifier: 5.1.0 + version: 5.1.0(vitest@5.1.0) '@vue/test-utils': specifier: 2.5.1 version: 2.5.1(@vue/compiler-dom@3.5.45)(@vue/server-renderer@3.5.44)(vue@3.5.45(typescript@6.0.3)) @@ -399,8 +399,8 @@ importers: specifier: 5.1.3 version: 5.1.3(vue@3.5.45(typescript@6.0.3)) vitest: - specifier: 5.0.5 - version: 5.0.5(@types/node@26.6.6)(@vitest/ui@5.0.5)(happy-dom@21.0.4)(msw@3.0.4(@types/node@26.6.6)(graphql@16.14.2)(typescript@6.0.3)(vite@8.3.5(@types/node@26.6.6)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.107.1)(yaml@2.9.1)))(vite@8.3.5(@types/node@26.6.6)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.107.1)(yaml@2.9.1)) + specifier: 5.1.0 + version: 5.1.0(@types/node@26.6.6)(@vitest/ui@5.1.0)(happy-dom@21.0.4)(msw@3.0.4(@types/node@26.6.6)(graphql@16.14.2)(typescript@6.0.3)(vite@8.3.5(@types/node@26.6.6)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.107.1)(yaml@2.9.1)))(vite@8.3.5(@types/node@26.6.6)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.107.1)(yaml@2.9.1)) vue-eslint-parser: specifier: 10.4.1 version: 10.4.1(eslint@10.14.0(jiti@2.7.0)) @@ -2864,8 +2864,8 @@ packages: vite: ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 vue: ^3.2.25 || ^3.6.0-rc.10 - '@vitest/mocker@5.0.5': - resolution: {integrity: sha512-xLL3lkDegJZw+MGoGaCCsFayDZthGgpAtr3Vziyfc4p7xH89K7KRPcRBBh/kEYm0Aqkt5DtTmkYpBtRV/FrHZg==} + '@vitest/mocker@5.1.0': + resolution: {integrity: sha512-5umB9/jlWcqVS6fsrFmv5Gdnpu6wAUio/lEOwAmvB7v+lFo/IW2B9FhAD0p19GCULTgMzLCdUmuCDCnAzWgppQ==} peerDependencies: msw: ^2.4.9 || ^3.0.0 vite: ^6.0.0 || ^7.0.0 || ^8.0.0 @@ -2875,19 +2875,19 @@ packages: vite: optional: true - '@vitest/pretty-format@5.0.5': - resolution: {integrity: sha512-24sSdIlMA9DVPXnYiB9siwU0bTd887Y9jX3+vabztCSsvHwo7ipvJ/a2L3Rljw8+2rK1f5fCj3h5U9I/Jsqgbw==} + '@vitest/pretty-format@5.1.0': + resolution: {integrity: sha512-IRx5mc30CrFzyMNni6SZKQ1r53kv049Mcvvk0WbWcD6PUz/bFjG4zYv0KosQAeonPpGp5WxqYBMqdSOfJfvVWw==} - '@vitest/spy@5.0.5': - resolution: {integrity: sha512-lwJRExuH417257Q5wv9QYugN9IMJkoxcrKrYxGPQkBzl7wlNpTUxD/5yNX4ESKVUIShKPgkGchYPFMWOOk0wzw==} + '@vitest/spy@5.1.0': + resolution: {integrity: sha512-2DPO5OMHWKrBngC+fCmTQqemNF0gidRhp3lxbBmRhW+M1XJrfgPpqNqWVevXtn2f2ufD5ZaR1B6B641aAlcX5A==} - '@vitest/ui@5.0.5': - resolution: {integrity: sha512-dCoGUOdgmCaSB2g+WQ/spPCBkytAWdNUkFSXY4z+eYp2d8JEOY8v0uDRaJTG9qf/kTlTVZ4CuYMYMz/f1HS/qQ==} + '@vitest/ui@5.1.0': + resolution: {integrity: sha512-00S3x4NRmqIBUiTVWF9/xLaA9EP9KeKv0+1sBO7e2Y4luBISlW+2ttnhlk/zjbTqEvVhJWCCo7MXzu6zNbefqQ==} peerDependencies: - vitest: 5.0.5 + vitest: 5.1.0 - '@vitest/utils@5.0.5': - resolution: {integrity: sha512-/rBu7gzLDQI/SC79Tn98b5DwOgaHU/Gt4I9OVeP3YofzNaYtbImRCOJQmT1S6vOJg9gEIlWC+r3QxKkjuSa1nQ==} + '@vitest/utils@5.1.0': + resolution: {integrity: sha512-V+qgCwkvVw+s1t1S5TaoBHsLi5Sz/YmohCMoOu0mZ8ZQst2bKhRYARAQucWpVg8D0mv0x5MHcWXY5QdOsoiGBQ==} '@volar/language-core@2.4.30': resolution: {integrity: sha512-73fjwEV8wat6aOZ6U/y/hqtE30ocrIWECg67b0txGczOMNw+MffLmvJ5fnFfN9drVUEYZzLdaNo6VAy6G6avMw==} @@ -5565,20 +5565,20 @@ packages: postcss: optional: true - vitest@5.0.5: - resolution: {integrity: sha512-cPODOMF8YnkiiYtDdHo6n4wWmBrOBBbOIYH2d33M4l3CdNn72h+qMmO6uXffUN6A5AZFXNND/d+krS9mgkXRfg==} + vitest@5.1.0: + resolution: {integrity: sha512-MzmNFnrwa8v8lF1bLxw3UJ4EREwVOVb75VqJZmUDRjJ6EluK/x9th7qTbaeDk41WxE1GxWqmTXcdsfobfH5sOA==} engines: {node: ^22.12.0 || ^24.0.0 || >=26.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@opentelemetry/api': ^1.9.0 '@types/node': ^22.0.0 || >=24.0.0 - '@vitest/browser-playwright': 5.0.5 - '@vitest/browser-preview': 5.0.5 + '@vitest/browser-playwright': 5.1.0 + '@vitest/browser-preview': 5.1.0 '@vitest/browser-webdriverio': ^5.0.0-beta.5 || >=5.0.0 - '@vitest/coverage-istanbul': 5.0.5 - '@vitest/coverage-v8': 5.0.5 - '@vitest/ui': 5.0.5 + '@vitest/coverage-istanbul': 5.1.0 + '@vitest/coverage-v8': 5.1.0 + '@vitest/ui': 5.1.0 happy-dom: '*' jsdom: '*' vite: ^6.4.0 || ^7.0.0 || ^8.0.0 @@ -7789,35 +7789,35 @@ snapshots: vite: 8.3.5(@types/node@26.6.6)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.107.1)(yaml@2.9.1) vue: 3.5.45(typescript@6.0.3) - '@vitest/mocker@5.0.5(msw@3.0.4(@types/node@26.6.6)(graphql@16.14.2)(typescript@6.0.3)(vite@8.3.5(@types/node@26.6.6)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.107.1)(yaml@2.9.1)))(vite@8.3.5(@types/node@26.6.6)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.107.1)(yaml@2.9.1))': + '@vitest/mocker@5.1.0(msw@3.0.4(@types/node@26.6.6)(graphql@16.14.2)(typescript@6.0.3)(vite@8.3.5(@types/node@26.6.6)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.107.1)(yaml@2.9.1)))(vite@8.3.5(@types/node@26.6.6)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.107.1)(yaml@2.9.1))': dependencies: '@jridgewell/trace-mapping': 0.3.31 - '@vitest/spy': 5.0.5 + '@vitest/spy': 5.1.0 estree-walker: 3.0.3 magic-string: 1.4.5 optionalDependencies: msw: 3.0.4(@types/node@26.6.6)(graphql@16.14.2)(typescript@6.0.3)(vite@8.3.5(@types/node@26.6.6)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.107.1)(yaml@2.9.1)) vite: 8.3.5(@types/node@26.6.6)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.107.1)(yaml@2.9.1) - '@vitest/pretty-format@5.0.5': + '@vitest/pretty-format@5.1.0': dependencies: tinyrainbow: 3.2.0 - '@vitest/spy@5.0.5': {} + '@vitest/spy@5.1.0': {} - '@vitest/ui@5.0.5(vitest@5.0.5)': + '@vitest/ui@5.1.0(vitest@5.1.0)': dependencies: - '@vitest/utils': 5.0.5 + '@vitest/utils': 5.1.0 fflate: 0.8.3 flatted: 3.4.4 pathe: 2.0.3 sirv: 3.0.2 tinyrainbow: 3.2.0 - vitest: 5.0.5(@types/node@26.6.6)(@vitest/ui@5.0.5)(happy-dom@21.0.4)(msw@3.0.4(@types/node@26.6.6)(graphql@16.14.2)(typescript@6.0.3)(vite@8.3.5(@types/node@26.6.6)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.107.1)(yaml@2.9.1)))(vite@8.3.5(@types/node@26.6.6)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.107.1)(yaml@2.9.1)) + vitest: 5.1.0(@types/node@26.6.6)(@vitest/ui@5.1.0)(happy-dom@21.0.4)(msw@3.0.4(@types/node@26.6.6)(graphql@16.14.2)(typescript@6.0.3)(vite@8.3.5(@types/node@26.6.6)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.107.1)(yaml@2.9.1)))(vite@8.3.5(@types/node@26.6.6)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.107.1)(yaml@2.9.1)) - '@vitest/utils@5.0.5': + '@vitest/utils@5.1.0': dependencies: - '@vitest/pretty-format': 5.0.5 + '@vitest/pretty-format': 5.1.0 convert-source-map: 2.0.0 tinyrainbow: 3.2.0 @@ -10661,10 +10661,10 @@ snapshots: - universal-cookie - yaml - vitest@5.0.5(@types/node@26.6.6)(@vitest/ui@5.0.5)(happy-dom@21.0.4)(msw@3.0.4(@types/node@26.6.6)(graphql@16.14.2)(typescript@6.0.3)(vite@8.3.5(@types/node@26.6.6)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.107.1)(yaml@2.9.1)))(vite@8.3.5(@types/node@26.6.6)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.107.1)(yaml@2.9.1)): + vitest@5.1.0(@types/node@26.6.6)(@vitest/ui@5.1.0)(happy-dom@21.0.4)(msw@3.0.4(@types/node@26.6.6)(graphql@16.14.2)(typescript@6.0.3)(vite@8.3.5(@types/node@26.6.6)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.107.1)(yaml@2.9.1)))(vite@8.3.5(@types/node@26.6.6)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.107.1)(yaml@2.9.1)): dependencies: '@types/chai': 5.2.3 - '@vitest/mocker': 5.0.5(msw@3.0.4(@types/node@26.6.6)(graphql@16.14.2)(typescript@6.0.3)(vite@8.3.5(@types/node@26.6.6)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.107.1)(yaml@2.9.1)))(vite@8.3.5(@types/node@26.6.6)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.107.1)(yaml@2.9.1)) + '@vitest/mocker': 5.1.0(msw@3.0.4(@types/node@26.6.6)(graphql@16.14.2)(typescript@6.0.3)(vite@8.3.5(@types/node@26.6.6)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.107.1)(yaml@2.9.1)))(vite@8.3.5(@types/node@26.6.6)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.107.1)(yaml@2.9.1)) chai: 6.3.0 es-module-lexer: 2.3.2 expect-type: 1.4.0 @@ -10679,7 +10679,7 @@ snapshots: why-is-node-running: 3.2.1 optionalDependencies: '@types/node': 26.6.6 - '@vitest/ui': 5.0.5(vitest@5.0.5) + '@vitest/ui': 5.1.0(vitest@5.1.0) happy-dom: 21.0.4 transitivePeerDependencies: - msw From 1f1f3f8676dee6bdbb0e53160f927435ce4b44ee Mon Sep 17 00:00:00 2001 From: XiaoDaiGua-Ray <51957438+XiaoDaiGua-Ray@users.noreply.github.com> Date: Mon, 9 Nov 2026 18:25:35 +0800 Subject: [PATCH 2/2] fix(deps): complete Vue and MSW integration --- __test__/layout/sidebar-scroll.spec.ts | 1 + __test__/mock/browser.spec.ts | 11 +- __test__/setup-api.ts | 2 +- apps/admin/public/mockServiceWorker.js | 437 +++++++++++++++++++------ apps/admin/src/mocks/browser.ts | 21 +- apps/admin/src/mocks/handlers.ts | 3 +- apps/docs/guide/backend.md | 2 +- packages/admin-shell/package.json | 2 +- packages/composables/package.json | 2 +- packages/directives/package.json | 2 +- packages/routing/package.json | 2 +- packages/ui/package.json | 2 +- pnpm-lock.yaml | 220 ++----------- 13 files changed, 405 insertions(+), 302 deletions(-) diff --git a/__test__/layout/sidebar-scroll.spec.ts b/__test__/layout/sidebar-scroll.spec.ts index b0d32be8..0e89557f 100644 --- a/__test__/layout/sidebar-scroll.spec.ts +++ b/__test__/layout/sidebar-scroll.spec.ts @@ -40,6 +40,7 @@ it.each([ try { piniaMenuStore().updateMenuState('menuKey', '/selected') await nextTick() + await vi.dynamicImportSettled() const logo = wrapper.get('.r-menu__logo').element const scroller = wrapper.get( `.app-menu__scroll ${selector}`, diff --git a/__test__/mock/browser.spec.ts b/__test__/mock/browser.spec.ts index 8dd63c22..fb737495 100644 --- a/__test__/mock/browser.spec.ts +++ b/__test__/mock/browser.spec.ts @@ -1,3 +1,5 @@ +import { version as mswVersion } from 'msw/package.json' + const { installGuard, setupWorker } = vi.hoisted(() => ({ installGuard: vi.fn<(guard: (url: string) => Promise) => void>(), setupWorker: vi.fn(), @@ -21,6 +23,14 @@ it('restarts the same MSW client across repeated and concurrent recoveries', asy await Promise.all([enableApiMock(), enableApiMock()]) expect(installGuard).toHaveBeenCalledOnce() + expect(worker.start).toHaveBeenCalledWith( + expect.objectContaining({ + serviceWorker: { + url: `${import.meta.env.BASE_URL}mockServiceWorker.js?v=${mswVersion}`, + options: { scope: import.meta.env.BASE_URL }, + }, + }), + ) const guard = installGuard.mock.calls[0]![0] const probe = vi @@ -43,6 +53,5 @@ it('restarts the same MSW client across repeated and concurrent recoveries', asy expect(worker.stop).toHaveBeenCalledTimes(2) expect(worker.start).toHaveBeenCalledTimes(3) expect(probe).toHaveBeenCalledTimes(4) - // MSW 2.11.6 的已停止实例仍会响应 PASSTHROUGH,不能创建新实例与它竞争。 expect(setupWorker).toHaveBeenCalledOnce() }) diff --git a/__test__/setup-api.ts b/__test__/setup-api.ts index ee5b5799..c5e98a24 100644 --- a/__test__/setup-api.ts +++ b/__test__/setup-api.ts @@ -9,7 +9,7 @@ if (typeof document !== 'undefined') { ) // 部分旧 Hook 用例在 describe 收集阶段启动应用,拦截必须先于该阶段就绪。 - server.listen({ onUnhandledRequest: 'bypass' }) + server.listen({ onUnhandledFrame: 'bypass' }) afterEach(() => server.resetHandlers()) afterAll(() => server.close()) } diff --git a/apps/admin/public/mockServiceWorker.js b/apps/admin/public/mockServiceWorker.js index 2f658e91..1a992cb8 100644 --- a/apps/admin/public/mockServiceWorker.js +++ b/apps/admin/public/mockServiceWorker.js @@ -7,10 +7,36 @@ * - Please do NOT modify this file. */ -const PACKAGE_VERSION = '2.11.6' -const INTEGRITY_CHECKSUM = '4db4a41e972cec1b64cc569c66952d82' +const PACKAGE_VERSION = '3.0.4' +const INTEGRITY_CHECKSUM = '0bd5af64c8dc112df5e0c5e9c8a2b15a' const IS_MOCKED_RESPONSE = Symbol('isMockedResponse') +// Cache Storage is shared by the whole origin. Scope the cache name +// to this registration so multiple workers do not overwrite each other. +const ACTIVE_CLIENTS_CACHE_NAME = `msw:active-clients:${self.registration.scope}` +const ACTIVE_CLIENTS_CACHE_KEY = '/__msw__/active-clients' + const activeClientIds = new Set() +/** + * @type {Map>>} + */ +const pendingRequests = new Map() + +/** + * The browser may terminate this worker at any point (idle timeout, + * hidden page throttling, event timeout) and evaluate it again on the + * next event, losing all in-memory state. Restore the active client IDs + * from the storage so the worker keeps handling requests after that. + */ +let hasRestoredActiveClientIds = false +let isStoredActiveClientIdsOutdated = false +let activeClientIdsStorePromise = Promise.resolve() +const activeClientIdsRestorePromise = restoreActiveClientIds() + .catch((error) => { + console.error('[MSW] Failed to restore the active clients:', error) + }) + .finally(() => { + hasRestoredActiveClientIds = true + }) addEventListener('install', function () { self.skipWaiting() @@ -20,82 +46,114 @@ addEventListener('activate', function (event) { event.waitUntil(self.clients.claim()) }) -addEventListener('message', async function (event) { +addEventListener('message', function (event) { const clientId = Reflect.get(event.source || {}, 'id') if (!clientId || !self.clients) { return } - const client = await self.clients.get(clientId) + event.waitUntil( + (async () => { + // Never mutate the active clients before they are restored, + // otherwise storing them would persist an incomplete set. + await activeClientIdsRestorePromise - if (!client) { - return - } + if (event.data === 'CLIENT_CLOSE') { + const allClients = await self.clients.matchAll({ + type: 'window', + }) - const allClients = await self.clients.matchAll({ - type: 'window', - }) + activeClientIds.delete(clientId) + await storeActiveClientIds() - switch (event.data) { - case 'KEEPALIVE_REQUEST': { - sendToClient(client, { - type: 'KEEPALIVE_RESPONSE', - }) - break - } + // Await any pending requests from the closing client. + // This makes sure that those requests are handled and not passthrough. + const pending = pendingRequests.get(clientId) + if (pending != null && pending.size > 0) { + await Promise.allSettled(pending) + } + pendingRequests.delete(clientId) - case 'INTEGRITY_CHECK_REQUEST': { - sendToClient(client, { - type: 'INTEGRITY_CHECK_RESPONSE', - payload: { - packageVersion: PACKAGE_VERSION, - checksum: INTEGRITY_CHECKSUM, - }, - }) - break - } + const remainingClients = allClients.filter((client) => { + return client.id !== clientId + }) - case 'MOCK_ACTIVATE': { - activeClientIds.add(clientId) + // Unregister itself when there are no more clients + if (remainingClients.length === 0) { + await clearStoredActiveClientIds() + await self.registration.unregister() + } - sendToClient(client, { - type: 'MOCKING_ENABLED', - payload: { - client: { - id: client.id, - frameType: client.frameType, - }, - }, - }) - break - } + const client = await self.clients.get(clientId) - case 'CLIENT_CLOSED': { - activeClientIds.delete(clientId) + if (client != null) { + notifyClient(client, { + type: 'CLIENT_CLOSED', + }) + } - const remainingClients = allClients.filter((client) => { - return client.id !== clientId - }) - - // Unregister itself when there are no more clients - if (remainingClients.length === 0) { - self.registration.unregister() + return } - break - } - } + /** + * @note Check for the client AFTER handling "CLIENT_CLOSE". + * This prevents early return on "!client" in case the page has reloaded + * and disassociated itself from the worker. This ensures self-unregistration + * still fires for those pages. + */ + const client = await self.clients.get(clientId) + + if (!client) { + return + } + + switch (event.data) { + case 'KEEPALIVE_REQUEST': { + // Retry a failed store on the next keepalive so the storage + // catches up with the in-memory state before the worker restarts. + if (isStoredActiveClientIdsOutdated) { + await storeActiveClientIds() + } + + notifyClient(client, { + type: 'KEEPALIVE_RESPONSE', + }) + break + } + + case 'INTEGRITY_CHECK_REQUEST': { + notifyClient(client, { + type: 'INTEGRITY_CHECK_RESPONSE', + payload: { + packageVersion: PACKAGE_VERSION, + checksum: INTEGRITY_CHECKSUM, + }, + }) + break + } + + case 'MOCK_ACTIVATE': { + activeClientIds.add(clientId) + await storeActiveClientIds() + + notifyClient(client, { + type: 'MOCKING_ENABLED', + payload: { + client: { + id: client.id, + frameType: client.frameType, + }, + }, + }) + break + } + } + })(), + ) }) addEventListener('fetch', function (event) { - const requestInterceptedAt = Date.now() - - // Bypass navigation requests. - if (event.request.mode === 'navigate') { - return - } - // Opening the DevTools triggers the "only-if-cached" request // that cannot be handled by the worker. Bypass such requests. if ( @@ -105,6 +163,22 @@ addEventListener('fetch', function (event) { return } + // This request may be the one waking the worker up after the browser + // has terminated it. Wait for the active clients to be restored + // before deciding whether to handle the request. + if (!hasRestoredActiveClientIds) { + event.respondWith( + activeClientIdsRestorePromise.then(() => { + if (activeClientIds.size === 0) { + return fetch(event.request) + } + + return handleRequest(event) + }), + ) + return + } + // Bypass all requests when there are no active clients. // Prevents the self-unregistered worked from handling requests // after it's been terminated (still remains active until the next reload). @@ -112,24 +186,125 @@ addEventListener('fetch', function (event) { return } - const requestId = crypto.randomUUID() - event.respondWith(handleRequest(event, requestId, requestInterceptedAt)) + event.respondWith(handleRequest(event)) }) /** - * @param {FetchEvent} event - * @param {string} requestId - * @param {number} requestInterceptedAt + * Populate the active client IDs from the storage, + * ignoring the clients that no longer exist. */ -async function handleRequest(event, requestId, requestInterceptedAt) { +async function restoreActiveClientIds() { + const storedClientIds = await readStoredActiveClientIds() + + if (storedClientIds.length === 0) { + return + } + + const windowClients = await self.clients.matchAll({ + type: 'window', + }) + const windowClientIds = new Set(windowClients.map((client) => client.id)) + + for (const clientId of storedClientIds) { + if (windowClientIds.has(clientId)) { + activeClientIds.add(clientId) + } + } +} + +/** + * @returns {Promise>} + */ +async function readStoredActiveClientIds() { + const cache = await caches.open(ACTIVE_CLIENTS_CACHE_NAME) + const response = await cache.match(ACTIVE_CLIENTS_CACHE_KEY) + + if (!response) { + return [] + } + + return response.json() +} + +/** + * Storing is best-effort: a failure must never prevent the client + * from being activated or closed, in-memory state is still correct. + * Stores are serialized so each write persists the latest state + * and an earlier success cannot clear the flag of a later failure. + */ +function storeActiveClientIds() { + activeClientIdsStorePromise = + activeClientIdsStorePromise.then(writeActiveClientIds) + return activeClientIdsStorePromise +} + +async function writeActiveClientIds() { + try { + const cache = await caches.open(ACTIVE_CLIENTS_CACHE_NAME) + await cache.put( + ACTIVE_CLIENTS_CACHE_KEY, + new Response(JSON.stringify(Array.from(activeClientIds))), + ) + isStoredActiveClientIdsOutdated = false + } catch (error) { + isStoredActiveClientIdsOutdated = true + console.error('[MSW] Failed to store the active clients:', error) + } +} + +async function clearStoredActiveClientIds() { + try { + await caches.delete(ACTIVE_CLIENTS_CACHE_NAME) + } catch (error) { + console.error('[MSW] Failed to clear the stored active clients:', error) + } +} + +/** + * @param {FetchEvent} event + */ +async function handleRequest(event) { + const requestId = crypto.randomUUID() const client = await resolveMainClient(event) const requestCloneForEvents = event.request.clone() - const response = await getResponse( - event, - client, - requestId, - requestInterceptedAt, - ) + + const responsePromise = getResponse(event, client, requestId) + + if (client != null) { + let pending = pendingRequests.get(client.id) + + if (pending == null) { + pendingRequests.set(client.id, (pending = new Set())) + } + + pending.add(responsePromise) + responsePromise + .finally(() => pending.delete(responsePromise)) + .catch(() => {}) + } + + let response + + try { + response = await responsePromise + } catch (error) { + // The request has settled without a response (e.g. a passthrough + // request failed with a network error). Notify the client so it + // can release the resources associated with this request. + if (client && activeClientIds.has(client.id)) { + notifyClient(client, { + type: 'REQUEST_ERROR', + payload: { + request: { + id: requestId, + }, + error: serializeError(error), + }, + }) + } + + throw error + } // Send back the response clone for the "response:*" life-cycle events. // Ensure MSW is active and ready to handle the message, otherwise @@ -137,10 +312,20 @@ async function handleRequest(event, requestId, requestInterceptedAt) { if (client && activeClientIds.has(client.id)) { const serializedRequest = await serializeRequest(requestCloneForEvents) - // Clone the response so both the client and the library could consume it. - const responseClone = response.clone() + // Omit the body of server-sent event stream responses. + // Cloning such responses would prevent client-side stream cancelations + // from reaching the original stream (a teed stream only cancels its + // source once both of its branches cancel) and would buffer the + // entire stream into the unconsumed clone indefinitely. + const isEventStreamResponse = response.headers + .get('content-type') + ?.toLowerCase() + .startsWith('text/event-stream') - sendToClient( + // Clone the response so both the client and the library could consume it. + const responseClone = isEventStreamResponse ? null : response.clone() + + notifyClient( client, { type: 'RESPONSE', @@ -151,15 +336,17 @@ async function handleRequest(event, requestId, requestInterceptedAt) { ...serializedRequest, }, response: { - type: responseClone.type, - status: responseClone.status, - statusText: responseClone.statusText, - headers: Object.fromEntries(responseClone.headers.entries()), - body: responseClone.body, + type: response.type, + status: response.status, + statusText: response.statusText, + headers: Object.fromEntries(response.headers.entries()), + body: responseClone ? responseClone.body : null, }, }, }, - responseClone.body ? [serializedRequest.body, responseClone.body] : [], + responseClone && responseClone.body + ? [serializedRequest.body, responseClone.body] + : [], ) } @@ -205,18 +392,32 @@ async function resolveMainClient(event) { * @param {FetchEvent} event * @param {Client | undefined} client * @param {string} requestId - * @param {number} requestInterceptedAt * @returns {Promise} */ -async function getResponse(event, client, requestId, requestInterceptedAt) { +async function getResponse(event, client, requestId) { // Clone the request because it might've been already used // (i.e. its body has been read and sent to the client). const requestClone = event.request.clone() - function passthrough() { - // Cast the request headers to a new Headers instance - // so the headers can be manipulated with. - const headers = new Headers(requestClone.headers) + /** + * @param {{ request?: { headers?: Array<[string, string]> } }} [data] + */ + function passthrough(data) { + const headers = new Headers() + const requestHeaders = data?.request?.headers + + if (Array.isArray(requestHeaders)) { + // Apply the request headers provided by the client. + // Those reflect any modifications made in the request handlers. + // Use ".append()" to support multiple headers with the same name. + for (const [name, value] of requestHeaders) { + headers.append(name, value) + } + } else { + for (const [name, value] of requestClone.headers) { + headers.append(name, value) + } + } // Remove the "accept" header value that marked this request as passthrough. // This prevents request alteration and also keeps it compliant with the @@ -259,7 +460,6 @@ async function getResponse(event, client, requestId, requestInterceptedAt) { type: 'REQUEST', payload: { id: requestId, - interceptedAt: requestInterceptedAt, ...serializedRequest, }, }, @@ -268,17 +468,35 @@ async function getResponse(event, client, requestId, requestInterceptedAt) { switch (clientMessage.type) { case 'MOCK_RESPONSE': { - return respondWithMock(clientMessage.data) + return respondWithMock(clientMessage.data, event) } case 'PASSTHROUGH': { - return passthrough() + return passthrough(clientMessage.data) } } return passthrough() } +/** + * @param {unknown} error + * @returns {{ name: string, message: string }} + */ +function serializeError(error) { + if (error instanceof Error) { + return { + name: error.name, + message: error.message, + } + } + + return { + name: 'Error', + message: String(error), + } +} + /** * @param {Client} client * @param {any} message @@ -305,10 +523,31 @@ function sendToClient(client, message, transferrables = []) { } /** - * @param {Response} response - * @returns {Response} + * Post a one-way message to the client. + * Unlike `sendToClient`, this does not open a MessageChannel or wait + * for a reply. The client never acknowledges these messages, so awaiting + * them keeps the extended event pending until the browser terminates + * the worker on its event timeout (5 minutes in Chromium), wiping its state. + * @param {Client} client + * @param {any} message + * @param {Array} transferrables */ -function respondWithMock(response) { +function notifyClient(client, message, transferrables = []) { + try { + client.postMessage(message, transferrables.filter(Boolean)) + } catch (error) { + // A one-way message must never fail its caller (e.g. a transferable + // that has already been detached must not reject a resolved request). + console.error('[MSW] Failed to notify the client:', error) + } +} + +/** + * @param {Response} response + * @param {FetchEvent} event + * @returns {Promise} + */ +async function respondWithMock(response, event) { // Setting response status code to 0 is a no-op. // However, when responding with a "Response.error()", the produced Response // instance will have status code set to 0. Since it's not possible to create @@ -317,7 +556,19 @@ function respondWithMock(response) { return Response.error() } - const mockedResponse = new Response(response.body, response) + let body = response.body + + // Buffer the streamed mocked response body for navigation requests. + // The stream is transferred from the client that is being navigated + // away from. Once the navigation commits, that client gets destroyed + // and the stream will never complete, resulting in an empty document. + // Buffering here keeps "event.respondWith()" pending (the navigation + // cannot commit) until the entire body arrives from the client. + if (event.request.mode === 'navigate' && body instanceof ReadableStream) { + body = await new Response(body).arrayBuffer() + } + + const mockedResponse = new Response(body, response) Reflect.defineProperty(mockedResponse, IS_MOCKED_RESPONSE, { value: true, diff --git a/apps/admin/src/mocks/browser.ts b/apps/admin/src/mocks/browser.ts index a8d96d72..1980581e 100644 --- a/apps/admin/src/mocks/browser.ts +++ b/apps/admin/src/mocks/browser.ts @@ -2,6 +2,8 @@ import { apiMockEnabled, apiUrl } from '@/api/admin/client' import { installMockRequestGuard } from '@/axios/instance' import { getStorageInstance } from '@/utils/cache-backend' import { setupWorker } from 'msw/browser' +import { HttpNetworkFrame } from 'msw/experimental' +import { version as mswVersion } from 'msw/package.json' import { createMockConnection } from './connection' import { createAdminDatabase } from './database' import { createAdminHandlers } from './handlers' @@ -21,12 +23,23 @@ export function enableApiMock() { const start = () => worker.start({ serviceWorker: { - url: `${import.meta.env.BASE_URL}mockServiceWorker.js`, + // 版本变化时注册新脚本,避免启动阶段与旧版 worker 握手。 + url: `${import.meta.env.BASE_URL}mockServiceWorker.js?v=${mswVersion}`, options: { scope: import.meta.env.BASE_URL }, }, quiet: true, - onUnhandledRequest: (request, print) => { - if (request.url.startsWith(base)) print.error() + onUnhandledFrame: ({ frame }) => { + if (!(frame instanceof HttpNetworkFrame)) return + + const { method, url } = frame.data.request + + if (!url.startsWith(base)) return + + console.error( + `[MSW] No mock handler for ${method} ${new URL(url).pathname}`, + ) + // MSW 3 的默认错误回调只记录日志,拒绝此帧才能阻止请求穿透。 + throw Response.error() }, }) @@ -44,7 +57,7 @@ export function enableApiMock() { return response.ok && response.headers.get('x-ray-mock') === 'active' }, async () => { - // 复用实例以清理旧监听器;MSW 2.11.6 的已停止实例仍会抢先回复 PASSTHROUGH。 + // 重启同一个实例,保持监听器和拦截状态由同一个客户端管理。 worker.stop() await start() }, diff --git a/apps/admin/src/mocks/handlers.ts b/apps/admin/src/mocks/handlers.ts index f238620b..709f3fec 100644 --- a/apps/admin/src/mocks/handlers.ts +++ b/apps/admin/src/mocks/handlers.ts @@ -17,7 +17,8 @@ import { searchDemoOrders, searchDemoOwners, } from '@ray-template/demo-data' -import { delay, http, HttpResponse } from 'msw' +import { http, HttpResponse } from 'msw/http' +import { delay } from 'msw/utils/delay' import * as v from 'valibot' import { routeDemoPeople } from './data/route-people' import { MockApiError } from './database' diff --git a/apps/docs/guide/backend.md b/apps/docs/guide/backend.md index 266efc7f..3e1c8dd3 100644 --- a/apps/docs/guide/backend.md +++ b/apps/docs/guide/backend.md @@ -30,7 +30,7 @@ VITE_API_BASE_URL=https://your-api.example.com/api/ 也可以使用同源 `/api/`,由部署代理转发。设置 `VITE_API_BASE_URL` 后默认关闭 Mock,显式 `VITE_API_MOCK=true` 才重新启用。接口基址可以包含版本前缀;页面只通过 `api/admin` 的方法调用,不拼接固定域名。`VITE_*` 会进入浏览器产物,仅用于公开配置。 -Mock 在应用启动前完成 Service Worker 注册。每次 API 请求前检查内部健康标记;浏览器回收 worker 后,在同一个 MSW 客户端实例上调用 `stop()` / `start()` 恢复,避免旧实例残留的监听器将请求放行。恢复失败则阻止业务请求继续发送,表单和演示数据保持原样。内部 `GET /admin/mock-health` 仅由 Mock 使用,关闭 Mock 后不请求这个接口。默认脚本路径为 `/ray-template/mockServiceWorker.js`,作用域为应用 base;静态服务器必须按原路径提供该文件。浏览器需要 HTTPS 或 localhost。GitHub Pages 只托管静态文件,这些 API 由已启动的页面中的 Mock 响应;直接在地址栏打开 API 地址会返回 404。真实后端模式不启动 Mock,也不会在请求失败时返回伪造业务数据。当前锁定 MSW 2.11.6,安装不自动执行其 worker 复制脚本;升级时显式运行 `pnpm exec msw init apps/admin/public --save`,再做契约和浏览器验证。 +Mock 在应用启动前完成 Service Worker 注册。每次 API 请求前检查内部健康标记;浏览器回收 worker 后,在同一个 MSW 客户端实例上调用 `stop()` / `start()` 恢复,让同一个客户端管理监听器和拦截状态。恢复失败则阻止业务请求继续发送,表单和演示数据保持原样。内部 `GET /admin/mock-health` 仅由 Mock 使用,关闭 Mock 后不请求这个接口。Worker 脚本路径为 `/ray-template/mockServiceWorker.js`,注册 URL 带有当前 MSW 版本的查询参数,作用域为应用 base。静态服务器须在该路径提供脚本。浏览器需要 HTTPS 或 localhost。GitHub Pages 只托管静态文件,这些 API 由已启动的页面中的 Mock 响应;直接在地址栏打开 API 地址会返回 404。真实后端模式不启动 Mock,也不会在请求失败时返回伪造业务数据。当前锁定 MSW 3.0.4,安装不自动执行其 worker 复制脚本;升级时显式运行 `pnpm exec msw init apps/admin/public --save`,再做契约和浏览器验证。 diff --git a/packages/admin-shell/package.json b/packages/admin-shell/package.json index 083047d6..977efe3d 100644 --- a/packages/admin-shell/package.json +++ b/packages/admin-shell/package.json @@ -15,7 +15,7 @@ "lodash-es": "4.18.1" }, "peerDependencies": { - "vue": "3.5.44", + "vue": "3.5.45", "naive-ui": "2.45.3", "vue-router": "5.4.0" }, diff --git a/packages/composables/package.json b/packages/composables/package.json index 832aa6ed..ece3bb69 100644 --- a/packages/composables/package.json +++ b/packages/composables/package.json @@ -26,7 +26,7 @@ "dayjs": "1.11.23" }, "peerDependencies": { - "vue": "3.5.44", + "vue": "3.5.45", "naive-ui": "2.45.3" }, "rayTemplate": { diff --git a/packages/directives/package.json b/packages/directives/package.json index 6e993fd1..58890a07 100644 --- a/packages/directives/package.json +++ b/packages/directives/package.json @@ -25,7 +25,7 @@ "@vueuse/core": "15.0.0" }, "peerDependencies": { - "vue": "3.5.44" + "vue": "3.5.45" }, "rayTemplate": { "runtime": "browser" diff --git a/packages/routing/package.json b/packages/routing/package.json index cce72de8..854a2446 100644 --- a/packages/routing/package.json +++ b/packages/routing/package.json @@ -18,7 +18,7 @@ "@ray-template/api-contracts": "workspace:*" }, "peerDependencies": { - "vue": "3.5.44", + "vue": "3.5.45", "vue-router": "5.4.0", "naive-ui": "2.45.3" }, diff --git a/packages/ui/package.json b/packages/ui/package.json index ce217b0d..12b2926b 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -35,7 +35,7 @@ "vue-hooks-plus": "2.4.3" }, "peerDependencies": { - "vue": "3.5.44", + "vue": "3.5.45", "naive-ui": "2.45.3" }, "rayTemplate": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f2a93e19..25555a52 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -322,7 +322,7 @@ importers: version: 5.1.0(vitest@5.1.0) '@vue/test-utils': specifier: 2.5.1 - version: 2.5.1(@vue/compiler-dom@3.5.45)(@vue/server-renderer@3.5.44)(vue@3.5.45(typescript@6.0.3)) + version: 2.5.1(@vue/compiler-dom@3.5.45)(@vue/server-renderer@3.5.45)(vue@3.5.45(typescript@6.0.3)) autoprefixer: specifier: 10.6.2 version: 10.6.2(postcss@8.5.32) @@ -658,19 +658,19 @@ importers: version: link:../ui '@vueuse/core': specifier: 15.0.0 - version: 15.0.0(vue@3.5.44(typescript@6.0.3)) + version: 15.0.0(vue@3.5.45(typescript@6.0.3)) lodash-es: specifier: 4.18.1 version: 4.18.1 naive-ui: specifier: 2.45.3 - version: 2.45.3(vue@3.5.44(typescript@6.0.3)) + version: 2.45.3(vue@3.5.45(typescript@6.0.3)) vue: - specifier: 3.5.44 - version: 3.5.44(typescript@6.0.3) + specifier: 3.5.45 + version: 3.5.45(typescript@6.0.3) vue-router: specifier: 5.4.0 - version: 5.4.0(@vue/compiler-sfc@3.5.44)(esbuild@0.28.2)(pinia@4.1.0(@vue/devtools-api@8.2.1)(typescript@6.0.3)(vue@3.5.44(typescript@6.0.3)))(rolldown@1.2.16)(rollup@4.67.4)(vite@8.3.5(@types/node@26.6.6)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.107.1)(yaml@2.9.1))(vue@3.5.44(typescript@6.0.3)) + version: 5.4.0(@vue/compiler-sfc@3.5.44)(esbuild@0.28.2)(pinia@4.1.0(@vue/devtools-api@8.2.1)(typescript@6.0.3)(vue@3.5.45(typescript@6.0.3)))(rolldown@1.2.16)(rollup@4.67.4)(vite@8.3.5(@types/node@26.6.6)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.107.1)(yaml@2.9.1))(vue@3.5.45(typescript@6.0.3)) packages/api-contracts: dependencies: @@ -688,7 +688,7 @@ importers: version: link:../utils '@vueuse/core': specifier: 15.0.0 - version: 15.0.0(vue@3.5.44(typescript@6.0.3)) + version: 15.0.0(vue@3.5.45(typescript@6.0.3)) dayjs: specifier: 1.11.23 version: 1.11.23 @@ -700,13 +700,13 @@ importers: version: 4.18.1 naive-ui: specifier: 2.45.3 - version: 2.45.3(vue@3.5.44(typescript@6.0.3)) + version: 2.45.3(vue@3.5.45(typescript@6.0.3)) print-js: specifier: 1.6.0 version: 1.6.0 vue: - specifier: 3.5.44 - version: 3.5.44(typescript@6.0.3) + specifier: 3.5.45 + version: 3.5.45(typescript@6.0.3) packages/demo-data: dependencies: @@ -730,7 +730,7 @@ importers: version: link:../utils '@vueuse/core': specifier: 15.0.0 - version: 15.0.0(vue@3.5.44(typescript@6.0.3)) + version: 15.0.0(vue@3.5.45(typescript@6.0.3)) clipboard: specifier: 2.0.11 version: 2.0.11 @@ -738,8 +738,8 @@ importers: specifier: 4.18.1 version: 4.18.1 vue: - specifier: 3.5.44 - version: 3.5.44(typescript@6.0.3) + specifier: 3.5.45 + version: 3.5.45(typescript@6.0.3) packages/http: dependencies: @@ -768,16 +768,16 @@ importers: version: 1.8.0(valibot@1.5.0(typescript@6.0.3)) naive-ui: specifier: 2.45.3 - version: 2.45.3(vue@3.5.44(typescript@6.0.3)) + version: 2.45.3(vue@3.5.45(typescript@6.0.3)) valibot: specifier: 1.5.0 version: 1.5.0(typescript@6.0.3) vue: - specifier: 3.5.44 - version: 3.5.44(typescript@6.0.3) + specifier: 3.5.45 + version: 3.5.45(typescript@6.0.3) vue-router: specifier: 5.4.0 - version: 5.4.0(@vue/compiler-sfc@3.5.44)(esbuild@0.28.2)(pinia@4.1.0(@vue/devtools-api@8.2.1)(typescript@6.0.3)(vue@3.5.44(typescript@6.0.3)))(rolldown@1.2.16)(rollup@4.67.4)(vite@8.3.5(@types/node@26.6.6)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.107.1)(yaml@2.9.1))(vue@3.5.44(typescript@6.0.3)) + version: 5.4.0(@vue/compiler-sfc@3.5.44)(esbuild@0.28.2)(pinia@4.1.0(@vue/devtools-api@8.2.1)(typescript@6.0.3)(vue@3.5.45(typescript@6.0.3)))(rolldown@1.2.16)(rollup@4.67.4)(vite@8.3.5(@types/node@26.6.6)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.107.1)(yaml@2.9.1))(vue@3.5.45(typescript@6.0.3)) packages/ui: dependencies: @@ -798,7 +798,7 @@ importers: version: link:../utils '@vueuse/core': specifier: 15.0.0 - version: 15.0.0(vue@3.5.44(typescript@6.0.3)) + version: 15.0.0(vue@3.5.45(typescript@6.0.3)) echarts: specifier: 6.1.0 version: 6.1.0 @@ -813,13 +813,13 @@ importers: version: 4.18.1 naive-ui: specifier: 2.45.3 - version: 2.45.3(vue@3.5.44(typescript@6.0.3)) + version: 2.45.3(vue@3.5.45(typescript@6.0.3)) vue: - specifier: 3.5.44 - version: 3.5.44(typescript@6.0.3) + specifier: 3.5.45 + version: 3.5.45(typescript@6.0.3) vue-hooks-plus: specifier: 2.4.3 - version: 2.4.3(vue@3.5.44(typescript@6.0.3)) + version: 2.4.3(vue@3.5.45(typescript@6.0.3)) packages/utils: dependencies: @@ -2984,27 +2984,15 @@ packages: '@vue/language-core@3.3.14': resolution: {integrity: sha512-kRB+3hHg0c+BdD1XLAvwjVMQd5pC05zijSlPDRI3ERvC/s04JlRs5upy2KjeMg/9m9oD5zuMVh9yVvkKfZqoJg==} - '@vue/reactivity@3.5.44': - resolution: {integrity: sha512-u+QJdKeBBEADkPdevsL+6E12QlYVfBD8Zcw5qjDQKtamI6l14KyqazJMobhCKelhWN5zpyKUiEDoTyHE93cqWw==} - '@vue/reactivity@3.5.45': resolution: {integrity: sha512-WqkyubNWpI4OYBOipSrjIssMdJO8K1i9Zts/Wm8Er10/0msOEwCyWWWvZnAI7WW3kQsTong6DJp8Cbb+vd4cPA==} - '@vue/runtime-core@3.5.44': - resolution: {integrity: sha512-uEa/ndwjhrrhnOfb2p+sZy6zeoamJOISqaLSJGk/8R6nABT1ZldpzcJoPzKj+zHVomVBPcmQYyC2r4LtvDV6CQ==} - '@vue/runtime-core@3.5.45': resolution: {integrity: sha512-bzIO3+FABjpj85uIKSc+Qnj36/sxDNI3tcH9i6w6xKA1k6e0ejv0G0jMCfeJBvK3yGL5XbJ3DMZj+ClqyCHFYw==} - '@vue/runtime-dom@3.5.44': - resolution: {integrity: sha512-3fc4ARcXVhVBaJ3ujWiNZJARD6pkyRcwG+ZYhMzjKtKUp7MAY0HLwr7r3Smep3Li6ZaWT6ewdmx8XqdaD5oNZg==} - '@vue/runtime-dom@3.5.45': resolution: {integrity: sha512-ZvRTFMDgfqTDYWvJfoVpQTJx1RN5M6l7Pyd6wfdY2NaXzbPQVh9ezeQYFbNPP6bIcRVn2SqSSR25N/jSW69BFw==} - '@vue/server-renderer@3.5.44': - resolution: {integrity: sha512-R4S1UoH4h5Frrauv8Z5XE5TxV9oBiUSgWIC4TyVK1FK+RocRnOLwFA5Xcmo2011RlgJp+AbZCnw6afrhlgRuUQ==} - '@vue/server-renderer@3.5.45': resolution: {integrity: sha512-1fNXUHhhsWf4EVL4XixbGBU5mKdiIXJAB82feHRTyPPo6ZUEYWIJuEeUl3mVV6QDBp50HJOX4obLhxYXlrjrzA==} @@ -5687,14 +5675,6 @@ packages: peerDependencies: vue: ^3.0.1 - vue@3.5.44: - resolution: {integrity: sha512-dvvmaOCG7lAMkJTPqPwWeGMsPS6DIsFsfZDUgBp9V6mHf9b3+/wyVwYR4Es+WV6uJC0FKRxp81Obcq0ZwUcGFQ==} - peerDependencies: - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - vue@3.5.45: resolution: {integrity: sha512-3cvsib8m9c0vB24+MDKsgcW4+Da4xaBl9Z/5Tbm2pmSIsRPxcil4cdXjXlVsmJ2g64XJo5h+IRd7rsdGT9pZaw==} peerDependencies: @@ -6239,10 +6219,6 @@ snapshots: dependencies: css-render: 0.15.14 - '@css-render/vue3-ssr@0.15.14(vue@3.5.44(typescript@6.0.3))': - dependencies: - vue: 3.5.44(typescript@6.0.3) - '@css-render/vue3-ssr@0.15.14(vue@3.5.45(typescript@6.0.3))': dependencies: vue: 3.5.45(typescript@6.0.3) @@ -7845,16 +7821,6 @@ snapshots: optionalDependencies: typescript: 6.0.3 - '@vue-macros/common@3.1.4(vue@3.5.44(typescript@6.0.3))': - dependencies: - '@vue/compiler-sfc': 3.5.44 - ast-kit: 2.2.0 - local-pkg: 1.2.1 - magic-string-ast: 1.0.3 - unplugin-utils: 0.3.2 - optionalDependencies: - vue: 3.5.44(typescript@6.0.3) - '@vue-macros/common@3.1.4(vue@3.5.45(typescript@6.0.3))': dependencies: '@vue/compiler-sfc': 3.5.44 @@ -7997,31 +7963,15 @@ snapshots: path-browserify: 1.0.1 picomatch: 4.0.7 - '@vue/reactivity@3.5.44': - dependencies: - '@vue/shared': 3.5.44 - '@vue/reactivity@3.5.45': dependencies: '@vue/shared': 3.5.45 - '@vue/runtime-core@3.5.44': - dependencies: - '@vue/reactivity': 3.5.44 - '@vue/shared': 3.5.44 - '@vue/runtime-core@3.5.45': dependencies: '@vue/reactivity': 3.5.45 '@vue/shared': 3.5.45 - '@vue/runtime-dom@3.5.44': - dependencies: - '@vue/reactivity': 3.5.44 - '@vue/runtime-core': 3.5.44 - '@vue/shared': 3.5.44 - csstype: 3.2.3 - '@vue/runtime-dom@3.5.45': dependencies: '@vue/reactivity': 3.5.45 @@ -8029,12 +7979,6 @@ snapshots: '@vue/shared': 3.5.45 csstype: 3.2.3 - '@vue/server-renderer@3.5.44': - dependencies: - '@vue/compiler-ssr': 3.5.44 - '@vue/runtime-dom': 3.5.44 - '@vue/shared': 3.5.44 - '@vue/server-renderer@3.5.45': dependencies: '@vue/compiler-ssr': 3.5.45 @@ -8045,14 +7989,14 @@ snapshots: '@vue/shared@3.5.45': {} - '@vue/test-utils@2.5.1(@vue/compiler-dom@3.5.45)(@vue/server-renderer@3.5.44)(vue@3.5.45(typescript@6.0.3))': + '@vue/test-utils@2.5.1(@vue/compiler-dom@3.5.45)(@vue/server-renderer@3.5.45)(vue@3.5.45(typescript@6.0.3))': dependencies: '@vue/compiler-dom': 3.5.45 js-beautify: 2.0.3 vue: 3.5.45(typescript@6.0.3) vue-component-type-helpers: 3.3.14 optionalDependencies: - '@vue/server-renderer': 3.5.44 + '@vue/server-renderer': 3.5.45 '@vueuse/core@12.8.2(typescript@6.0.3)': dependencies: @@ -8063,13 +8007,6 @@ snapshots: transitivePeerDependencies: - typescript - '@vueuse/core@15.0.0(vue@3.5.44(typescript@6.0.3))': - dependencies: - '@types/web-bluetooth': 0.0.21 - '@vueuse/metadata': 15.0.0 - '@vueuse/shared': 15.0.0(vue@3.5.44(typescript@6.0.3)) - vue: 3.5.44(typescript@6.0.3) - '@vueuse/core@15.0.0(vue@3.5.45(typescript@6.0.3))': dependencies: '@types/web-bluetooth': 0.0.21 @@ -8099,10 +8036,6 @@ snapshots: transitivePeerDependencies: - typescript - '@vueuse/shared@15.0.0(vue@3.5.44(typescript@6.0.3))': - dependencies: - vue: 3.5.44(typescript@6.0.3) - '@vueuse/shared@15.0.0(vue@3.5.45(typescript@6.0.3))': dependencies: vue: 3.5.45(typescript@6.0.3) @@ -9511,28 +9444,6 @@ snapshots: named-placeholders: 1.1.6 sql-escaper: 1.5.2 - naive-ui@2.45.3(vue@3.5.44(typescript@6.0.3)): - dependencies: - '@css-render/plugin-bem': 0.15.14(css-render@0.15.14) - '@css-render/vue3-ssr': 0.15.14(vue@3.5.44(typescript@6.0.3)) - '@types/lodash': 4.17.27 - '@types/lodash-es': 4.17.12 - async-validator: 4.2.5 - css-render: 0.15.14 - csstype: 3.2.3 - date-fns: 4.4.0 - date-fns-tz: 3.2.0(date-fns@4.4.0) - evtd: 0.2.4 - highlight.js: 11.12.0 - lodash: 4.18.1 - lodash-es: 4.18.1 - seemly: 0.3.10 - treemate: 0.3.11 - vdirs: 0.1.8(vue@3.5.44(typescript@6.0.3)) - vooks: 0.2.12(vue@3.5.44(typescript@6.0.3)) - vue: 3.5.44(typescript@6.0.3) - vueuc: 0.4.66(vue@3.5.44(typescript@6.0.3)) - naive-ui@2.45.3(vue@3.5.45(typescript@6.0.3)): dependencies: '@css-render/plugin-bem': 0.15.14(css-render@0.15.14) @@ -9751,15 +9662,6 @@ snapshots: optionalDependencies: pinia: 4.1.0(@vue/devtools-api@8.2.1)(typescript@6.0.3)(vue@3.5.45(typescript@6.0.3)) - pinia@4.1.0(@vue/devtools-api@8.2.1)(typescript@6.0.3)(vue@3.5.44(typescript@6.0.3)): - dependencies: - '@vue/devtools-api': 8.2.1 - nostics: 1.3.0 - vue: 3.5.44(typescript@6.0.3) - optionalDependencies: - typescript: 6.0.3 - optional: true - pinia@4.1.0(@vue/devtools-api@8.2.1)(typescript@6.0.3)(vue@3.5.45(typescript@6.0.3)): dependencies: '@vue/devtools-api': 8.2.1 @@ -10509,11 +10411,6 @@ snapshots: vary@1.1.2: {} - vdirs@0.1.8(vue@3.5.44(typescript@6.0.3)): - dependencies: - evtd: 0.2.4 - vue: 3.5.44(typescript@6.0.3) - vdirs@0.1.8(vue@3.5.45(typescript@6.0.3)): dependencies: evtd: 0.2.4 @@ -10684,11 +10581,6 @@ snapshots: transitivePeerDependencies: - msw - vooks@0.2.12(vue@3.5.44(typescript@6.0.3)): - dependencies: - evtd: 0.2.4 - vue: 3.5.44(typescript@6.0.3) - vooks@0.2.12(vue@3.5.45(typescript@6.0.3)): dependencies: evtd: 0.2.4 @@ -10725,15 +10617,6 @@ snapshots: transitivePeerDependencies: - supports-color - vue-hooks-plus@2.4.3(vue@3.5.44(typescript@6.0.3)): - dependencies: - '@types/js-cookie': 3.0.6 - '@vue/devtools-api': 7.7.2 - js-cookie: 3.0.8 - lodash-es: 4.18.1 - screenfull: 5.2.0 - vue: 3.5.44(typescript@6.0.3) - vue-hooks-plus@2.4.3(vue@3.5.45(typescript@6.0.3)): dependencies: '@types/js-cookie': 3.0.6 @@ -10751,40 +10634,6 @@ snapshots: '@vue/devtools-api': 6.6.4 vue: 3.5.45(typescript@6.0.3) - vue-router@5.4.0(@vue/compiler-sfc@3.5.44)(esbuild@0.28.2)(pinia@4.1.0(@vue/devtools-api@8.2.1)(typescript@6.0.3)(vue@3.5.44(typescript@6.0.3)))(rolldown@1.2.16)(rollup@4.67.4)(vite@8.3.5(@types/node@26.6.6)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.107.1)(yaml@2.9.1))(vue@3.5.44(typescript@6.0.3)): - dependencies: - '@vue-macros/common': 3.1.4(vue@3.5.44(typescript@6.0.3)) - '@vue/devtools-api': 8.2.1 - ast-walker-scope: 0.10.0 - chokidar: 5.0.0 - confbox: 0.3.2 - local-pkg: 1.2.1 - magic-string: 1.4.5 - mlly: 1.8.2 - muggle-string: 0.4.1 - nostics: 1.3.0 - pathe: 2.0.3 - picomatch: 4.0.7 - scule: 1.3.0 - tinyglobby: 0.2.17 - unplugin: 3.7.0(esbuild@0.28.2)(rolldown@1.2.16)(rollup@4.67.4)(vite@8.3.5(@types/node@26.6.6)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.107.1)(yaml@2.9.1)) - unplugin-utils: 0.3.2 - vue: 3.5.44(typescript@6.0.3) - optionalDependencies: - '@vue/compiler-sfc': 3.5.44 - pinia: 4.1.0(@vue/devtools-api@8.2.1)(typescript@6.0.3)(vue@3.5.44(typescript@6.0.3)) - vite: 8.3.5(@types/node@26.6.6)(esbuild@0.28.2)(jiti@2.7.0)(sass@1.107.1)(yaml@2.9.1) - transitivePeerDependencies: - - '@farmfe/core' - - '@rsbuild/core' - - '@rspack/core' - - bun-types-no-globals - - esbuild - - rolldown - - rollup - - unloader - - webpack - vue-router@5.4.0(@vue/compiler-sfc@3.5.44)(esbuild@0.28.2)(pinia@4.1.0(@vue/devtools-api@8.2.1)(typescript@6.0.3)(vue@3.5.45(typescript@6.0.3)))(rolldown@1.2.16)(rollup@4.67.4)(vite@6.4.5(@types/node@26.6.6)(jiti@2.7.0)(lightningcss@1.33.0)(sass@1.107.1)(yaml@2.9.1))(vue@3.5.45(typescript@6.0.3)): dependencies: '@vue-macros/common': 3.1.4(vue@3.5.45(typescript@6.0.3)) @@ -10864,16 +10713,6 @@ snapshots: js-binary-schema-parser: 2.0.3 vue: 3.5.45(typescript@6.0.3) - vue@3.5.44(typescript@6.0.3): - dependencies: - '@vue/compiler-dom': 3.5.44 - '@vue/compiler-sfc': 3.5.44 - '@vue/runtime-dom': 3.5.44 - '@vue/server-renderer': 3.5.44 - '@vue/shared': 3.5.44 - optionalDependencies: - typescript: 6.0.3 - vue@3.5.45(typescript@6.0.3): dependencies: '@vue/compiler-dom': 3.5.45 @@ -10884,17 +10723,6 @@ snapshots: optionalDependencies: typescript: 6.0.3 - vueuc@0.4.66(vue@3.5.44(typescript@6.0.3)): - dependencies: - '@css-render/vue3-ssr': 0.15.14(vue@3.5.44(typescript@6.0.3)) - '@juggle/resize-observer': 3.4.0 - css-render: 0.15.14 - evtd: 0.2.4 - seemly: 0.3.10 - vdirs: 0.1.8(vue@3.5.44(typescript@6.0.3)) - vooks: 0.2.12(vue@3.5.44(typescript@6.0.3)) - vue: 3.5.44(typescript@6.0.3) - vueuc@0.4.66(vue@3.5.45(typescript@6.0.3)): dependencies: '@css-render/vue3-ssr': 0.15.14(vue@3.5.45(typescript@6.0.3))