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(vite-plugin): consider content as object #672

Merged
merged 10 commits into from
May 15, 2023
Merged

fix(vite-plugin): consider content as object #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4334ea3
fix: typeof import default in dts
ineshbose Mar 25, 2023
da4f9d3
chore: using nuxt convention for indexing type
ineshbose Mar 28, 2023
75cd334
Merge branch 'main' into main
ineshbose Mar 28, 2023
b5956f3
Merge branch 'main' of https://github.com/nuxt-modules/tailwindcss in…
ineshbose Apr 16, 2023
ac83e06
Merge branch 'main' of https://github.com/ineshbose/nuxt-tailwindcss-…
ineshbose Apr 16, 2023
c5d94f9
Merge branch 'main' of https://github.com/nuxt-modules/tailwindcss in…
ineshbose May 6, 2023
e81e9dd
Merge branch 'main' of https://github.com/nuxt-modules/tailwindcss in…
ineshbose May 9, 2023
a0ba511
Merge branch 'main' of https://github.com/nuxt-modules/tailwindcss in…
ineshbose May 9, 2023
aa98d6f
fix(vite-plugin): consider content as object
ineshbose May 9, 2023
9cd865b
chore: use pathe
ineshbose May 9, 2023
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
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"destr": "^1.2.2",
"h3": "^1.6.5",
"iron-webcrypto": "^0.7.0",
"minimatch": "^9.0.0",
"micromatch": "^4.0.5",
"pathe": "^1.1.0",
"postcss": "^8.4.23",
"postcss-custom-properties": "^13.1.5",
Expand All @@ -55,6 +55,7 @@
"@nuxt/module-builder": "^0.3.1",
"@nuxt/test-utils": "^3.4.3",
"@tailwindcss/typography": "^0.5.9",
"@types/micromatch": "^4.0.2",
"changelogen": "^0.5.3",
"codecov": "latest",
"eslint": "latest",
Expand Down
80 changes: 63 additions & 17 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 9 additions & 8 deletions src/hmr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
import { isAbsolute, resolve } from 'path'
import { HmrContext, Plugin } from 'vite'
import { minimatch } from 'minimatch'
import { isAbsolute, resolve } from 'pathe'
import type { Plugin as VitePlugin } from 'vite'
import type { Config } from 'tailwindcss'
import micromatch from 'micromatch'

export default function (tailwindConfig: any = {}, rootDir: string, cssPath: string): Plugin {
const resolvedContent: string[] = (tailwindConfig.content || []).map(f => !isAbsolute(f) ? resolve(rootDir, f) : f)
export default function (tailwindConfig: Partial<Config> = {}, rootDir: string, cssPath: string): VitePlugin {
const resolvedContent = ((Array.isArray(tailwindConfig.content) ? tailwindConfig.content : tailwindConfig.content?.files || []).filter(f => typeof f === 'string') as Array<string>).map(f => !isAbsolute(f) ? resolve(rootDir, f) : f)

return {
name: 'nuxt:tailwindcss',
handleHotUpdate (ctx: HmrContext): void {
if (resolvedContent.findIndex(c => minimatch(ctx.file, c)) === -1) {
handleHotUpdate (ctx): void {
if (resolvedContent.findIndex(c => micromatch.isMatch(ctx.file, c)) === -1) {
return
}

const extraModules = ctx.server.moduleGraph.getModulesByFile(cssPath)
const extraModules = ctx.server.moduleGraph.getModulesByFile(cssPath) || new Set()
const timestamp = +Date.now()

for (const mod of extraModules) {
Expand Down