From c8cfd6af57e764749c5d67627953189dad1b2819 Mon Sep 17 00:00:00 2001 From: David Dal Busco Date: Tue, 10 Dec 2024 10:43:52 +0100 Subject: [PATCH 1/4] feat: support `vite-plugin-inspect` for both Vite 5 and 6 (#730) --- packages/playground/applet/package.json | 2 +- packages/playground/basic/package.json | 2 +- packages/playground/multi-app/package.json | 2 +- packages/vite/package.json | 2 +- pnpm-lock.yaml | 26 +++++++++++----------- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/playground/applet/package.json b/packages/playground/applet/package.json index 393ccf79e..3b78e9d6c 100644 --- a/packages/playground/applet/package.json +++ b/packages/playground/applet/package.json @@ -28,7 +28,7 @@ "typescript": "^5.7.2", "unocss": "^0.64.1", "vite": "^6.0.1", - "vite-plugin-inspect": "0.8.8", + "vite-plugin-inspect": "0.8.9", "vite-plugin-vue-devtools": "workspace:*" } } diff --git a/packages/playground/basic/package.json b/packages/playground/basic/package.json index e936c7f85..07b94754d 100644 --- a/packages/playground/basic/package.json +++ b/packages/playground/basic/package.json @@ -27,7 +27,7 @@ "typescript": "^5.7.2", "unocss": "^0.64.1", "vite": "^6.0.1", - "vite-plugin-inspect": "0.8.8", + "vite-plugin-inspect": "0.8.9", "vite-plugin-vue-devtools": "workspace:*" } } diff --git a/packages/playground/multi-app/package.json b/packages/playground/multi-app/package.json index e41c3bc61..ec75fd08d 100644 --- a/packages/playground/multi-app/package.json +++ b/packages/playground/multi-app/package.json @@ -20,7 +20,7 @@ "typescript": "^5.7.2", "unocss": "^0.64.1", "vite": "^6.0.1", - "vite-plugin-inspect": "0.8.8", + "vite-plugin-inspect": "0.8.9", "vite-plugin-vue-devtools": "workspace:*" } } diff --git a/packages/vite/package.json b/packages/vite/package.json index 9189569a5..7fa99f2cc 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -55,7 +55,7 @@ "@vue/devtools-shared": "workspace:^", "execa": "^9.5.1", "sirv": "^3.0.0", - "vite-plugin-inspect": "0.8.8", + "vite-plugin-inspect": "0.8.9", "vite-plugin-vue-inspector": "^5.3.1" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 33f078183..4b3d2d24a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -579,8 +579,8 @@ importers: specifier: ^6.0.1 version: 6.0.1(@types/node@22.10.1)(jiti@2.0.0)(sass-embedded@1.81.0)(sass@1.80.3)(terser@5.26.0)(tsx@4.19.2)(yaml@2.5.0) vite-plugin-inspect: - specifier: 0.8.8 - version: 0.8.8(rollup@4.24.4)(vite@6.0.1(@types/node@22.10.1)(jiti@2.0.0)(sass-embedded@1.81.0)(sass@1.80.3)(terser@5.26.0)(tsx@4.19.2)(yaml@2.5.0)) + specifier: 0.8.9 + version: 0.8.9(rollup@4.24.4)(vite@6.0.1(@types/node@22.10.1)(jiti@2.0.0)(sass-embedded@1.81.0)(sass@1.80.3)(terser@5.26.0)(tsx@4.19.2)(yaml@2.5.0)) vite-plugin-vue-devtools: specifier: workspace:* version: link:../../vite @@ -643,8 +643,8 @@ importers: specifier: ^6.0.1 version: 6.0.1(@types/node@22.10.1)(jiti@2.0.0)(sass-embedded@1.81.0)(sass@1.80.3)(terser@5.26.0)(tsx@4.19.2)(yaml@2.5.0) vite-plugin-inspect: - specifier: 0.8.8 - version: 0.8.8(rollup@4.24.4)(vite@6.0.1(@types/node@22.10.1)(jiti@2.0.0)(sass-embedded@1.81.0)(sass@1.80.3)(terser@5.26.0)(tsx@4.19.2)(yaml@2.5.0)) + specifier: 0.8.9 + version: 0.8.9(rollup@4.24.4)(vite@6.0.1(@types/node@22.10.1)(jiti@2.0.0)(sass-embedded@1.81.0)(sass@1.80.3)(terser@5.26.0)(tsx@4.19.2)(yaml@2.5.0)) vite-plugin-vue-devtools: specifier: workspace:* version: link:../../vite @@ -686,8 +686,8 @@ importers: specifier: ^6.0.1 version: 6.0.1(@types/node@22.10.1)(jiti@2.0.0)(sass-embedded@1.81.0)(sass@1.80.3)(terser@5.26.0)(tsx@4.19.2)(yaml@2.5.0) vite-plugin-inspect: - specifier: 0.8.8 - version: 0.8.8(rollup@4.24.4)(vite@6.0.1(@types/node@22.10.1)(jiti@2.0.0)(sass-embedded@1.81.0)(sass@1.80.3)(terser@5.26.0)(tsx@4.19.2)(yaml@2.5.0)) + specifier: 0.8.9 + version: 0.8.9(rollup@4.24.4)(vite@6.0.1(@types/node@22.10.1)(jiti@2.0.0)(sass-embedded@1.81.0)(sass@1.80.3)(terser@5.26.0)(tsx@4.19.2)(yaml@2.5.0)) vite-plugin-vue-devtools: specifier: workspace:* version: link:../../vite @@ -859,8 +859,8 @@ importers: specifier: ^3.1.0 || ^4.0.0-0 || ^5.0.0-0 || ^6.0.0-0 version: 5.4.11(@types/node@22.10.1)(sass-embedded@1.81.0)(sass@1.80.3)(terser@5.26.0) vite-plugin-inspect: - specifier: 0.8.8 - version: 0.8.8(rollup@4.24.4)(vite@5.4.11(@types/node@22.10.1)(sass-embedded@1.81.0)(sass@1.80.3)(terser@5.26.0)) + specifier: 0.8.9 + version: 0.8.9(rollup@4.24.4)(vite@5.4.11(@types/node@22.10.1)(sass-embedded@1.81.0)(sass@1.80.3)(terser@5.26.0)) vite-plugin-vue-inspector: specifier: ^5.3.1 version: 5.3.1(vite@5.4.11(@types/node@22.10.1)(sass-embedded@1.81.0)(sass@1.80.3)(terser@5.26.0)) @@ -8985,12 +8985,12 @@ packages: vite: optional: true - vite-plugin-inspect@0.8.8: - resolution: {integrity: sha512-aZlBuXsWUPJFmMK92GIv6lH7LrwG2POu4KJ+aEdcqnu92OAf+rhBnfMDQvxIJPEB7hE2t5EyY/PMgf5aDLT8EA==} + vite-plugin-inspect@0.8.9: + resolution: {integrity: sha512-22/8qn+LYonzibb1VeFZmISdVao5kC22jmEKm24vfFE8siEn47EpVcCLYMv6iKOYMJfjSvSJfueOwcFCkUnV3A==} engines: {node: '>=14'} peerDependencies: '@nuxt/kit': '*' - vite: ^3.1.0 || ^4.0.0 || ^5.0.0-0 + vite: ^3.1.0 || ^4.0.0 || ^5.0.0-0 || ^6.0.1 peerDependenciesMeta: '@nuxt/kit': optional: true @@ -18566,7 +18566,7 @@ snapshots: - rollup - supports-color - vite-plugin-inspect@0.8.8(rollup@4.24.4)(vite@5.4.11(@types/node@22.10.1)(sass-embedded@1.81.0)(sass@1.80.3)(terser@5.26.0)): + vite-plugin-inspect@0.8.9(rollup@4.24.4)(vite@5.4.11(@types/node@22.10.1)(sass-embedded@1.81.0)(sass@1.80.3)(terser@5.26.0)): dependencies: '@antfu/utils': 0.7.10 '@rollup/pluginutils': 5.1.3(rollup@4.24.4) @@ -18582,7 +18582,7 @@ snapshots: - rollup - supports-color - vite-plugin-inspect@0.8.8(rollup@4.24.4)(vite@6.0.1(@types/node@22.10.1)(jiti@2.0.0)(sass-embedded@1.81.0)(sass@1.80.3)(terser@5.26.0)(tsx@4.19.2)(yaml@2.5.0)): + vite-plugin-inspect@0.8.9(rollup@4.24.4)(vite@6.0.1(@types/node@22.10.1)(jiti@2.0.0)(sass-embedded@1.81.0)(sass@1.80.3)(terser@5.26.0)(tsx@4.19.2)(yaml@2.5.0)): dependencies: '@antfu/utils': 0.7.10 '@rollup/pluginutils': 5.1.3(rollup@4.24.4) From 77494352b37ac19d72dead210e1169ca8129d945 Mon Sep 17 00:00:00 2001 From: Hash Brown Date: Wed, 11 Dec 2024 09:22:41 +0800 Subject: [PATCH 2/4] fix(client): XSS vulnerability in components tab (#726) --- packages/applet/src/components/state/StateFieldViewer.vue | 4 ++-- packages/devtools-kit/src/index.ts | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/applet/src/components/state/StateFieldViewer.vue b/packages/applet/src/components/state/StateFieldViewer.vue index 6c4d5277f..a26c03a5c 100644 --- a/packages/applet/src/components/state/StateFieldViewer.vue +++ b/packages/applet/src/components/state/StateFieldViewer.vue @@ -2,7 +2,7 @@ import type { CustomInspectorState, InspectorCustomState } from '@vue/devtools-kit' import type { EditorAddNewPropType } from '~/composables/state-editor' import { rpc } from '@vue/devtools-core' -import { DevToolsV6PluginAPIHookKeys, DevToolsV6PluginAPIHookPayloads, formatInspectorStateValue, getInspectorStateValueType, getRaw, toEdit, toSubmit } from '@vue/devtools-kit' +import { DevToolsV6PluginAPIHookKeys, DevToolsV6PluginAPIHookPayloads, escape, formatInspectorStateValue, getInspectorStateValueType, getRaw, toEdit, toSubmit } from '@vue/devtools-kit' import { isArray, isObject, sortByKey } from '@vue/devtools-shared' import { vTooltip, VueButton, VueIcon } from '@vue/devtools-ui' import { computed, ref, watch } from 'vue' @@ -71,7 +71,7 @@ const normalizedDisplayedValue = computed(() => { const _value = type.value === 'custom' && !_type ? `"${displayedValue.value}"` : (displayedValue.value === '' ? `""` : displayedValue.value) const normalizedType = type.value === 'custom' && _type === 'ref' ? getInspectorStateValueType(_value) : type.value const selectText = type.value === 'string' ? 'select-text' : '' - const result = `${_value}` + const result = `${_value}` if (extraDisplayedValue) return `${result} (${extraDisplayedValue})` diff --git a/packages/devtools-kit/src/index.ts b/packages/devtools-kit/src/index.ts index 6cedae6b4..4ba1badd9 100644 --- a/packages/devtools-kit/src/index.ts +++ b/packages/devtools-kit/src/index.ts @@ -12,6 +12,7 @@ export type * from './core/component-inspector' export { INFINITY, NAN, NEGATIVE_INFINITY, UNDEFINED } from './core/component/state/constants' export { formatInspectorStateValue, getInspectorStateValueType, getRaw, toEdit, toSubmit } from './core/component/state/format' export { isPlainObject } from './core/component/state/is' +export { escape } from './core/component/state/util' export type * from './core/component/types' export { updateDevToolsClientDetected } from './core/devtools-client/detected' export type * from './core/open-in-editor' From 61b5df82e17e663d999d5d27d32c2fb722678ba8 Mon Sep 17 00:00:00 2001 From: arlo Date: Wed, 11 Dec 2024 19:22:52 +0800 Subject: [PATCH 3/4] chore: pin `vite-plugin-inspect` as patch range --- packages/playground/applet/package.json | 2 +- packages/playground/basic/package.json | 2 +- packages/playground/multi-app/package.json | 2 +- packages/vite/package.json | 2 +- pnpm-lock.yaml | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/playground/applet/package.json b/packages/playground/applet/package.json index 3b78e9d6c..971eaff2a 100644 --- a/packages/playground/applet/package.json +++ b/packages/playground/applet/package.json @@ -28,7 +28,7 @@ "typescript": "^5.7.2", "unocss": "^0.64.1", "vite": "^6.0.1", - "vite-plugin-inspect": "0.8.9", + "vite-plugin-inspect": "~0.8.9", "vite-plugin-vue-devtools": "workspace:*" } } diff --git a/packages/playground/basic/package.json b/packages/playground/basic/package.json index 07b94754d..537ca5c13 100644 --- a/packages/playground/basic/package.json +++ b/packages/playground/basic/package.json @@ -27,7 +27,7 @@ "typescript": "^5.7.2", "unocss": "^0.64.1", "vite": "^6.0.1", - "vite-plugin-inspect": "0.8.9", + "vite-plugin-inspect": "~0.8.9", "vite-plugin-vue-devtools": "workspace:*" } } diff --git a/packages/playground/multi-app/package.json b/packages/playground/multi-app/package.json index ec75fd08d..5e7b6e467 100644 --- a/packages/playground/multi-app/package.json +++ b/packages/playground/multi-app/package.json @@ -20,7 +20,7 @@ "typescript": "^5.7.2", "unocss": "^0.64.1", "vite": "^6.0.1", - "vite-plugin-inspect": "0.8.9", + "vite-plugin-inspect": "~0.8.9", "vite-plugin-vue-devtools": "workspace:*" } } diff --git a/packages/vite/package.json b/packages/vite/package.json index 7fa99f2cc..2d72ed07f 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -55,7 +55,7 @@ "@vue/devtools-shared": "workspace:^", "execa": "^9.5.1", "sirv": "^3.0.0", - "vite-plugin-inspect": "0.8.9", + "vite-plugin-inspect": "~0.8.9", "vite-plugin-vue-inspector": "^5.3.1" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4b3d2d24a..2af37e887 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -579,7 +579,7 @@ importers: specifier: ^6.0.1 version: 6.0.1(@types/node@22.10.1)(jiti@2.0.0)(sass-embedded@1.81.0)(sass@1.80.3)(terser@5.26.0)(tsx@4.19.2)(yaml@2.5.0) vite-plugin-inspect: - specifier: 0.8.9 + specifier: ~0.8.9 version: 0.8.9(rollup@4.24.4)(vite@6.0.1(@types/node@22.10.1)(jiti@2.0.0)(sass-embedded@1.81.0)(sass@1.80.3)(terser@5.26.0)(tsx@4.19.2)(yaml@2.5.0)) vite-plugin-vue-devtools: specifier: workspace:* @@ -643,7 +643,7 @@ importers: specifier: ^6.0.1 version: 6.0.1(@types/node@22.10.1)(jiti@2.0.0)(sass-embedded@1.81.0)(sass@1.80.3)(terser@5.26.0)(tsx@4.19.2)(yaml@2.5.0) vite-plugin-inspect: - specifier: 0.8.9 + specifier: ~0.8.9 version: 0.8.9(rollup@4.24.4)(vite@6.0.1(@types/node@22.10.1)(jiti@2.0.0)(sass-embedded@1.81.0)(sass@1.80.3)(terser@5.26.0)(tsx@4.19.2)(yaml@2.5.0)) vite-plugin-vue-devtools: specifier: workspace:* @@ -686,7 +686,7 @@ importers: specifier: ^6.0.1 version: 6.0.1(@types/node@22.10.1)(jiti@2.0.0)(sass-embedded@1.81.0)(sass@1.80.3)(terser@5.26.0)(tsx@4.19.2)(yaml@2.5.0) vite-plugin-inspect: - specifier: 0.8.9 + specifier: ~0.8.9 version: 0.8.9(rollup@4.24.4)(vite@6.0.1(@types/node@22.10.1)(jiti@2.0.0)(sass-embedded@1.81.0)(sass@1.80.3)(terser@5.26.0)(tsx@4.19.2)(yaml@2.5.0)) vite-plugin-vue-devtools: specifier: workspace:* @@ -859,7 +859,7 @@ importers: specifier: ^3.1.0 || ^4.0.0-0 || ^5.0.0-0 || ^6.0.0-0 version: 5.4.11(@types/node@22.10.1)(sass-embedded@1.81.0)(sass@1.80.3)(terser@5.26.0) vite-plugin-inspect: - specifier: 0.8.9 + specifier: ~0.8.9 version: 0.8.9(rollup@4.24.4)(vite@5.4.11(@types/node@22.10.1)(sass-embedded@1.81.0)(sass@1.80.3)(terser@5.26.0)) vite-plugin-vue-inspector: specifier: ^5.3.1 From 60595325ab1abf0e2d1bcd7f24556c1f3fbe3f96 Mon Sep 17 00:00:00 2001 From: arlo Date: Wed, 11 Dec 2024 19:27:01 +0800 Subject: [PATCH 4/4] chore: release v7.6.8 --- packages/applet/package.json | 2 +- packages/client/package.json | 2 +- packages/core/package.json | 2 +- packages/devtools-api/package.json | 2 +- packages/devtools-kit/package.json | 2 +- packages/devtools/package.json | 2 +- packages/electron/package.json | 2 +- packages/overlay/package.json | 2 +- packages/shared/package.json | 2 +- packages/ui/package.json | 2 +- packages/vite/package.json | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/applet/package.json b/packages/applet/package.json index 1679218d6..de8efeb62 100644 --- a/packages/applet/package.json +++ b/packages/applet/package.json @@ -1,7 +1,7 @@ { "name": "@vue/devtools-applet", "type": "module", - "version": "7.6.7", + "version": "7.6.8", "author": "webfansplz", "license": "MIT", "repository": { diff --git a/packages/client/package.json b/packages/client/package.json index 45081188e..4df942f2d 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,7 +1,7 @@ { "name": "@vue/devtools-client", "type": "module", - "version": "7.6.7", + "version": "7.6.8", "private": true, "author": "webfansplz", "license": "MIT", diff --git a/packages/core/package.json b/packages/core/package.json index ab80e1c5a..5a3b11831 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,7 +1,7 @@ { "name": "@vue/devtools-core", "type": "module", - "version": "7.6.7", + "version": "7.6.8", "author": "webfansplz", "license": "MIT", "repository": { diff --git a/packages/devtools-api/package.json b/packages/devtools-api/package.json index ddb857b76..6e42714dc 100644 --- a/packages/devtools-api/package.json +++ b/packages/devtools-api/package.json @@ -1,7 +1,7 @@ { "name": "@vue/devtools-api", "type": "module", - "version": "7.6.7", + "version": "7.6.8", "author": "webfansplz", "license": "MIT", "repository": { diff --git a/packages/devtools-kit/package.json b/packages/devtools-kit/package.json index b6b85c75a..0dac2608b 100644 --- a/packages/devtools-kit/package.json +++ b/packages/devtools-kit/package.json @@ -1,7 +1,7 @@ { "name": "@vue/devtools-kit", "type": "module", - "version": "7.6.7", + "version": "7.6.8", "author": "webfansplz", "license": "MIT", "repository": { diff --git a/packages/devtools/package.json b/packages/devtools/package.json index 3ac622128..19976918d 100644 --- a/packages/devtools/package.json +++ b/packages/devtools/package.json @@ -1,7 +1,7 @@ { "name": "@vue/devtools", "type": "module", - "version": "7.6.7", + "version": "7.6.8", "author": "webfansplz", "license": "MIT", "repository": { diff --git a/packages/electron/package.json b/packages/electron/package.json index e847e8340..66bbc5cfe 100644 --- a/packages/electron/package.json +++ b/packages/electron/package.json @@ -1,7 +1,7 @@ { "name": "@vue/devtools-electron", "type": "module", - "version": "7.6.7", + "version": "7.6.8", "author": "webfansplz", "license": "MIT", "repository": { diff --git a/packages/overlay/package.json b/packages/overlay/package.json index b3853a1a4..60fef7bdc 100644 --- a/packages/overlay/package.json +++ b/packages/overlay/package.json @@ -1,7 +1,7 @@ { "name": "@vue/devtools-overlay", "type": "module", - "version": "7.6.7", + "version": "7.6.8", "private": true, "author": "webfansplz", "license": "MIT", diff --git a/packages/shared/package.json b/packages/shared/package.json index f23e30dc5..552511c07 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,7 +1,7 @@ { "name": "@vue/devtools-shared", "type": "module", - "version": "7.6.7", + "version": "7.6.8", "author": "webfansplz", "license": "MIT", "repository": { diff --git a/packages/ui/package.json b/packages/ui/package.json index 0b3137c38..bf2d137e7 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,7 +1,7 @@ { "name": "@vue/devtools-ui", "type": "module", - "version": "7.6.7", + "version": "7.6.8", "author": "webfansplz", "license": "MIT", "repository": { diff --git a/packages/vite/package.json b/packages/vite/package.json index 2d72ed07f..54b3cf7eb 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -1,7 +1,7 @@ { "name": "vite-plugin-vue-devtools", "type": "module", - "version": "7.6.7", + "version": "7.6.8", "description": "A vite plugin for Vue DevTools", "author": "webfansplz", "license": "MIT",