Skip to content

refactor(@schematics/angular): standardize Tailwind import and detection #32380

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
alan-agius4 merged 1 commit into from
Jan 28, 2026
Merged

refactor(@schematics/angular): standardize Tailwind import and detection #32380

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
2 changes: 1 addition & 1 deletion packages/schematics/angular/application/index_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,7 @@ describe('Application Schematic', () => {
expect(packageJson.devDependencies['@tailwindcss/postcss']).toBeDefined();

const stylesContent = tree.readContent('/projects/foo/src/styles.css');
expect(stylesContent).toContain('@import "tailwindcss";');
expect(stylesContent).toContain(`@import 'tailwindcss';`);
});

describe(`fileNameStyleGuide: '2016'`, () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/schematics/angular/ng-new/index_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ describe('Ng New Schematic', () => {
expect(packageJson.devDependencies['@tailwindcss/postcss']).toBeDefined();

const stylesContent = tree.readContent('/bar/src/styles.css');
expect(stylesContent).toContain('@import "tailwindcss";');
expect(stylesContent).toContain(`@import 'tailwindcss';`);
});

it(`should create files with file name style guide '2016'`, async () => {
Expand Down
6 changes: 3 additions & 3 deletions packages/schematics/angular/tailwind/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function addTailwindStyles(options: { project: string }, project: ProjectDefinit

if (!stylesheetPath) {
const newStylesheetPath = join(project.sourceRoot ?? 'src', 'tailwind.css');
tree.create(newStylesheetPath, '@import "tailwindcss";\n');
tree.create(newStylesheetPath, `@import 'tailwindcss';\n`);

return updateWorkspace((workspace) => {
const project = workspace.projects.get(options.project);
Expand All @@ -82,8 +82,8 @@ function addTailwindStyles(options: { project: string }, project: ProjectDefinit
});
} else {
let stylesheetContent = tree.readText(stylesheetPath);
if (!stylesheetContent.includes('@import "tailwindcss";')) {
stylesheetContent += '\n@import "tailwindcss";\n';
if (!/@import ["']tailwindcss["'];/.test(stylesheetContent)) {
stylesheetContent += `\n@import 'tailwindcss';\n`;
tree.overwrite(stylesheetPath, stylesheetContent);
}
}
Expand Down
10 changes: 5 additions & 5 deletions packages/schematics/angular/tailwind/index_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,17 @@ describe('Tailwind Schematic', () => {
it('should add tailwind imports to styles.css', async () => {
const tree = await schematicRunner.runSchematic('tailwind', { project: 'bar' }, appTree);
const stylesContent = tree.readContent('/projects/bar/src/styles.css');
expect(stylesContent).toContain('@import "tailwindcss";');
expect(stylesContent).toContain(`@import 'tailwindcss';`);
});

it('should not add duplicate tailwind imports to styles.css', async () => {
let tree = await schematicRunner.runSchematic('tailwind', { project: 'bar' }, appTree);
const stylesContent = tree.readContent('/projects/bar/src/styles.css');
expect(stylesContent.match(/@import "tailwindcss";/g)?.length).toBe(1);
expect(stylesContent.match(/@import 'tailwindcss';/g)?.length).toBe(1);

tree = await schematicRunner.runSchematic('tailwind', { project: 'bar' }, tree);
const stylesContentAfter = tree.readContent('/projects/bar/src/styles.css');
expect(stylesContentAfter.match(/@import "tailwindcss";/g)?.length).toBe(1);
expect(stylesContentAfter.match(/@import 'tailwindcss';/g)?.length).toBe(1);
});

describe('with scss styles', () => {
Expand All @@ -86,7 +86,7 @@ describe('Tailwind Schematic', () => {
const tree = await schematicRunner.runSchematic('tailwind', { project: 'bar' }, appTree);
expect(tree.exists('/projects/bar/src/tailwind.css')).toBe(true);
const stylesContent = tree.readContent('/projects/bar/src/tailwind.css');
expect(stylesContent).toContain('@import "tailwindcss";');
expect(stylesContent).toContain(`@import 'tailwindcss';`);
});

it('should add tailwind.css to angular.json', async () => {
Expand All @@ -99,7 +99,7 @@ describe('Tailwind Schematic', () => {
it('should not add tailwind imports to styles.scss', async () => {
const tree = await schematicRunner.runSchematic('tailwind', { project: 'bar' }, appTree);
const stylesContent = tree.readContent('/projects/bar/src/styles.scss');
expect(stylesContent).not.toContain('@import "tailwindcss";');
expect(stylesContent).not.toContain(`@import 'tailwindcss';`);
});
});

Expand Down