Skip to content

Commit e2edd45

Browse files
soren121soren121
committed
Merge remote-tracking branch 'upstream/main' into eslint9
2 parents 7a6a8d5 + cce67ec commit e2edd45

36 files changed

+461
-487
lines changed

‎.changeset/fluffy-garlics-smash.md

-5
This file was deleted.

‎.changeset/grumpy-suits-cough.md

-5
This file was deleted.

‎.changeset/rotten-baboons-knock.md

-5
This file was deleted.

‎.changeset/young-ears-give.md

-5
This file was deleted.

‎packages/cache/CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# @emotion/cache
22

3+
## 11.14.0
4+
5+
### Minor Changes
6+
7+
- [#3277](https://github.com/emotion-js/emotion/pull/3277) [`8dc1a6d`](https://github.com/emotion-js/emotion/commit/8dc1a6dd19d2dc9ce435ef0aff85ccf5647f5d2e) Thanks [@Andarist](https://github.com/Andarist)! - Source code has been migrated to TypeScript. From now on type declarations will be emitted based on that, instead of being hand-written.
8+
39
## 11.13.5
410

511
### Patch Changes

‎packages/cache/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@emotion/cache",
3-
"version": "11.13.5",
3+
"version": "11.14.0",
44
"description": "emotion's cache",
55
"main": "dist/emotion-cache.cjs.js",
66
"module": "dist/emotion-cache.esm.js",

‎packages/css-prettifier/CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# @emotion/css-prettifier
22

3+
## 1.2.0
4+
5+
### Minor Changes
6+
7+
- [#3278](https://github.com/emotion-js/emotion/pull/3278) [`282b61d`](https://github.com/emotion-js/emotion/commit/282b61d2ad4e39ea65af88351a894a903c2d42c4) Thanks [@Andarist](https://github.com/Andarist)! - Source code has been migrated to TypeScript. From now on type declarations will be emitted based on that, instead of being hand-written.
8+
39
## 1.1.4
410

511
### Patch Changes

‎packages/css-prettifier/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@emotion/css-prettifier",
3-
"version": "1.1.4",
3+
"version": "1.2.0",
44
"description": "Simple Stylis-based CSS prettifier",
55
"keywords": [
66
"emotion"

‎packages/jest/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
},
5858
"dependencies": {
5959
"@babel/runtime": "^7.18.3",
60-
"@emotion/css-prettifier": "^1.1.4",
60+
"@emotion/css-prettifier": "^1.2.0",
6161
"chalk": "^4.1.0",
6262
"specificity": "^0.4.1",
6363
"stylis": "4.2.0"
@@ -77,7 +77,7 @@
7777
"devDependencies": {
7878
"@definitelytyped/dtslint": "0.0.112",
7979
"@emotion/css": "11.13.5",
80-
"@emotion/react": "11.13.5",
80+
"@emotion/react": "11.14.0",
8181
"@types/jest": "^29.5.12",
8282
"enzyme-to-json": "^3.6.1",
8383
"pretty-format": "^22.4.3",

‎packages/primitives-core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"react": ">=16.8.0"
1919
},
2020
"devDependencies": {
21-
"@emotion/react": "11.13.5",
21+
"@emotion/react": "11.14.0",
2222
"@types/css-to-react-native": "^3.0.0",
2323
"react": "16.14.0"
2424
},

‎packages/react/CHANGELOG.md

+12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# @emotion/react
22

3+
## 11.14.0
4+
5+
### Minor Changes
6+
7+
- [#3281](https://github.com/emotion-js/emotion/pull/3281) [`fc4d7bd`](https://github.com/emotion-js/emotion/commit/fc4d7bd744c205f55513dcd4e4e5134198c219de) Thanks [@Andarist](https://github.com/Andarist)! - Source code has been migrated to TypeScript. From now on type declarations will be emitted based on that, instead of being hand-written.
8+
9+
### Patch Changes
10+
11+
- Updated dependencies [[`8dc1a6d`](https://github.com/emotion-js/emotion/commit/8dc1a6dd19d2dc9ce435ef0aff85ccf5647f5d2e), [`e1bf17e`](https://github.com/emotion-js/emotion/commit/e1bf17ee87ec51da1412eb5291460ea95a39d27a)]:
12+
- @emotion/cache@11.14.0
13+
- @emotion/use-insertion-effect-with-fallbacks@1.2.0
14+
315
## 11.13.5
416

517
### Patch Changes

‎packages/react/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@emotion/react",
3-
"version": "11.13.5",
3+
"version": "11.14.0",
44
"main": "dist/emotion-react.cjs.js",
55
"module": "dist/emotion-react.esm.js",
66
"types": "dist/emotion-react.cjs.d.ts",
@@ -262,9 +262,9 @@
262262
"dependencies": {
263263
"@babel/runtime": "^7.18.3",
264264
"@emotion/babel-plugin": "^11.13.5",
265-
"@emotion/cache": "^11.13.5",
265+
"@emotion/cache": "^11.14.0",
266266
"@emotion/serialize": "^1.3.3",
267-
"@emotion/use-insertion-effect-with-fallbacks": "^1.1.0",
267+
"@emotion/use-insertion-effect-with-fallbacks": "^1.2.0",
268268
"@emotion/utils": "^1.4.2",
269269
"@emotion/weak-memoize": "^0.4.0",
270270
"hoist-non-react-statics": "^3.3.1"
@@ -280,9 +280,9 @@
280280
"devDependencies": {
281281
"@definitelytyped/dtslint": "0.0.112",
282282
"@emotion/css": "11.13.5",
283-
"@emotion/css-prettifier": "1.1.4",
283+
"@emotion/css-prettifier": "1.2.0",
284284
"@emotion/server": "11.11.0",
285-
"@emotion/styled": "11.13.5",
285+
"@emotion/styled": "11.14.0",
286286
"@types/hoist-non-react-statics": "^3.3.5",
287287
"html-tag-names": "^1.1.2",
288288
"react": "16.14.0",

‎packages/react/src/jsx-namespace.ts

+43-44
Original file line numberDiff line numberDiff line change
@@ -13,54 +13,53 @@ type WithConditionalCSSProp<P> = 'className' extends keyof P
1313
: {}
1414

1515
// unpack all here to avoid infinite self-referencing when defining our own JSX namespace for the pre-React 19 case
16-
type ReactJSXElement = true extends IsPreReact19
17-
? /** @ts-ignore */
18-
JSX.Element
19-
: /** @ts-ignore */
20-
React.JSX.Element
21-
type ReactJSXElementClass = true extends IsPreReact19
22-
? /** @ts-ignore */
23-
JSX.ElementClass
24-
: /** @ts-ignore */
25-
React.JSX.ElementClass
26-
type ReactJSXElementAttributesProperty = true extends IsPreReact19
27-
? /** @ts-ignore */
28-
JSX.ElementAttributesProperty
29-
: /** @ts-ignore */
30-
React.JSX.ElementAttributesProperty
31-
type ReactJSXElementChildrenAttribute = true extends IsPreReact19
32-
? /** @ts-ignore */
33-
JSX.ElementChildrenAttribute
34-
: /** @ts-ignore */
35-
React.JSX.ElementChildrenAttribute
36-
type ReactJSXLibraryManagedAttributes<C, P> = true extends IsPreReact19
37-
? /** @ts-ignore */
38-
JSX.LibraryManagedAttributes<C, P>
39-
: /** @ts-ignore */
40-
React.JSX.LibraryManagedAttributes<C, P>
41-
type ReactJSXIntrinsicAttributes = true extends IsPreReact19
42-
? /** @ts-ignore */
43-
JSX.IntrinsicAttributes
44-
: /** @ts-ignore */
45-
React.JSX.IntrinsicAttributes
46-
type ReactJSXIntrinsicClassAttributes<T> = true extends IsPreReact19
47-
? /** @ts-ignore */
48-
JSX.IntrinsicClassAttributes<T>
49-
: /** @ts-ignore */
50-
React.JSX.IntrinsicClassAttributes<T>
51-
type ReactJSXIntrinsicElements = true extends IsPreReact19
52-
? /** @ts-ignore */
53-
JSX.IntrinsicElements
54-
: /** @ts-ignore */
55-
React.JSX.IntrinsicElements
16+
17+
// the IsPreReact19 and @ts-ignore comments are to allow @emotion/react to support three different cases of types
18+
// - pre-React 18.something which didn't have `React.JSX`
19+
// - React 18.something with `React.JSX`
20+
// - React 19 with `React.JSX` and no global `JSX`
21+
// we support both pre-React 19 cases by using the global `JSX` and with the React 19 types, we use `React.JSX`
22+
// to make this work, we need @ts-ignore comments to ignore references that are invalid
23+
// though note that the error types resulting from ignoring the errors will never be used
24+
// since the pre vs post React 19 conditional will pick the one that won't error
25+
26+
// prettier-ignore
27+
/** @ts-ignore */
28+
type ReactJSXElement = true extends IsPreReact19 ? JSX.Element : React.JSX.Element
29+
30+
// prettier-ignore
31+
/** @ts-ignore */
32+
type ReactJSXElementClass = true extends IsPreReact19 ? JSX.ElementClass : React.JSX.ElementClass
33+
34+
// prettier-ignore
35+
/** @ts-ignore */
36+
type ReactJSXElementAttributesProperty = true extends IsPreReact19 ? JSX.ElementAttributesProperty : React.JSX.ElementAttributesProperty
37+
38+
// prettier-ignore
39+
/** @ts-ignore */
40+
type ReactJSXElementChildrenAttribute = true extends IsPreReact19 ? JSX.ElementChildrenAttribute : React.JSX.ElementChildrenAttribute
41+
42+
// prettier-ignore
43+
/** @ts-ignore */
44+
type ReactJSXLibraryManagedAttributes<C, P> = true extends IsPreReact19 ? JSX.LibraryManagedAttributes<C, P> : React.JSX.LibraryManagedAttributes<C, P>
45+
46+
// prettier-ignore
47+
/** @ts-ignore */
48+
type ReactJSXIntrinsicAttributes = true extends IsPreReact19 ? JSX.IntrinsicAttributes : React.JSX.IntrinsicAttributes
49+
50+
// prettier-ignore
51+
/** @ts-ignore */
52+
type ReactJSXIntrinsicClassAttributes<T> = true extends IsPreReact19 ? JSX.IntrinsicClassAttributes<T> : React.JSX.IntrinsicClassAttributes<T>
53+
54+
// prettier-ignore
55+
/** @ts-ignore */
56+
type ReactJSXIntrinsicElements = true extends IsPreReact19 ? JSX.IntrinsicElements : React.JSX.IntrinsicElements
5657

5758
// based on the code from @types/react@18.2.8
5859
// https://github.com/DefinitelyTyped/DefinitelyTyped/blob/3197efc097d522c4bf02b94e1a0766d007d6cdeb/types/react/index.d.ts#LL3204C13-L3204C13
60+
// prettier-ignore
5961
/** @ts-ignore */
60-
type ReactJSXElementType = true extends IsPreReact19
61-
? string | React.JSXElementConstructor<any>
62-
: /** @ts-ignore */
63-
React.JSX.ElementType
62+
type ReactJSXElementType = true extends IsPreReact19 ? string | React.JSXElementConstructor<any> : React.JSX.ElementType
6463

6564
export namespace ReactJSX {
6665
export type ElementType = ReactJSXElementType

‎packages/serialize/src/index.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -398,11 +398,11 @@ export function serializeStyles(
398398
strings as Interpolation
399399
)
400400
} else {
401-
const asTemplateStringsArr = strings as TemplateStringsArray
402-
if (isDevelopment && asTemplateStringsArr[0] === undefined) {
401+
const templateStringsArr = strings as TemplateStringsArray
402+
if (isDevelopment && templateStringsArr[0] === undefined) {
403403
console.error(ILLEGAL_ESCAPE_SEQUENCE_ERROR)
404404
}
405-
styles += asTemplateStringsArr[0]
405+
styles += templateStringsArr[0]
406406
}
407407
// we start at 1 since we've already handled the first arg
408408
for (let i = 1; i < args.length; i++) {

‎packages/server/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"@definitelytyped/dtslint": "0.0.112",
3333
"@emotion/babel-plugin": "11.13.5",
3434
"@emotion/css": "11.13.5",
35-
"@emotion/css-prettifier": "1.1.4",
35+
"@emotion/css-prettifier": "1.2.0",
3636
"@types/node": "^12.20.37",
3737
"typescript": "^5.4.5"
3838
},

‎packages/styled/CHANGELOG.md

+11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# @emotion/styled
22

3+
## 11.14.0
4+
5+
### Minor Changes
6+
7+
- [#3284](https://github.com/emotion-js/emotion/pull/3284) [`a19d019`](https://github.com/emotion-js/emotion/commit/a19d019bd418ebc3b9cba0e58f58b36ac2862a42) Thanks [@Andarist](https://github.com/Andarist)! - Source code has been migrated to TypeScript. From now on type declarations will be emitted based on that, instead of being hand-written.
8+
9+
### Patch Changes
10+
11+
- Updated dependencies [[`e1bf17e`](https://github.com/emotion-js/emotion/commit/e1bf17ee87ec51da1412eb5291460ea95a39d27a)]:
12+
- @emotion/use-insertion-effect-with-fallbacks@1.2.0
13+
314
## 11.13.5
415

516
### Patch Changes

‎packages/styled/base/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"main": "dist/emotion-styled-base.cjs.js",
33
"module": "dist/emotion-styled-base.esm.js",
44
"umd:main": "dist/emotion-styled-base.umd.min.js",
5-
"types": "../types/base",
5+
"types": "dist/emotion-styled-base.cjs.d.ts",
66
"preconstruct": {
77
"umdName": "emotionStyledBase"
88
}

‎packages/styled/package.json

+13-14
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "@emotion/styled",
3-
"version": "11.13.5",
3+
"version": "11.14.0",
44
"description": "styled API for emotion",
55
"main": "dist/emotion-styled.cjs.js",
66
"module": "dist/emotion-styled.esm.js",
7-
"types": "types/index.d.ts",
7+
"types": "dist/emotion-styled.cjs.d.ts",
88
"license": "MIT",
99
"repository": "https://github.com/emotion-js/emotion/tree/main/packages/styled",
1010
"scripts": {
@@ -15,7 +15,7 @@
1515
"@emotion/babel-plugin": "^11.13.5",
1616
"@emotion/is-prop-valid": "^1.3.0",
1717
"@emotion/serialize": "^1.3.3",
18-
"@emotion/use-insertion-effect-with-fallbacks": "^1.1.0",
18+
"@emotion/use-insertion-effect-with-fallbacks": "^1.2.0",
1919
"@emotion/utils": "^1.4.2"
2020
},
2121
"peerDependencies": {
@@ -29,7 +29,7 @@
2929
},
3030
"devDependencies": {
3131
"@definitelytyped/dtslint": "0.0.112",
32-
"@emotion/react": "11.13.5",
32+
"@emotion/react": "11.14.0",
3333
"react": "16.14.0",
3434
"typescript": "^5.4.5"
3535
},
@@ -40,7 +40,6 @@
4040
"src",
4141
"dist",
4242
"base",
43-
"types/*.d.ts",
4443
"macro.*"
4544
],
4645
"umd:main": "dist/emotion-styled.umd.min.js",
@@ -164,22 +163,22 @@
164163
},
165164
"imports": {
166165
"#is-development": {
167-
"development": "./src/conditions/true.js",
168-
"default": "./src/conditions/false.js"
166+
"development": "./src/conditions/true.ts",
167+
"default": "./src/conditions/false.ts"
169168
},
170169
"#is-browser": {
171-
"edge-light": "./src/conditions/false.js",
172-
"workerd": "./src/conditions/false.js",
173-
"worker": "./src/conditions/false.js",
174-
"browser": "./src/conditions/true.js",
175-
"default": "./src/conditions/is-browser.js"
170+
"edge-light": "./src/conditions/false.ts",
171+
"workerd": "./src/conditions/false.ts",
172+
"worker": "./src/conditions/false.ts",
173+
"browser": "./src/conditions/true.ts",
174+
"default": "./src/conditions/is-browser.ts"
176175
}
177176
},
178177
"preconstruct": {
179178
"umdName": "emotionStyled",
180179
"entrypoints": [
181-
"./index.js",
182-
"./base.js"
180+
"./index.ts",
181+
"./base.tsx"
183182
],
184183
"exports": {
185184
"extra": {

‎packages/styled/src/base.d.ts

-2
This file was deleted.

0 commit comments

Comments
 (0)