Skip to content

Fix Vite resolution for bare CSS imports #20056

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

Open
yudin-s wants to merge 1 commit into
base: main
Choose a base branch
from
+79 −0
Open

Fix Vite resolution for bare CSS imports #20056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 61 additions & 0 deletions integrations/vite/resolvers.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,67 @@ test(
},
)

test(
'resolve bare CSS imports in the same folder',
{
fs: {
'package.json': json`
{
"type": "module",
"dependencies": {
"@tailwindcss/vite": "workspace:^",
"tailwindcss": "workspace:^"
},
"devDependencies": {
"vite": "^8"
}
}
`,
'vite.config.ts': ts`
import tailwindcss from '@tailwindcss/vite'
import { defineConfig } from 'vite'

export default defineConfig({
build: { cssMinify: false },
plugins: [tailwindcss()],
})
`,
'index.html': html`
<html>
<head>
<link rel="stylesheet" href="./src/index.css" />
</head>
<body></body>
</html>
`,
'src/index.css': css`
@reference 'tailwindcss/theme';
@import 'tailwindcss/utilities';
@import 'components.css';
`,
'src/components.css': css`
.component-style {
color: green;
}
`,
},
},
async ({ exec, fs, expect }) => {
await exec('pnpm vite build')

expect(
(await fs.dumpFiles('./dist/**/*.css')).replace(/-[^/]*\.css/g, '-<hash>.css'),
).toMatchInlineSnapshot(`
"
--- ./dist/assets/index-<hash>.css ---
.component-style {
color: green;
}
"
`)
},
)

test(
'resolve relative JS files correctly',
{
Expand Down
18 changes: 18 additions & 0 deletions packages/@tailwindcss-vite/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,24 @@ function createCustomResolver(

return resolved
}

// Vite can treat a local CSS import without `./` as a package import.
// If all resolvers failed, try the importing directory as a final fallback.
let localCssFile = path.resolve(base, id)
if (
id.endsWith('.css') &&
!id.startsWith('.') &&
!path.isAbsolute(id) &&
!id.includes('/') &&
!id.includes('\\') &&
filter(localCssFile) &&
(await fs.stat(localCssFile).then(
(s) => s.isFile(),
() => false,
))
) {
return localCssFile
}
}
}

Expand Down