diff --git a/eslint.config.js b/eslint.config.js index 49007818..da8e26cc 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -12,3 +12,6 @@ export default antfu({ 'no-console': 'off', }, }) + .removeRules( + 'vue/no-template-shadow', + ) diff --git a/package.json b/package.json index 17427cae..8e9e9bae 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "@types/ws": "catalog:types", "@typescript-eslint/utils": "catalog:devtools", "@unocss/eslint-config": "catalog:devtools", + "@vueuse/core": "catalog:frontend", "ansis": "catalog:deps", "bumpp": "catalog:devtools", "esbuild": "catalog:build", diff --git a/packages/core/package.json b/packages/core/package.json index d454f697..f8780ff1 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -62,17 +62,19 @@ "debug": "catalog:deps", "launch-editor": "catalog:deps", "mlly": "catalog:deps", - "nanoevents": "catalog:deps", "open": "catalog:deps", "pathe": "catalog:deps", "perfect-debounce": "catalog:deps", "sirv": "catalog:deps", + "tinyexec": "catalog:deps", "ws": "catalog:deps" }, "devDependencies": { "@vitejs/devtools": "workspace:*", "@vitejs/devtools-vite": "workspace:*", "@vitejs/plugin-vue": "catalog:build", + "@xterm/addon-fit": "catalog:frontend", + "@xterm/xterm": "catalog:frontend", "tsdown": "catalog:build", "typescript": "catalog:devtools", "unplugin-vue": "catalog:build", diff --git a/packages/core/playground/vite.config.ts b/packages/core/playground/vite.config.ts index 93f6741b..c0c3713b 100644 --- a/packages/core/playground/vite.config.ts +++ b/packages/core/playground/vite.config.ts @@ -102,6 +102,14 @@ export default defineConfig({ launcher: { title: 'Launcher My Cool App', onLaunch: async () => { + await ctx.terminals.startChildProcess({ + command: 'vite', + args: ['dev'], + cwd: process.cwd(), + }, { + id: 'vite-run', + title: 'Vite Run', + }) await new Promise(resolve => setTimeout(resolve, 1000)) ctx.docks.update({ diff --git a/packages/core/src/client/inject/index.ts b/packages/core/src/client/inject/index.ts index 1aa300fa..fcda02ef 100644 --- a/packages/core/src/client/inject/index.ts +++ b/packages/core/src/client/inject/index.ts @@ -4,7 +4,7 @@ import type { DockPanelStorage } from '@vitejs/devtools-kit/client' import { getDevToolsRpcClient } from '@vitejs/devtools-kit/client' import { useLocalStorage } from '@vueuse/core' -import { createDocksContext } from '../webcomponents' +import { createDocksContext } from '../webcomponents/state/context' export async function init(): Promise { // eslint-disable-next-line no-console @@ -16,7 +16,7 @@ export async function init(): Promise { // eslint-disable-next-line no-console console.log('[VITE DEVTOOLS] RPC', rpc) - const rpcFunctions = await rpc.$call('vite:core:list-rpc-functions') + const rpcFunctions = await rpc.$call('vite:internal:rpc:server:list') // eslint-disable-next-line no-console console.log('[VITE DEVTOOLS] RPC Functions', rpcFunctions) diff --git a/packages/core/src/client/standalone/App.vue b/packages/core/src/client/standalone/App.vue index 2005fd88..2896695f 100644 --- a/packages/core/src/client/standalone/App.vue +++ b/packages/core/src/client/standalone/App.vue @@ -5,8 +5,7 @@ import { markRaw, useTemplateRef } from 'vue' import DockEntries from '../webcomponents/components/DockEntries.vue' import VitePlus from '../webcomponents/components/icons/VitePlus.vue' import ViewEntry from '../webcomponents/components/ViewEntry.vue' -import { createDocksContext } from '../webcomponents/state/dock' -import { useStateHandlers } from '../webcomponents/state/state' +import { createDocksContext } from '../webcomponents/state/context' import { PersistedDomViewsManager } from '../webcomponents/utils/PersistedDomViewsManager' const rpcReturn = await getDevToolsRpcClient() @@ -24,8 +23,6 @@ const context: DocksContext = await createDocksContext( ) context.docks.selectedId ||= context.docks.entries[0]?.id ?? null - -const { selectDockEntry } = useStateHandlers(context)