From e0ecca30c11feb61586fcb91f6414e5e65c77a99 Mon Sep 17 00:00:00 2001 From: Andrei Volchenko Date: Thu, 14 Dec 2017 14:28:43 +0300 Subject: [PATCH 1/5] add types for styled-jsx --- types/styled-jsx/index.d.ts | 13 +++++++++++++ types/styled-jsx/styled-jsx-tests.tsx | 15 +++++++++++++++ types/styled-jsx/tsconfig.json | 24 ++++++++++++++++++++++++ types/styled-jsx/tslint.json | 1 + 4 files changed, 53 insertions(+) create mode 100644 types/styled-jsx/index.d.ts create mode 100644 types/styled-jsx/styled-jsx-tests.tsx create mode 100644 types/styled-jsx/tsconfig.json create mode 100644 types/styled-jsx/tslint.json diff --git a/types/styled-jsx/index.d.ts b/types/styled-jsx/index.d.ts new file mode 100644 index 0000000000..9e3ac68dff --- /dev/null +++ b/types/styled-jsx/index.d.ts @@ -0,0 +1,13 @@ +// Type definitions for styled-jsx 2.2.1 +// Project: https://github.com/zeit/styled-jsx +// Definitions by: R1ZZU +// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped + +import * as React from 'react'; + +declare module 'react' { + interface StyleHTMLAttributes extends React.HTMLAttributes { + jsx?: boolean; + global?: boolean; + } +} diff --git a/types/styled-jsx/styled-jsx-tests.tsx b/types/styled-jsx/styled-jsx-tests.tsx new file mode 100644 index 0000000000..65081d9bbd --- /dev/null +++ b/types/styled-jsx/styled-jsx-tests.tsx @@ -0,0 +1,15 @@ +const styled = ( +
+ +
+); + +const styledGlobal = ( +
+ +
+); diff --git a/types/styled-jsx/tsconfig.json b/types/styled-jsx/tsconfig.json new file mode 100644 index 0000000000..494ed25a0a --- /dev/null +++ b/types/styled-jsx/tsconfig.json @@ -0,0 +1,24 @@ +{ + "compilerOptions": { + "module": "commonjs", + "lib": [ + "es6" + ], + "noImplicitAny": true, + "noImplicitThis": true, + "strictNullChecks": true, + "strictFunctionTypes": true, + "baseUrl": "../", + "typeRoots": [ + "../" + ], + "types": [], + "noEmit": true, + "forceConsistentCasingInFileNames": true, + "jsx": "react" + }, + "files": [ + "index.d.ts", + "styled-jsx-tests.tsx" + ] +} diff --git a/types/styled-jsx/tslint.json b/types/styled-jsx/tslint.json new file mode 100644 index 0000000000..3db14f85ea --- /dev/null +++ b/types/styled-jsx/tslint.json @@ -0,0 +1 @@ +{ "extends": "dtslint/dt.json" } From ca2179bf66a419d1e552a8e76768bf4750b371d8 Mon Sep 17 00:00:00 2001 From: Andrei Volchenko Date: Thu, 14 Dec 2017 14:36:08 +0300 Subject: [PATCH 2/5] specify ts version --- types/styled-jsx/index.d.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/types/styled-jsx/index.d.ts b/types/styled-jsx/index.d.ts index 9e3ac68dff..5ea6365d48 100644 --- a/types/styled-jsx/index.d.ts +++ b/types/styled-jsx/index.d.ts @@ -2,10 +2,11 @@ // Project: https://github.com/zeit/styled-jsx // Definitions by: R1ZZU // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped +// TypeScript Version: 2.3 -import * as React from 'react'; +import * as React from "react"; -declare module 'react' { +declare module "react" { interface StyleHTMLAttributes extends React.HTMLAttributes { jsx?: boolean; global?: boolean; From 8aa0c79cc6990384935c2bc367ca94e0ce432acb Mon Sep 17 00:00:00 2001 From: Andrei Volchenko Date: Thu, 14 Dec 2017 14:42:46 +0300 Subject: [PATCH 3/5] disable dt-header rule --- types/styled-jsx/tslint.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/types/styled-jsx/tslint.json b/types/styled-jsx/tslint.json index 3db14f85ea..65c83fb1e3 100644 --- a/types/styled-jsx/tslint.json +++ b/types/styled-jsx/tslint.json @@ -1 +1,6 @@ -{ "extends": "dtslint/dt.json" } +{ + "extends": "dtslint/dt.json", + "rules": { + "dt-header": false + } +} From d0d28a0cd178391d21b2348475184efd9aa40380 Mon Sep 17 00:00:00 2001 From: Andrei Volchenko Date: Thu, 14 Dec 2017 14:51:52 +0300 Subject: [PATCH 4/5] drop no-unnecessary-qualifier rule --- types/styled-jsx/index.d.ts | 2 +- types/styled-jsx/tslint.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/types/styled-jsx/index.d.ts b/types/styled-jsx/index.d.ts index 5ea6365d48..61c2cffa23 100644 --- a/types/styled-jsx/index.d.ts +++ b/types/styled-jsx/index.d.ts @@ -4,7 +4,7 @@ // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped // TypeScript Version: 2.3 -import * as React from "react"; +import "react"; declare module "react" { interface StyleHTMLAttributes extends React.HTMLAttributes { diff --git a/types/styled-jsx/tslint.json b/types/styled-jsx/tslint.json index 65c83fb1e3..1d415aae00 100644 --- a/types/styled-jsx/tslint.json +++ b/types/styled-jsx/tslint.json @@ -1,6 +1,7 @@ { "extends": "dtslint/dt.json", "rules": { - "dt-header": false + "dt-header": false, + "no-unnecessary-qualifier": false } } From 5fc0ddf002c97511858aabf891db86b6a0be5a35 Mon Sep 17 00:00:00 2001 From: Andrei Volchenko Date: Fri, 15 Dec 2017 17:34:22 +0300 Subject: [PATCH 5/5] fix eslint rules --- types/styled-jsx/index.d.ts | 4 ++-- types/styled-jsx/tslint.json | 8 +------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/types/styled-jsx/index.d.ts b/types/styled-jsx/index.d.ts index 61c2cffa23..dc7a46d3d0 100644 --- a/types/styled-jsx/index.d.ts +++ b/types/styled-jsx/index.d.ts @@ -1,4 +1,4 @@ -// Type definitions for styled-jsx 2.2.1 +// Type definitions for styled-jsx 2.2 // Project: https://github.com/zeit/styled-jsx // Definitions by: R1ZZU // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped @@ -7,7 +7,7 @@ import "react"; declare module "react" { - interface StyleHTMLAttributes extends React.HTMLAttributes { + interface StyleHTMLAttributes extends HTMLAttributes { jsx?: boolean; global?: boolean; } diff --git a/types/styled-jsx/tslint.json b/types/styled-jsx/tslint.json index 1d415aae00..3db14f85ea 100644 --- a/types/styled-jsx/tslint.json +++ b/types/styled-jsx/tslint.json @@ -1,7 +1 @@ -{ - "extends": "dtslint/dt.json", - "rules": { - "dt-header": false, - "no-unnecessary-qualifier": false - } -} +{ "extends": "dtslint/dt.json" }