Merge branch 'main' into feat/run-in-worker

vitest-dev · May 29, 2022 · bfbc35c · bfbc35c
2 parents 93d48e8 + 27be365
commit bfbc35c
Show file tree

Hide file tree

Showing 21 changed files with 2,152 additions and 2,666 deletions.
diff --git a/.pnpmfile.cjs b/.pnpmfile.cjs
@@ -0,0 +1,9 @@
+module.exports = {
+  hooks: {
+    readPackage(pkg) {
+      if (pkg.name === 'vue-template-compiler')
+        pkg.dependencies.vue = '^2.6.0'
+      return pkg
+    },
+  },
+}
diff --git a/docs/docs-data.ts b/docs/docs-data.ts
@@ -1,6 +1,4 @@
 // noinspection ES6PreferShortImport: IntelliJ IDE hint to avoid warning to use `~/contributors`, will fail on build if changed
-/* PWA DISABLED */
-export const pwaDisabled = false
 
 /* Texts */
 export const vitestName = 'Vitest'

diff --git a/docs/package.json b/docs/package.json
@@ -3,7 +3,7 @@
   "private": true,
   "scripts": {
     "dev": "vitepress --port 3333 --open",
-    "build": "nr prefetch && vitepress build && esno scripts/build-pwa.ts",
+    "build": "nr prefetch && vitepress build",
     "serve": "vitepress serve",
     "preview-https": "pnpm run build && serve .vitepress/dist",
     "prefetch": "esno scripts/fetch-avatars.ts"

diff --git a/docs/scripts/assets.ts b/docs/scripts/assets.ts
@@ -3,13 +3,13 @@ import fg from 'fast-glob'
 import { font, preconnectHomeLinks, preconnectLinks } from '../docs-data'
 
 const preconnect = `
-    ${preconnectLinks.map(l => `<link rel="dns-prefetch" href="${l}">`).join('\n')}
-    ${preconnectLinks.map(l => `<link rel="preconnect" crossorigin="anonymous" href="${l}">`).join('\n')}
+  ${preconnectLinks.map(l => `<link rel="dns-prefetch" href="${l}">`).join('\n')}
+  ${preconnectLinks.map(l => `<link rel="preconnect" crossorigin="anonymous" href="${l}">`).join('\n')}
 `
 
 const preconnectHome = `
-    ${preconnectHomeLinks.map(l => `<link rel="dns-prefetch" href="${l}">`).join('\n')}
-    ${preconnectHomeLinks.map(l => `<link rel="preconnect" crossorigin="anonymous" href="${l}">`).join('\n')}
+  ${preconnectHomeLinks.map(l => `<link rel="dns-prefetch" href="${l}">`).join('\n')}
+  ${preconnectHomeLinks.map(l => `<link rel="preconnect" crossorigin="anonymous" href="${l}">`).join('\n')}
 `
 
 export const optimizePages = async (pwa: boolean) => {

diff --git a/docs/scripts/build-pwa.ts b/docs/scripts/build-pwa.ts
diff --git a/docs/vite.config.ts b/docs/vite.config.ts
@@ -5,21 +5,84 @@ import Components from 'unplugin-vue-components/vite'
 import Unocss from 'unocss/vite'
 import { presetAttributify, presetIcons, presetUno } from 'unocss'
 import { resolve } from 'pathe'
+import type { VitePluginPWAAPI } from 'vite-plugin-pwa'
 import { VitePWA } from 'vite-plugin-pwa'
 import fg from 'fast-glob'
 import {
-  pwaDisabled,
   pwaFontStylesRegex,
   pwaFontsRegex,
   vitestDescription,
   vitestName,
   vitestShortName,
 } from './docs-data'
+import { optimizePages } from './scripts/assets'
 
-export default defineConfig({
-  define: {
-    'process.env.__PWA_DISABLED__': pwaDisabled,
+const PWA = VitePWA({
+  outDir: '.vitepress/dist',
+  registerType: 'autoUpdate',
+  // include all static assets under public/
+  includeAssets: fg.sync('**/*.{png,svg,ico,txt}', { cwd: resolve(__dirname, 'public') }),
+  manifest: {
+    id: '/',
+    name: vitestName,
+    short_name: vitestShortName,
+    description: vitestDescription,
+    theme_color: '#ffffff',
+    icons: [
+      {
+        src: 'pwa-192x192.png',
+        sizes: '192x192',
+        type: 'image/png',
+      },
+      {
+        src: 'pwa-512x512.png',
+        sizes: '512x512',
+        type: 'image/png',
+      },
+      {
+        src: 'logo.svg',
+        sizes: '165x165',
+        type: 'image/svg',
+        purpose: 'any maskable',
+      },
+    ],
+  },
+  workbox: {
+    navigateFallbackDenylist: [/^\/new$/],
+    runtimeCaching: [
+      {
+        urlPattern: pwaFontsRegex,
+        handler: 'CacheFirst',
+        options: {
+          cacheName: 'google-fonts-cache',
+          expiration: {
+            maxEntries: 10,
+            maxAgeSeconds: 60 * 60 * 24 * 365, // <== 365 days
+          },
+          cacheableResponse: {
+            statuses: [0, 200],
+          },
+        },
+      },
+      {
+        urlPattern: pwaFontStylesRegex,
+        handler: 'CacheFirst',
+        options: {
+          cacheName: 'gstatic-fonts-cache',
+          expiration: {
+            maxEntries: 10,
+            maxAgeSeconds: 60 * 60 * 24 * 365, // <== 365 days
+          },
+          cacheableResponse: {
+            statuses: [0, 200],
+          },
+        },
+      },
+    ],
   },
+})
+
+export default defineConfig({
   plugins: [
     Components({
       include: [/\.vue/, /\.md/],
@@ -40,82 +103,19 @@ export default defineConfig({
       ],
     }),
     IncludesPlugin(),
-    VitePWA({
-      disable: pwaDisabled,
-      outDir: '.vitepress/dist',
-      registerType: 'autoUpdate',
-      // include all static assets under public/
-      includeAssets: fg.sync('**/*.{png,svg,ico,txt}', { cwd: resolve(__dirname, 'public') }),
-      manifest: {
-        id: '/',
-        name: vitestName,
-        short_name: vitestShortName,
-        description: vitestDescription,
-        theme_color: '#ffffff',
-        icons: [
-          {
-            src: 'pwa-192x192.png',
-            sizes: '192x192',
-            type: 'image/png',
-          },
-          {
-            src: 'pwa-512x512.png',
-            sizes: '512x512',
-            type: 'image/png',
-          },
-          {
-            src: 'logo.svg',
-            sizes: '165x165',
-            type: 'image/svg',
-            purpose: 'any maskable',
-          },
-        ],
-      },
-      workbox: {
-        navigateFallbackDenylist: [/^\/new$/],
-        runtimeCaching: [
-          {
-            urlPattern: pwaFontsRegex,
-            handler: 'CacheFirst',
-            options: {
-              cacheName: 'google-fonts-cache',
-              expiration: {
-                maxEntries: 10,
-                maxAgeSeconds: 60 * 60 * 24 * 365, // <== 365 days
-              },
-              cacheableResponse: {
-                statuses: [0, 200],
-              },
-            },
-          },
-          {
-            urlPattern: pwaFontStylesRegex,
-            handler: 'CacheFirst',
-            options: {
-              cacheName: 'gstatic-fonts-cache',
-              expiration: {
-                maxEntries: 10,
-                maxAgeSeconds: 60 * 60 * 24 * 365, // <== 365 days
-              },
-              cacheableResponse: {
-                statuses: [0, 200],
-              },
-            },
-          },
-        ],
+    PWA,
+    {
+      name: 'pwa:post',
+      enforce: 'post',
+      async buildEnd() {
+        const pwaPlugin: VitePluginPWAAPI = PWA.find(i => i.name === 'vite-plugin-pwa')?.api
+        const pwa = pwaPlugin && !pwaPlugin.disabled
+        await optimizePages(pwa)
+        if (pwa)
+          await pwaPlugin.generateSW()
       },
-    }),
+    },
   ],
-
-  optimizeDeps: {
-    include: [
-      'vue',
-      '@vueuse/core',
-    ],
-    exclude: [
-      'vue-demi',
-    ],
-  },
 })
 
 function IncludesPlugin(): Plugin {

diff --git a/examples/image-snapshot/README.md b/examples/image-snapshot/README.md
@@ -0,0 +1,5 @@
+# Vitest Demo
+
+Run `npm test` and change a test or source code to see HMR in action!
+
+Learn more at https://vitest.dev
diff --git a/examples/image-snapshot/package.json b/examples/image-snapshot/package.json
@@ -0,0 +1,21 @@
+{
+  "name": "@vitest/example-image-snapshot",
+  "type": "module",
+  "private": true,
+  "license": "MIT",
+  "main": "index.js",
+  "scripts": {
+    "test": "vitest",
+    "test:ui": "vitest --ui",
+    "test:run": "vitest run"
+  },
+  "devDependencies": {
+    "@vitest/ui": "latest",
+    "jest-image-snapshot": "^4.5.1",
+    "vite": "^2.9.9",
+    "vitest": "latest"
+  },
+  "stackblitz": {
+    "startCommand": "npm run test:ui"
+  }
+}
diff --git a/..._snapshots__/basic-test-ts-test-basic-test-ts-2-m-22-mimage-snapshot-1-snap.png b/..._snapshots__/basic-test-ts-test-basic-test-ts-2-m-22-mimage-snapshot-1-snap.png
diff --git a/examples/image-snapshot/test/basic.test.ts b/examples/image-snapshot/test/basic.test.ts
@@ -0,0 +1,17 @@
+import { readFileSync } from 'fs'
+import { expect, test } from 'vitest'
+import { toMatchImageSnapshot } from 'jest-image-snapshot'
+
+declare global {
+  namespace jest {
+    interface Matchers<R> {
+      toMatchImageSnapshot(): R
+    }
+  }
+}
+
+expect.extend({ toMatchImageSnapshot })
+
+test('image snapshot', () => {
+  expect(readFileSync('./test/stubs/input-image.png')).toMatchImageSnapshot()
+})
diff --git a/examples/image-snapshot/test/stubs/input-image.png b/examples/image-snapshot/test/stubs/input-image.png
diff --git a/examples/image-snapshot/vite.config.ts b/examples/image-snapshot/vite.config.ts
@@ -0,0 +1,12 @@
+/// <reference types="vitest" />
+
+// Configure Vitest (https://vitest.dev/config/)
+
+import { defineConfig } from 'vite'
+
+export default defineConfig({
+  test: {
+    /* for example, use global to avoid globals imports (describe, test, expect): */
+    // globals: true,
+  },
+})