feat: adopt new tab interface

danielroe · Jan 26, 2023 · 074dde9 · 074dde9
1 parent af33fa0
commit 074dde9
Show file tree

Hide file tree

Showing 7 changed files with 198 additions and 219 deletions.
diff --git a/package.json b/package.json
@@ -5,35 +5,35 @@
     "build": "pnpm run --filter=./packages/* -r build",
     "stub": "pnpm run --filter=./packages/* -r stub",
     "dev:prepare": "pnpm nuxi prepare playground",
-    "dev": "pnpm run build && pnpm -C playground test:nuxt",
+    "dev": "pnpm run build && pnpm -C playground test:unit",
     "lint": "pnpm lint:all:eslint && pnpm lint:all:prettier",
     "lint:all:eslint": "pnpm lint:eslint --ext .ts,.js,.mjs,.cjs .",
     "lint:all:prettier": "pnpm lint:prettier \"**/*.{js,json,ts}\"",
     "lint:eslint": "eslint --fix",
-    "play": "pnpm run stub && pnpm -C playground dev",
     "lint:prettier": "prettier --write --loglevel warn",
+    "play": "pnpm run stub && pnpm -C playground dev",
     "prepare": "husky install",
     "test": "pnpm -C playground test",
     "release": "release-it"
   },
   "devDependencies": {
     "@nuxt/eslint-config": "^0.1.1",
-    "@nuxt/schema": "3.1.0",
+    "@nuxt/schema": "3.1.1",
     "@release-it-plugins/workspaces": "^3.2.0",
     "@release-it/conventional-changelog": "5.1.1",
-    "@vitest/coverage-c8": "0.28.1",
+    "@vitest/coverage-c8": "0.28.2",
     "conventional-changelog-conventionalcommits": "5.0.0",
     "eslint": "8.32.0",
     "eslint-config-prettier": "8.6.0",
     "eslint-plugin-prettier": "4.2.1",
     "husky": "8.0.3",
     "lint-staged": "13.1.0",
-    "nuxt": "3.1.0",
+    "nuxt": "3.1.1",
     "pinst": "3.0.0",
     "prettier": "2.8.3",
     "release-it": "15.6.0",
     "unbuild": "1.1.1",
-    "vitest": "0.28.1",
+    "vitest": "0.28.2",
     "vue": "3.2.45"
   },
   "pnpm": {

diff --git a/packages/nuxt-vitest/package.json b/packages/nuxt-vitest/package.json
@@ -39,15 +39,15 @@
     "vite": "*"
   },
   "dependencies": {
-    "@nuxt/kit": "^3.1.0",
-    "@vitest/ui": "^0.28.1",
+    "@nuxt/kit": "^3.1.1",
+    "@vitest/ui": "^0.28.2",
     "get-port-please": "^3.0.1",
-    "vitest": "^0.28.1",
+    "vitest": "^0.28.2",
     "vitest-environment-nuxt": "0.6.1"
   },
   "devDependencies": {
     "@nuxt/module-builder": "^0.2.1",
-    "@nuxt/schema": "^3.1.0",
-    "nuxt": "3.1.0"
+    "@nuxt/schema": "^3.1.1",
+    "nuxt": "3.1.1"
   }
 }
diff --git a/packages/nuxt-vitest/src/module.ts b/packages/nuxt-vitest/src/module.ts
@@ -44,6 +44,8 @@ export default defineNuxtModule<NuxtVitestOptions>({
 
     const PORT = await getPort({ port: 15555 })
     const URL = `http://localhost:${PORT}/__vitest__/`
+    let loaded = false
+    let promise: Promise<any> | undefined
 
     async function start() {
       const rawViteConfig = mergeConfig({}, await rawViteConfigPromise)
@@ -95,33 +97,44 @@ export default defineNuxtModule<NuxtVitestOptions>({
 
       logger.info(`Vitest UI starting on ${URL}`)
 
-      return await promise
+      loaded = true
+      promise
     }
 
-    let promise: Promise<any> | undefined
-
     // @ts-ignore
-    nuxt.hook('devtools:customTabs', iframeTabs => {
-      iframeTabs.push({
+    nuxt.hook('devtools:customTabs', tabs => {
+      tabs.push({
         title: 'Vitest',
         name: 'vitest',
         icon: 'logos-vitest',
-        view: {
-          type: 'iframe',
-          src: URL,
-        },
-        lazy: {
-          onLoad: async () => {
-            promise = promise || start()
-            await promise
-          },
-          description: 'Start tests along with Nuxt',
-        },
+        view: loaded
+          ? {
+              type: 'iframe',
+              src: URL,
+            }
+          : {
+              type: 'launch',
+              description: 'Start tests along with Nuxt',
+              actions: [
+                {
+                  label: promise ? 'Starting...' : 'Start Vitest',
+                  pending: !!promise,
+                  handle: () => {
+                    promise = promise || start()
+                    return promise
+                  },
+                },
+              ],
+            },
       })
     })
 
     if (options.startOnBoot) {
       promise = promise || start()
+      promise.then(() => {
+        // @ts-expect-error
+        nuxt.callHook('devtools:customTabs:refresh')
+      })
     }
   },
 })
diff --git a/packages/vitest-environment-nuxt/package.json b/packages/vitest-environment-nuxt/package.json
@@ -42,14 +42,14 @@
     "*.d.ts"
   ],
   "dependencies": {
-    "@nuxt/kit": "^3.1.0",
+    "@nuxt/kit": "^3.1.1",
     "@vue/test-utils": "^2.2.7",
     "estree-walker": "^3.0.3",
-    "h3": "^1.0.2",
+    "h3": "^1.1.0",
     "happy-dom": "^8.1.5",
     "magic-string": "^0.27.0",
     "ofetch": "^1.0.0",
-    "unenv": "^1.0.1"
+    "unenv": "^1.0.2"
   },
   "peerDependencies": {
     "vitest": "^0.24.5 || ^0.26.0 || ^0.27.0 || ^0.28.0",

diff --git a/playground/nuxt.config.ts b/playground/nuxt.config.ts
@@ -1,6 +1,7 @@
 // https://v3.nuxtjs.org/api/configuration/nuxt.config
 export default defineNuxtConfig({
   modules: ['nuxt-vitest', '@nuxt/devtools-edge', '~/modules/custom'],
+  ssr: false,
   vitest: {
     startOnBoot: true,
     logToConsole: true,

diff --git a/playground/package.json b/playground/package.json
@@ -11,10 +11,10 @@
     "test": "pnpm test:unit --run && pnpm test:dev"
   },
   "devDependencies": {
-    "@nuxt/devtools-edge": "0.0.0-27909847.46d1bc3",
-    "nuxt": "3.1.0",
+    "@nuxt/devtools-edge": "0.0.0-27912280.546e2ef",
+    "nuxt": "3.1.1",
     "nuxt-vitest": "0.6.1",
-    "vitest": "0.28.1",
+    "vitest": "0.28.2",
     "vitest-environment-nuxt": "0.6.1"
   },
   "version": "0.6.1"