Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Merge branch 'main' of github.com:tailwindlabs/tailwindcss into bun-p…
…lugin
  • Loading branch information
zackradisic committed Mar 4, 2025
commit 4f006b51c6d19742fde89c05bf63a33f551eb532
6 changes: 6 additions & 0 deletions Cargo.lock

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

21 changes: 4 additions & 17 deletions integrations/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ interface ExecOptions {
}

interface TestConfig {
fs: {
[filePath: string]: string | Uint8Array
}
fs: { [filePath: string]: string | Uint8Array }

installDependencies?: boolean
}
Expand Down Expand Up @@ -118,11 +116,7 @@ export function test(
return new Promise((resolve, reject) => {
let child = exec(
command,
{
cwd,
...childProcessOptions,
env: childProcessOptions.env,
},
{ cwd, ...childProcessOptions, env: childProcessOptions.env },
(error, stdout, stderr) => {
if (error) {
if (execOptions.ignoreStdErr !== true) console.error(stderr)
Expand Down Expand Up @@ -163,10 +157,7 @@ export function test(
cwd,
shell: true,
...childProcessOptions,
env: {
...process.env,
...childProcessOptions.env,
},
env: { ...process.env, ...childProcessOptions.env },
})

function dispose() {
Expand Down Expand Up @@ -644,11 +635,7 @@ export async function fetchStyles(base: string, path = '/', isBun = false): Prom
stylesheets.push(
...(await Promise.all(
paths.map(async (path) => {
let css = await fetch(`${base}${path}`, {
headers: {
Accept: 'text/css',
},
})
let css = await fetch(`${base}${path}`, { headers: { Accept: 'text/css' } })
return await css.text()
}),
)),
Expand Down
71 changes: 23 additions & 48 deletions pnpm-lock.yaml

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

You are viewing a condensed version of this merge commit. You can view the full changes here.