chore: update

Author: webfansplz

package.json

@@ -29,7 +29,7 @@
     "typecheck": "vue-tsc -b",
     "watch": "turbo watch build",
     "zip": "pnpm run zip:webext",
-    "zip:webext": "turbo run build --filter=@vitejs/devtools-webext && node packages/webext/scripts/zip.mjs"
+    "zip:webext": "turbo run build --filter=@vitejs/devtools-webext && pnpm --filter @vitejs/devtools-webext run zip"
   },
   "scripts-info": {
     "actionspack": "Update pinned GitHub Actions versions",

packages/core/src/client/webcomponents/state/__tests__/context-cache.test.ts

@@ -89,4 +89,27 @@ describe('dock state caches', () => {
     expect(context.docks.entries[0]?.icon)
       .toBe('http://localhost:5173/__devtools-vite/favicon.svg')
   })
+
+  it('resolves server-hosted launcher icons against the RPC server', async () => {
+    const rpc = createMockRpc([{
+      id: 'vitest',
+      type: 'launcher',
+      title: 'Vitest',
+      icon: '/__devtools-vitest/favicon.svg',
+      launcher: {
+        title: 'Vitest UI',
+        description: 'Start Vitest UI.',
+        icon: '/__devtools-vitest/favicon.svg',
+        status: 'idle',
+      },
+    }])
+
+    const context = await createDocksContext('standalone', rpc)
+    const entry = context.docks.entries[0]
+
+    expect(entry?.icon)
+      .toBe('http://localhost:5173/__devtools-vitest/favicon.svg')
+    expect(entry?.type === 'launcher' && entry.launcher.icon)
+      .toBe('http://localhost:5173/__devtools-vitest/favicon.svg')
+  })
 })

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

@@ -28,10 +28,21 @@ export async function createDocksContext(
   }
 
   const dockEntries = await useDocksEntries(rpc)
-  const resolveEntryIcon = <T extends DevToolsDockEntry>(entry: T): T => ({
-    ...entry,
-    icon: resolveDockIcon(entry.icon, rpc.connection),
-  })
+  const resolveEntryIcon = <T extends DevToolsDockEntry>(entry: T): T => {
+    const resolved = {
+      ...entry,
+      icon: resolveDockIcon(entry.icon, rpc.connection),
+    }
+
+    if (resolved.type === 'launcher' && resolved.launcher.icon) {
+      resolved.launcher = {
+        ...resolved.launcher,
+        icon: resolveDockIcon(resolved.launcher.icon, rpc.connection),
+      }
+    }
+
+    return resolved
+  }
 
   // Client-only dock registry (0.7.10 `DocksEntriesContext` API). Docks
   // registered here live in this page only, merged over the server-provided

packages/webext/package.json

@@ -24,7 +24,8 @@
     "build:scripts": "tsdown",
     "build:client": "vite build",
     "watch": "tsdown --watch && vite build --watch",
-    "prepack": "pnpm build"
+    "prepack": "pnpm build",
+    "zip": "tsx scripts/zip.ts"
   },
   "dependencies": {
     "@vitejs/devtools": "workspace:*",
@@ -33,6 +34,7 @@
     "webext-bridge": "catalog:deps"
   },
   "devDependencies": {
+    "@types/archiver": "catalog:types",
     "@types/chrome": "catalog:types",
     "@vitejs/plugin-vue": "catalog:build",
     "archiver": "catalog:build",

packages/webext/scripts/zip.mjs packages/webext/scripts/zip.tspackages/webext/scripts/zip.mjs renamed to packages/webext/scripts/zip.ts

@@ -1,11 +1,17 @@
-// @ts-check
 import fs from 'node:fs'
-import { createRequire } from 'node:module'
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
+import archiver from 'archiver'
 
-const require = createRequire(import.meta.url)
-const archiver = require('archiver')
+type ManifestFileCollection = string[] | Record<string, string>
+
+interface ExtensionManifest {
+  devtools_page?: string
+  background?: { service_worker?: string }
+  action?: { default_icon?: ManifestFileCollection }
+  icons?: ManifestFileCollection
+  content_scripts?: Array<{ js?: string[], css?: string[] }>
+}
 
 const packageDir = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..')
 const rootDir = path.resolve(packageDir, '../..')
@@ -28,17 +34,17 @@ const ignore = [
   '**/*.tsbuildinfo',
 ]
 
-const manifest = JSON.parse(fs.readFileSync(path.join(packageDir, 'manifest.json'), 'utf8'))
+const manifest = JSON.parse(fs.readFileSync(path.join(packageDir, 'manifest.json'), 'utf8')) as ExtensionManifest
 const requiredFiles = collectManifestFiles(manifest)
 
 fs.rmSync(outFile, { force: true })
 fs.mkdirSync(outDir, { recursive: true })
 
 const output = fs.createWriteStream(outFile)
 const archive = archiver('zip', { zlib: { level: 9 } })
-const entries = new Set()
+const entries = new Set<string>()
 
-const done = new Promise((resolve, reject) => {
+const done = new Promise<void>((resolve, reject) => {
   output.on('close', resolve)
   output.on('error', reject)
   archive.on('entry', entry => entries.add(entry.name))
@@ -72,7 +78,7 @@ for (const file of requiredFiles) {
 
 console.log(`Created ${path.relative(rootDir, outFile)} (${formatBytes(size)}, ${entries.size} files)`)
 
-function collectManifestFiles(manifest) {
+function collectManifestFiles(manifest: ExtensionManifest): Set<string> {
   const files = new Set(['manifest.json'])
 
   add(files, manifest.devtools_page)
@@ -88,12 +94,12 @@ function collectManifestFiles(manifest) {
   return files
 }
 
-function add(files, value) {
+function add(files: Set<string>, value: string | undefined): void {
   if (typeof value === 'string')
     files.add(value)
 }
 
-function addAll(files, value) {
+function addAll(files: Set<string>, value: ManifestFileCollection | undefined): void {
   if (Array.isArray(value)) {
     for (const entry of value)
       add(files, entry)
@@ -106,7 +112,7 @@ function addAll(files, value) {
   }
 }
 
-function formatBytes(bytes) {
+function formatBytes(bytes: number): string {
   const units = ['B', 'KB', 'MB', 'GB']
   let size = bytes
   let unit = 0

pnpm-lock.yaml

@@ -207,6 +207,7 @@ catalogs:
     tsnapi: ^1.2.0
     vitest: ^4.1.10
   types:
+    '@types/archiver': ^7.0.0
     '@types/chrome': ^0.2.5
     '@types/connect': ^3.4.38
     '@types/d3': ^7.4.3