Skip to content

Commit cf56694

Browse files
AndaristAndarist
authored
Preconstruct upgrade (#2088)
* Use experimental entrypoints in preconstruct * Use newDistFilenames in preconstruct
1 parent db32e5a commit cf56694

File tree

33 files changed

+135
-147
lines changed

33 files changed

+135
-147
lines changed

‎package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,10 @@
139139
"react": "React",
140140
"react/jsx-runtime": "ReactJSX",
141141
"react/jsx-dev-runtime": "ReactJSXDev"
142+
},
143+
"___experimentalFlags_WILL_CHANGE_IN_PATCH": {
144+
"newEntrypoints": true,
145+
"newDistFilenames": true
142146
}
143147
},
144148
"bugs": {
@@ -191,7 +195,7 @@
191195
"@manypkg/cli": "^0.16.1",
192196
"@mdx-js/mdx": "^1.1.0",
193197
"@mdx-js/react": "^1.0.27",
194-
"@preconstruct/cli": "1.1.29",
198+
"@preconstruct/cli": "1.1.34",
195199
"@testing-library/react": "^11.0.4",
196200
"@types/jest": "^26.0.14",
197201
"@types/node": "^10.11.4",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"name": "@emotion/babel-plugin-jsx-pragmatic",
33
"version": "0.1.5",
44
"description": "Insert code to load a module corresponding to JSX pragma.",
5-
"main": "dist/babel-plugin-jsx-pragmatic.cjs.js",
6-
"module": "dist/babel-plugin-jsx-pragmatic.esm.js",
5+
"main": "dist/emotion-babel-plugin-jsx-pragmatic.cjs.js",
6+
"module": "dist/emotion-babel-plugin-jsx-pragmatic.esm.js",
77
"license": "MIT",
88
"repository": "https://github.com/emotion-js/emotion/tree/master/packages/babel-plugin-jsx-pragmatic",
99
"scripts": {

‎packages/babel-plugin/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"name": "@emotion/babel-plugin",
33
"version": "11.0.0-rc.0",
44
"description": "A recommended babel preprocessing plugin for emotion, The Next Generation of CSS-in-JS.",
5-
"main": "dist/babel-plugin.cjs.js",
6-
"module": "dist/babel-plugin.esm.js",
5+
"main": "dist/emotion-babel-plugin.cjs.js",
6+
"module": "dist/emotion-babel-plugin.esm.js",
77
"files": [
88
"src",
99
"lib",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"name": "@emotion/babel-preset-css-prop",
33
"version": "11.0.0-rc.0",
44
"description": "A babel preset to automatically enable emotion's css prop",
5-
"main": "dist/babel-preset-css-prop.cjs.js",
6-
"module": "dist/babel-preset-css-prop.esm.js",
5+
"main": "dist/emotion-babel-preset-css-prop.cjs.js",
6+
"module": "dist/emotion-babel-preset-css-prop.esm.js",
77
"license": "MIT",
88
"repository": "https://github.com/emotion-js/emotion/tree/master/packages/babel-preset-css-prop",
99
"scripts": {

‎packages/cache/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"name": "@emotion/cache",
33
"version": "11.0.0-rc.0",
44
"description": "emotion's cache",
5-
"main": "dist/cache.cjs.js",
6-
"module": "dist/cache.esm.js",
5+
"main": "dist/emotion-cache.cjs.js",
6+
"module": "dist/emotion-cache.esm.js",
77
"browser": {
8-
"./dist/cache.cjs.js": "./dist/cache.browser.cjs.js",
9-
"./dist/cache.esm.js": "./dist/cache.browser.esm.js"
8+
"./dist/emotion-cache.cjs.js": "./dist/emotion-cache.browser.cjs.js",
9+
"./dist/emotion-cache.esm.js": "./dist/emotion-cache.browser.esm.js"
1010
},
1111
"types": "types/index.d.ts",
1212
"license": "MIT",

‎packages/css-prettifier/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"emotion"
1010
],
1111
"author": "Mateusz Burzyński <[email protected]> (https://github.com/Andarist)",
12-
"main": "dist/css-prettifier.cjs.js",
13-
"module": "dist/css-prettifier.esm.js",
12+
"main": "dist/emotion-css-prettifier.cjs.js",
13+
"module": "dist/emotion-css-prettifier.esm.js",
1414
"types": "types/index.d.ts",
1515
"license": "MIT",
1616
"dependencies": {

‎packages/css/create-instance/package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
{
2-
"main": "dist/css.cjs.js",
3-
"module": "dist/css.esm.js",
4-
"umd:main": "dist/css.umd.min.js",
2+
"main": "dist/emotion-css-create-instance.cjs.js",
3+
"module": "dist/emotion-css-create-instance.esm.js",
4+
"umd:main": "dist/emotion-css-create-instance.umd.min.js",
55
"types": "../types/create-instance",
66
"preconstruct": {
7-
"source": "../src/create-instance",
87
"umdName": "createEmotion"
98
}
109
}

‎packages/css/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"name": "@emotion/css",
33
"version": "11.0.0-rc.0",
44
"description": "The Next Generation of CSS-in-JS.",
5-
"main": "dist/css.cjs.js",
6-
"module": "dist/css.esm.js",
5+
"main": "dist/emotion-css.cjs.js",
6+
"module": "dist/emotion-css.esm.js",
77
"types": "types/index.d.ts",
88
"files": [
99
"src",
@@ -50,12 +50,12 @@
5050
"bugs": {
5151
"url": "https://github.com/emotion-js/emotion/issues"
5252
},
53-
"umd:main": "dist/css.umd.min.js",
53+
"umd:main": "dist/emotion-css.umd.min.js",
5454
"preconstruct": {
5555
"umdName": "emotion",
5656
"entrypoints": [
57-
".",
58-
"create-instance"
57+
"./index.js",
58+
"./create-instance.js"
5959
]
6060
}
6161
}

‎packages/eslint-plugin/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"emotion"
1313
],
1414
"author": "alex-pex <[email protected]>",
15-
"main": "dist/eslint-plugin.cjs.js",
15+
"main": "dist/emotion-eslint-plugin.cjs.js",
1616
"engines": {
1717
"node": ">=6"
1818
},

‎packages/hash/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"name": "@emotion/hash",
33
"version": "0.8.0",
44
"description": "A MurmurHash2 implementation",
5-
"main": "dist/hash.cjs.js",
6-
"module": "dist/hash.esm.js",
5+
"main": "dist/emotion-hash.cjs.js",
6+
"module": "dist/emotion-hash.esm.js",
77
"types": "types/index.d.ts",
88
"license": "MIT",
99
"repository": "https://github.com/emotion-js/emotion/tree/master/packages/hash",
@@ -22,7 +22,7 @@
2222
"dtslint": "^0.3.0"
2323
},
2424
"browser": {
25-
"./dist/hash.cjs.js": "./dist/hash.browser.cjs.js",
26-
"./dist/hash.esm.js": "./dist/hash.browser.esm.js"
25+
"./dist/emotion-hash.cjs.js": "./dist/emotion-hash.browser.cjs.js",
26+
"./dist/emotion-hash.esm.js": "./dist/emotion-hash.browser.esm.js"
2727
}
2828
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"name": "@emotion/is-prop-valid",
33
"version": "1.0.0-rc.0",
44
"description": "A function to check whether a prop is valid for HTML and SVG elements",
5-
"main": "dist/is-prop-valid.cjs.js",
6-
"module": "dist/is-prop-valid.esm.js",
5+
"main": "dist/emotion-is-prop-valid.cjs.js",
6+
"module": "dist/emotion-is-prop-valid.esm.js",
77
"types": "types/index.d.ts",
88
"license": "MIT",
99
"repository": "https://github.com/emotion-js/emotion/tree/master/packages/is-prop-valid",
@@ -25,7 +25,7 @@
2525
"types/*.d.ts"
2626
],
2727
"browser": {
28-
"./dist/is-prop-valid.cjs.js": "./dist/is-prop-valid.browser.cjs.js",
29-
"./dist/is-prop-valid.esm.js": "./dist/is-prop-valid.browser.esm.js"
28+
"./dist/emotion-is-prop-valid.cjs.js": "./dist/emotion-is-prop-valid.browser.cjs.js",
29+
"./dist/emotion-is-prop-valid.esm.js": "./dist/emotion-is-prop-valid.browser.esm.js"
3030
}
3131
}

‎packages/jest/enzyme-serializer/package.json

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
{
2-
"main": "dist/jest.cjs.js",
3-
"module": "dist/jest.esm.js",
4-
"types": "../types/enzyme-serializer",
5-
"preconstruct": {
6-
"source": "../src/enzyme-serializer"
7-
}
2+
"main": "dist/emotion-jest-enzyme-serializer.cjs.js",
3+
"module": "dist/emotion-jest-enzyme-serializer.esm.js",
4+
"types": "../types/enzyme-serializer"
85
}

‎packages/jest/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"name": "@emotion/jest",
33
"version": "11.0.0-rc.0",
44
"description": "Jest utilities for emotion",
5-
"main": "dist/jest.cjs.js",
6-
"module": "dist/jest.esm.js",
5+
"main": "dist/emotion-jest.cjs.js",
6+
"module": "dist/emotion-jest.esm.js",
77
"types": "types/index.d.ts",
88
"files": [
99
"src",
@@ -64,9 +64,9 @@
6464
},
6565
"preconstruct": {
6666
"entrypoints": [
67-
".",
68-
"serializer",
69-
"enzyme-serializer"
67+
"./index.js",
68+
"./serializer.js",
69+
"./enzyme-serializer.js"
7070
]
7171
}
7272
}

‎packages/jest/serializer/package.json

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
{
2-
"main": "dist/jest.cjs.js",
3-
"module": "dist/jest.esm.js",
4-
"types": "../types/serializer",
5-
"preconstruct": {
6-
"source": "../src/serializer"
7-
}
2+
"main": "dist/emotion-jest-serializer.cjs.js",
3+
"module": "dist/emotion-jest-serializer.esm.js",
4+
"types": "../types/serializer"
85
}

‎packages/memoize/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"name": "@emotion/memoize",
33
"version": "0.7.4",
44
"description": "emotion's memoize utility",
5-
"main": "dist/memoize.cjs.js",
6-
"module": "dist/memoize.esm.js",
5+
"main": "dist/emotion-memoize.cjs.js",
6+
"module": "dist/emotion-memoize.esm.js",
77
"types": "types/index.d.ts",
88
"license": "MIT",
99
"repository": "https://github.com/emotion-js/emotion/tree/master/packages/memoize",
@@ -22,7 +22,7 @@
2222
"types/*.d.ts"
2323
],
2424
"browser": {
25-
"./dist/memoize.cjs.js": "./dist/memoize.browser.cjs.js",
26-
"./dist/memoize.esm.js": "./dist/memoize.browser.esm.js"
25+
"./dist/emotion-memoize.cjs.js": "./dist/emotion-memoize.browser.cjs.js",
26+
"./dist/emotion-memoize.esm.js": "./dist/emotion-memoize.browser.esm.js"
2727
}
2828
}

‎packages/native/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"name": "@emotion/native",
33
"version": "11.0.0-rc.0",
44
"description": "Style and render React Native components using emotion",
5-
"main": "dist/native.cjs.js",
6-
"module": "dist/native.esm.js",
5+
"main": "dist/emotion-native.cjs.js",
6+
"module": "dist/emotion-native.esm.js",
77
"scripts": {
88
"test:typescript": "dtslint types"
99
},
@@ -51,7 +51,7 @@
5151
"access": "public"
5252
},
5353
"browser": {
54-
"./dist/native.cjs.js": "./dist/native.browser.cjs.js",
55-
"./dist/native.esm.js": "./dist/native.browser.esm.js"
54+
"./dist/emotion-native.cjs.js": "./dist/emotion-native.browser.cjs.js",
55+
"./dist/emotion-native.esm.js": "./dist/emotion-native.browser.esm.js"
5656
}
5757
}

‎packages/primitives-core/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"name": "@emotion/primitives-core",
33
"version": "11.0.0-rc.0",
44
"description": "Shared utilities for emotion primitives and native",
5-
"main": "dist/primitives-core.cjs.js",
6-
"module": "dist/primitives-core.esm.js",
5+
"main": "dist/emotion-primitives-core.cjs.js",
6+
"module": "dist/emotion-primitives-core.esm.js",
77
"scripts": {
88
"test:typescript": "exit 0"
99
},
@@ -41,7 +41,7 @@
4141
"access": "public"
4242
},
4343
"browser": {
44-
"./dist/primitives-core.cjs.js": "./dist/primitives-core.browser.cjs.js",
45-
"./dist/primitives-core.esm.js": "./dist/primitives-core.browser.esm.js"
44+
"./dist/emotion-primitives-core.cjs.js": "./dist/emotion-primitives-core.browser.cjs.js",
45+
"./dist/emotion-primitives-core.esm.js": "./dist/emotion-primitives-core.browser.esm.js"
4646
}
4747
}

‎packages/primitives/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "@emotion/primitives",
33
"version": "11.0.0-rc.0",
4-
"main": "dist/primitives.cjs.js",
5-
"module": "dist/primitives.esm.js",
4+
"main": "dist/emotion-primitives.cjs.js",
5+
"module": "dist/emotion-primitives.esm.js",
66
"scripts": {
77
"test:typescript": "exit 0"
88
},
@@ -51,7 +51,7 @@
5151
"access": "public"
5252
},
5353
"browser": {
54-
"./dist/primitives.cjs.js": "./dist/primitives.browser.cjs.js",
55-
"./dist/primitives.esm.js": "./dist/primitives.browser.esm.js"
54+
"./dist/emotion-primitives.cjs.js": "./dist/emotion-primitives.browser.cjs.js",
55+
"./dist/emotion-primitives.esm.js": "./dist/emotion-primitives.browser.esm.js"
5656
}
5757
}

‎packages/react/jsx-dev-runtime/package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
{
2-
"main": "dist/react.cjs.js",
3-
"module": "dist/react.esm.js",
4-
"umd:main": "dist/react.umd.min.js",
2+
"main": "dist/emotion-react-jsx-dev-runtime.cjs.js",
3+
"module": "dist/emotion-react-jsx-dev-runtime.esm.js",
4+
"umd:main": "dist/emotion-react-jsx-dev-runtime.umd.min.js",
55
"browser": {
6-
"./dist/react.cjs.js": "./dist/react.browser.cjs.js",
7-
"./dist/react.esm.js": "./dist/react.browser.esm.js"
6+
"./dist/emotion-react-jsx-dev-runtime.cjs.js": "./dist/emotion-react-jsx-dev-runtime.browser.cjs.js",
7+
"./dist/emotion-react-jsx-dev-runtime.esm.js": "./dist/emotion-react-jsx-dev-runtime.browser.esm.js"
88
},
99
"types": "../types/jsx-dev-runtime",
1010
"preconstruct": {
11-
"source": "../src/jsx-dev-runtime",
1211
"umdName": "emotionReactJSXDevRuntime"
1312
}
1413
}

‎packages/react/jsx-runtime/package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
{
2-
"main": "dist/react.cjs.js",
3-
"module": "dist/react.esm.js",
4-
"umd:main": "dist/react.umd.min.js",
2+
"main": "dist/emotion-react-jsx-runtime.cjs.js",
3+
"module": "dist/emotion-react-jsx-runtime.esm.js",
4+
"umd:main": "dist/emotion-react-jsx-runtime.umd.min.js",
55
"browser": {
6-
"./dist/react.cjs.js": "./dist/react.browser.cjs.js",
7-
"./dist/react.esm.js": "./dist/react.browser.esm.js"
6+
"./dist/emotion-react-jsx-runtime.cjs.js": "./dist/emotion-react-jsx-runtime.browser.cjs.js",
7+
"./dist/emotion-react-jsx-runtime.esm.js": "./dist/emotion-react-jsx-runtime.browser.esm.js"
88
},
99
"types": "../types/jsx-runtime",
1010
"preconstruct": {
11-
"source": "../src/jsx-runtime",
1211
"umdName": "emotionReactJSXRuntime"
1312
}
1413
}

‎packages/react/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"name": "@emotion/react",
33
"version": "11.0.0-rc.0",
4-
"main": "dist/react.cjs.js",
5-
"module": "dist/react.esm.js",
4+
"main": "dist/emotion-react.cjs.js",
5+
"module": "dist/emotion-react.esm.js",
66
"browser": {
7-
"./dist/react.cjs.js": "./dist/react.browser.cjs.js",
8-
"./dist/react.esm.js": "./dist/react.browser.esm.js"
7+
"./dist/emotion-react.cjs.js": "./dist/emotion-react.browser.cjs.js",
8+
"./dist/emotion-react.esm.js": "./dist/emotion-react.browser.esm.js"
99
},
1010
"types": "types/index.d.ts",
1111
"files": [
@@ -60,12 +60,12 @@
6060
"publishConfig": {
6161
"access": "public"
6262
},
63-
"umd:main": "dist/react.umd.min.js",
63+
"umd:main": "dist/emotion-react.umd.min.js",
6464
"preconstruct": {
6565
"entrypoints": [
66-
".",
67-
"jsx-runtime",
68-
"jsx-dev-runtime"
66+
"./index.js",
67+
"./jsx-runtime.js",
68+
"./jsx-dev-runtime.js"
6969
],
7070
"umdName": "emotionReact"
7171
}

‎packages/serialize/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"name": "@emotion/serialize",
33
"version": "1.0.0-rc.0",
44
"description": "serialization utils for emotion",
5-
"main": "dist/serialize.cjs.js",
6-
"module": "dist/serialize.esm.js",
5+
"main": "dist/emotion-serialize.cjs.js",
6+
"module": "dist/emotion-serialize.esm.js",
77
"types": "types/index.d.ts",
88
"license": "MIT",
99
"repository": "https://github.com/emotion-js/emotion/tree/master/packages/serialize",
@@ -29,7 +29,7 @@
2929
"types/*.d.ts"
3030
],
3131
"browser": {
32-
"./dist/serialize.cjs.js": "./dist/serialize.browser.cjs.js",
33-
"./dist/serialize.esm.js": "./dist/serialize.browser.esm.js"
32+
"./dist/emotion-serialize.cjs.js": "./dist/emotion-serialize.browser.cjs.js",
33+
"./dist/emotion-serialize.esm.js": "./dist/emotion-serialize.browser.esm.js"
3434
}
3535
}

0 commit comments

Comments
 (0)