From 8849c5d2ecf69bab8b6eb962b7608ce98a63c4e7 Mon Sep 17 00:00:00 2001 From: ZHAO Jinxiang Date: Sun, 7 Oct 2018 22:57:05 +0800 Subject: [PATCH 1/2] fix: css-module support about '@keyframes logo-spin' --- template/images.d.ts | 13 +++++++++++++ template/src/{App.css => App.module.css} | 8 ++++---- template/src/App.tsx | 2 +- 3 files changed, 18 insertions(+), 5 deletions(-) rename template/src/{App.css => App.module.css} (87%) diff --git a/template/images.d.ts b/template/images.d.ts index 04c45b068..0a736e8fe 100644 --- a/template/images.d.ts +++ b/template/images.d.ts @@ -5,6 +5,19 @@ declare module '*.jpeg' declare module '*.gif' declare module '*.bmp' declare module '*.tiff' + +declare module '*.module.css' { + const exports: { [exportName: string]: string }; + export = exports; +} +declare module '*.module.scss' { + const exports: { [exportName: string]: string }; + export = exports; +} +declare module '*.module.sass' { + const exports: { [exportName: string]: string }; + export = exports; +} declare module '*.css' declare module '*.scss' declare module '*.sass' diff --git a/template/src/App.css b/template/src/App.module.css similarity index 87% rename from template/src/App.css rename to template/src/App.module.css index 7f39295fc..5b5b28321 100644 --- a/template/src/App.css +++ b/template/src/App.module.css @@ -1,13 +1,13 @@ -:local .app { +.app { text-align: center; } -:local .logo { +.logo { animation: logo-spin infinite 20s linear; height: 40vmin; } -:local .header { +.header { background-color: #282c34; min-height: 100vh; display: flex; @@ -18,7 +18,7 @@ color: white; } -:local .link { +.link { color: #61dafb; } diff --git a/template/src/App.tsx b/template/src/App.tsx index 10acbb5da..26d1f5fe8 100644 --- a/template/src/App.tsx +++ b/template/src/App.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import * as styles from './App.css'; +import * as styles from './App.module.css'; import logo from './logo.svg'; class App extends React.Component { From 72ad68235b5b9e2d5b48888c80ce23c918655fe3 Mon Sep 17 00:00:00 2001 From: ZHAO Jinxiang Date: Tue, 23 Oct 2018 15:02:45 +0800 Subject: [PATCH 2/2] add shims of style --- template/shims/images.d.ts | 7 +++++++ template/{images.d.ts => shims/styles.d.ts} | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 template/shims/images.d.ts rename template/{images.d.ts => shims/styles.d.ts} (70%) diff --git a/template/shims/images.d.ts b/template/shims/images.d.ts new file mode 100644 index 000000000..3f287eaa6 --- /dev/null +++ b/template/shims/images.d.ts @@ -0,0 +1,7 @@ +declare module '*.svg' +declare module '*.png' +declare module '*.jpg' +declare module '*.jpeg' +declare module '*.gif' +declare module '*.bmp' +declare module '*.tiff' diff --git a/template/images.d.ts b/template/shims/styles.d.ts similarity index 70% rename from template/images.d.ts rename to template/shims/styles.d.ts index 0a736e8fe..cf6b60bd4 100644 --- a/template/images.d.ts +++ b/template/shims/styles.d.ts @@ -1,10 +1,3 @@ -declare module '*.svg' -declare module '*.png' -declare module '*.jpg' -declare module '*.jpeg' -declare module '*.gif' -declare module '*.bmp' -declare module '*.tiff' declare module '*.module.css' { const exports: { [exportName: string]: string };