From 13d4d3951d9d3c9fde01aa82da6f76246c8ef164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Burzy=C5=84ski?= Date: Wed, 11 Nov 2020 00:20:28 +0100 Subject: [PATCH 1/2] Use experimental entrypoints in preconstruct --- package.json | 3 +++ packages/css/create-instance/package.json | 1 - packages/css/package.json | 5 +++-- packages/jest/enzyme-serializer/package.json | 5 +---- packages/jest/package.json | 6 +++--- packages/jest/serializer/package.json | 5 +---- packages/react/jsx-dev-runtime/package.json | 1 - packages/react/jsx-runtime/package.json | 1 - packages/react/package.json | 6 +++--- packages/server/create-instance/package.json | 5 +---- packages/server/package.json | 4 ++-- packages/styled/base/package.json | 1 - packages/styled/package.json | 4 ++-- 13 files changed, 19 insertions(+), 28 deletions(-) diff --git a/package.json b/package.json index ed63fdc2e..0bcd75a16 100644 --- a/package.json +++ b/package.json @@ -139,6 +139,9 @@ "react": "React", "react/jsx-runtime": "ReactJSX", "react/jsx-dev-runtime": "ReactJSXDev" + }, + "___experimentalFlags_WILL_CHANGE_IN_PATCH": { + "newEntrypoints": true } }, "bugs": { diff --git a/packages/css/create-instance/package.json b/packages/css/create-instance/package.json index 5de05ffda..e59eeac07 100644 --- a/packages/css/create-instance/package.json +++ b/packages/css/create-instance/package.json @@ -4,7 +4,6 @@ "umd:main": "dist/css.umd.min.js", "types": "../types/create-instance", "preconstruct": { - "source": "../src/create-instance", "umdName": "createEmotion" } } diff --git a/packages/css/package.json b/packages/css/package.json index f2e595a87..df8b114a7 100644 --- a/packages/css/package.json +++ b/packages/css/package.json @@ -53,9 +53,10 @@ "umd:main": "dist/css.umd.min.js", "preconstruct": { "umdName": "emotion", + "distFilenameStrategy": "full", "entrypoints": [ - ".", - "create-instance" + "./index.js", + "./create-instance.js" ] } } diff --git a/packages/jest/enzyme-serializer/package.json b/packages/jest/enzyme-serializer/package.json index 99b42c7b5..adeabaa2b 100644 --- a/packages/jest/enzyme-serializer/package.json +++ b/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" - } + "types": "../types/enzyme-serializer" } diff --git a/packages/jest/package.json b/packages/jest/package.json index f1d64c9e7..9b78eba71 100644 --- a/packages/jest/package.json +++ b/packages/jest/package.json @@ -64,9 +64,9 @@ }, "preconstruct": { "entrypoints": [ - ".", - "serializer", - "enzyme-serializer" + "./index.js", + "./serializer.js", + "./enzyme-serializer.js" ] } } diff --git a/packages/jest/serializer/package.json b/packages/jest/serializer/package.json index e53574168..0171bc5f0 100644 --- a/packages/jest/serializer/package.json +++ b/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" - } + "types": "../types/serializer" } diff --git a/packages/react/jsx-dev-runtime/package.json b/packages/react/jsx-dev-runtime/package.json index caeb56738..89dd77897 100644 --- a/packages/react/jsx-dev-runtime/package.json +++ b/packages/react/jsx-dev-runtime/package.json @@ -8,7 +8,6 @@ }, "types": "../types/jsx-dev-runtime", "preconstruct": { - "source": "../src/jsx-dev-runtime", "umdName": "emotionReactJSXDevRuntime" } } diff --git a/packages/react/jsx-runtime/package.json b/packages/react/jsx-runtime/package.json index ac7680063..e7e631191 100644 --- a/packages/react/jsx-runtime/package.json +++ b/packages/react/jsx-runtime/package.json @@ -8,7 +8,6 @@ }, "types": "../types/jsx-runtime", "preconstruct": { - "source": "../src/jsx-runtime", "umdName": "emotionReactJSXRuntime" } } diff --git a/packages/react/package.json b/packages/react/package.json index ab8418be7..546616ceb 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -63,9 +63,9 @@ "umd:main": "dist/react.umd.min.js", "preconstruct": { "entrypoints": [ - ".", - "jsx-runtime", - "jsx-dev-runtime" + "./index.js", + "./jsx-runtime.js", + "./jsx-dev-runtime.js" ], "umdName": "emotionReact" } diff --git a/packages/server/create-instance/package.json b/packages/server/create-instance/package.json index 21385b5bd..c4dda8328 100644 --- a/packages/server/create-instance/package.json +++ b/packages/server/create-instance/package.json @@ -3,8 +3,5 @@ "browser": { "./dist/server.cjs.js": "./dist/server.browser.cjs.js" }, - "types": "../types/create-instance", - "preconstruct": { - "source": "../src/create-instance" - } + "types": "../types/create-instance" } diff --git a/packages/server/package.json b/packages/server/package.json index ec356e00a..eaf403364 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -55,8 +55,8 @@ }, "preconstruct": { "entrypoints": [ - ".", - "create-instance" + "./index.js", + "./create-instance.js" ] } } diff --git a/packages/styled/base/package.json b/packages/styled/base/package.json index 192109b0e..532e0adae 100644 --- a/packages/styled/base/package.json +++ b/packages/styled/base/package.json @@ -8,7 +8,6 @@ }, "types": "../types/base", "preconstruct": { - "source": "../src/base", "umdName": "emotionStyledBase" } } diff --git a/packages/styled/package.json b/packages/styled/package.json index 4e55634d8..a8b162cbc 100644 --- a/packages/styled/package.json +++ b/packages/styled/package.json @@ -56,8 +56,8 @@ "preconstruct": { "umdName": "emotionStyled", "entrypoints": [ - ".", - "base" + "./index.js", + "./base.js" ] } } From 9794a3517429127a18032981551998cc73369123 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Burzy=C5=84ski?= Date: Wed, 11 Nov 2020 00:29:24 +0100 Subject: [PATCH 2/2] Use newDistFilenames in preconstruct --- package.json | 5 ++- .../babel-plugin-jsx-pragmatic/package.json | 4 +- packages/babel-plugin/package.json | 4 +- packages/babel-preset-css-prop/package.json | 4 +- packages/cache/package.json | 8 ++-- packages/css-prettifier/package.json | 4 +- packages/css/create-instance/package.json | 6 +-- packages/css/package.json | 7 ++-- packages/eslint-plugin/package.json | 2 +- packages/hash/package.json | 8 ++-- packages/is-prop-valid/package.json | 8 ++-- packages/jest/enzyme-serializer/package.json | 4 +- packages/jest/package.json | 4 +- packages/jest/serializer/package.json | 4 +- packages/memoize/package.json | 8 ++-- packages/native/package.json | 8 ++-- packages/primitives-core/package.json | 8 ++-- packages/primitives/package.json | 8 ++-- packages/react/jsx-dev-runtime/package.json | 10 ++--- packages/react/jsx-runtime/package.json | 10 ++--- packages/react/package.json | 10 ++--- packages/serialize/package.json | 8 ++-- packages/server/package.json | 4 +- packages/sheet/package.json | 8 ++-- packages/styled/base/package.json | 10 ++--- packages/styled/package.json | 10 ++--- packages/unitless/package.json | 8 ++-- packages/utils/package.json | 8 ++-- packages/weak-memoize/package.json | 8 ++-- removed-packages/core/package.json | 2 +- removed-packages/styled-base/package.json | 2 +- yarn.lock | 37 +++++++++---------- 32 files changed, 118 insertions(+), 121 deletions(-) diff --git a/package.json b/package.json index 0bcd75a16..651714af3 100644 --- a/package.json +++ b/package.json @@ -141,7 +141,8 @@ "react/jsx-dev-runtime": "ReactJSXDev" }, "___experimentalFlags_WILL_CHANGE_IN_PATCH": { - "newEntrypoints": true + "newEntrypoints": true, + "newDistFilenames": true } }, "bugs": { @@ -194,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", diff --git a/packages/babel-plugin-jsx-pragmatic/package.json b/packages/babel-plugin-jsx-pragmatic/package.json index bef28befb..9ace31064 100644 --- a/packages/babel-plugin-jsx-pragmatic/package.json +++ b/packages/babel-plugin-jsx-pragmatic/package.json @@ -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": { diff --git a/packages/babel-plugin/package.json b/packages/babel-plugin/package.json index c7d4b267b..231c30ccd 100644 --- a/packages/babel-plugin/package.json +++ b/packages/babel-plugin/package.json @@ -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", diff --git a/packages/babel-preset-css-prop/package.json b/packages/babel-preset-css-prop/package.json index 4144b1c69..f164a30e0 100644 --- a/packages/babel-preset-css-prop/package.json +++ b/packages/babel-preset-css-prop/package.json @@ -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": { diff --git a/packages/cache/package.json b/packages/cache/package.json index f0a8bbd78..94eae2f7f 100644 --- a/packages/cache/package.json +++ b/packages/cache/package.json @@ -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", diff --git a/packages/css-prettifier/package.json b/packages/css-prettifier/package.json index bad3e75b2..95dd70a3b 100644 --- a/packages/css-prettifier/package.json +++ b/packages/css-prettifier/package.json @@ -9,8 +9,8 @@ "emotion" ], "author": "Mateusz Burzyński (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": { diff --git a/packages/css/create-instance/package.json b/packages/css/create-instance/package.json index e59eeac07..203a18da1 100644 --- a/packages/css/create-instance/package.json +++ b/packages/css/create-instance/package.json @@ -1,7 +1,7 @@ { - "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": { "umdName": "createEmotion" diff --git a/packages/css/package.json b/packages/css/package.json index df8b114a7..f2fe71532 100644 --- a/packages/css/package.json +++ b/packages/css/package.json @@ -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", @@ -50,10 +50,9 @@ "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", - "distFilenameStrategy": "full", "entrypoints": [ "./index.js", "./create-instance.js" diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json index 04e0e36e9..6408a16cb 100644 --- a/packages/eslint-plugin/package.json +++ b/packages/eslint-plugin/package.json @@ -12,7 +12,7 @@ "emotion" ], "author": "alex-pex ", - "main": "dist/eslint-plugin.cjs.js", + "main": "dist/emotion-eslint-plugin.cjs.js", "engines": { "node": ">=6" }, diff --git a/packages/hash/package.json b/packages/hash/package.json index 3fb556f30..28bdf09f5 100644 --- a/packages/hash/package.json +++ b/packages/hash/package.json @@ -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", @@ -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" } } diff --git a/packages/is-prop-valid/package.json b/packages/is-prop-valid/package.json index 0e0d48556..4be6aa6c2 100644 --- a/packages/is-prop-valid/package.json +++ b/packages/is-prop-valid/package.json @@ -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", @@ -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" } } diff --git a/packages/jest/enzyme-serializer/package.json b/packages/jest/enzyme-serializer/package.json index adeabaa2b..5afdff682 100644 --- a/packages/jest/enzyme-serializer/package.json +++ b/packages/jest/enzyme-serializer/package.json @@ -1,5 +1,5 @@ { - "main": "dist/jest.cjs.js", - "module": "dist/jest.esm.js", + "main": "dist/emotion-jest-enzyme-serializer.cjs.js", + "module": "dist/emotion-jest-enzyme-serializer.esm.js", "types": "../types/enzyme-serializer" } diff --git a/packages/jest/package.json b/packages/jest/package.json index 9b78eba71..09716fcc1 100644 --- a/packages/jest/package.json +++ b/packages/jest/package.json @@ -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", diff --git a/packages/jest/serializer/package.json b/packages/jest/serializer/package.json index 0171bc5f0..d0e5e499b 100644 --- a/packages/jest/serializer/package.json +++ b/packages/jest/serializer/package.json @@ -1,5 +1,5 @@ { - "main": "dist/jest.cjs.js", - "module": "dist/jest.esm.js", + "main": "dist/emotion-jest-serializer.cjs.js", + "module": "dist/emotion-jest-serializer.esm.js", "types": "../types/serializer" } diff --git a/packages/memoize/package.json b/packages/memoize/package.json index 61b824d81..77907a630 100644 --- a/packages/memoize/package.json +++ b/packages/memoize/package.json @@ -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", @@ -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" } } diff --git a/packages/native/package.json b/packages/native/package.json index 6d96d591d..99943b1dd 100644 --- a/packages/native/package.json +++ b/packages/native/package.json @@ -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" }, @@ -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" } } diff --git a/packages/primitives-core/package.json b/packages/primitives-core/package.json index 102c4eae3..5dca04c13 100644 --- a/packages/primitives-core/package.json +++ b/packages/primitives-core/package.json @@ -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" }, @@ -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" } } diff --git a/packages/primitives/package.json b/packages/primitives/package.json index b249a3b44..9cd830a9f 100644 --- a/packages/primitives/package.json +++ b/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" }, @@ -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" } } diff --git a/packages/react/jsx-dev-runtime/package.json b/packages/react/jsx-dev-runtime/package.json index 89dd77897..4eb6338cc 100644 --- a/packages/react/jsx-dev-runtime/package.json +++ b/packages/react/jsx-dev-runtime/package.json @@ -1,10 +1,10 @@ { - "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": { diff --git a/packages/react/jsx-runtime/package.json b/packages/react/jsx-runtime/package.json index e7e631191..45eed2c06 100644 --- a/packages/react/jsx-runtime/package.json +++ b/packages/react/jsx-runtime/package.json @@ -1,10 +1,10 @@ { - "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": { diff --git a/packages/react/package.json b/packages/react/package.json index 546616ceb..f8c04d20a 100644 --- a/packages/react/package.json +++ b/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": [ @@ -60,7 +60,7 @@ "publishConfig": { "access": "public" }, - "umd:main": "dist/react.umd.min.js", + "umd:main": "dist/emotion-react.umd.min.js", "preconstruct": { "entrypoints": [ "./index.js", diff --git a/packages/serialize/package.json b/packages/serialize/package.json index 38271a11b..3b8e28df6 100644 --- a/packages/serialize/package.json +++ b/packages/serialize/package.json @@ -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", @@ -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" } } diff --git a/packages/server/package.json b/packages/server/package.json index eaf403364..0565d1f4e 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -2,7 +2,7 @@ "name": "@emotion/server", "version": "11.0.0-rc.0", "description": "Extract and inline critical css with emotion for server side rendering.", - "main": "dist/server.cjs.js", + "main": "dist/emotion-server.cjs.js", "types": "types/index.d.ts", "files": [ "src", @@ -51,7 +51,7 @@ "url": "https://github.com/emotion-js/emotion/issues" }, "browser": { - "./dist/server.cjs.js": "./dist/server.browser.cjs.js" + "./dist/emotion-server.cjs.js": "./dist/emotion-server.browser.cjs.js" }, "preconstruct": { "entrypoints": [ diff --git a/packages/sheet/package.json b/packages/sheet/package.json index bec1de3d9..b870c3af5 100644 --- a/packages/sheet/package.json +++ b/packages/sheet/package.json @@ -2,11 +2,11 @@ "name": "@emotion/sheet", "version": "1.0.0-rc.0", "description": "emotion's stylesheet", - "main": "dist/sheet.cjs.js", - "module": "dist/sheet.esm.js", + "main": "dist/emotion-sheet.cjs.js", + "module": "dist/emotion-sheet.esm.js", "browser": { - "./dist/sheet.cjs.js": "./dist/sheet.browser.cjs.js", - "./dist/sheet.esm.js": "./dist/sheet.browser.esm.js" + "./dist/emotion-sheet.cjs.js": "./dist/emotion-sheet.browser.cjs.js", + "./dist/emotion-sheet.esm.js": "./dist/emotion-sheet.browser.esm.js" }, "types": "types/index.d.ts", "license": "MIT", diff --git a/packages/styled/base/package.json b/packages/styled/base/package.json index 532e0adae..96f433f21 100644 --- a/packages/styled/base/package.json +++ b/packages/styled/base/package.json @@ -1,10 +1,10 @@ { - "main": "dist/styled.cjs.js", - "module": "dist/styled.esm.js", - "umd:main": "dist/styled.umd.min.js", + "main": "dist/emotion-styled-base.cjs.js", + "module": "dist/emotion-styled-base.esm.js", + "umd:main": "dist/emotion-styled-base.umd.min.js", "browser": { - "./dist/styled.cjs.js": "./dist/styled.browser.cjs.js", - "./dist/styled.esm.js": "./dist/styled.browser.esm.js" + "./dist/emotion-styled-base.cjs.js": "./dist/emotion-styled-base.browser.cjs.js", + "./dist/emotion-styled-base.esm.js": "./dist/emotion-styled-base.browser.esm.js" }, "types": "../types/base", "preconstruct": { diff --git a/packages/styled/package.json b/packages/styled/package.json index a8b162cbc..b754c2b78 100644 --- a/packages/styled/package.json +++ b/packages/styled/package.json @@ -2,8 +2,8 @@ "name": "@emotion/styled", "version": "11.0.0-rc.0", "description": "styled API for emotion", - "main": "dist/styled.cjs.js", - "module": "dist/styled.esm.js", + "main": "dist/emotion-styled.cjs.js", + "module": "dist/emotion-styled.esm.js", "types": "types/index.d.ts", "license": "MIT", "repository": "https://github.com/emotion-js/emotion/tree/master/packages/styled", @@ -48,10 +48,10 @@ "macro.js", "macro.js.flow" ], - "umd:main": "dist/styled.umd.min.js", + "umd:main": "dist/emotion-styled.umd.min.js", "browser": { - "./dist/styled.cjs.js": "./dist/styled.browser.cjs.js", - "./dist/styled.esm.js": "./dist/styled.browser.esm.js" + "./dist/emotion-styled.cjs.js": "./dist/emotion-styled.browser.cjs.js", + "./dist/emotion-styled.esm.js": "./dist/emotion-styled.browser.esm.js" }, "preconstruct": { "umdName": "emotionStyled", diff --git a/packages/unitless/package.json b/packages/unitless/package.json index bddafbd0e..11be70376 100644 --- a/packages/unitless/package.json +++ b/packages/unitless/package.json @@ -2,8 +2,8 @@ "name": "@emotion/unitless", "version": "0.7.5", "description": "An object of css properties that don't accept values with units", - "main": "dist/unitless.cjs.js", - "module": "dist/unitless.esm.js", + "main": "dist/emotion-unitless.cjs.js", + "module": "dist/emotion-unitless.esm.js", "license": "MIT", "repository": "https://github.com/emotion-js/emotion/tree/master/packages/unitless", "scripts": { @@ -17,7 +17,7 @@ "dist" ], "browser": { - "./dist/unitless.cjs.js": "./dist/unitless.browser.cjs.js", - "./dist/unitless.esm.js": "./dist/unitless.browser.esm.js" + "./dist/emotion-unitless.cjs.js": "./dist/emotion-unitless.browser.cjs.js", + "./dist/emotion-unitless.esm.js": "./dist/emotion-unitless.browser.esm.js" } } diff --git a/packages/utils/package.json b/packages/utils/package.json index 2a8e9bb1a..c1ab3a7cd 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -2,11 +2,11 @@ "name": "@emotion/utils", "version": "1.0.0-rc.0", "description": "internal utils for emotion", - "main": "dist/utils.cjs.js", - "module": "dist/utils.esm.js", + "main": "dist/emotion-utils.cjs.js", + "module": "dist/emotion-utils.esm.js", "browser": { - "./dist/utils.cjs.js": "./dist/utils.browser.cjs.js", - "./dist/utils.esm.js": "./dist/utils.browser.esm.js" + "./dist/emotion-utils.cjs.js": "./dist/emotion-utils.browser.cjs.js", + "./dist/emotion-utils.esm.js": "./dist/emotion-utils.browser.esm.js" }, "types": "types/index.d.ts", "license": "MIT", diff --git a/packages/weak-memoize/package.json b/packages/weak-memoize/package.json index 84269146c..b024a6a38 100644 --- a/packages/weak-memoize/package.json +++ b/packages/weak-memoize/package.json @@ -2,8 +2,8 @@ "name": "@emotion/weak-memoize", "version": "0.2.5", "description": "A memoization function that uses a WeakMap", - "main": "dist/weak-memoize.cjs.js", - "module": "dist/weak-memoize.esm.js", + "main": "dist/emotion-weak-memoize.cjs.js", + "module": "dist/emotion-weak-memoize.esm.js", "types": "types/index.d.ts", "license": "MIT", "repository": "https://github.com/emotion-js/emotion/tree/master/packages/weak-memoize", @@ -22,7 +22,7 @@ "types/*.d.ts" ], "browser": { - "./dist/weak-memoize.cjs.js": "./dist/weak-memoize.browser.cjs.js", - "./dist/weak-memoize.esm.js": "./dist/weak-memoize.browser.esm.js" + "./dist/emotion-weak-memoize.cjs.js": "./dist/emotion-weak-memoize.browser.cjs.js", + "./dist/emotion-weak-memoize.esm.js": "./dist/emotion-weak-memoize.browser.esm.js" } } diff --git a/removed-packages/core/package.json b/removed-packages/core/package.json index b8210513c..d9b5c5e78 100644 --- a/removed-packages/core/package.json +++ b/removed-packages/core/package.json @@ -1,7 +1,7 @@ { "name": "@emotion/core", "version": "11.0.0-rc.0", - "main": "dist/core.cjs.js", + "main": "dist/emotion-core.cjs.js", "types": "types/index.d.ts", "files": [ "src", diff --git a/removed-packages/styled-base/package.json b/removed-packages/styled-base/package.json index 14930be27..a0cbaf68f 100644 --- a/removed-packages/styled-base/package.json +++ b/removed-packages/styled-base/package.json @@ -2,7 +2,7 @@ "name": "@emotion/styled-base", "version": "11.0.0-rc.0", "description": "Deprecated package which became `@emotion/styled/base`", - "main": "dist/styled-base.cjs.js", + "main": "dist/emotion-styled-base.cjs.js", "license": "MIT", "repository": "https://github.com/emotion-js/emotion/tree/master/packages/styled-base", "scripts": { diff --git a/yarn.lock b/yarn.lock index 7e09cd4ea..0a7940ffb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2620,16 +2620,16 @@ string-width "^2.0.0" strip-ansi "^3" -"@preconstruct/cli@1.1.29": - version "1.1.29" - resolved "https://registry.yarnpkg.com/@preconstruct/cli/-/cli-1.1.29.tgz#28211c5bc0b7a8959456cc96474d88628f10d23d" - integrity sha512-otzF5uslBT2lQ2RHvq9QCCjO5RvDF85exgrjAh+6frj5E6YRQ6i9YBjnkROM6vtMisAklm9HGBRjVsTsx2jLrA== +"@preconstruct/cli@1.1.34": + version "1.1.34" + resolved "https://registry.yarnpkg.com/@preconstruct/cli/-/cli-1.1.34.tgz#092416a936c4915777fa4560c2bcb16fb1f274cc" + integrity sha512-yrKUxDzHskWqcyLqhUFQpxkvKo+xnpkMmXso0c/u6AKn9dvTSbcBx7fdcMshDk5tzW1nR+M/xn0Eb+CtLcGT7w== dependencies: "@babel/code-frame" "^7.5.5" "@babel/core" "^7.7.7" "@babel/helper-module-imports" "^7.10.4" "@babel/runtime" "^7.7.7" - "@preconstruct/hook" "^0.3.0" + "@preconstruct/hook" "^0.4.0" "@rollup/plugin-alias" "^3.1.1" "@rollup/plugin-commonjs" "^15.0.0" "@rollup/plugin-json" "^4.1.0" @@ -2640,11 +2640,14 @@ dataloader "^2.0.0" detect-indent "^6.0.0" enquirer "^2.3.6" + estree-walker "^2.0.1" fast-deep-equal "^2.0.1" fs-extra "^9.0.1" globby "^11.0.1" is-ci "^2.0.0" + is-reference "^1.2.1" jest-worker "^26.3.0" + magic-string "^0.25.7" meow "^7.1.0" micromatch "^4.0.2" ms "^2.1.2" @@ -2656,15 +2659,14 @@ quick-lru "^5.1.1" resolve "^1.17.0" resolve-from "^5.0.0" - rollup "^2.26.5" + rollup "^2.32.0" terser "^5.2.1" v8-compile-cache "^2.1.1" - xxhash-wasm "^0.4.0" -"@preconstruct/hook@^0.3.0": - version "0.3.0" - resolved "https://registry.yarnpkg.com/@preconstruct/hook/-/hook-0.3.0.tgz#d8cee47aa99ab3ec86a452724d3dc0f6a52a4551" - integrity sha512-IKgThZklIRdkWmU8DBXAG5n04VqD/m/Xhdr+Pz+eOBCTimjtwQlMDrGPmAjKJIr45eAsJdNakabLdz4o/ZBIpg== +"@preconstruct/hook@^0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@preconstruct/hook/-/hook-0.4.0.tgz#c15dfacfc6e60652a6837209c2fd87f0240b099e" + integrity sha512-a7mrlPTM3tAFJyz43qb4pPVpUx8j8TzZBFsNFqcKcE/sEakNXRlQAuCT4RGZRf9dQiiUnBahzSIWawU4rENl+Q== dependencies: "@babel/core" "^7.7.7" "@babel/plugin-transform-modules-commonjs" "^7.7.5" @@ -22870,10 +22872,10 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^3.0.0" inherits "^2.0.1" -rollup@^2.26.5: - version "2.32.0" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.32.0.tgz#ac58c8e85782bea8aa2d440fc05aba345013582a" - integrity sha512-0FIG1jY88uhCP2yP4CfvtKEqPDRmsUwfY1kEOOM+DH/KOGATgaIFd/is1+fQOxsvh62ELzcFfKonwKWnHhrqmw== +rollup@^2.32.0: + version "2.33.1" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.33.1.tgz#802795164164ee63cd47769d8879c33ec8ae0c40" + integrity sha512-uY4O/IoL9oNW8MMcbA5hcOaz6tZTMIh7qJHx/tzIJm+n1wLoY38BLn6fuy7DhR57oNFLMbDQtDeJoFURt5933w== optionalDependencies: fsevents "~2.1.2" @@ -26837,11 +26839,6 @@ xtend@~2.1.1: dependencies: object-keys "~0.4.0" -xxhash-wasm@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/xxhash-wasm/-/xxhash-wasm-0.4.0.tgz#9b045adebd69226f15214773dbf3c4ed6134ffd2" - integrity sha512-jCFDE9zSkItI//25A/Pb27r88s6zjkXsajy/dUMWr1XqiHhlrZIRxG3GxDnBcY5KKjRKi713iaDfAKjXrkboog== - y18n@^3.2.0, y18n@^3.2.1: version "3.2.1" resolved "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"