Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: support vite-plugin-inspect for both Vite 5 and 6 #757

Merged
merged 6 commits into from
Dec 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/autofix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- run: corepack enable
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
node-version: 18
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- run: corepack enable
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
node-version: 18
Expand Down
1 change: 1 addition & 0 deletions packages/devtools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
"tinyglobby": "catalog:",
"unimport": "catalog:",
"vite-plugin-inspect": "catalog:",
"vite-plugin-inspect-legacy": "npm:[email protected]",
"vite-plugin-vue-inspector": "catalog:",
"which": "catalog:",
"ws": "catalog:"
Expand Down
4 changes: 2 additions & 2 deletions packages/devtools/src/integrations/analyze-build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import type { Nuxt } from 'nuxt/schema'
import type { AnalyzeBuildMeta, ModuleOptions } from '../types'
import { addVitePlugin } from '@nuxt/kit'
import { join } from 'pathe'
import Inspect from 'vite-plugin-inspect'
import { getFolderSize } from '../utils/fs'
import { createVitePluginInspect } from './vite-inspect'

export async function setup(nuxt: Nuxt, options: ModuleOptions) {
if (options.viteInspect !== false) {
addVitePlugin(
Inspect({
await createVitePluginInspect({
build: true,
outputDir: join(nuxt.options.analyzeDir, '.vite-inspect'),
}),
Expand Down
20 changes: 16 additions & 4 deletions packages/devtools/src/integrations/vite-inspect.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,23 @@
import type { ViteInspectAPI } from 'vite-plugin-inspect'
import type { Plugin } from 'vite'
import type { ViteInspectAPI, ViteInspectOptions } from 'vite-plugin-inspect'
import type { NuxtDevtoolsServerContext } from '../types'
import { addCustomTab } from '@nuxt/devtools-kit'
import { addVitePlugin } from '@nuxt/kit'
import Inspect from 'vite-plugin-inspect'

export function setup({ nuxt, rpc }: NuxtDevtoolsServerContext) {
const plugin = Inspect()
export async function createVitePluginInspect(options?: ViteInspectOptions): Promise<Plugin> {
const { version } = await import('vite')
const major = Number.parseInt(version.split('.')[0], 10)

if (major < 6) {
return await import('vite-plugin-inspect-legacy').then(r => r.default(options))
}
else {
return await import('vite-plugin-inspect').then(r => r.default(options))
}
}

export async function setup({ nuxt, rpc }: NuxtDevtoolsServerContext) {
const plugin = await createVitePluginInspect()
addVitePlugin(plugin)

let api: ViteInspectAPI | undefined
Expand Down
407 changes: 241 additions & 166 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ catalog:
'@nuxt/test-utils': ^3.14.4
'@opentelemetry/api': ^1.9.0
'@parcel/watcher': ^2.5.0
'@pinia/nuxt': ^0.7.0
'@pinia/nuxt': ^0.8.0
'@types/diff': ^6.0.0
'@types/markdown-it': ^14.1.2
'@types/markdown-it-link-attributes': ^3.0.5
Expand Down Expand Up @@ -84,12 +84,12 @@ catalog:
nitropack: ^2.10.4
nuxt: ^3.14.1592
nuxt-eslint-auto-explicit-import: ^0.1.1
nypm: ^0.4.0
nypm: ^0.4.1
ofetch: ^1.4.1
ohash: ^1.1.4
pathe: ^1.1.2
perfect-debounce: ^1.0.0
pinia: ^2.2.7
pinia: ^2.2.8
pkg-types: ^1.2.1
prompts: ^2.4.2
quicktype-core: ^23.0.170
Expand All @@ -107,16 +107,16 @@ catalog:
typescript: 5.6.3
ua-parser-js: ^1.0.39
unbuild: ^2.0.0
unimport: ^3.13.4
unimport: ^3.14.1
unocss: ^0.64.1
unplugin-vue-markdown: ^0.26.3
v-lazy-show: ^0.2.4
vanilla-jsoneditor: ^0.23.8
vis-data: ^7.1.9
vis-network: ^9.1.9
vite: ^5.4.11
vite: ^6.0.1
vite-hot-client: ^0.2.4
vite-plugin-inspect: ^0.8.8
vite-plugin-inspect: ^0.10.3
vite-plugin-vue-inspector: 5.1.3
vitest: ^2.1.6
vue: ^3.5.13
Expand Down
Loading