From 9f558cea82c710af1c6b29cd9596caf8a901a826 Mon Sep 17 00:00:00 2001 From: Anthony Catel Date: Thu, 15 Jul 2021 18:21:21 +0200 Subject: [PATCH 01/12] fix(vite): ensureEntryFromUrl should return an existing module with the same id --- packages/vite/src/node/server/moduleGraph.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/vite/src/node/server/moduleGraph.ts b/packages/vite/src/node/server/moduleGraph.ts index d29c31aae6bcc0..7d0aa602821cf3 100644 --- a/packages/vite/src/node/server/moduleGraph.ts +++ b/packages/vite/src/node/server/moduleGraph.ts @@ -141,7 +141,8 @@ export class ModuleGraph { async ensureEntryFromUrl(rawUrl: string): Promise { const [url, resolvedId] = await this.resolveUrl(rawUrl) - let mod = this.urlToModuleMap.get(url) + let mod = this.urlToModuleMap.get(url) || this.idToModuleMap.get(resolvedId) + if (!mod) { mod = new ModuleNode(url) this.urlToModuleMap.set(url, mod) @@ -179,6 +180,10 @@ export class ModuleGraph { const mod = new ModuleNode(url) mod.file = file + + mod.id = file + this.idToModuleMap.set(mod.id, mod) + fileMappedModules.add(mod) return mod } From 26853881f05e325a49becc5f563bb93e7bc24ce1 Mon Sep 17 00:00:00 2001 From: Anthony Catel Date: Fri, 16 Jul 2021 11:35:21 +0200 Subject: [PATCH 02/12] fix: CSS plugin transform should call ensureEntryFromUrl() for non CSS files (fix #4150) --- packages/vite/src/node/plugins/css.ts | 18 ++++++++++++++++-- packages/vite/src/node/server/moduleGraph.ts | 2 +- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/packages/vite/src/node/plugins/css.ts b/packages/vite/src/node/plugins/css.ts index 1a145f4b592efd..1903736bc8c310 100644 --- a/packages/vite/src/node/plugins/css.ts +++ b/packages/vite/src/node/plugins/css.ts @@ -24,7 +24,7 @@ import { } from 'rollup' import { dataToEsm } from '@rollup/pluginutils' import chalk from 'chalk' -import { CLIENT_PUBLIC_PATH } from '../constants' +import { CLIENT_PUBLIC_PATH, FS_PREFIX } from '../constants' import { ResolveFn, ViteDevServer } from '../' import { getAssetFilename, @@ -191,9 +191,23 @@ export function cssPlugin(config: ResolvedConfig): Plugin { if (deps) { // record deps in the module graph so edits to @import css can trigger // main import to hot update + const depModules = new Set( - [...deps].map((file) => moduleGraph.createFileOnlyEntry(file)) + await Promise.all( + [...deps].map(async (file) => { + if (cssLangRE.test(file)) { + return moduleGraph.createFileOnlyEntry(file) + } + + const url = file.startsWith(config.root) + ? file.slice(config.root.length) + : path.posix.join(FS_PREFIX, file) + + return await moduleGraph.ensureEntryFromUrl(url) + }) + ) ) + moduleGraph.updateModuleInfo( thisModule, depModules, diff --git a/packages/vite/src/node/server/moduleGraph.ts b/packages/vite/src/node/server/moduleGraph.ts index 7d0aa602821cf3..ff9c1c85256652 100644 --- a/packages/vite/src/node/server/moduleGraph.ts +++ b/packages/vite/src/node/server/moduleGraph.ts @@ -141,7 +141,7 @@ export class ModuleGraph { async ensureEntryFromUrl(rawUrl: string): Promise { const [url, resolvedId] = await this.resolveUrl(rawUrl) - let mod = this.urlToModuleMap.get(url) || this.idToModuleMap.get(resolvedId) + let mod = this.urlToModuleMap.get(url) if (!mod) { mod = new ModuleNode(url) From c97ad89397e6e74f4a77d034985fde4b8711b021 Mon Sep 17 00:00:00 2001 From: Anthony Catel Date: Fri, 16 Jul 2021 11:44:00 +0200 Subject: [PATCH 03/12] revert change in ensureEntryFromUrl() --- packages/vite/src/node/server/moduleGraph.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/vite/src/node/server/moduleGraph.ts b/packages/vite/src/node/server/moduleGraph.ts index ff9c1c85256652..035e09a11c9f07 100644 --- a/packages/vite/src/node/server/moduleGraph.ts +++ b/packages/vite/src/node/server/moduleGraph.ts @@ -142,7 +142,6 @@ export class ModuleGraph { async ensureEntryFromUrl(rawUrl: string): Promise { const [url, resolvedId] = await this.resolveUrl(rawUrl) let mod = this.urlToModuleMap.get(url) - if (!mod) { mod = new ModuleNode(url) this.urlToModuleMap.set(url, mod) @@ -181,9 +180,6 @@ export class ModuleGraph { const mod = new ModuleNode(url) mod.file = file - mod.id = file - this.idToModuleMap.set(mod.id, mod) - fileMappedModules.add(mod) return mod } From 82fbaf7e97b52680b126f07c0949533e295b7110 Mon Sep 17 00:00:00 2001 From: Anthony Catel Date: Fri, 16 Jul 2021 13:38:54 +0200 Subject: [PATCH 04/12] Use fileToUrl --- packages/vite/src/node/plugins/css.ts | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/packages/vite/src/node/plugins/css.ts b/packages/vite/src/node/plugins/css.ts index 1903736bc8c310..1aab8ceb81695d 100644 --- a/packages/vite/src/node/plugins/css.ts +++ b/packages/vite/src/node/plugins/css.ts @@ -24,7 +24,7 @@ import { } from 'rollup' import { dataToEsm } from '@rollup/pluginutils' import chalk from 'chalk' -import { CLIENT_PUBLIC_PATH, FS_PREFIX } from '../constants' +import { CLIENT_PUBLIC_PATH } from '../constants' import { ResolveFn, ViteDevServer } from '../' import { getAssetFilename, @@ -194,17 +194,13 @@ export function cssPlugin(config: ResolvedConfig): Plugin { const depModules = new Set( await Promise.all( - [...deps].map(async (file) => { - if (cssLangRE.test(file)) { - return moduleGraph.createFileOnlyEntry(file) - } - - const url = file.startsWith(config.root) - ? file.slice(config.root.length) - : path.posix.join(FS_PREFIX, file) - - return await moduleGraph.ensureEntryFromUrl(url) - }) + [...deps].map(async (file) => + cssLangRE.test(file) + ? moduleGraph.createFileOnlyEntry(file) + : moduleGraph.ensureEntryFromUrl( + await fileToUrl(file, config, this) + ) + ) ) ) From 465b0e219f81ef08dc0330bfa2005ee8241dd41e Mon Sep 17 00:00:00 2001 From: Anthony Catel Date: Sat, 17 Jul 2021 18:13:01 +0200 Subject: [PATCH 05/12] test: add a playground project to test tailwind update --- .../tailwind/__test__/tailwind.spec.ts | 44 ++++++++++++++++++ packages/playground/tailwind/index.css | 3 ++ packages/playground/tailwind/index.html | 14 ++++++ packages/playground/tailwind/package.json | 21 +++++++++ .../playground/tailwind/postcss.config.js | 7 +++ .../playground/tailwind/public/favicon.ico | Bin 0 -> 4286 bytes packages/playground/tailwind/src/App.vue | 12 +++++ .../playground/tailwind/src/assets/logo.png | Bin 0 -> 6849 bytes .../tailwind/src/components/HelloWorld.vue | 7 +++ packages/playground/tailwind/src/main.js | 6 +++ packages/playground/tailwind/src/router.ts | 18 +++++++ .../playground/tailwind/src/views/Page.vue | 26 +++++++++++ .../playground/tailwind/tailwind.config.js | 12 +++++ packages/playground/tailwind/vite.config.ts | 15 ++++++ 14 files changed, 185 insertions(+) create mode 100644 packages/playground/tailwind/__test__/tailwind.spec.ts create mode 100644 packages/playground/tailwind/index.css create mode 100644 packages/playground/tailwind/index.html create mode 100644 packages/playground/tailwind/package.json create mode 100644 packages/playground/tailwind/postcss.config.js create mode 100644 packages/playground/tailwind/public/favicon.ico create mode 100644 packages/playground/tailwind/src/App.vue create mode 100644 packages/playground/tailwind/src/assets/logo.png create mode 100644 packages/playground/tailwind/src/components/HelloWorld.vue create mode 100644 packages/playground/tailwind/src/main.js create mode 100644 packages/playground/tailwind/src/router.ts create mode 100644 packages/playground/tailwind/src/views/Page.vue create mode 100644 packages/playground/tailwind/tailwind.config.js create mode 100644 packages/playground/tailwind/vite.config.ts diff --git a/packages/playground/tailwind/__test__/tailwind.spec.ts b/packages/playground/tailwind/__test__/tailwind.spec.ts new file mode 100644 index 00000000000000..5dd32f3ce379ea --- /dev/null +++ b/packages/playground/tailwind/__test__/tailwind.spec.ts @@ -0,0 +1,44 @@ +import { isBuild, editFile, untilUpdated, getColor } from '../../testUtils' + +if (!isBuild) { + // test('should connect tailwind', async () => { + // expect(browserLogs.length).toBe(2) + // expect(browserLogs.some((msg) => msg.match('connected'))).toBe(true) + // browserLogs.length = 0 + // }) + + test('regenerate CSS and HMR', async () => { + browserLogs.length = 0 + const el = await page.$('#pagetitle') + const el2 = await page.$('#helloroot') + + expect(await getColor(el)).toBe('rgb(11, 22, 33)') + + editFile('src/views/Page.vue', (code) => + code.replace('|Page title|', '|Page title updated|') + ) + await untilUpdated(() => el.textContent(), '|Page title updated|') + + expect(browserLogs).toMatchObject([ + '[vite] css hot updated: /index.css', + '[vite] hot updated: /src/views/Page.vue' + ]) + + browserLogs.length = 0 + + editFile('src/components/HelloWorld.vue', (code) => + code.replace('text-gray-800', 'text-[rgb(10,20,30)]') + ) + + await untilUpdated(() => getColor(el2), 'rgb(10, 20, 30)') + + expect(browserLogs).toMatchObject([ + '[vite] css hot updated: /index.css', + '[vite] hot updated: /src/components/HelloWorld.vue' + ]) + + console.log('logs', browserLogs) + + browserLogs.length = 0 + }) +} diff --git a/packages/playground/tailwind/index.css b/packages/playground/tailwind/index.css new file mode 100644 index 00000000000000..796882ab8758bd --- /dev/null +++ b/packages/playground/tailwind/index.css @@ -0,0 +1,3 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; \ No newline at end of file diff --git a/packages/playground/tailwind/index.html b/packages/playground/tailwind/index.html new file mode 100644 index 00000000000000..ffa9b2ed1c4d12 --- /dev/null +++ b/packages/playground/tailwind/index.html @@ -0,0 +1,14 @@ + + + + + + + Vite App + + + +
+ + + diff --git a/packages/playground/tailwind/package.json b/packages/playground/tailwind/package.json new file mode 100644 index 00000000000000..7bdb376a7edd8d --- /dev/null +++ b/packages/playground/tailwind/package.json @@ -0,0 +1,21 @@ +{ + "name": "test-tailwind", + "private": true, + "version": "0.0.0", + "scripts": { + "dev": "vite", + "build": "vite build", + "debug": "node --inspect-brk ../../vite/bin/vite", + "serve": "vite preview" + }, + "dependencies": { + "autoprefixer": "^10.3.0", + "tailwindcss": "^2.2.4", + "vue": "^3.0.8" + }, + "devDependencies": { + "@vitejs/plugin-vue": "^1.0.0", + "@vue/compiler-sfc": "^3.0.8", + "vue-router": "^4.0.10" + } +} diff --git a/packages/playground/tailwind/postcss.config.js b/packages/playground/tailwind/postcss.config.js new file mode 100644 index 00000000000000..b73493f7f96fae --- /dev/null +++ b/packages/playground/tailwind/postcss.config.js @@ -0,0 +1,7 @@ +// postcss.config.js +module.exports = { + plugins: { + tailwindcss: { config: __dirname + '/tailwind.config.js' }, + autoprefixer: {} + } +} diff --git a/packages/playground/tailwind/public/favicon.ico b/packages/playground/tailwind/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..df36fcfb72584e00488330b560ebcf34a41c64c2 GIT binary patch literal 4286 zcmds*O-Phc6o&64GDVCEQHxsW(p4>LW*W<827=Unuo8sGpRux(DN@jWP-e29Wl%wj zY84_aq9}^Am9-cWTD5GGEo#+5Fi2wX_P*bo+xO!)p*7B;iKlbFd(U~_d(U?#hLj56 zPhFkj-|A6~Qk#@g^#D^U0XT1cu=c-vu1+SElX9NR;kzAUV(q0|dl0|%h|dI$%VICy zJnu2^L*Te9JrJMGh%-P79CL0}dq92RGU6gI{v2~|)p}sG5x0U*z<8U;Ij*hB9z?ei z@g6Xq-pDoPl=MANPiR7%172VA%r)kevtV-_5H*QJKFmd;8yA$98zCxBZYXTNZ#QFk2(TX0;Y2dt&WitL#$96|gJY=3xX zpCoi|YNzgO3R`f@IiEeSmKrPSf#h#Qd<$%Ej^RIeeYfsxhPMOG`S`Pz8q``=511zm zAm)MX5AV^5xIWPyEu7u>qYs?pn$I4nL9J!=K=SGlKLXpE<5x+2cDTXq?brj?n6sp= zphe9;_JHf40^9~}9i08r{XM$7HB!`{Ys~TK0kx<}ZQng`UPvH*11|q7&l9?@FQz;8 zx!=3<4seY*%=OlbCbcae?5^V_}*K>Uo6ZWV8mTyE^B=DKy7-sdLYkR5Z?paTgK-zyIkKjIcpyO z{+uIt&YSa_$QnN_@t~L014dyK(fOOo+W*MIxbA6Ndgr=Y!f#Tokqv}n<7-9qfHkc3 z=>a|HWqcX8fzQCT=dqVbogRq!-S>H%yA{1w#2Pn;=e>JiEj7Hl;zdt-2f+j2%DeVD zsW0Ab)ZK@0cIW%W7z}H{&~yGhn~D;aiP4=;m-HCo`BEI+Kd6 z={Xwx{TKxD#iCLfl2vQGDitKtN>z|-AdCN|$jTFDg0m3O`WLD4_s#$S literal 0 HcmV?d00001 diff --git a/packages/playground/tailwind/src/App.vue b/packages/playground/tailwind/src/App.vue new file mode 100644 index 00000000000000..a6ef13d4ca31f9 --- /dev/null +++ b/packages/playground/tailwind/src/App.vue @@ -0,0 +1,12 @@ + + + \ No newline at end of file diff --git a/packages/playground/tailwind/src/assets/logo.png b/packages/playground/tailwind/src/assets/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..f3d2503fc2a44b5053b0837ebea6e87a2d339a43 GIT binary patch literal 6849 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 +
HelloWorld - {{ count }}
+ + + \ No newline at end of file diff --git a/packages/playground/tailwind/src/main.js b/packages/playground/tailwind/src/main.js new file mode 100644 index 00000000000000..78494e75b4741d --- /dev/null +++ b/packages/playground/tailwind/src/main.js @@ -0,0 +1,6 @@ +import { createApp } from 'vue' +import App from './App.vue' +import router from './router' +// import '../index.css'; + +createApp(App).use(router).mount('#app') diff --git a/packages/playground/tailwind/src/router.ts b/packages/playground/tailwind/src/router.ts new file mode 100644 index 00000000000000..3daf66ee4a6049 --- /dev/null +++ b/packages/playground/tailwind/src/router.ts @@ -0,0 +1,18 @@ +import { createWebHistory, createRouter } from 'vue-router' +import Page from './views/Page.vue' + +const history = createWebHistory() + +// const Page = () => import("./views/Page.vue"); + +const routeur = createRouter({ + history: history, + routes: [ + { + path: '/', + component: Page + } + ] +}) + +export default routeur diff --git a/packages/playground/tailwind/src/views/Page.vue b/packages/playground/tailwind/src/views/Page.vue new file mode 100644 index 00000000000000..39d66a61893e29 --- /dev/null +++ b/packages/playground/tailwind/src/views/Page.vue @@ -0,0 +1,26 @@ + + + diff --git a/packages/playground/tailwind/tailwind.config.js b/packages/playground/tailwind/tailwind.config.js new file mode 100644 index 00000000000000..eb7a876578f52e --- /dev/null +++ b/packages/playground/tailwind/tailwind.config.js @@ -0,0 +1,12 @@ +module.exports = { + mode: 'jit', + purge: [__dirname + '/src/**/*.vue'], + darkMode: false, // or 'media' or 'class' + theme: { + extend: {} + }, + variants: { + extend: {} + }, + plugins: [] +} diff --git a/packages/playground/tailwind/vite.config.ts b/packages/playground/tailwind/vite.config.ts new file mode 100644 index 00000000000000..8d076bee7e2277 --- /dev/null +++ b/packages/playground/tailwind/vite.config.ts @@ -0,0 +1,15 @@ +import { defineConfig } from 'vite' +import vue from '@vitejs/plugin-vue' + +export default defineConfig({ + resolve: { + alias: { + '/@': __dirname + } + }, + plugins: [vue()], + build: { + // to make tests faster + minify: false + } +}) From 9b5b49dd7ba9db004aa860ddb704f83ed059c15a Mon Sep 17 00:00:00 2001 From: Anthony Catel Date: Sat, 17 Jul 2021 18:16:53 +0200 Subject: [PATCH 06/12] test: cleanup tailwind playground --- packages/playground/tailwind/__test__/tailwind.spec.ts | 8 -------- packages/playground/tailwind/src/router.ts | 2 -- 2 files changed, 10 deletions(-) diff --git a/packages/playground/tailwind/__test__/tailwind.spec.ts b/packages/playground/tailwind/__test__/tailwind.spec.ts index 5dd32f3ce379ea..f6a1c1f06a65ba 100644 --- a/packages/playground/tailwind/__test__/tailwind.spec.ts +++ b/packages/playground/tailwind/__test__/tailwind.spec.ts @@ -1,12 +1,6 @@ import { isBuild, editFile, untilUpdated, getColor } from '../../testUtils' if (!isBuild) { - // test('should connect tailwind', async () => { - // expect(browserLogs.length).toBe(2) - // expect(browserLogs.some((msg) => msg.match('connected'))).toBe(true) - // browserLogs.length = 0 - // }) - test('regenerate CSS and HMR', async () => { browserLogs.length = 0 const el = await page.$('#pagetitle') @@ -37,8 +31,6 @@ if (!isBuild) { '[vite] hot updated: /src/components/HelloWorld.vue' ]) - console.log('logs', browserLogs) - browserLogs.length = 0 }) } diff --git a/packages/playground/tailwind/src/router.ts b/packages/playground/tailwind/src/router.ts index 3daf66ee4a6049..32f1a47b40540d 100644 --- a/packages/playground/tailwind/src/router.ts +++ b/packages/playground/tailwind/src/router.ts @@ -3,8 +3,6 @@ import Page from './views/Page.vue' const history = createWebHistory() -// const Page = () => import("./views/Page.vue"); - const routeur = createRouter({ history: history, routes: [ From 886ec7949728077205746dc460d169a806b7526f Mon Sep 17 00:00:00 2001 From: Anthony Catel Date: Sat, 17 Jul 2021 22:38:02 +0200 Subject: [PATCH 07/12] test: fix test-build tailwind playground --- packages/playground/tailwind/__test__/tailwind.spec.ts | 4 ++++ packages/playground/tailwind/index.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/playground/tailwind/__test__/tailwind.spec.ts b/packages/playground/tailwind/__test__/tailwind.spec.ts index f6a1c1f06a65ba..105eb245bf207e 100644 --- a/packages/playground/tailwind/__test__/tailwind.spec.ts +++ b/packages/playground/tailwind/__test__/tailwind.spec.ts @@ -1,5 +1,9 @@ import { isBuild, editFile, untilUpdated, getColor } from '../../testUtils' +test('should render', async () => { + expect(await page.textContent('#pagetitle')).toBe('|Page title|') +}) + if (!isBuild) { test('regenerate CSS and HMR', async () => { browserLogs.length = 0 diff --git a/packages/playground/tailwind/index.html b/packages/playground/tailwind/index.html index ffa9b2ed1c4d12..5165c9f6325cde 100644 --- a/packages/playground/tailwind/index.html +++ b/packages/playground/tailwind/index.html @@ -5,7 +5,7 @@ Vite App - +
From 02e96209608ded45e24e0ac4d7b41b6c2d1318fc Mon Sep 17 00:00:00 2001 From: Shinigami Date: Sun, 18 Jul 2021 10:18:41 +0200 Subject: [PATCH 08/12] chore: add blank lines --- packages/playground/tailwind/index.css | 2 +- packages/playground/tailwind/src/App.vue | 2 +- packages/playground/tailwind/src/components/HelloWorld.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/playground/tailwind/index.css b/packages/playground/tailwind/index.css index 796882ab8758bd..04b35af2af65c8 100644 --- a/packages/playground/tailwind/index.css +++ b/packages/playground/tailwind/index.css @@ -1,3 +1,3 @@ @tailwind base; @tailwind components; -@tailwind utilities; \ No newline at end of file +@tailwind utilities; diff --git a/packages/playground/tailwind/src/App.vue b/packages/playground/tailwind/src/App.vue index a6ef13d4ca31f9..a4c63083c17349 100644 --- a/packages/playground/tailwind/src/App.vue +++ b/packages/playground/tailwind/src/App.vue @@ -9,4 +9,4 @@ \ No newline at end of file + diff --git a/packages/playground/tailwind/src/components/HelloWorld.vue b/packages/playground/tailwind/src/components/HelloWorld.vue index 790ee0532c26bd..36bcdb634a7cd6 100644 --- a/packages/playground/tailwind/src/components/HelloWorld.vue +++ b/packages/playground/tailwind/src/components/HelloWorld.vue @@ -4,4 +4,4 @@ \ No newline at end of file + From a3fa68312f3d871a150ae9d572eb67806774d540 Mon Sep 17 00:00:00 2001 From: Anthony Catel Date: Mon, 19 Jul 2021 15:18:08 +0200 Subject: [PATCH 09/12] Update packages/vite/src/node/plugins/css.ts Co-authored-by: patak --- packages/vite/src/node/plugins/css.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/vite/src/node/plugins/css.ts b/packages/vite/src/node/plugins/css.ts index 1aab8ceb81695d..66d3a03e8331af 100644 --- a/packages/vite/src/node/plugins/css.ts +++ b/packages/vite/src/node/plugins/css.ts @@ -203,7 +203,6 @@ export function cssPlugin(config: ResolvedConfig): Plugin { ) ) ) - moduleGraph.updateModuleInfo( thisModule, depModules, From ccf369195dbd977aec76b5daac2b6c73328d88f2 Mon Sep 17 00:00:00 2001 From: Anthony Catel Date: Mon, 19 Jul 2021 15:18:13 +0200 Subject: [PATCH 10/12] Update packages/vite/src/node/server/moduleGraph.ts Co-authored-by: patak --- packages/vite/src/node/server/moduleGraph.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/vite/src/node/server/moduleGraph.ts b/packages/vite/src/node/server/moduleGraph.ts index 035e09a11c9f07..d29c31aae6bcc0 100644 --- a/packages/vite/src/node/server/moduleGraph.ts +++ b/packages/vite/src/node/server/moduleGraph.ts @@ -179,7 +179,6 @@ export class ModuleGraph { const mod = new ModuleNode(url) mod.file = file - fileMappedModules.add(mod) return mod } From b9b5e03776454e8062f82de7e75d23b7361a43e2 Mon Sep 17 00:00:00 2001 From: Anthony Catel Date: Mon, 19 Jul 2021 15:18:25 +0200 Subject: [PATCH 11/12] Update packages/vite/src/node/plugins/css.ts Co-authored-by: patak --- packages/vite/src/node/plugins/css.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/vite/src/node/plugins/css.ts b/packages/vite/src/node/plugins/css.ts index 66d3a03e8331af..61514cdba38e03 100644 --- a/packages/vite/src/node/plugins/css.ts +++ b/packages/vite/src/node/plugins/css.ts @@ -191,7 +191,6 @@ export function cssPlugin(config: ResolvedConfig): Plugin { if (deps) { // record deps in the module graph so edits to @import css can trigger // main import to hot update - const depModules = new Set( await Promise.all( [...deps].map(async (file) => From 1b337e71721224b0aa676b8e5dc8973a2f48044e Mon Sep 17 00:00:00 2001 From: Anthony Catel Date: Tue, 20 Jul 2021 10:27:18 +0200 Subject: [PATCH 12/12] ensureEntryFromUrl should be called sequentially --- packages/vite/src/node/plugins/css.ts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/vite/src/node/plugins/css.ts b/packages/vite/src/node/plugins/css.ts index 61514cdba38e03..b8f03366c7b326 100644 --- a/packages/vite/src/node/plugins/css.ts +++ b/packages/vite/src/node/plugins/css.ts @@ -41,6 +41,7 @@ import type Sass from 'sass' import type Stylus from 'stylus' // eslint-disable-line node/no-extraneous-import import type Less from 'less' import { Alias } from 'types/alias' +import type { ModuleNode } from '../server/moduleGraph' // const debug = createDebugger('vite:css') @@ -191,17 +192,16 @@ export function cssPlugin(config: ResolvedConfig): Plugin { if (deps) { // record deps in the module graph so edits to @import css can trigger // main import to hot update - const depModules = new Set( - await Promise.all( - [...deps].map(async (file) => - cssLangRE.test(file) - ? moduleGraph.createFileOnlyEntry(file) - : moduleGraph.ensureEntryFromUrl( - await fileToUrl(file, config, this) - ) - ) + const depModules = new Set() + for (const file of deps) { + depModules.add( + cssLangRE.test(file) + ? moduleGraph.createFileOnlyEntry(file) + : await moduleGraph.ensureEntryFromUrl( + await fileToUrl(file, config, this) + ) ) - ) + } moduleGraph.updateModuleInfo( thisModule, depModules,