Skip to content

Commit 7c18de5

Browse files
committed
chore: move vite module types to core to avoid circle reference
1 parent a7d5c6c commit 7c18de5

File tree

9 files changed

+44
-48
lines changed

9 files changed

+44
-48
lines changed

packages/client/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
"unplugin-auto-import": "^0.17.5",
6262
"unplugin-vue-components": "^0.26.0",
6363
"vite": "^5.1.4",
64-
"vite-plugin-vue-devtools": "workspace:^",
6564
"vue": "^3.4.21"
6665
}
6766
}

packages/client/src/components/assets/AssetDetails.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<script setup lang="ts">
22
import { useTimeAgo } from '@vueuse/core'
3-
import type { AssetInfo, CodeSnippet } from '@vue/devtools-core'
3+
import type { AssetInfo, CodeSnippet, ImageMeta } from '@vue/devtools-core'
44
import { callViteServerAction, useDevToolsState } from '@vue/devtools-core'
55
import { VueButton, VueIcon, VTooltip as vTooltip } from '@vue/devtools-ui'
6-
import type { ImageMeta } from 'vite-plugin-vue-devtools'
76
87
const props = defineProps<{
98
modelValue: AssetInfo

packages/client/src/pages/assets.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script setup lang="ts">
22
import { VueCheckbox, VueDrawer, VueIcon, VueSelect } from '@vue/devtools-ui'
33
import { callViteServerAction, defineViteClientListener } from '@vue/devtools-core'
4-
import type { AssetInfo } from 'vite-plugin-vue-devtools'
4+
import type { AssetInfo } from '@vue/devtools-core'
55
import Fuse from 'fuse.js'
66
77
const DETAILS_MAX_ITEMS = 50

packages/client/src/pages/graph.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script setup lang="ts">
22
import { callViteServerAction, defineViteClientListener } from '@vue/devtools-core'
33
import { Network } from 'vis-network'
4-
import type { ModuleInfo } from 'vite-plugin-vue-devtools'
4+
import type { ModuleInfo } from '@vue/devtools-core'
55
66
const getRoot = callViteServerAction<string>('get-vite-root')
77
const getGraph = callViteServerAction<ModuleInfo[]>('graph:get-modules')
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
export * from './client'
22
export * from './server'
3+
export * from './module-types'
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
// assets
2+
export type AssetType = 'image' | 'font' | 'video' | 'audio' | 'text' | 'json' | 'other'
3+
export interface AssetInfo {
4+
path: string
5+
type: AssetType
6+
publicPath: string
7+
filePath: string
8+
size: number
9+
mtime: number
10+
}
11+
export interface ImageMeta {
12+
width: number
13+
height: number
14+
orientation?: number
15+
type?: string
16+
mimeType?: string
17+
}
18+
19+
export interface AssetEntry {
20+
path: string
21+
content: string
22+
encoding?: BufferEncoding
23+
override?: boolean
24+
}
25+
26+
export interface CodeSnippet {
27+
code: string
28+
lang: string
29+
name: string
30+
docs?: string
31+
}
32+
33+
// graph
34+
export interface ModuleInfo {
35+
id: string
36+
plugins: { name: string, transform?: number, resolveId?: number }[]
37+
deps: string[]
38+
virtual: boolean
39+
}

packages/vite/src/modules/assets.ts

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,11 @@ import type { ViteInspectAPI } from 'vite-plugin-inspect'
33
import { debounce } from 'perfect-debounce'
44
import type { ResolvedConfig, ViteDevServer } from 'vite'
55
import { callViteClientListener, defineViteServerAction } from '@vue/devtools-core'
6+
import type { AssetInfo, AssetType, ImageMeta } from '@vue/devtools-core'
67
import fg from 'fast-glob'
78
import { join, resolve } from 'pathe'
89
import { imageMeta } from 'image-meta'
910

10-
// assets
11-
export type AssetType = 'image' | 'font' | 'video' | 'audio' | 'text' | 'json' | 'other'
12-
export interface AssetInfo {
13-
path: string
14-
type: AssetType
15-
publicPath: string
16-
filePath: string
17-
size: number
18-
mtime: number
19-
}
20-
export interface ImageMeta {
21-
width: number
22-
height: number
23-
orientation?: number
24-
type?: string
25-
mimeType?: string
26-
}
27-
28-
export interface AssetEntry {
29-
path: string
30-
content: string
31-
encoding?: BufferEncoding
32-
override?: boolean
33-
}
34-
35-
export interface CodeSnippet {
36-
code: string
37-
lang: string
38-
name: string
39-
docs?: string
40-
}
41-
4211
const defaultAllowedExtensions = [
4312
'png',
4413
'jpg',

packages/vite/src/modules/graph.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@ import { debounce } from 'perfect-debounce'
33
import type { ViteDevServer } from 'vite'
44
import { callViteClientListener, defineViteServerAction } from '@vue/devtools-core'
55

6-
// graph
7-
export interface ModuleInfo {
8-
id: string
9-
plugins: { name: string, transform?: number, resolveId?: number }[]
10-
deps: string[]
11-
virtual: boolean
12-
}
13-
146
export function setupGraphModule(options: { rpc: ViteInspectAPI['rpc'], server: ViteDevServer }) {
157
const { rpc, server } = options
168

pnpm-lock.yaml

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)