Merge pull request #14928 from cypress-io/fix/dedupe-runner-css

fix: scope scss glob imports in runner & reporter
cypress-io · Feb 5, 2021 · 2891a51 · 2891a51 · cypress-bot · Feb 5, 2021
2 parents cd30185 + ea4ff5a
commit 2891a51
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/packages/reporter/src/main-runner.scss b/packages/reporter/src/main-runner.scss
@@ -7,4 +7,7 @@
 @import 'lib/shared';
 @import '../../../node_modules/@reach/dialog/styles.css';
 @import '../../ui-components/src/file-opener/file-opener';
-@import './!(lib)*/**/!(main)*.scss';
+// import all other scss files in src except if they are in lib 
+// or their file name is `selecor-playground` or `main`
+// NOTA: no need to import scss files in their components
+@import '../../reporter/src/!(lib)*/**/!(main)*.scss';
diff --git a/packages/reporter/src/main.scss b/packages/reporter/src/main.scss
@@ -8,4 +8,7 @@
 @import 'lib/shared';
 @import '../../../node_modules/@reach/dialog/styles.css';
 @import '../../ui-components/src/file-opener/file-opener';
-@import '!(lib)*/**/!(main)*.scss';
+// import all other scss files in src except if they are in lib 
+// or their file name is `selecor-playground` or `main`
+// NOTA: no need to import scss files in their components
+@import '../../reporter/src/!(lib)*/**/!(main)*.scss';
diff --git a/packages/runner/src/main.scss b/packages/runner/src/main.scss
@@ -4,7 +4,10 @@
 $cy-tooltip-class: 'cy-tooltip';
 @import '../../node_modules/@cypress/react-tooltip/dist/tooltip.scss';
 @import 'lib/base';
-@import '!(lib)*/**/!(selector-playground|main).scss';
+// import all other scss files in src except if they are in lib 
+// or their file name is `main`
+// NOTA: no need to import scss files in their components
+@import '../../runner/src/!(lib)*/**/!(selector-playground|main).scss';
 
 @import '../../ui-components/src/dropdown';
 @import '../../reporter/src/main-runner';