Skip to content

fix(tailwind-generator): support removing tailwind import with simple quotes #1153

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

Merged
merged 2 commits into from
Oct 7, 2025
Merged

fix(tailwind-generator): support removing tailwind import with simple quotes #1153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d34499
fix(tailwind-generator): support removing tailwind import with simple…
maiieul Oct 7, 2025
cb52674
chore: changeset
maiieul Oct 7, 2025
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
5 changes: 5 additions & 0 deletions .changeset/violet-doodles-travel.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'qwik-ui': patch
---

fix: the cli now supports handling tailwind import with simple quotes
50 changes: 29 additions & 21 deletions packages/cli/src/generators/setup-tailwind/setup-tailwind-generator.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { SetupTailwindGeneratorSchema } from './schema';
import { setupTailwindGenerator } from './setup-tailwind-generator';

describe('Setup Tailwind generator', () => {
function setupWithProperFiles() {
function setupWithProperFiles(tailwindImport = '@import "tailwindcss";') {
const options: SetupTailwindGeneratorSchema = {};
const tree = createTreeWithEmptyWorkspace();

Expand All @@ -16,7 +16,7 @@ describe('Setup Tailwind generator', () => {
color: red;
}

@import "tailwindcss";
${tailwindImport}
`,
);

Expand All @@ -26,18 +26,22 @@ describe('Setup Tailwind generator', () => {
};
}

test(`
const importVariants = ['@import "tailwindcss";', "@import 'tailwindcss';"];

test.each(importVariants)(
`
GIVEN no options are passed
THEN it should generate "simple" style with primary color "cyan-600", base color "slate" and border-radius 0`, async () => {
const { tree, options } = setupWithProperFiles();
THEN it should generate "simple" style with primary color "cyan-600", base color "slate" and border-radius 0 (base import: %s)`,
async (importVariant) => {
const { tree, options } = setupWithProperFiles(importVariant);

options.rootCssPath = 'src/global.css';
options.rootCssPath = 'src/global.css';

await setupTailwindGenerator(tree, options);
await setupTailwindGenerator(tree, options);

const updatedGlobalCssContent = tree.read('src/global.css', 'utf-8');
const updatedGlobalCssContent = tree.read('src/global.css', 'utf-8');

expect(updatedGlobalCssContent).toMatchInlineSnapshot(`
expect(updatedGlobalCssContent).toMatchInlineSnapshot(`
"test {
color: red;
}
Expand Down Expand Up @@ -217,22 +221,25 @@ describe('Setup Tailwind generator', () => {
}
"
`);
});
test(`
},
);
test.each(importVariants)(
`
GIVEN style is "brutalist" and primary color is "red-600" and border-radius is 1
THEN it should generate the correct theme`, async () => {
const { tree, options } = setupWithProperFiles();
THEN it should generate the correct theme (base import: %s)`,
async (importVariant) => {
const { tree, options } = setupWithProperFiles(importVariant);

options.rootCssPath = 'src/global.css';
options.borderRadius = ThemeBorderRadiuses['BORDER-RADIUS-1'];
options.primaryColor = ThemePrimaryColors.RED600;
options.style = ThemeStyles.BRUTALIST;
options.rootCssPath = 'src/global.css';
options.borderRadius = ThemeBorderRadiuses['BORDER-RADIUS-1'];
options.primaryColor = ThemePrimaryColors.RED600;
options.style = ThemeStyles.BRUTALIST;

await setupTailwindGenerator(tree, options);
await setupTailwindGenerator(tree, options);

const updatedGlobalCssContent = tree.read('src/global.css', 'utf-8');
const updatedGlobalCssContent = tree.read('src/global.css', 'utf-8');

expect(updatedGlobalCssContent).toMatchInlineSnapshot(`
expect(updatedGlobalCssContent).toMatchInlineSnapshot(`
"test {
color: red;
}
Expand Down Expand Up @@ -406,5 +413,6 @@ describe('Setup Tailwind generator', () => {
}
"
`);
});
},
);
});
6 changes: 5 additions & 1 deletion packages/cli/src/generators/setup-tailwind/setup-tailwind-generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,11 @@ function updateRootCss(

console.log('rootCssContent', rootCssContent);

const tailwindBaseImport = '@import "tailwindcss";';
// support both single and double quote variants
const tailwindBaseImportVariants = ['@import "tailwindcss";', "@import 'tailwindcss';"];
const tailwindBaseImport =
tailwindBaseImportVariants.find((imp) => rootCssContent?.includes(imp)) ??
tailwindBaseImportVariants[0];

const rootCssContentWithoutTailwindBaseImport = rootCssContent.replace(
tailwindBaseImport,
Expand Down
Loading