From 0e43a3f63aa5be4d72300c668f49808009515b6a Mon Sep 17 00:00:00 2001 From: Sam Magura Date: Sun, 10 Jul 2022 11:43:27 -0400 Subject: [PATCH 1/4] Fix dtslint issues --- packages/serialize/src/index.ts | 6 ++++++ packages/server/types/tsconfig.json | 4 +++- packages/sheet/src/index.ts | 6 ++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/packages/serialize/src/index.ts b/packages/serialize/src/index.ts index 0dbb0d65f7..b765fd6743 100644 --- a/packages/serialize/src/index.ts +++ b/packages/serialize/src/index.ts @@ -68,6 +68,12 @@ export type Interpolation = | ArrayInterpolation | FunctionInterpolation +declare const process: { + env: { + NODE_ENV: string + } +} + const ILLEGAL_ESCAPE_SEQUENCE_ERROR = `You have illegal escape sequence in your template literal, most likely inside content's property value. Because you write your CSS inside a JavaScript string you actually have to do double escaping, so for example "content: '\\00d7';" should become "content: '\\\\00d7';". You can read more about this here: diff --git a/packages/server/types/tsconfig.json b/packages/server/types/tsconfig.json index d7f5174a6e..771b4a1109 100644 --- a/packages/server/types/tsconfig.json +++ b/packages/server/types/tsconfig.json @@ -3,7 +3,9 @@ "baseUrl": "../", "forceConsistentCasingInFileNames": true, "jsx": "react", - "lib": ["es6"], + + // dom is needed because @emotion/server references packages that use DOM types + "lib": ["es6", "dom"], "module": "commonjs", "noEmit": true, "strict": true, diff --git a/packages/sheet/src/index.ts b/packages/sheet/src/index.ts index 6a4a1336de..fcb3225fa6 100644 --- a/packages/sheet/src/index.ts +++ b/packages/sheet/src/index.ts @@ -21,6 +21,12 @@ styleSheet.flush() */ +declare const process: { + env: { + NODE_ENV: string + } +} + function sheetForTag(tag: HTMLStyleElement): CSSStyleSheet { if (tag.sheet) { return tag.sheet From eb482805f8912caca02e02d63c071a866fed39ba Mon Sep 17 00:00:00 2001 From: Sam Magura Date: Thu, 14 Jul 2022 10:03:44 -0400 Subject: [PATCH 2/4] Update @emotion/server tsconfig comment about DOM types --- packages/server/types/tsconfig.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/server/types/tsconfig.json b/packages/server/types/tsconfig.json index 771b4a1109..261b69a930 100644 --- a/packages/server/types/tsconfig.json +++ b/packages/server/types/tsconfig.json @@ -4,7 +4,8 @@ "forceConsistentCasingInFileNames": true, "jsx": "react", - // dom is needed because @emotion/server references packages that use DOM types + // dom is needed because @emotion/server imports from @emotion/css, which + // imports from @emotion/sheet, which uses DOM types. "lib": ["es6", "dom"], "module": "commonjs", "noEmit": true, From 8d06515891248a8113be9990428318709cee44d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Burzy=C5=84ski?= Date: Tue, 26 Jul 2022 11:39:25 +0200 Subject: [PATCH 3/4] Remove redundant declarations --- packages/serialize/src/index.ts | 6 ------ packages/server/types/tsconfig.json | 10 ++++++---- packages/sheet/src/index.ts | 6 ------ 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/packages/serialize/src/index.ts b/packages/serialize/src/index.ts index b765fd6743..0dbb0d65f7 100644 --- a/packages/serialize/src/index.ts +++ b/packages/serialize/src/index.ts @@ -68,12 +68,6 @@ export type Interpolation = | ArrayInterpolation | FunctionInterpolation -declare const process: { - env: { - NODE_ENV: string - } -} - const ILLEGAL_ESCAPE_SEQUENCE_ERROR = `You have illegal escape sequence in your template literal, most likely inside content's property value. Because you write your CSS inside a JavaScript string you actually have to do double escaping, so for example "content: '\\00d7';" should become "content: '\\\\00d7';". You can read more about this here: diff --git a/packages/server/types/tsconfig.json b/packages/server/types/tsconfig.json index 261b69a930..5f5a3d15e2 100644 --- a/packages/server/types/tsconfig.json +++ b/packages/server/types/tsconfig.json @@ -3,10 +3,12 @@ "baseUrl": "../", "forceConsistentCasingInFileNames": true, "jsx": "react", - - // dom is needed because @emotion/server imports from @emotion/css, which - // imports from @emotion/sheet, which uses DOM types. - "lib": ["es6", "dom"], + "lib": [ + "es6", + // dom is needed here because @emotion/server depends on @emotion/css + // which depends on @emotion/sheet, which depends on DOM types + "dom" + ], "module": "commonjs", "noEmit": true, "strict": true, diff --git a/packages/sheet/src/index.ts b/packages/sheet/src/index.ts index fcb3225fa6..6a4a1336de 100644 --- a/packages/sheet/src/index.ts +++ b/packages/sheet/src/index.ts @@ -21,12 +21,6 @@ styleSheet.flush() */ -declare const process: { - env: { - NODE_ENV: string - } -} - function sheetForTag(tag: HTMLStyleElement): CSSStyleSheet { if (tag.sheet) { return tag.sheet From bd40f455f33d71c0f58936225c3eae266d661478 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Burzy=C5=84ski?= Date: Tue, 26 Jul 2022 12:56:10 +0200 Subject: [PATCH 4/4] Fixed dtslint in `@emotion/cache` --- packages/cache/types/index.d.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/cache/types/index.d.ts b/packages/cache/types/index.d.ts index 7822587db8..3bba3ded23 100644 --- a/packages/cache/types/index.d.ts +++ b/packages/cache/types/index.d.ts @@ -1,5 +1,8 @@ // Definitions by: Junyoung Clare Jang // TypeScript Version: 2.2 + +/// + import { EmotionCache } from '@emotion/utils' export { EmotionCache }