From cd9b96c98e45b74b7df97cf4ffba1938007d6d93 Mon Sep 17 00:00:00 2001 From: Jack Hsu Date: Fri, 18 Dec 2020 15:35:51 -0500 Subject: [PATCH] fix(react): remove generated styles.[ext] file for CSS-in-JS solutions like styled-compoentns/emotion (#4347) --- packages/react/src/schematics/application/application.spec.ts | 3 +++ .../files/{common => css-module}/src/styles.__style__ | 0 .../application/files/global-css/src/styles.__style__ | 1 + 3 files changed, 4 insertions(+) rename packages/react/src/schematics/application/files/{common => css-module}/src/styles.__style__ (100%) create mode 100644 packages/react/src/schematics/application/files/global-css/src/styles.__style__ diff --git a/packages/react/src/schematics/application/application.spec.ts b/packages/react/src/schematics/application/application.spec.ts index 15aff9d4c2..8fb1e74de6 100644 --- a/packages/react/src/schematics/application/application.spec.ts +++ b/packages/react/src/schematics/application/application.spec.ts @@ -482,6 +482,9 @@ describe('app', () => { tree.exists('apps/my-app/src/app/app.styled-components') ).toBeFalsy(); expect(tree.exists('apps/my-app/src/app/app.tsx')).toBeTruthy(); + expect( + tree.exists('apps/my-app/src/styles.styled-components') + ).toBeFalsy(); const content = tree.read('apps/my-app/src/app/app.tsx').toString(); expect(content).toContain('styled-component'); diff --git a/packages/react/src/schematics/application/files/common/src/styles.__style__ b/packages/react/src/schematics/application/files/css-module/src/styles.__style__ similarity index 100% rename from packages/react/src/schematics/application/files/common/src/styles.__style__ rename to packages/react/src/schematics/application/files/css-module/src/styles.__style__ diff --git a/packages/react/src/schematics/application/files/global-css/src/styles.__style__ b/packages/react/src/schematics/application/files/global-css/src/styles.__style__ new file mode 100644 index 0000000000..90d4ee0072 --- /dev/null +++ b/packages/react/src/schematics/application/files/global-css/src/styles.__style__ @@ -0,0 +1 @@ +/* You can add global styles to this file, and also import other style files */