fix(angular): update tailwind content glob pattern to ignore stories …

…and tests (#8637)
nrwl · Jan 21, 2022 · 5afd3d6 · 5afd3d6
1 parent 59f98e4
commit 5afd3d6
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 12 deletions.
diff --git a/e2e/angular-extensions/src/tailwind.test.ts b/e2e/angular-extensions/src/tailwind.test.ts
@@ -52,7 +52,10 @@ describe('Tailwind support', () => {
     const tailwindConfigFile = 'tailwind.config.js';
 
     const tailwindConfig = `module.exports = {
-      content: ['./apps/**/*.{html,ts}', './libs/**/*.{html,ts}'],
+      content: [
+        './apps/**/!(*.stories|*.spec).{ts,html}',
+        './libs/**/!(*.stories|*.spec).{ts,html}',
+      ],
       theme: {
         spacing: {
           sm: '${spacing.root.sm}',
@@ -76,7 +79,7 @@ describe('Tailwind support', () => {
   
     module.exports = {
       content: [
-        join(__dirname, 'src/**/*.{html,ts}'),
+        join(__dirname, 'src/**/!(*.stories|*.spec).{ts,html}'),
         ...createGlobPatternsForDependencies(__dirname),
       ],
       theme: {

diff --git a/packages/angular/src/generators/application/application.spec.ts b/packages/angular/src/generators/application/application.spec.ts
@@ -972,7 +972,7 @@ describe('app', () => {
 
         module.exports = {
           content: [
-            join(__dirname, 'src/**/*.{html,ts}'),
+            join(__dirname, 'src/**/!(*.stories|*.spec).{ts,html}'),
             ...createGlobPatternsForDependencies(__dirname),
           ],
           theme: {

diff --git a/packages/angular/src/generators/library/library.spec.ts b/packages/angular/src/generators/library/library.spec.ts
@@ -1371,7 +1371,7 @@ describe('lib', () => {
 
         module.exports = {
           content: [
-            join(__dirname, 'src/**/*.{html,ts}'),
+            join(__dirname, 'src/**/!(*.stories|*.spec).{ts,html}'),
             ...createGlobPatternsForDependencies(__dirname),
           ],
           theme: {

diff --git a/packages/angular/src/generators/setup-tailwind/files/v2/tailwind.config.js__tmpl__ b/packages/angular/src/generators/setup-tailwind/files/v2/tailwind.config.js__tmpl__
@@ -4,7 +4,7 @@ const { join } = require('path');
 module.exports = {
   mode: 'jit',
   purge: [
-    join(__dirname, '<%= relativeSourceRoot %>/**/*.{html,ts}'),
+    join(__dirname, '<%= relativeSourceRoot %>/**/!(*.stories|*.spec).{ts,html}'),
     ...createGlobPatternsForDependencies(__dirname),
   ],
   darkMode: false, // or 'media' or 'class'

diff --git a/packages/angular/src/generators/setup-tailwind/files/v3/tailwind.config.js__tmpl__ b/packages/angular/src/generators/setup-tailwind/files/v3/tailwind.config.js__tmpl__
@@ -3,7 +3,7 @@ const { join } = require('path');
 
 module.exports = {
   content: [
-    join(__dirname, '<%= relativeSourceRoot %>/**/*.{html,ts}'),
+    join(__dirname, '<%= relativeSourceRoot %>/**/!(*.stories|*.spec).{ts,html}'),
     ...createGlobPatternsForDependencies(__dirname),
   ],
   theme: {

diff --git a/packages/angular/src/generators/setup-tailwind/setup-tailwind.application.spec.ts b/packages/angular/src/generators/setup-tailwind/setup-tailwind.application.spec.ts
@@ -333,7 +333,7 @@ describe('setupTailwind generator', () => {
 
         module.exports = {
           content: [
-            join(__dirname, 'src/**/*.{html,ts}'),
+            join(__dirname, 'src/**/!(*.stories|*.spec).{ts,html}'),
             ...createGlobPatternsForDependencies(__dirname),
           ],
           theme: {
@@ -362,7 +362,7 @@ describe('setupTailwind generator', () => {
 
         module.exports = {
           content: [
-            join(__dirname, 'src/**/*.{html,ts}'),
+            join(__dirname, 'src/**/!(*.stories|*.spec).{ts,html}'),
             ...createGlobPatternsForDependencies(__dirname),
           ],
           theme: {
@@ -392,7 +392,7 @@ describe('setupTailwind generator', () => {
         module.exports = {
           mode: 'jit',
           purge: [
-            join(__dirname, 'src/**/*.{html,ts}'),
+            join(__dirname, 'src/**/!(*.stories|*.spec).{ts,html}'),
             ...createGlobPatternsForDependencies(__dirname),
           ],
           darkMode: false, // or 'media' or 'class'

diff --git a/packages/angular/src/generators/setup-tailwind/setup-tailwind.library.spec.ts b/packages/angular/src/generators/setup-tailwind/setup-tailwind.library.spec.ts
@@ -202,7 +202,7 @@ describe('setupTailwind generator', () => {
 
         module.exports = {
           content: [
-            join(__dirname, 'src/**/*.{html,ts}'),
+            join(__dirname, 'src/**/!(*.stories|*.spec).{ts,html}'),
             ...createGlobPatternsForDependencies(__dirname),
           ],
           theme: {
@@ -234,7 +234,7 @@ describe('setupTailwind generator', () => {
 
         module.exports = {
           content: [
-            join(__dirname, 'src/**/*.{html,ts}'),
+            join(__dirname, 'src/**/!(*.stories|*.spec).{ts,html}'),
             ...createGlobPatternsForDependencies(__dirname),
           ],
           theme: {
@@ -267,7 +267,7 @@ describe('setupTailwind generator', () => {
         module.exports = {
           mode: 'jit',
           purge: [
-            join(__dirname, 'src/**/*.{html,ts}'),
+            join(__dirname, 'src/**/!(*.stories|*.spec).{ts,html}'),
             ...createGlobPatternsForDependencies(__dirname),
           ],
           darkMode: false, // or 'media' or 'class'