From 473a90731911755bfb4f73295c9272a679eb1ce4 Mon Sep 17 00:00:00 2001 From: Jiachi Liu Date: Tue, 3 Aug 2021 16:31:39 +0800 Subject: [PATCH 1/3] fix: css typing --- css.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css.d.ts b/css.d.ts index ea8e4855..0ce0e8c4 100644 --- a/css.d.ts +++ b/css.d.ts @@ -6,6 +6,6 @@ declare namespace css { function resolve( chunks: TemplateStringsArray, ...args: any[] - ): { className: string; styles: JSX.Element } + ): { className: string; styles: string } } -export { css } +export = css From d59747bc52d3752c41562b77ec0422926f5277cd Mon Sep 17 00:00:00 2001 From: Jiachi Liu Date: Tue, 3 Aug 2021 16:38:38 +0800 Subject: [PATCH 2/3] jsx.element -> string --- css.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css.d.ts b/css.d.ts index 0ce0e8c4..7f24f7b9 100644 --- a/css.d.ts +++ b/css.d.ts @@ -1,8 +1,8 @@ // Definitions by: @types/styled-jsx -declare function css(chunks: TemplateStringsArray, ...args: any[]): JSX.Element +declare function css(chunks: TemplateStringsArray, ...args: any[]): string declare namespace css { - function global(chunks: TemplateStringsArray, ...args: any[]): JSX.Element + function global(chunks: TemplateStringsArray, ...args: any[]): string function resolve( chunks: TemplateStringsArray, ...args: any[] From 5ca0c2c2383d50d1b45feafbf5ef058b96993ef8 Mon Sep 17 00:00:00 2001 From: Jiachi Liu Date: Tue, 3 Aug 2021 19:55:39 +0800 Subject: [PATCH 3/3] revert --- css.d.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/css.d.ts b/css.d.ts index 7f24f7b9..30fb692f 100644 --- a/css.d.ts +++ b/css.d.ts @@ -1,11 +1,11 @@ // Definitions by: @types/styled-jsx -declare function css(chunks: TemplateStringsArray, ...args: any[]): string +declare function css(chunks: TemplateStringsArray, ...args: any[]): JSX.Element declare namespace css { - function global(chunks: TemplateStringsArray, ...args: any[]): string + function global(chunks: TemplateStringsArray, ...args: any[]): JSX.Element function resolve( chunks: TemplateStringsArray, ...args: any[] - ): { className: string; styles: string } + ): { className: string; styles: JSX.Element } } export = css