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.

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

fix: update postcss-load-config to load PostCSS plugins based on their config file path #6856

Merged
merged 6 commits into from Mar 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .npmrc
@@ -0,0 +1,7 @@
hoist-pattern[]=*eslint*
hoist-pattern[]=*babel*
hoist-pattern[]=*jest*
hoist-pattern[]=@emotion/*
hoist-pattern[]=postcss
hoist-pattern[]=pug
hoist-pattern[]=source-map-support
3 changes: 3 additions & 0 deletions packages/playground/backend-integration/package.json
Expand Up @@ -10,5 +10,8 @@
},
"dependencies": {
"tailwindcss": "^2.2.19"
},
"devDependencies": {
"fast-glob": "^3.2.11"
}
}
@@ -0,0 +1,29 @@
import { getColor, getBgColor } from '../../testUtils'
import { createServer } from 'vite'
import path from 'path'

// Regression test for https://github.com/vitejs/vite/issues/4000
test('postcss plugins in different dir', async () => {
const port = 5005
const server = await createServer({
root: path.join(__dirname, '..', '..', 'tailwind'),
logLevel: 'silent',
server: {
port,
strictPort: true
},
build: {
// skip transpilation during tests to make it faster
target: 'esnext'
}
})
await server.listen()
try {
await page.goto(`http://localhost:${port}`)
const tailwindStyle = await page.$('.tailwind-style')
expect(await getBgColor(tailwindStyle)).toBe('rgb(254, 226, 226)')
expect(await getColor(tailwindStyle)).toBe('rgb(136, 136, 136)')
} finally {
await server.close()
}
})
1 change: 1 addition & 0 deletions packages/playground/css/package.json
Expand Up @@ -10,6 +10,7 @@
},
"devDependencies": {
"css-dep": "link:./css-dep",
"fast-glob": "^3.2.11",
"less": "^4.1.2",
"postcss-nested": "^5.0.6",
"sass": "^1.43.4",
Expand Down
3 changes: 2 additions & 1 deletion packages/playground/legacy/package.json
Expand Up @@ -10,6 +10,7 @@
"preview": "vite preview"
},
"devDependencies": {
"@vitejs/plugin-legacy": "workspace:*"
"@vitejs/plugin-legacy": "workspace:*",
"express": "^4.17.1"
}
}
4 changes: 4 additions & 0 deletions packages/playground/multiple-entrypoints/package.json
Expand Up @@ -7,5 +7,9 @@
"build": "vite build",
"debug": "node --inspect-brk ../../vite/bin/vite",
"preview": "vite preview"
},
"devDependencies": {
"fast-glob": "^3.2.11",
"sass": "^1.43.4"
}
}
4 changes: 3 additions & 1 deletion packages/playground/tailwind/src/views/Page.vue
Expand Up @@ -2,7 +2,9 @@
<div>
<h1 id="pagetitle" class="text-[rgb(11,22,33)] text-2xl">|Page title|</h1>
<div @click="val = val + 1">{{ val }}</div>
<div class="bg-red-100 inline-block h-24 px-8 mb-8 text-[#888888]">
<div
class="tailwind-style bg-red-100 inline-block h-24 px-8 mb-8 text-[#888888]"
>
Tailwind style
</div>
<HelloWorld />
Expand Down
5 changes: 5 additions & 0 deletions packages/playground/testUtils.ts
Expand Up @@ -64,6 +64,11 @@ export async function getBg(el: string | ElementHandle): Promise<string> {
return el.evaluate((el) => getComputedStyle(el as Element).backgroundImage)
}

export async function getBgColor(el: string | ElementHandle): Promise<string> {
el = await toEl(el)
return el.evaluate((el) => getComputedStyle(el as Element).backgroundColor)
}

export function readFile(filename: string): string {
return fs.readFileSync(path.resolve(testDir, filename), 'utf-8')
}
Expand Down
Binary file added packages/playground/vue/public/favicon.ico
Binary file not shown.
2 changes: 1 addition & 1 deletion packages/vite/LICENSE.md
Expand Up @@ -3033,7 +3033,7 @@ Repository: https://github.com/postcss/postcss-import.git

## postcss-load-config
License: MIT
By: Michael Ciniawky, Ryan Dunckel, Mateusz Derks, Dalton Santos, Patrick Gilday
By: Michael Ciniawky, Ryan Dunckel, Mateusz Derks, Dalton Santos, Patrick Gilday, François Wouts
Repository: postcss/postcss-load-config

> The MIT License (MIT)
Expand Down
2 changes: 1 addition & 1 deletion packages/vite/package.json
Expand Up @@ -105,7 +105,7 @@
"periscopic": "^2.0.3",
"picocolors": "^1.0.0",
"postcss-import": "^14.0.2",
"postcss-load-config": "^3.1.1",
"postcss-load-config": "^3.1.3",
"postcss-modules": "^4.3.0",
"resolve.exports": "^1.1.0",
"rollup-plugin-license": "^2.6.1",
Expand Down
35 changes: 23 additions & 12 deletions pnpm-lock.yaml

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