Skip to content

Commit

Permalink
Preconstruct upgrade (#2088)
Browse files Browse the repository at this point in the history
* Use experimental entrypoints in preconstruct

* Use newDistFilenames in preconstruct
  • Loading branch information
Andarist committed Nov 10, 2020
1 parent db32e5a commit cf56694
Show file tree
Hide file tree
Showing 33 changed files with 135 additions and 147 deletions.
6 changes: 5 additions & 1 deletion package.json
Expand Up @@ -139,6 +139,10 @@
"react": "React",
"react/jsx-runtime": "ReactJSX",
"react/jsx-dev-runtime": "ReactJSXDev"
},
"___experimentalFlags_WILL_CHANGE_IN_PATCH": {
"newEntrypoints": true,
"newDistFilenames": true
}
},
"bugs": {
Expand Down Expand Up @@ -191,7 +195,7 @@
"@manypkg/cli": "^0.16.1",
"@mdx-js/mdx": "^1.1.0",
"@mdx-js/react": "^1.0.27",
"@preconstruct/cli": "1.1.29",
"@preconstruct/cli": "1.1.34",
"@testing-library/react": "^11.0.4",
"@types/jest": "^26.0.14",
"@types/node": "^10.11.4",
Expand Down
4 changes: 2 additions & 2 deletions packages/babel-plugin-jsx-pragmatic/package.json
Expand Up @@ -2,8 +2,8 @@
"name": "@emotion/babel-plugin-jsx-pragmatic",
"version": "0.1.5",
"description": "Insert code to load a module corresponding to JSX pragma.",
"main": "dist/babel-plugin-jsx-pragmatic.cjs.js",
"module": "dist/babel-plugin-jsx-pragmatic.esm.js",
"main": "dist/emotion-babel-plugin-jsx-pragmatic.cjs.js",
"module": "dist/emotion-babel-plugin-jsx-pragmatic.esm.js",
"license": "MIT",
"repository": "https://github.com/emotion-js/emotion/tree/master/packages/babel-plugin-jsx-pragmatic",
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions packages/babel-plugin/package.json
Expand Up @@ -2,8 +2,8 @@
"name": "@emotion/babel-plugin",
"version": "11.0.0-rc.0",
"description": "A recommended babel preprocessing plugin for emotion, The Next Generation of CSS-in-JS.",
"main": "dist/babel-plugin.cjs.js",
"module": "dist/babel-plugin.esm.js",
"main": "dist/emotion-babel-plugin.cjs.js",
"module": "dist/emotion-babel-plugin.esm.js",
"files": [
"src",
"lib",
Expand Down
4 changes: 2 additions & 2 deletions packages/babel-preset-css-prop/package.json
Expand Up @@ -2,8 +2,8 @@
"name": "@emotion/babel-preset-css-prop",
"version": "11.0.0-rc.0",
"description": "A babel preset to automatically enable emotion's css prop",
"main": "dist/babel-preset-css-prop.cjs.js",
"module": "dist/babel-preset-css-prop.esm.js",
"main": "dist/emotion-babel-preset-css-prop.cjs.js",
"module": "dist/emotion-babel-preset-css-prop.esm.js",
"license": "MIT",
"repository": "https://github.com/emotion-js/emotion/tree/master/packages/babel-preset-css-prop",
"scripts": {
Expand Down
8 changes: 4 additions & 4 deletions packages/cache/package.json
Expand Up @@ -2,11 +2,11 @@
"name": "@emotion/cache",
"version": "11.0.0-rc.0",
"description": "emotion's cache",
"main": "dist/cache.cjs.js",
"module": "dist/cache.esm.js",
"main": "dist/emotion-cache.cjs.js",
"module": "dist/emotion-cache.esm.js",
"browser": {
"./dist/cache.cjs.js": "./dist/cache.browser.cjs.js",
"./dist/cache.esm.js": "./dist/cache.browser.esm.js"
"./dist/emotion-cache.cjs.js": "./dist/emotion-cache.browser.cjs.js",
"./dist/emotion-cache.esm.js": "./dist/emotion-cache.browser.esm.js"
},
"types": "types/index.d.ts",
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions packages/css-prettifier/package.json
Expand Up @@ -9,8 +9,8 @@
"emotion"
],
"author": "Mateusz Burzyński <mateuszburzynski@gmail.com> (https://github.com/Andarist)",
"main": "dist/css-prettifier.cjs.js",
"module": "dist/css-prettifier.esm.js",
"main": "dist/emotion-css-prettifier.cjs.js",
"module": "dist/emotion-css-prettifier.esm.js",
"types": "types/index.d.ts",
"license": "MIT",
"dependencies": {
Expand Down
7 changes: 3 additions & 4 deletions packages/css/create-instance/package.json
@@ -1,10 +1,9 @@
{
"main": "dist/css.cjs.js",
"module": "dist/css.esm.js",
"umd:main": "dist/css.umd.min.js",
"main": "dist/emotion-css-create-instance.cjs.js",
"module": "dist/emotion-css-create-instance.esm.js",
"umd:main": "dist/emotion-css-create-instance.umd.min.js",
"types": "../types/create-instance",
"preconstruct": {
"source": "../src/create-instance",
"umdName": "createEmotion"
}
}
10 changes: 5 additions & 5 deletions packages/css/package.json
Expand Up @@ -2,8 +2,8 @@
"name": "@emotion/css",
"version": "11.0.0-rc.0",
"description": "The Next Generation of CSS-in-JS.",
"main": "dist/css.cjs.js",
"module": "dist/css.esm.js",
"main": "dist/emotion-css.cjs.js",
"module": "dist/emotion-css.esm.js",
"types": "types/index.d.ts",
"files": [
"src",
Expand Down Expand Up @@ -50,12 +50,12 @@
"bugs": {
"url": "https://github.com/emotion-js/emotion/issues"
},
"umd:main": "dist/css.umd.min.js",
"umd:main": "dist/emotion-css.umd.min.js",
"preconstruct": {
"umdName": "emotion",
"entrypoints": [
".",
"create-instance"
"./index.js",
"./create-instance.js"
]
}
}
2 changes: 1 addition & 1 deletion packages/eslint-plugin/package.json
Expand Up @@ -12,7 +12,7 @@
"emotion"
],
"author": "alex-pex <alexandre.paixao@stadline.com>",
"main": "dist/eslint-plugin.cjs.js",
"main": "dist/emotion-eslint-plugin.cjs.js",
"engines": {
"node": ">=6"
},
Expand Down
8 changes: 4 additions & 4 deletions packages/hash/package.json
Expand Up @@ -2,8 +2,8 @@
"name": "@emotion/hash",
"version": "0.8.0",
"description": "A MurmurHash2 implementation",
"main": "dist/hash.cjs.js",
"module": "dist/hash.esm.js",
"main": "dist/emotion-hash.cjs.js",
"module": "dist/emotion-hash.esm.js",
"types": "types/index.d.ts",
"license": "MIT",
"repository": "https://github.com/emotion-js/emotion/tree/master/packages/hash",
Expand All @@ -22,7 +22,7 @@
"dtslint": "^0.3.0"
},
"browser": {
"./dist/hash.cjs.js": "./dist/hash.browser.cjs.js",
"./dist/hash.esm.js": "./dist/hash.browser.esm.js"
"./dist/emotion-hash.cjs.js": "./dist/emotion-hash.browser.cjs.js",
"./dist/emotion-hash.esm.js": "./dist/emotion-hash.browser.esm.js"
}
}
8 changes: 4 additions & 4 deletions packages/is-prop-valid/package.json
Expand Up @@ -2,8 +2,8 @@
"name": "@emotion/is-prop-valid",
"version": "1.0.0-rc.0",
"description": "A function to check whether a prop is valid for HTML and SVG elements",
"main": "dist/is-prop-valid.cjs.js",
"module": "dist/is-prop-valid.esm.js",
"main": "dist/emotion-is-prop-valid.cjs.js",
"module": "dist/emotion-is-prop-valid.esm.js",
"types": "types/index.d.ts",
"license": "MIT",
"repository": "https://github.com/emotion-js/emotion/tree/master/packages/is-prop-valid",
Expand All @@ -25,7 +25,7 @@
"types/*.d.ts"
],
"browser": {
"./dist/is-prop-valid.cjs.js": "./dist/is-prop-valid.browser.cjs.js",
"./dist/is-prop-valid.esm.js": "./dist/is-prop-valid.browser.esm.js"
"./dist/emotion-is-prop-valid.cjs.js": "./dist/emotion-is-prop-valid.browser.cjs.js",
"./dist/emotion-is-prop-valid.esm.js": "./dist/emotion-is-prop-valid.browser.esm.js"
}
}
9 changes: 3 additions & 6 deletions packages/jest/enzyme-serializer/package.json
@@ -1,8 +1,5 @@
{
"main": "dist/jest.cjs.js",
"module": "dist/jest.esm.js",
"types": "../types/enzyme-serializer",
"preconstruct": {
"source": "../src/enzyme-serializer"
}
"main": "dist/emotion-jest-enzyme-serializer.cjs.js",
"module": "dist/emotion-jest-enzyme-serializer.esm.js",
"types": "../types/enzyme-serializer"
}
10 changes: 5 additions & 5 deletions packages/jest/package.json
Expand Up @@ -2,8 +2,8 @@
"name": "@emotion/jest",
"version": "11.0.0-rc.0",
"description": "Jest utilities for emotion",
"main": "dist/jest.cjs.js",
"module": "dist/jest.esm.js",
"main": "dist/emotion-jest.cjs.js",
"module": "dist/emotion-jest.esm.js",
"types": "types/index.d.ts",
"files": [
"src",
Expand Down Expand Up @@ -64,9 +64,9 @@
},
"preconstruct": {
"entrypoints": [
".",
"serializer",
"enzyme-serializer"
"./index.js",
"./serializer.js",
"./enzyme-serializer.js"
]
}
}
9 changes: 3 additions & 6 deletions packages/jest/serializer/package.json
@@ -1,8 +1,5 @@
{
"main": "dist/jest.cjs.js",
"module": "dist/jest.esm.js",
"types": "../types/serializer",
"preconstruct": {
"source": "../src/serializer"
}
"main": "dist/emotion-jest-serializer.cjs.js",
"module": "dist/emotion-jest-serializer.esm.js",
"types": "../types/serializer"
}
8 changes: 4 additions & 4 deletions packages/memoize/package.json
Expand Up @@ -2,8 +2,8 @@
"name": "@emotion/memoize",
"version": "0.7.4",
"description": "emotion's memoize utility",
"main": "dist/memoize.cjs.js",
"module": "dist/memoize.esm.js",
"main": "dist/emotion-memoize.cjs.js",
"module": "dist/emotion-memoize.esm.js",
"types": "types/index.d.ts",
"license": "MIT",
"repository": "https://github.com/emotion-js/emotion/tree/master/packages/memoize",
Expand All @@ -22,7 +22,7 @@
"types/*.d.ts"
],
"browser": {
"./dist/memoize.cjs.js": "./dist/memoize.browser.cjs.js",
"./dist/memoize.esm.js": "./dist/memoize.browser.esm.js"
"./dist/emotion-memoize.cjs.js": "./dist/emotion-memoize.browser.cjs.js",
"./dist/emotion-memoize.esm.js": "./dist/emotion-memoize.browser.esm.js"
}
}
8 changes: 4 additions & 4 deletions packages/native/package.json
Expand Up @@ -2,8 +2,8 @@
"name": "@emotion/native",
"version": "11.0.0-rc.0",
"description": "Style and render React Native components using emotion",
"main": "dist/native.cjs.js",
"module": "dist/native.esm.js",
"main": "dist/emotion-native.cjs.js",
"module": "dist/emotion-native.esm.js",
"scripts": {
"test:typescript": "dtslint types"
},
Expand Down Expand Up @@ -51,7 +51,7 @@
"access": "public"
},
"browser": {
"./dist/native.cjs.js": "./dist/native.browser.cjs.js",
"./dist/native.esm.js": "./dist/native.browser.esm.js"
"./dist/emotion-native.cjs.js": "./dist/emotion-native.browser.cjs.js",
"./dist/emotion-native.esm.js": "./dist/emotion-native.browser.esm.js"
}
}
8 changes: 4 additions & 4 deletions packages/primitives-core/package.json
Expand Up @@ -2,8 +2,8 @@
"name": "@emotion/primitives-core",
"version": "11.0.0-rc.0",
"description": "Shared utilities for emotion primitives and native",
"main": "dist/primitives-core.cjs.js",
"module": "dist/primitives-core.esm.js",
"main": "dist/emotion-primitives-core.cjs.js",
"module": "dist/emotion-primitives-core.esm.js",
"scripts": {
"test:typescript": "exit 0"
},
Expand Down Expand Up @@ -41,7 +41,7 @@
"access": "public"
},
"browser": {
"./dist/primitives-core.cjs.js": "./dist/primitives-core.browser.cjs.js",
"./dist/primitives-core.esm.js": "./dist/primitives-core.browser.esm.js"
"./dist/emotion-primitives-core.cjs.js": "./dist/emotion-primitives-core.browser.cjs.js",
"./dist/emotion-primitives-core.esm.js": "./dist/emotion-primitives-core.browser.esm.js"
}
}
8 changes: 4 additions & 4 deletions packages/primitives/package.json
@@ -1,8 +1,8 @@
{
"name": "@emotion/primitives",
"version": "11.0.0-rc.0",
"main": "dist/primitives.cjs.js",
"module": "dist/primitives.esm.js",
"main": "dist/emotion-primitives.cjs.js",
"module": "dist/emotion-primitives.esm.js",
"scripts": {
"test:typescript": "exit 0"
},
Expand Down Expand Up @@ -51,7 +51,7 @@
"access": "public"
},
"browser": {
"./dist/primitives.cjs.js": "./dist/primitives.browser.cjs.js",
"./dist/primitives.esm.js": "./dist/primitives.browser.esm.js"
"./dist/emotion-primitives.cjs.js": "./dist/emotion-primitives.browser.cjs.js",
"./dist/emotion-primitives.esm.js": "./dist/emotion-primitives.browser.esm.js"
}
}
11 changes: 5 additions & 6 deletions packages/react/jsx-dev-runtime/package.json
@@ -1,14 +1,13 @@
{
"main": "dist/react.cjs.js",
"module": "dist/react.esm.js",
"umd:main": "dist/react.umd.min.js",
"main": "dist/emotion-react-jsx-dev-runtime.cjs.js",
"module": "dist/emotion-react-jsx-dev-runtime.esm.js",
"umd:main": "dist/emotion-react-jsx-dev-runtime.umd.min.js",
"browser": {
"./dist/react.cjs.js": "./dist/react.browser.cjs.js",
"./dist/react.esm.js": "./dist/react.browser.esm.js"
"./dist/emotion-react-jsx-dev-runtime.cjs.js": "./dist/emotion-react-jsx-dev-runtime.browser.cjs.js",
"./dist/emotion-react-jsx-dev-runtime.esm.js": "./dist/emotion-react-jsx-dev-runtime.browser.esm.js"
},
"types": "../types/jsx-dev-runtime",
"preconstruct": {
"source": "../src/jsx-dev-runtime",
"umdName": "emotionReactJSXDevRuntime"
}
}
11 changes: 5 additions & 6 deletions packages/react/jsx-runtime/package.json
@@ -1,14 +1,13 @@
{
"main": "dist/react.cjs.js",
"module": "dist/react.esm.js",
"umd:main": "dist/react.umd.min.js",
"main": "dist/emotion-react-jsx-runtime.cjs.js",
"module": "dist/emotion-react-jsx-runtime.esm.js",
"umd:main": "dist/emotion-react-jsx-runtime.umd.min.js",
"browser": {
"./dist/react.cjs.js": "./dist/react.browser.cjs.js",
"./dist/react.esm.js": "./dist/react.browser.esm.js"
"./dist/emotion-react-jsx-runtime.cjs.js": "./dist/emotion-react-jsx-runtime.browser.cjs.js",
"./dist/emotion-react-jsx-runtime.esm.js": "./dist/emotion-react-jsx-runtime.browser.esm.js"
},
"types": "../types/jsx-runtime",
"preconstruct": {
"source": "../src/jsx-runtime",
"umdName": "emotionReactJSXRuntime"
}
}
16 changes: 8 additions & 8 deletions packages/react/package.json
@@ -1,11 +1,11 @@
{
"name": "@emotion/react",
"version": "11.0.0-rc.0",
"main": "dist/react.cjs.js",
"module": "dist/react.esm.js",
"main": "dist/emotion-react.cjs.js",
"module": "dist/emotion-react.esm.js",
"browser": {
"./dist/react.cjs.js": "./dist/react.browser.cjs.js",
"./dist/react.esm.js": "./dist/react.browser.esm.js"
"./dist/emotion-react.cjs.js": "./dist/emotion-react.browser.cjs.js",
"./dist/emotion-react.esm.js": "./dist/emotion-react.browser.esm.js"
},
"types": "types/index.d.ts",
"files": [
Expand Down Expand Up @@ -60,12 +60,12 @@
"publishConfig": {
"access": "public"
},
"umd:main": "dist/react.umd.min.js",
"umd:main": "dist/emotion-react.umd.min.js",
"preconstruct": {
"entrypoints": [
".",
"jsx-runtime",
"jsx-dev-runtime"
"./index.js",
"./jsx-runtime.js",
"./jsx-dev-runtime.js"
],
"umdName": "emotionReact"
}
Expand Down
8 changes: 4 additions & 4 deletions packages/serialize/package.json
Expand Up @@ -2,8 +2,8 @@
"name": "@emotion/serialize",
"version": "1.0.0-rc.0",
"description": "serialization utils for emotion",
"main": "dist/serialize.cjs.js",
"module": "dist/serialize.esm.js",
"main": "dist/emotion-serialize.cjs.js",
"module": "dist/emotion-serialize.esm.js",
"types": "types/index.d.ts",
"license": "MIT",
"repository": "https://github.com/emotion-js/emotion/tree/master/packages/serialize",
Expand All @@ -29,7 +29,7 @@
"types/*.d.ts"
],
"browser": {
"./dist/serialize.cjs.js": "./dist/serialize.browser.cjs.js",
"./dist/serialize.esm.js": "./dist/serialize.browser.esm.js"
"./dist/emotion-serialize.cjs.js": "./dist/emotion-serialize.browser.cjs.js",
"./dist/emotion-serialize.esm.js": "./dist/emotion-serialize.browser.esm.js"
}
}

0 comments on commit cf56694

Please sign in to comment.