Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: call createFileOnlyEntry() only for CSS deps, fix #4150 #4267

Merged
merged 12 commits into from Jul 20, 2021
Merged

fix: call createFileOnlyEntry() only for CSS deps, fix #4150 #4267

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9f558ce
fix(vite): ensureEntryFromUrl should return an existing module with t…
paraboul Jul 15, 2021
2685388
fix: CSS plugin transform should call ensureEntryFromUrl() for non CS…
paraboul Jul 16, 2021
c97ad89
revert change in ensureEntryFromUrl()
paraboul Jul 16, 2021
82fbaf7
Use fileToUrl
paraboul Jul 16, 2021
465b0e2
test: add a playground project to test tailwind update
paraboul Jul 17, 2021
9b5b49d
test: cleanup tailwind playground
paraboul Jul 17, 2021
886ec79
test: fix test-build tailwind playground
paraboul Jul 17, 2021
02e9620
chore: add blank lines
Shinigami92 Jul 18, 2021
a3fa683
Update packages/vite/src/node/plugins/css.ts
paraboul Jul 19, 2021
ccf3691
Update packages/vite/src/node/server/moduleGraph.ts
paraboul Jul 19, 2021
b9b5e03
Update packages/vite/src/node/plugins/css.ts
paraboul Jul 19, 2021
1b337e7
ensureEntryFromUrl should be called sequentially
paraboul Jul 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 16 additions & 2 deletions packages/vite/src/node/plugins/css.ts
View file
Open in desktop
Expand Up @@ -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,
Expand Down Expand Up @@ -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

paraboul marked this conversation as resolved.
Show resolved Hide resolved
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)
paraboul marked this conversation as resolved.
Show resolved Hide resolved

return await moduleGraph.ensureEntryFromUrl(url)
})
)
)

paraboul marked this conversation as resolved.
Show resolved Hide resolved
moduleGraph.updateModuleInfo(
thisModule,
depModules,
Expand Down
1 change: 1 addition & 0 deletions packages/vite/src/node/server/moduleGraph.ts
View file
Open in desktop
Expand Up @@ -179,6 +179,7 @@ export class ModuleGraph {

const mod = new ModuleNode(url)
mod.file = file

paraboul marked this conversation as resolved.
Show resolved Hide resolved
fileMappedModules.add(mod)
return mod
}
Expand Down