From 32c8528a63153acd05f3da1d627d8617758e8033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Burzy=C5=84ski?= Date: Tue, 10 Nov 2020 16:20:45 +0100 Subject: [PATCH 1/2] Only use `'@babel/plugin-transform-react-jsx-development'` based on the `development` option when `runtime` is set to `"automatic"` (#2084) --- .changeset/wicked-baboons-vanish.md | 5 +++++ packages/babel-preset-css-prop/src/index.js | 18 +++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 .changeset/wicked-baboons-vanish.md diff --git a/.changeset/wicked-baboons-vanish.md b/.changeset/wicked-baboons-vanish.md new file mode 100644 index 000000000..f40de0fd1 --- /dev/null +++ b/.changeset/wicked-baboons-vanish.md @@ -0,0 +1,5 @@ +--- +'@emotion/babel-preset-css-prop': patch +--- + +Only use `'@babel/plugin-transform-react-jsx-development'` based on the `development` option when `runtime` is set to `"automatic"`. The classic runtime is not compatible with this plugin. diff --git a/packages/babel-preset-css-prop/src/index.js b/packages/babel-preset-css-prop/src/index.js index 1413c1c41..22a9d891f 100644 --- a/packages/babel-preset-css-prop/src/index.js +++ b/packages/babel-preset-css-prop/src/index.js @@ -34,15 +34,15 @@ export default ( pragmatic, { export: 'jsx', module: '@emotion/core', import: pragmaName } ], - [ - development ? jsxDev : jsx, - { - ...(options.runtime === 'automatic' - ? { importSource: '@emotion/core' } - : { pragma: pragmaName, pragmaFrag: 'React.Fragment' }), - ...options - } - ], + options.runtime === 'automatic' + ? [ + development ? jsxDev : jsx, + { importSource: '@emotion/core', ...options } + ] + : [ + jsx, + { pragma: pragmaName, pragmaFrag: 'React.Fragment', ...options } + ], [ emotion, { From cd86ef5e2ea43d83ebe76f0f1ddb544c034d4e8f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 10 Nov 2020 16:45:16 +0100 Subject: [PATCH 2/2] Version Packages (#2085) Co-authored-by: github-actions[bot] --- .changeset/wicked-baboons-vanish.md | 5 ----- packages/babel-preset-css-prop/CHANGELOG.md | 6 ++++++ packages/babel-preset-css-prop/package.json | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) delete mode 100644 .changeset/wicked-baboons-vanish.md diff --git a/.changeset/wicked-baboons-vanish.md b/.changeset/wicked-baboons-vanish.md deleted file mode 100644 index f40de0fd1..000000000 --- a/.changeset/wicked-baboons-vanish.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@emotion/babel-preset-css-prop': patch ---- - -Only use `'@babel/plugin-transform-react-jsx-development'` based on the `development` option when `runtime` is set to `"automatic"`. The classic runtime is not compatible with this plugin. diff --git a/packages/babel-preset-css-prop/CHANGELOG.md b/packages/babel-preset-css-prop/CHANGELOG.md index 073a525dc..5c1b38751 100644 --- a/packages/babel-preset-css-prop/CHANGELOG.md +++ b/packages/babel-preset-css-prop/CHANGELOG.md @@ -1,5 +1,11 @@ # @emotion/babel-preset-css-prop +## 10.2.1 + +### Patch Changes + +- [`32c8528a`](https://github.com/emotion-js/emotion/commit/32c8528a63153acd05f3da1d627d8617758e8033) [#2084](https://github.com/emotion-js/emotion/pull/2084) Thanks [@Andarist](https://github.com/Andarist)! - Only use `'@babel/plugin-transform-react-jsx-development'` based on the `development` option when `runtime` is set to `"automatic"`. The classic runtime is not compatible with this plugin. + ## 10.2.0 ### Minor Changes diff --git a/packages/babel-preset-css-prop/package.json b/packages/babel-preset-css-prop/package.json index 5d0219c5d..93e8fd981 100644 --- a/packages/babel-preset-css-prop/package.json +++ b/packages/babel-preset-css-prop/package.json @@ -1,6 +1,6 @@ { "name": "@emotion/babel-preset-css-prop", - "version": "10.2.0", + "version": "10.2.1", "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",