From 7831296434eaccb315e9959ddd318f9bf9b3d41b Mon Sep 17 00:00:00 2001 From: sapphi-red Date: Fri, 11 Aug 2023 00:54:41 +0900 Subject: [PATCH 1/3] test: remove tailwind + vue + pug test https://github.com/vitejs/vite-plugin-vue/pull/224 --- playground/tailwind/__test__/tailwind.spec.ts | 19 ------------------- .../tailwind/src/components/PugTemplate.vue | 3 --- playground/tailwind/src/views/Page.vue | 4 +--- 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 playground/tailwind/src/components/PugTemplate.vue diff --git a/playground/tailwind/__test__/tailwind.spec.ts b/playground/tailwind/__test__/tailwind.spec.ts index e639678331e9e5..5eaef491cfb85c 100644 --- a/playground/tailwind/__test__/tailwind.spec.ts +++ b/playground/tailwind/__test__/tailwind.spec.ts @@ -1,7 +1,6 @@ import { expect, test } from 'vitest' import { editFile, - getBgColor, getColor, isBuild, page, @@ -63,22 +62,4 @@ if (!isBuild) { ) await untilUpdated(() => getColor(el), 'rgb(11, 22, 33)') }) - - test('regenerate CSS and HMR (pug template)', async () => { - const el = await page.$('.pug') - expect(await getBgColor(el)).toBe('rgb(248, 113, 113)') - - await untilBrowserLogAfter( - () => - editFile('src/components/PugTemplate.vue', (code) => - code.replace('bg-red-400', 'bg-red-600'), - ), - [ - '[vite] css hot updated: /index.css', - '[vite] hot updated: /src/components/PugTemplate.vue?vue&type=template&lang.js', - ], - false, - ) - await untilUpdated(() => getBgColor(el), 'rgb(220, 38, 38)') - }) } diff --git a/playground/tailwind/src/components/PugTemplate.vue b/playground/tailwind/src/components/PugTemplate.vue deleted file mode 100644 index 4169b534dee4ef..00000000000000 --- a/playground/tailwind/src/components/PugTemplate.vue +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/playground/tailwind/src/views/Page.vue b/playground/tailwind/src/views/Page.vue index 76f8aabf13d7d3..b8de953a0f84a4 100644 --- a/playground/tailwind/src/views/Page.vue +++ b/playground/tailwind/src/views/Page.vue @@ -8,18 +8,16 @@ {{ name }} style - - - + + +
+ + diff --git a/playground/tailwind/src/App.vue b/playground/tailwind/src/App.vue deleted file mode 100644 index 25835fc414a06f..00000000000000 --- a/playground/tailwind/src/App.vue +++ /dev/null @@ -1,12 +0,0 @@ - - - diff --git a/playground/tailwind/src/assets/logo.png b/playground/tailwind/src/assets/logo.png deleted file mode 100644 index f3d2503fc2a44b5053b0837ebea6e87a2d339a43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6849 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 -
- HelloWorld - {{ count }} -
- - - diff --git a/playground/tailwind/src/components/component1.js b/playground/tailwind/src/components/component1.js new file mode 100644 index 00000000000000..df5e36f0bacd56 --- /dev/null +++ b/playground/tailwind/src/components/component1.js @@ -0,0 +1,9 @@ +export const component1 = /* html */ ` +
component1
+` + +import.meta.hot?.accept((mod) => { + document.querySelectorAll('[data-id="component1"]').forEach((d) => { + d.outerHTML = mod.component1 + }) +}) diff --git a/playground/tailwind/src/main.js b/playground/tailwind/src/main.js index 78494e75b4741d..efe0d42e683608 100644 --- a/playground/tailwind/src/main.js +++ b/playground/tailwind/src/main.js @@ -1,6 +1,16 @@ -import { createApp } from 'vue' -import App from './App.vue' -import router from './router' -// import '../index.css'; +import { view1 } from './views/view1' -createApp(App).use(router).mount('#app') +export const main = (view1Content) => /* html */ ` +

Page title

+ ${view1Content} +` + +document.getElementById('app').innerHTML = main(view1) + +import.meta.hot?.accept((mod) => { + document.getElementById('app').innerHTML = mod.main(view1) +}) + +import.meta.hot?.accept(['./views/view1'], ([mod]) => { + document.getElementById('app').innerHTML = main(mod.view1) +}) diff --git a/playground/tailwind/src/router.ts b/playground/tailwind/src/router.ts deleted file mode 100644 index 10e3980cb07cb8..00000000000000 --- a/playground/tailwind/src/router.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { createRouter, createWebHistory } from 'vue-router' -import Page from './views/Page.vue' - -const history = createWebHistory() - -const router = createRouter({ - history: history, - routes: [ - { - path: '/', - component: Page, - }, - ], -}) - -export default router diff --git a/playground/tailwind/src/utils.ts b/playground/tailwind/src/utils.ts deleted file mode 100644 index 38c21ae7a0f8d8..00000000000000 --- a/playground/tailwind/src/utils.ts +++ /dev/null @@ -1,2 +0,0 @@ -export const NAME = 'Tailwind' -export const INITIAL_COUNT = 1 diff --git a/playground/tailwind/src/views/Page.vue b/playground/tailwind/src/views/Page.vue deleted file mode 100644 index b8de953a0f84a4..00000000000000 --- a/playground/tailwind/src/views/Page.vue +++ /dev/null @@ -1,31 +0,0 @@ - - - diff --git a/playground/tailwind/src/views/view1.js b/playground/tailwind/src/views/view1.js new file mode 100644 index 00000000000000..c9e0c0d1745fe2 --- /dev/null +++ b/playground/tailwind/src/views/view1.js @@ -0,0 +1,8 @@ +import { component1 } from '../components/component1' + +export const view1 = /* html */ ` +
+
|view1|
+ ${component1} +
+` diff --git a/playground/tailwind/tailwind.config.js b/playground/tailwind/tailwind.config.js index 1b80b08aba2ef1..e4504c499e78f0 100644 --- a/playground/tailwind/tailwind.config.js +++ b/playground/tailwind/tailwind.config.js @@ -2,10 +2,10 @@ module.exports = { content: [ - // Before editing this section, make sure no paths are matching with `/src/App.vue` + // Before editing this section, make sure no paths are matching with `/src/main.js` // Look https://github.com/vitejs/vite/pull/6959 for more details - __dirname + '/src/{components,views}/**/*.vue', - __dirname + '/src/App.vue', + __dirname + '/src/{components,views}/**/*.js', + __dirname + '/src/main.js', ], theme: { extend: {}, diff --git a/playground/tailwind/vite.config.ts b/playground/tailwind/vite.config.ts index d3680f6c39c3e3..5b97ed1053e382 100644 --- a/playground/tailwind/vite.config.ts +++ b/playground/tailwind/vite.config.ts @@ -1,5 +1,4 @@ import { defineConfig } from 'vite' -import vue from '@vitejs/plugin-vue' export default defineConfig({ resolve: { @@ -7,7 +6,6 @@ export default defineConfig({ '/@': __dirname, }, }, - plugins: [vue()], build: { // to make tests faster minify: false, @@ -17,4 +15,15 @@ export default defineConfig({ // although it should not affect the build origin: 'http://localhost:8080', }, + plugins: [ + { + name: 'delay view', + enforce: 'pre', + async transform(_code, id) { + if (id.includes('views/view1.js')) { + await new Promise((resolve) => setTimeout(resolve, 100)) + } + }, + }, + ], }) diff --git a/playground/test-utils.ts b/playground/test-utils.ts index df68dce9c5e66f..59cfd14862e0ae 100644 --- a/playground/test-utils.ts +++ b/playground/test-utils.ts @@ -4,7 +4,11 @@ import fs from 'node:fs' import path from 'node:path' import colors from 'css-color-names' -import type { ConsoleMessage, ElementHandle } from 'playwright-chromium' +import type { + ConsoleMessage, + ElementHandle, + Locator, +} from 'playwright-chromium' import type { DepOptimizationMetadata, Manifest } from 'vite' import { normalizePath } from 'vite' import { fromComment } from 'convert-source-map' @@ -74,7 +78,9 @@ function rgbToHex(rgb: string): string { const timeout = (n: number) => new Promise((r) => setTimeout(r, n)) -async function toEl(el: string | ElementHandle): Promise { +async function toEl( + el: string | ElementHandle | Locator, +): Promise { if (typeof el === 'string') { const realEl = await page.$(el) if (realEl == null) { @@ -82,10 +88,15 @@ async function toEl(el: string | ElementHandle): Promise { } return realEl } + if ('elementHandle' in el) { + return el.elementHandle() + } return el } -export async function getColor(el: string | ElementHandle): Promise { +export async function getColor( + el: string | ElementHandle | Locator, +): Promise { el = await toEl(el) const rgb = await el.evaluate((el) => getComputedStyle(el as Element).color) return hexToNameMap[rgbToHex(rgb)] ?? rgb From 5f10f59afb72f37ff8f82ade7b2253e126cd673d Mon Sep 17 00:00:00 2001 From: sapphi-red Date: Fri, 11 Aug 2023 02:58:47 +0900 Subject: [PATCH 3/3] test: fix postcss-plugins-different-dir --- .../postcss-plugins-different-dir.spec.ts | 2 +- playground/tailwind/src/main.js | 2 ++ playground/test-utils.ts | 8 ++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/playground/css/__tests__/postcss-plugins-different-dir/postcss-plugins-different-dir.spec.ts b/playground/css/__tests__/postcss-plugins-different-dir/postcss-plugins-different-dir.spec.ts index fb748bf2c8fff2..1d21eb760dabfd 100644 --- a/playground/css/__tests__/postcss-plugins-different-dir/postcss-plugins-different-dir.spec.ts +++ b/playground/css/__tests__/postcss-plugins-different-dir/postcss-plugins-different-dir.spec.ts @@ -21,7 +21,7 @@ test.runIf(isServe)('postcss plugins in different dir', async () => { await server.listen() try { await page.goto(`http://localhost:${port}`) - const tailwindStyle = await page.$('.tailwind-style') + const tailwindStyle = page.locator('#tailwind-style') expect(await getBgColor(tailwindStyle)).toBe('rgb(254, 226, 226)') expect(await getColor(tailwindStyle)).toBe('rgb(136, 136, 136)') } finally { diff --git a/playground/tailwind/src/main.js b/playground/tailwind/src/main.js index efe0d42e683608..b9f0c5956232d5 100644 --- a/playground/tailwind/src/main.js +++ b/playground/tailwind/src/main.js @@ -3,6 +3,8 @@ import { view1 } from './views/view1' export const main = (view1Content) => /* html */ `

Page title

${view1Content} + +
style
` document.getElementById('app').innerHTML = main(view1) diff --git a/playground/test-utils.ts b/playground/test-utils.ts index 59cfd14862e0ae..39e2f56c5e6a86 100644 --- a/playground/test-utils.ts +++ b/playground/test-utils.ts @@ -102,12 +102,16 @@ export async function getColor( return hexToNameMap[rgbToHex(rgb)] ?? rgb } -export async function getBg(el: string | ElementHandle): Promise { +export async function getBg( + el: string | ElementHandle | Locator, +): Promise { el = await toEl(el) return el.evaluate((el) => getComputedStyle(el as Element).backgroundImage) } -export async function getBgColor(el: string | ElementHandle): Promise { +export async function getBgColor( + el: string | ElementHandle | Locator, +): Promise { el = await toEl(el) return el.evaluate((el) => getComputedStyle(el as Element).backgroundColor) }