Skip to content

Commit 9c6ffea

Browse files
committed
chore: update
1 parent 434c1ae commit 9c6ffea

8 files changed

Lines changed: 30 additions & 13 deletions

File tree

alias.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export const alias = {
1111
'@vitejs/devtools-rpc/presets': r('rpc/src/presets/index.ts'),
1212
'@vitejs/devtools-rpc': r('rpc/src'),
1313
'@vitejs/devtools-kit/client': r('kit/src/client/index.ts'),
14+
'@vitejs/devtools-kit/constants': r('kit/src/constants.ts'),
1415
'@vitejs/devtools-kit/utils/events': r('kit/src/utils/events.ts'),
1516
'@vitejs/devtools-kit/utils/nanoid': r('kit/src/utils/nanoid.ts'),
1617
'@vitejs/devtools-kit/utils/shared-state': r('kit/src/utils/shared-state.ts'),

packages/core/src/client/webcomponents/components/ViewBuiltinSettings.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<script setup lang="ts">
22
import type { DevToolsViewBuiltin } from '@vitejs/devtools-kit'
33
import type { DocksContext } from '@vitejs/devtools-kit/client'
4+
import { DEFAULT_STATE_DOCKS_SETTINGS } from '@vitejs/devtools-kit/constants'
45
import { computed } from 'vue'
5-
import { defaultDocksSettings, docksGroupByCategories } from '../state/dock-settings'
6+
import { docksGroupByCategories } from '../state/dock-settings'
67
import { sharedStateToRef } from '../state/docks'
78
import DockIcon from './DockIcon.vue'
89
@@ -125,7 +126,7 @@ function resetSettings() {
125126
// eslint-disable-next-line no-alert
126127
if (confirm('Reset all dock settings to defaults?')) {
127128
settingsStore.mutate(() => {
128-
return defaultDocksSettings()
129+
return DEFAULT_STATE_DOCKS_SETTINGS()
129130
})
130131
}
131132
}

packages/core/src/client/webcomponents/state/context.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ import type { DevToolsRpcClient, DockClientScriptContext, DockEntryState, DockPa
22
import type { SharedState } from '@vitejs/devtools-kit/utils/shared-state'
33
import type { Ref } from 'vue'
44
import type { DevToolsDocksUserSettings } from './dock-settings'
5+
import { DEFAULT_STATE_DOCKS_SETTINGS } from '@vitejs/devtools-kit/constants'
56
import { computed, markRaw, reactive, ref, toRefs, watchEffect } from 'vue'
67
import { BUILTIN_ENTRIES } from '../constants'
7-
import { defaultDocksSettings, docksGroupByCategories } from './dock-settings'
8+
import { docksGroupByCategories } from './dock-settings'
89
import { createDockEntryState, DEFAULT_DOCK_PANEL_STORE, useDocksEntries } from './docks'
910
import { executeSetupScript } from './setup-script'
1011

@@ -86,7 +87,7 @@ export async function createDocksContext(
8687
if (!_settingsStorePromise) {
8788
_settingsStorePromise = rpc.sharedState.get(
8889
'vite:internal:docks:settings',
89-
{ initialValue: defaultDocksSettings() },
90+
{ initialValue: DEFAULT_STATE_DOCKS_SETTINGS() },
9091
)
9192
}
9293
return _settingsStorePromise

packages/core/src/client/webcomponents/state/dock-settings.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,6 @@ export interface SplitGroupsResult {
1111
overflow: DevToolsDockEntriesGrouped
1212
}
1313

14-
export function defaultDocksSettings(): DevToolsDocksUserSettings {
15-
return {
16-
hiddenDocks: [],
17-
hiddenCategories: [],
18-
pinnedDocks: [],
19-
customOrder: {},
20-
}
21-
}
22-
2314
/**
2415
* Group and sort dock entries based on user settings.
2516
* Filters out hidden entries and categories, sorts by pinned status, custom order, and default order.

packages/kit/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"exports": {
2222
".": "./dist/index.mjs",
2323
"./client": "./dist/client.mjs",
24+
"./constants": "./dist/constants.mjs",
2425
"./utils/events": "./dist/utils/events.mjs",
2526
"./utils/nanoid": "./dist/utils/nanoid.mjs",
2627
"./utils/shared-state": "./dist/utils/shared-state.mjs",

packages/kit/src/constants.ts

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import type { DevToolsDockEntryCategory, DevToolsDocksUserSettings } from './types'
2+
3+
export const DEFAULT_CATEGORIES_ORDER: Record<string, number> = {
4+
'~viteplus': -1000,
5+
'default': 0,
6+
'app': 100,
7+
'framework': 200,
8+
'web': 300,
9+
'advanced': 400,
10+
'~builtin': 1000,
11+
} satisfies Record<DevToolsDockEntryCategory, number>
12+
13+
export const DEFAULT_STATE_DOCKS_SETTINGS: () => DevToolsDocksUserSettings = () => ({
14+
hiddenDocks: [],
15+
hiddenCategories: [],
16+
pinnedDocks: [],
17+
customOrder: {},
18+
})

packages/kit/tsdown.config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { defineConfig } from 'tsdown'
33
export default defineConfig({
44
entry: {
55
'index': 'src/index.ts',
6+
'constants': 'src/constants.ts',
67
'utils/events': 'src/utils/events.ts',
78
'utils/nanoid': 'src/utils/nanoid.ts',
89
'utils/shared-state': 'src/utils/shared-state.ts',

tsconfig.base.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
"@vitejs/devtools-kit/client": [
2525
"./packages/kit/src/client/index.ts"
2626
],
27+
"@vitejs/devtools-kit/constants": [
28+
"./packages/kit/src/constants.ts"
29+
],
2730
"@vitejs/devtools-kit/utils/events": [
2831
"./packages/kit/src/utils/events.ts"
2932
],

0 commit comments

Comments
 (0)