Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: emotion-js/emotion
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: @emotion/cache@11.10.8
Choose a base ref
...
head repository: emotion-js/emotion
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: @emotion/cache@11.11.0
Choose a head ref
  • 4 commits
  • 55 files changed
  • 4 contributors

Commits on May 4, 2023

  1. Add aspectRatio property to unitless (#3012)

    @sgrishchenko
    sgrishchenko authored May 4, 2023

    Verified

    This commit was signed with the committer’s verified signature.
    taneliang E-Liang Tan
    GPG key ID: 692BCC42C61FC9B2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e6e5b3d View commit details

  2. Fixed importing in Node ESM (#3029) 

    * Fixed importing in Node ESM

* Fixed macro types

* rerun preconstruct fix

* remove redundant .default files
    @Andarist
    Andarist authored May 4, 2023
    Copy the full SHA
    eed5e6c View commit details

Commits on May 6, 2023

  1. Add support for cascade @layers (#3031)

    @Andarist
    Andarist authored May 6, 2023
    Copy the full SHA
    336f3d5 View commit details

  2. Version Packages (#3030) 

    Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
    @github-actions
    github-actions[bot] and github-actions[bot] authored May 6, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1135f8e View commit details
Showing with 552 additions and 207 deletions.
  1. +3 −4 package.json
  2. +6 −0 packages/babel-plugin-jsx-pragmatic/CHANGELOG.md
  3. +2 −1 packages/babel-plugin-jsx-pragmatic/package.json
  4. +13 −0 packages/babel-plugin/CHANGELOG.md
  5. +6 −5 packages/babel-plugin/package.json
  6. +10 −0 packages/babel-preset-css-prop/CHANGELOG.md
  7. +4 −3 packages/babel-preset-css-prop/package.json
  8. +16 −0 packages/cache/CHANGELOG.md
  9. +7 −6 packages/cache/package.json
  10. +11 −0 packages/css-prettifier/CHANGELOG.md
  11. +4 −3 packages/css-prettifier/package.json
  12. +17 −0 packages/css/CHANGELOG.md
  13. +1 −0 packages/css/macro.d.mts
  14. +23 −11 packages/css/package.json
  15. +6 −0 packages/eslint-plugin/CHANGELOG.md
  16. +2 −1 packages/eslint-plugin/package.json
  17. +6 −0 packages/hash/CHANGELOG.md
  18. +2 −1 packages/hash/package.json
  19. +9 −0 packages/is-prop-valid/CHANGELOG.md
  20. +3 −2 packages/is-prop-valid/package.json
  21. +11 −0 packages/jest/CHANGELOG.md
  22. +9 −5 packages/jest/package.json
  23. +6 −0 packages/memoize/CHANGELOG.md
  24. +2 −1 packages/memoize/package.json
  25. +9 −0 packages/native/CHANGELOG.md
  26. +3 −0 packages/native/macro.d.mts
  27. +3 −0 packages/native/macro.d.ts
  28. +18 −5 packages/native/package.json
  29. +6 −0 packages/primitives-core/CHANGELOG.md
  30. +3 −2 packages/primitives-core/package.json
  31. +11 −0 packages/primitives/CHANGELOG.md
  32. +6 −5 packages/primitives/package.json
  33. +18 −0 packages/react/CHANGELOG.md
  34. +1 −0 packages/react/macro.d.mts
  35. +30 −16 packages/react/package.json
  36. +12 −0 packages/serialize/CHANGELOG.md
  37. +6 −5 packages/serialize/package.json
  38. +9 −0 packages/server/CHANGELOG.md
  39. +7 −5 packages/server/package.json
  40. +6 −0 packages/sheet/CHANGELOG.md
  41. +2 −1 packages/sheet/package.json
  42. +17 −0 packages/styled/CHANGELOG.md
  43. +3 −0 packages/styled/macro.d.mts
  44. +3 −5 packages/styled/macro.d.ts
  45. +24 −12 packages/styled/package.json
  46. +8 −0 packages/unitless/CHANGELOG.md
  47. +2 −1 packages/unitless/package.json
  48. +1 −0 packages/unitless/src/index.js
  49. +7 −2 packages/use-insertion-effect-with-fallbacks/CHANGELOG.md
  50. +2 −1 packages/use-insertion-effect-with-fallbacks/package.json
  51. +6 −0 packages/utils/CHANGELOG.md
  52. +2 −1 packages/utils/package.json
  53. +6 −0 packages/weak-memoize/CHANGELOG.md
  54. +2 −1 packages/weak-memoize/package.json
  55. +140 −102 yarn.lock
7 changes: 3 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -128,9 +128,8 @@
"react/jsx-runtime": "ReactJSX",
"react/jsx-dev-runtime": "ReactJSXDev"
},
"exports": true,
"___experimentalFlags_WILL_CHANGE_IN_PATCH": {
"exports": true
"exports": {
"importConditionDefaultExport": "default"
}
},
"bugs": {
@@ -181,7 +180,7 @@
"@changesets/changelog-github": "^0.4.0",
"@changesets/cli": "^2.16.0",
"@manypkg/cli": "^0.19.1",
"@preconstruct/cli": "^2.2.1",
"@preconstruct/cli": "^2.6.2",
"@testing-library/react": "13.0.0-alpha.5",
"@types/jest": "^27.0.3",
"@types/node": "^12.20.37",
6 changes: 6 additions & 0 deletions packages/babel-plugin-jsx-pragmatic/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @emotion/babel-plugin-jsx-pragmatic

## 0.2.1

### Patch Changes

- [#3029](https://github.com/emotion-js/emotion/pull/3029) [`eed5e6cf`](https://github.com/emotion-js/emotion/commit/eed5e6cf00f94f3011b93825ccce43cb2270c247) Thanks [@Andarist](https://github.com/Andarist)! - Fixed importing in Node ESM

## 0.2.0

### Minor Changes
3 changes: 2 additions & 1 deletion packages/babel-plugin-jsx-pragmatic/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{
"name": "@emotion/babel-plugin-jsx-pragmatic",
"version": "0.2.0",
"version": "0.2.1",
"description": "Insert code to load a module corresponding to JSX pragma.",
"main": "dist/emotion-babel-plugin-jsx-pragmatic.cjs.js",
"module": "dist/emotion-babel-plugin-jsx-pragmatic.esm.js",
"exports": {
".": {
"module": "./dist/emotion-babel-plugin-jsx-pragmatic.esm.js",
"import": "./dist/emotion-babel-plugin-jsx-pragmatic.cjs.mjs",
"default": "./dist/emotion-babel-plugin-jsx-pragmatic.cjs.js"
},
"./package.json": "./package.json"
13 changes: 13 additions & 0 deletions packages/babel-plugin/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# @emotion/babel-plugin

## 11.11.0

### Patch Changes

- [#3031](https://github.com/emotion-js/emotion/pull/3031) [`336f3d50`](https://github.com/emotion-js/emotion/commit/336f3d50fd684ccbb160fff0c63d5560936f1ee5) Thanks [@Andarist](https://github.com/Andarist)! - Updated the underlying parser ([stylis](https://github.com/thysultan/stylis)) to 4.2.0

* [#3029](https://github.com/emotion-js/emotion/pull/3029) [`eed5e6cf`](https://github.com/emotion-js/emotion/commit/eed5e6cf00f94f3011b93825ccce43cb2270c247) Thanks [@Andarist](https://github.com/Andarist)! - Fixed importing in Node ESM

* Updated dependencies [[`eed5e6cf`](https://github.com/emotion-js/emotion/commit/eed5e6cf00f94f3011b93825ccce43cb2270c247)]:
- @emotion/hash@0.9.1
- @emotion/memoize@0.8.1
- @emotion/serialize@1.1.2

## 11.10.8

### Patch Changes
11 changes: 6 additions & 5 deletions packages/babel-plugin/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{
"name": "@emotion/babel-plugin",
"version": "11.10.8",
"version": "11.11.0",
"description": "A recommended babel preprocessing plugin for emotion, The Next Generation of CSS-in-JS.",
"main": "dist/emotion-babel-plugin.cjs.js",
"module": "dist/emotion-babel-plugin.esm.js",
"exports": {
".": {
"module": "./dist/emotion-babel-plugin.esm.js",
"import": "./dist/emotion-babel-plugin.cjs.mjs",
"default": "./dist/emotion-babel-plugin.cjs.js"
},
"./package.json": "./package.json"
@@ -19,15 +20,15 @@
"dependencies": {
"@babel/helper-module-imports": "^7.16.7",
"@babel/runtime": "^7.18.3",
"@emotion/hash": "^0.9.0",
"@emotion/memoize": "^0.8.0",
"@emotion/serialize": "^1.1.1",
"@emotion/hash": "^0.9.1",
"@emotion/memoize": "^0.8.1",
"@emotion/serialize": "^1.1.2",
"babel-plugin-macros": "^3.1.0",
"convert-source-map": "^1.5.0",
"escape-string-regexp": "^4.0.0",
"find-root": "^1.1.0",
"source-map": "^0.5.7",
"stylis": "4.1.4"
"stylis": "4.2.0"
},
"devDependencies": {
"@babel/core": "^7.18.5",
10 changes: 10 additions & 0 deletions packages/babel-preset-css-prop/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# @emotion/babel-preset-css-prop

## 11.11.0

### Patch Changes

- [#3029](https://github.com/emotion-js/emotion/pull/3029) [`eed5e6cf`](https://github.com/emotion-js/emotion/commit/eed5e6cf00f94f3011b93825ccce43cb2270c247) Thanks [@Andarist](https://github.com/Andarist)! - Fixed importing in Node ESM

- Updated dependencies [[`336f3d50`](https://github.com/emotion-js/emotion/commit/336f3d50fd684ccbb160fff0c63d5560936f1ee5), [`eed5e6cf`](https://github.com/emotion-js/emotion/commit/eed5e6cf00f94f3011b93825ccce43cb2270c247)]:
- @emotion/babel-plugin@11.11.0
- @emotion/babel-plugin-jsx-pragmatic@0.2.1

## 11.10.0

### Minor Changes
7 changes: 4 additions & 3 deletions packages/babel-preset-css-prop/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{
"name": "@emotion/babel-preset-css-prop",
"version": "11.10.0",
"version": "11.11.0",
"description": "A babel preset to automatically enable emotion's css prop",
"main": "dist/emotion-babel-preset-css-prop.cjs.js",
"module": "dist/emotion-babel-preset-css-prop.esm.js",
"exports": {
".": {
"module": "./dist/emotion-babel-preset-css-prop.esm.js",
"import": "./dist/emotion-babel-preset-css-prop.cjs.mjs",
"default": "./dist/emotion-babel-preset-css-prop.cjs.js"
},
"./package.json": "./package.json"
@@ -16,8 +17,8 @@
"dependencies": {
"@babel/plugin-transform-react-jsx": "^7.17.12",
"@babel/runtime": "^7.18.3",
"@emotion/babel-plugin": "^11.10.0",
"@emotion/babel-plugin-jsx-pragmatic": "^0.2.0"
"@emotion/babel-plugin": "^11.11.0",
"@emotion/babel-plugin-jsx-pragmatic": "^0.2.1"
},
"peerDependencies": {
"@babel/core": "^7.0.0"
16 changes: 16 additions & 0 deletions packages/cache/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# @emotion/cache

## 11.11.0

### Minor Changes

- [#3031](https://github.com/emotion-js/emotion/pull/3031) [`336f3d50`](https://github.com/emotion-js/emotion/commit/336f3d50fd684ccbb160fff0c63d5560936f1ee5) Thanks [@Andarist](https://github.com/Andarist)! - Added support for cascade `@layer`s by updating the underlying parser ([stylis](https://github.com/thysultan/stylis)).

### Patch Changes

- [#3029](https://github.com/emotion-js/emotion/pull/3029) [`eed5e6cf`](https://github.com/emotion-js/emotion/commit/eed5e6cf00f94f3011b93825ccce43cb2270c247) Thanks [@Andarist](https://github.com/Andarist)! - Fixed importing in Node ESM

- Updated dependencies [[`eed5e6cf`](https://github.com/emotion-js/emotion/commit/eed5e6cf00f94f3011b93825ccce43cb2270c247)]:
- @emotion/memoize@0.8.1
- @emotion/sheet@1.2.2
- @emotion/utils@1.2.1
- @emotion/weak-memoize@0.3.1

## 11.10.8

### Patch Changes
13 changes: 7 additions & 6 deletions packages/cache/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@emotion/cache",
"version": "11.10.8",
"version": "11.11.0",
"description": "emotion's cache",
"main": "dist/emotion-cache.cjs.js",
"module": "dist/emotion-cache.esm.js",
@@ -14,6 +14,7 @@
"browser": "./dist/emotion-cache.browser.esm.js",
"default": "./dist/emotion-cache.esm.js"
},
"import": "./dist/emotion-cache.cjs.mjs",
"default": "./dist/emotion-cache.cjs.js"
},
"./package.json": "./package.json"
@@ -25,11 +26,11 @@
"test:typescript": "dtslint types"
},
"dependencies": {
"@emotion/memoize": "^0.8.0",
"@emotion/sheet": "^1.2.1",
"@emotion/utils": "^1.2.0",
"@emotion/weak-memoize": "^0.3.0",
"stylis": "4.1.4"
"@emotion/memoize": "^0.8.1",
"@emotion/sheet": "^1.2.2",
"@emotion/utils": "^1.2.1",
"@emotion/weak-memoize": "^0.3.1",
"stylis": "4.2.0"
},
"devDependencies": {
"@definitelytyped/dtslint": "0.0.112",
11 changes: 11 additions & 0 deletions packages/css-prettifier/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# @emotion/css-prettifier

## 1.1.3

### Patch Changes

- [#3031](https://github.com/emotion-js/emotion/pull/3031) [`336f3d50`](https://github.com/emotion-js/emotion/commit/336f3d50fd684ccbb160fff0c63d5560936f1ee5) Thanks [@Andarist](https://github.com/Andarist)! - Updated the underlying parser ([stylis](https://github.com/thysultan/stylis)) to 4.2.0

* [#3029](https://github.com/emotion-js/emotion/pull/3029) [`eed5e6cf`](https://github.com/emotion-js/emotion/commit/eed5e6cf00f94f3011b93825ccce43cb2270c247) Thanks [@Andarist](https://github.com/Andarist)! - Fixed importing in Node ESM

* Updated dependencies [[`eed5e6cf`](https://github.com/emotion-js/emotion/commit/eed5e6cf00f94f3011b93825ccce43cb2270c247)]:
- @emotion/memoize@0.8.1

## 1.1.2

### Patch Changes
7 changes: 4 additions & 3 deletions packages/css-prettifier/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@emotion/css-prettifier",
"version": "1.1.2",
"version": "1.1.3",
"description": "Simple Stylis-based CSS prettifier",
"keywords": [
"emotion"
@@ -11,6 +11,7 @@
"exports": {
".": {
"module": "./dist/emotion-css-prettifier.esm.js",
"import": "./dist/emotion-css-prettifier.cjs.mjs",
"default": "./dist/emotion-css-prettifier.cjs.js"
},
"./package.json": "./package.json"
@@ -19,8 +20,8 @@
"license": "MIT",
"repository": "https://github.com/emotion-js/emotion/tree/main/packages/css-prettifier",
"dependencies": {
"@emotion/memoize": "^0.8.0",
"stylis": "4.1.4"
"@emotion/memoize": "^0.8.1",
"stylis": "4.2.0"
},
"publishConfig": {
"access": "public"
17 changes: 17 additions & 0 deletions packages/css/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,22 @@
# emotion

## 11.11.0

### Minor Changes

- [#3031](https://github.com/emotion-js/emotion/pull/3031) [`336f3d50`](https://github.com/emotion-js/emotion/commit/336f3d50fd684ccbb160fff0c63d5560936f1ee5) Thanks [@Andarist](https://github.com/Andarist)! - Added support for cascade `@layer`s by updating the underlying parser ([stylis](https://github.com/thysultan/stylis)).

### Patch Changes

- [#3029](https://github.com/emotion-js/emotion/pull/3029) [`eed5e6cf`](https://github.com/emotion-js/emotion/commit/eed5e6cf00f94f3011b93825ccce43cb2270c247) Thanks [@Andarist](https://github.com/Andarist)! - Fixed importing in Node ESM

- Updated dependencies [[`336f3d50`](https://github.com/emotion-js/emotion/commit/336f3d50fd684ccbb160fff0c63d5560936f1ee5), [`eed5e6cf`](https://github.com/emotion-js/emotion/commit/eed5e6cf00f94f3011b93825ccce43cb2270c247), [`336f3d50`](https://github.com/emotion-js/emotion/commit/336f3d50fd684ccbb160fff0c63d5560936f1ee5)]:
- @emotion/babel-plugin@11.11.0
- @emotion/cache@11.11.0
- @emotion/serialize@1.1.2
- @emotion/sheet@1.2.2
- @emotion/utils@1.2.1

## 11.10.8

### Patch Changes
1 change: 1 addition & 0 deletions packages/css/macro.d.mts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './macro.js'
34 changes: 23 additions & 11 deletions packages/css/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@emotion/css",
"version": "11.10.8",
"version": "11.11.0",
"description": "The Next Generation of CSS-in-JS.",
"main": "dist/emotion-css.cjs.js",
"module": "dist/emotion-css.esm.js",
@@ -9,20 +9,18 @@
"src",
"dist",
"types",
"macro.js",
"macro.d.ts",
"macro.js.flow",
"macro.*",
"create-instance"
],
"scripts": {
"test:typescript": "dtslint types"
},
"dependencies": {
"@emotion/babel-plugin": "^11.10.8",
"@emotion/cache": "^11.10.8",
"@emotion/serialize": "^1.1.1",
"@emotion/sheet": "^1.2.1",
"@emotion/utils": "^1.2.0"
"@emotion/babel-plugin": "^11.11.0",
"@emotion/cache": "^11.11.0",
"@emotion/serialize": "^1.1.2",
"@emotion/sheet": "^1.2.2",
"@emotion/utils": "^1.2.1"
},
"devDependencies": {
"@definitelytyped/dtslint": "0.0.112",
@@ -46,14 +44,22 @@
"exports": {
".": {
"module": "./dist/emotion-css.esm.js",
"import": "./dist/emotion-css.cjs.mjs",
"default": "./dist/emotion-css.cjs.js"
},
"./create-instance": {
"module": "./create-instance/dist/emotion-css-create-instance.esm.js",
"import": "./create-instance/dist/emotion-css-create-instance.cjs.mjs",
"default": "./create-instance/dist/emotion-css-create-instance.cjs.js"
},
"./package.json": "./package.json",
"./macro": "./macro.js"
"./macro": {
"types": {
"import": "./macro.d.mts",
"default": "./macro.d.ts"
},
"default": "./macro.js"
}
},
"preconstruct": {
"umdName": "emotion",
@@ -63,7 +69,13 @@
],
"exports": {
"extra": {
"./macro": "./macro.js"
"./macro": {
"types": {
"import": "./macro.d.mts",
"default": "./macro.d.ts"
},
"default": "./macro.js"
}
}
}
}
6 changes: 6 additions & 0 deletions packages/eslint-plugin/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @emotion/eslint-plugin

## 11.11.0

### Patch Changes

- [#3029](https://github.com/emotion-js/emotion/pull/3029) [`eed5e6cf`](https://github.com/emotion-js/emotion/commit/eed5e6cf00f94f3011b93825ccce43cb2270c247) Thanks [@Andarist](https://github.com/Andarist)! - Fixed importing in Node ESM

## 11.10.0

### Minor Changes
3 changes: 2 additions & 1 deletion packages/eslint-plugin/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@emotion/eslint-plugin",
"version": "11.10.0",
"version": "11.11.0",
"description": "ESLint rules for emotion",
"keywords": [
"eslint",
@@ -14,6 +14,7 @@
"exports": {
".": {
"module": "./dist/emotion-eslint-plugin.esm.js",
"import": "./dist/emotion-eslint-plugin.cjs.mjs",
"default": "./dist/emotion-eslint-plugin.cjs.js"
},
"./package.json": "./package.json"
6 changes: 6 additions & 0 deletions packages/hash/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @emotion/hash

## 0.9.1

### Patch Changes

- [#3029](https://github.com/emotion-js/emotion/pull/3029) [`eed5e6cf`](https://github.com/emotion-js/emotion/commit/eed5e6cf00f94f3011b93825ccce43cb2270c247) Thanks [@Andarist](https://github.com/Andarist)! - Fixed importing in Node ESM

## 0.9.0

### Minor Changes
3 changes: 2 additions & 1 deletion packages/hash/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@emotion/hash",
"version": "0.9.0",
"version": "0.9.1",
"description": "A MurmurHash2 implementation",
"main": "dist/emotion-hash.cjs.js",
"module": "dist/emotion-hash.esm.js",
@@ -22,6 +22,7 @@
"exports": {
".": {
"module": "./dist/emotion-hash.esm.js",
"import": "./dist/emotion-hash.cjs.mjs",
"default": "./dist/emotion-hash.cjs.js"
},
"./package.json": "./package.json"
Loading