Skip to content

Commit 0dbe9f3

Browse files
Merge branch 'main' into main
2 parents 242ee2d + 4922955 commit 0dbe9f3

File tree

5 files changed

+14
-8
lines changed

5 files changed

+14
-8
lines changed

packages/react/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@
282282
"@emotion/css": "11.13.5",
283283
"@emotion/css-prettifier": "1.2.0",
284284
"@emotion/server": "11.11.0",
285-
"@emotion/styled": "11.14.0",
285+
"@emotion/styled": "11.14.1",
286286
"@types/hoist-non-react-statics": "^3.3.5",
287287
"html-tag-names": "^1.1.2",
288288
"react": "16.14.0",

packages/styled/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# @emotion/styled
22

3+
## 11.14.1
4+
5+
### Patch Changes
6+
7+
- [#3334](https://github.com/emotion-js/emotion/pull/3334) [`0facbe4`](https://github.com/emotion-js/emotion/commit/0facbe47bd9099ae4ed22dc201822d910ac3dec5) Thanks [@ZachRiegel](https://github.com/ZachRiegel)! - Renamed default-exported variable in `@emotion/styled` to aid inferred import names in auto-import completions in IDEs
8+
39
## 11.14.0
410

511
### Minor Changes

packages/styled/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@emotion/styled",
3-
"version": "11.14.0",
3+
"version": "11.14.1",
44
"description": "styled API for emotion",
55
"main": "dist/emotion-styled.cjs.js",
66
"module": "dist/emotion-styled.esm.js",

packages/styled/src/index.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Theme } from '@emotion/react'
2-
import styled from './base'
2+
import baseStyled from './base'
33
import { ReactJSXIntrinsicElements } from './jsx-namespace'
44
import { tags } from './tags'
55
import {
@@ -33,10 +33,10 @@ export type StyledTags = {
3333
export interface CreateStyled extends BaseCreateStyled, StyledTags {}
3434

3535
// bind it to avoid mutating the original function
36-
const newStyled = styled.bind(null) as CreateStyled
36+
const styled = baseStyled.bind(null) as CreateStyled
3737

3838
tags.forEach(tagName => {
39-
;(newStyled as any)[tagName] = newStyled(tagName as keyof typeof newStyled)
39+
;(styled as any)[tagName] = styled(tagName as keyof typeof styled)
4040
})
4141

42-
export default newStyled
42+
export default styled

yarn.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2895,7 +2895,7 @@ __metadata:
28952895
"@emotion/css-prettifier": 1.2.0
28962896
"@emotion/serialize": ^1.3.3
28972897
"@emotion/server": 11.11.0
2898-
"@emotion/styled": 11.14.0
2898+
"@emotion/styled": 11.14.1
28992899
"@emotion/use-insertion-effect-with-fallbacks": ^1.2.0
29002900
"@emotion/utils": ^1.4.2
29012901
"@emotion/weak-memoize": ^0.4.0
@@ -2958,7 +2958,7 @@ __metadata:
29582958
languageName: unknown
29592959
linkType: soft
29602960

2961-
"@emotion/[email protected].0, @emotion/styled@^11.0.0, @emotion/styled@workspace:packages/styled":
2961+
"@emotion/[email protected].1, @emotion/styled@^11.0.0, @emotion/styled@workspace:packages/styled":
29622962
version: 0.0.0-use.local
29632963
resolution: "@emotion/styled@workspace:packages/styled"
29642964
dependencies:

0 commit comments

Comments
 (0)