Skip to content

Commit eed5e6c

Browse files
AndaristAndarist
authored
Fixed importing in Node ESM (emotion-js#3029)
* Fixed importing in Node ESM * Fixed macro types * rerun preconstruct fix * remove redundant .default files
1 parent e6e5b3d commit eed5e6c

File tree

32 files changed

+203
-56
lines changed

32 files changed

+203
-56
lines changed

‎.changeset/perfect-otters-compete.md

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
---
2+
'@emotion/babel-plugin': patch
3+
'@emotion/babel-plugin-jsx-pragmatic': patch
4+
'@emotion/babel-preset-css-prop': patch
5+
'@emotion/cache': patch
6+
'@emotion/css': patch
7+
'@emotion/css-prettifier': patch
8+
'@emotion/eslint-plugin': patch
9+
'@emotion/hash': patch
10+
'@emotion/is-prop-valid': patch
11+
'@emotion/jest': patch
12+
'@emotion/memoize': patch
13+
'@emotion/native': patch
14+
'@emotion/primitives': patch
15+
'@emotion/primitives-core': patch
16+
'@emotion/react': patch
17+
'@emotion/serialize': patch
18+
'@emotion/server': patch
19+
'@emotion/sheet': patch
20+
'@emotion/styled': patch
21+
'@emotion/unitless': patch
22+
'@emotion/use-insertion-effect-with-fallbacks': patch
23+
'@emotion/utils': patch
24+
'@emotion/weak-memoize': patch
25+
---
26+
27+
Fixed importing in Node ESM

‎package.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,8 @@
128128
"react/jsx-runtime": "ReactJSX",
129129
"react/jsx-dev-runtime": "ReactJSXDev"
130130
},
131-
"exports": true,
132-
"___experimentalFlags_WILL_CHANGE_IN_PATCH": {
133-
"exports": true
131+
"exports": {
132+
"importConditionDefaultExport": "default"
134133
}
135134
},
136135
"bugs": {
@@ -181,7 +180,7 @@
181180
"@changesets/changelog-github": "^0.4.0",
182181
"@changesets/cli": "^2.16.0",
183182
"@manypkg/cli": "^0.19.1",
184-
"@preconstruct/cli": "^2.2.1",
183+
"@preconstruct/cli": "^2.6.2",
185184
"@testing-library/react": "13.0.0-alpha.5",
186185
"@types/jest": "^27.0.3",
187186
"@types/node": "^12.20.37",

‎packages/babel-plugin-jsx-pragmatic/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"exports": {
88
".": {
99
"module": "./dist/emotion-babel-plugin-jsx-pragmatic.esm.js",
10+
"import": "./dist/emotion-babel-plugin-jsx-pragmatic.cjs.mjs",
1011
"default": "./dist/emotion-babel-plugin-jsx-pragmatic.cjs.js"
1112
},
1213
"./package.json": "./package.json"

‎packages/babel-plugin/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"exports": {
88
".": {
99
"module": "./dist/emotion-babel-plugin.esm.js",
10+
"import": "./dist/emotion-babel-plugin.cjs.mjs",
1011
"default": "./dist/emotion-babel-plugin.cjs.js"
1112
},
1213
"./package.json": "./package.json"

‎packages/babel-preset-css-prop/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"exports": {
88
".": {
99
"module": "./dist/emotion-babel-preset-css-prop.esm.js",
10+
"import": "./dist/emotion-babel-preset-css-prop.cjs.mjs",
1011
"default": "./dist/emotion-babel-preset-css-prop.cjs.js"
1112
},
1213
"./package.json": "./package.json"

‎packages/cache/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"browser": "./dist/emotion-cache.browser.esm.js",
1515
"default": "./dist/emotion-cache.esm.js"
1616
},
17+
"import": "./dist/emotion-cache.cjs.mjs",
1718
"default": "./dist/emotion-cache.cjs.js"
1819
},
1920
"./package.json": "./package.json"

‎packages/css-prettifier/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"exports": {
1212
".": {
1313
"module": "./dist/emotion-css-prettifier.esm.js",
14+
"import": "./dist/emotion-css-prettifier.cjs.mjs",
1415
"default": "./dist/emotion-css-prettifier.cjs.js"
1516
},
1617
"./package.json": "./package.json"

‎packages/css/macro.d.mts

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from './macro.js'

‎packages/css/package.json

+17-5
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
"src",
1010
"dist",
1111
"types",
12-
"macro.js",
13-
"macro.d.ts",
14-
"macro.js.flow",
12+
"macro.*",
1513
"create-instance"
1614
],
1715
"scripts": {
@@ -46,14 +44,22 @@
4644
"exports": {
4745
".": {
4846
"module": "./dist/emotion-css.esm.js",
47+
"import": "./dist/emotion-css.cjs.mjs",
4948
"default": "./dist/emotion-css.cjs.js"
5049
},
5150
"./create-instance": {
5251
"module": "./create-instance/dist/emotion-css-create-instance.esm.js",
52+
"import": "./create-instance/dist/emotion-css-create-instance.cjs.mjs",
5353
"default": "./create-instance/dist/emotion-css-create-instance.cjs.js"
5454
},
5555
"./package.json": "./package.json",
56-
"./macro": "./macro.js"
56+
"./macro": {
57+
"types": {
58+
"import": "./macro.d.mts",
59+
"default": "./macro.d.ts"
60+
},
61+
"default": "./macro.js"
62+
}
5763
},
5864
"preconstruct": {
5965
"umdName": "emotion",
@@ -63,7 +69,13 @@
6369
],
6470
"exports": {
6571
"extra": {
66-
"./macro": "./macro.js"
72+
"./macro": {
73+
"types": {
74+
"import": "./macro.d.mts",
75+
"default": "./macro.d.ts"
76+
},
77+
"default": "./macro.js"
78+
}
6779
}
6880
}
6981
}

‎packages/eslint-plugin/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"exports": {
1515
".": {
1616
"module": "./dist/emotion-eslint-plugin.esm.js",
17+
"import": "./dist/emotion-eslint-plugin.cjs.mjs",
1718
"default": "./dist/emotion-eslint-plugin.cjs.js"
1819
},
1920
"./package.json": "./package.json"

‎packages/hash/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"exports": {
2323
".": {
2424
"module": "./dist/emotion-hash.esm.js",
25+
"import": "./dist/emotion-hash.cjs.mjs",
2526
"default": "./dist/emotion-hash.cjs.js"
2627
},
2728
"./package.json": "./package.json"

‎packages/is-prop-valid/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
"exports": {
2929
".": {
3030
"module": "./dist/emotion-is-prop-valid.esm.js",
31+
"import": "./dist/emotion-is-prop-valid.cjs.mjs",
3132
"default": "./dist/emotion-is-prop-valid.cjs.js"
3233
},
3334
"./package.json": "./package.json"

‎packages/jest/package.json

+4
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,22 @@
77
"exports": {
88
".": {
99
"module": "./dist/emotion-jest.esm.js",
10+
"import": "./dist/emotion-jest.cjs.mjs",
1011
"default": "./dist/emotion-jest.cjs.js"
1112
},
1213
"./enzyme": {
1314
"module": "./enzyme/dist/emotion-jest-enzyme.esm.js",
15+
"import": "./enzyme/dist/emotion-jest-enzyme.cjs.mjs",
1416
"default": "./enzyme/dist/emotion-jest-enzyme.cjs.js"
1517
},
1618
"./serializer": {
1719
"module": "./serializer/dist/emotion-jest-serializer.esm.js",
20+
"import": "./serializer/dist/emotion-jest-serializer.cjs.mjs",
1821
"default": "./serializer/dist/emotion-jest-serializer.cjs.js"
1922
},
2023
"./enzyme-serializer": {
2124
"module": "./enzyme-serializer/dist/emotion-jest-enzyme-serializer.esm.js",
25+
"import": "./enzyme-serializer/dist/emotion-jest-enzyme-serializer.cjs.mjs",
2226
"default": "./enzyme-serializer/dist/emotion-jest-enzyme-serializer.cjs.js"
2327
},
2428
"./package.json": "./package.json"

‎packages/memoize/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"exports": {
2626
".": {
2727
"module": "./dist/emotion-memoize.esm.js",
28+
"import": "./dist/emotion-memoize.cjs.mjs",
2829
"default": "./dist/emotion-memoize.cjs.js"
2930
},
3031
"./package.json": "./package.json"

‎packages/native/macro.d.mts

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import styled from '@emotion/native'
2+
export * from '@emotion/native'
3+
export default styled

‎packages/native/macro.d.ts

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import styled from '@emotion/native'
2+
export * from '@emotion/native'
3+
export default styled

‎packages/native/package.json

+16-3
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,17 @@
77
"exports": {
88
".": {
99
"module": "./dist/emotion-native.esm.js",
10+
"import": "./dist/emotion-native.cjs.mjs",
1011
"default": "./dist/emotion-native.cjs.js"
1112
},
1213
"./package.json": "./package.json",
13-
"./macro": "./macro.js"
14+
"./macro": {
15+
"types": {
16+
"import": "./macro.d.mts",
17+
"default": "./macro.d.ts"
18+
},
19+
"default": "./macro.js"
20+
}
1421
},
1522
"scripts": {
1623
"test:typescript": "dtslint types"
@@ -19,7 +26,7 @@
1926
"src",
2027
"dist",
2128
"types/*.d.ts",
22-
"macro.js"
29+
"macro.*"
2330
],
2431
"types": "types/index.d.ts",
2532
"devDependencies": {
@@ -55,7 +62,13 @@
5562
"preconstruct": {
5663
"exports": {
5764
"extra": {
58-
"./macro": "./macro.js"
65+
"./macro": {
66+
"types": {
67+
"import": "./macro.d.mts",
68+
"default": "./macro.d.ts"
69+
},
70+
"default": "./macro.js"
71+
}
5972
}
6073
}
6174
}

‎packages/primitives-core/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
"browser": "./dist/emotion-primitives-core.browser.esm.js",
4747
"default": "./dist/emotion-primitives-core.esm.js"
4848
},
49+
"import": "./dist/emotion-primitives-core.cjs.mjs",
4950
"default": "./dist/emotion-primitives-core.cjs.js"
5051
},
5152
"./package.json": "./package.json"

‎packages/primitives/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"files": [
77
"src",
88
"dist",
9-
"macro.js"
9+
"macro.*"
1010
],
1111
"dependencies": {
1212
"@emotion/babel-plugin": "^11.10.6",
@@ -49,6 +49,7 @@
4949
"browser": "./dist/emotion-primitives.browser.esm.js",
5050
"default": "./dist/emotion-primitives.esm.js"
5151
},
52+
"import": "./dist/emotion-primitives.cjs.mjs",
5253
"default": "./dist/emotion-primitives.cjs.js"
5354
},
5455
"./package.json": "./package.json",

‎packages/react/macro.d.mts

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from './macro.js'

‎packages/react/package.json

+19-5
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"browser": "./dist/emotion-react.browser.esm.js",
1414
"default": "./dist/emotion-react.esm.js"
1515
},
16+
"import": "./dist/emotion-react.cjs.mjs",
1617
"default": "./dist/emotion-react.cjs.js"
1718
},
1819
"./jsx-runtime": {
@@ -21,6 +22,7 @@
2122
"browser": "./jsx-runtime/dist/emotion-react-jsx-runtime.browser.esm.js",
2223
"default": "./jsx-runtime/dist/emotion-react-jsx-runtime.esm.js"
2324
},
25+
"import": "./jsx-runtime/dist/emotion-react-jsx-runtime.cjs.mjs",
2426
"default": "./jsx-runtime/dist/emotion-react-jsx-runtime.cjs.js"
2527
},
2628
"./_isolated-hnrs": {
@@ -29,6 +31,7 @@
2931
"browser": "./_isolated-hnrs/dist/emotion-react-_isolated-hnrs.browser.esm.js",
3032
"default": "./_isolated-hnrs/dist/emotion-react-_isolated-hnrs.esm.js"
3133
},
34+
"import": "./_isolated-hnrs/dist/emotion-react-_isolated-hnrs.cjs.mjs",
3235
"default": "./_isolated-hnrs/dist/emotion-react-_isolated-hnrs.cjs.js"
3336
},
3437
"./jsx-dev-runtime": {
@@ -37,11 +40,18 @@
3740
"browser": "./jsx-dev-runtime/dist/emotion-react-jsx-dev-runtime.browser.esm.js",
3841
"default": "./jsx-dev-runtime/dist/emotion-react-jsx-dev-runtime.esm.js"
3942
},
43+
"import": "./jsx-dev-runtime/dist/emotion-react-jsx-dev-runtime.cjs.mjs",
4044
"default": "./jsx-dev-runtime/dist/emotion-react-jsx-dev-runtime.cjs.js"
4145
},
4246
"./package.json": "./package.json",
4347
"./types/css-prop": "./types/css-prop.d.ts",
44-
"./macro": "./macro.js"
48+
"./macro": {
49+
"types": {
50+
"import": "./macro.d.mts",
51+
"default": "./macro.d.ts"
52+
},
53+
"default": "./macro.js"
54+
}
4555
},
4656
"types": "types/index.d.ts",
4757
"files": [
@@ -51,9 +61,7 @@
5161
"jsx-dev-runtime",
5262
"_isolated-hnrs",
5363
"types/*.d.ts",
54-
"macro.js",
55-
"macro.d.ts",
56-
"macro.js.flow"
64+
"macro.*"
5765
],
5866
"sideEffects": false,
5967
"author": "Emotion Contributors",
@@ -110,7 +118,13 @@
110118
],
111119
"extra": {
112120
"./types/css-prop": "./types/css-prop.d.ts",
113-
"./macro": "./macro.js"
121+
"./macro": {
122+
"types": {
123+
"import": "./macro.d.mts",
124+
"default": "./macro.d.ts"
125+
},
126+
"default": "./macro.js"
127+
}
114128
}
115129
}
116130
}

‎packages/serialize/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
"browser": "./dist/emotion-serialize.browser.esm.js",
3939
"default": "./dist/emotion-serialize.esm.js"
4040
},
41+
"import": "./dist/emotion-serialize.cjs.mjs",
4142
"default": "./dist/emotion-serialize.cjs.js"
4243
},
4344
"./package.json": "./package.json"

‎packages/server/package.json

+2
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,15 @@
6161
"browser": "./dist/emotion-server.browser.esm.js",
6262
"default": "./dist/emotion-server.esm.js"
6363
},
64+
"import": "./dist/emotion-server.cjs.mjs",
6465
"default": "./dist/emotion-server.cjs.js"
6566
},
6667
"./create-instance": {
6768
"module": {
6869
"browser": "./create-instance/dist/emotion-server-create-instance.browser.esm.js",
6970
"default": "./create-instance/dist/emotion-server-create-instance.esm.js"
7071
},
72+
"import": "./create-instance/dist/emotion-server-create-instance.cjs.mjs",
7173
"default": "./create-instance/dist/emotion-server-create-instance.cjs.js"
7274
},
7375
"./package.json": "./package.json"

‎packages/sheet/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"browser": "./dist/emotion-sheet.browser.esm.js",
1414
"default": "./dist/emotion-sheet.esm.js"
1515
},
16+
"import": "./dist/emotion-sheet.cjs.mjs",
1617
"default": "./dist/emotion-sheet.cjs.js"
1718
},
1819
"./package.json": "./package.json"

‎packages/styled/macro.d.mts

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import styled from '@emotion/styled'
2+
export * from '@emotion/styled'
3+
export default styled

‎packages/styled/macro.d.ts

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
declare module '@emotion/styled/macro' {
2-
import styled from '@emotion/styled'
3-
export * from '@emotion/styled'
4-
export default styled
5-
}
1+
import styled from '@emotion/styled'
2+
export * from '@emotion/styled'
3+
export default styled

0 commit comments

Comments
 (0)