Merge branch 'main' into feat/debug-page

Author: antfu

.github/workflows/autofix.yml

@@ -12,12 +12,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: corepack enable
       - uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: lts/*
           cache: pnpm
+      - run: corepack enable
       - run: pnpm install
       - run: pnpm lint --fix
       - uses: autofix-ci/action@ea32e3a12414e6d3183163c3424a7d7a8631ad84

.github/workflows/ci.yml

@@ -16,12 +16,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: corepack enable
       - uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: lts/*
           cache: pnpm
+      - run: corepack enable
       - run: pnpm install
       - run: pnpm lint
       - run: pnpm build

docs/package.json

@@ -15,7 +15,7 @@
     "@nuxt/devtools": "^1.7.0",
     "@nuxt/fonts": "^0.10.3",
     "@nuxt/image": "1.8.0",
-    "@nuxt/ui-pro": "^1.6.0",
+    "@nuxt/ui-pro": "^1.7.0",
     "@nuxthq/studio": "^2.2.1",
     "@nuxtjs/plausible": "^1.2.0",
     "@vueuse/core": "^12.4.0",

docs/pnpm-lock.yaml

@@ -127,6 +127,7 @@ export interface InstalledModuleInfo {
   isUninstallable: boolean
   info?: ModuleStaticInfo
   entryPath?: string
+  timings?: Record<string, number | undefined>
   meta?: {
     name?: string
   }

packages/devtools-kit/src/_types/integrations.ts

@@ -43,6 +43,8 @@ const units = computed(() => {
 
 <template>
   <div :class="getLatencyColor(duration)">
+    <slot name="before" />
     {{ units[0] }}<span ml-1 text-xs op50>{{ units[1] }}</span>
+    <slot name="after" />
   </div>
 </template>

packages/devtools/client/components/DurationDisplay.vue

@@ -93,19 +93,32 @@ const openInEditor = useOpenInEditor()
       <slot name="items" />
 
       <div v-if="data.stats" flex="~ gap-4 items-center">
-        <div flex="~ gap-1 items-center" op50>
+        <div flex="~ gap-2 items-center" op50>
           <NIcon icon="carbon-star" text-lg />
           <span>
             {{ data.stats.stars }}
           </span>
         </div>
-        <div flex="~ gap-1 items-center" op50>
+        <div flex="~ gap-2 items-center" op50>
           <NIcon icon="carbon-download" text-lg />
           <span>
             {{ data.stats.downloads }}
           </span>
         </div>
       </div>
+
+      <div v-if="mod.timings?.setup">
+        <DurationDisplay
+          title="Module Setup Time"
+          flex="~ items-center"
+          :duration="mod.timings.setup * 1000"
+          :factor="0.5"
+        >
+          <template #before>
+            <NIcon icon="carbon-time" mr2 text-lg op50 />
+          </template>
+        </DurationDisplay>
+      </div>
     </div>
     <div flex="~ col" items-end>
       <div

packages/devtools/client/components/ModuleItemBase.vue

@@ -33,7 +33,7 @@ export const rpc = createBirpc<ServerFunctions, ClientFunctions>(clientFunctions
       return fn
     if (!name.includes(':'))
       return
-    const [namespace, fnName] = name.split(':')
+    const [namespace, fnName] = name.split(':') as [string, string]
     return extendedRpcMap.get(namespace)?.[fnName]
   },
   onError(error, name) {
@@ -43,8 +43,11 @@ export const rpc = createBirpc<ServerFunctions, ClientFunctions>(clientFunctions
 })
 
 async function connectVite() {
-  let base = window.parent?.__NUXT__?.config?.app?.baseURL ?? '/'
-  const buildAssetsDir = window.parent?.__NUXT__?.config?.app.buildAssetsDir.replace(/^\/|\/$/g, '') ?? '_nuxt'
+  const appConfig = window.parent?.__NUXT__?.config?.app
+    ?? window.parent?.useNuxtApp?.()?.payload?.config?.app // Nuxt 4 removes __NUXT__
+
+  let base = appConfig?.baseURL ?? '/'
+  const buildAssetsDir = appConfig?.buildAssetsDir?.replace(/^\/|\/$/g, '') ?? '_nuxt'
   if (base && !base.endsWith('/'))
     base += '/'
   const current = window.location.href.replace(/\/__nuxt_devtools__\/client\/.*$/, '/')

packages/devtools/client/composables/rpc.ts

@@ -84,8 +84,8 @@
     "ws": "catalog:"
   },
   "devDependencies": {
-    "@discoveryjs/cli": "^2.12.1",
-    "@discoveryjs/discovery": "1.0.0-beta.92",
+    "@discoveryjs/cli": "catalog:",
+    "@discoveryjs/discovery": "catalog:",
     "@iconify-json/bxl": "catalog:",
     "@iconify-json/carbon": "catalog:",
     "@iconify-json/logos": "catalog:",
@@ -96,6 +96,7 @@
     "@nuxt/devtools": "workspace:*",
     "@nuxt/test-utils": "catalog:",
     "@parcel/watcher": "catalog:",
+    "@shikijs/langs-precompiled": "catalog:",
     "@types/markdown-it-link-attributes": "catalog:",
     "@unocss/nuxt": "catalog:",
     "@unocss/preset-icons": "catalog:",
@@ -119,7 +120,7 @@
     "ofetch": "catalog:",
     "quicktype-core": "catalog:",
     "shiki": "catalog:",
-    "shiki-codegen": "^1.27.0",
+    "shiki-codegen": "catalog:",
     "theme-vitesse": "catalog:",
     "unocss": "catalog:",
     "unplugin-vue-markdown": "catalog:",