emotion-js · emmatown · Jan 5, 2020 · Dec 2, 2019 · Dec 2, 2019 · Dec 2, 2019
diff --git a/.changeset/brave-rice-yawn.md b/.changeset/brave-rice-yawn.md
@@ -0,0 +1,6 @@
+---
+'@emotion/eslint-plugin': major
+'eslint-plugin-emotion': major
+---
+
+Rename `eslint-plugin-emotion` to `@emotion/eslint-plugin`. Please replace `"plugins": ["emotion"]` with `"plugins": ["@emotion"]` and `emotion/` with `@emotion/` in your rules config in your ESLint config.
diff --git a/.changeset/clever-emus-watch.md b/.changeset/clever-emus-watch.md
@@ -1,5 +1,5 @@
 ---
-'babel-plugin-emotion': minor
+'@emotion/babel-plugin': minor
 '@emotion/babel-preset-css-prop': minor
 ---
 

diff --git a/.changeset/config.json b/.changeset/config.json
@@ -8,21 +8,26 @@
   "linked": [
     [
       "@emotion/core",
+      "@emotion/react",
       "@emotion/styled",
       "@emotion/styled-base",
       "@emotion/cache",
       "@emotion/css",
       "create-emotion",
       "emotion",
       "emotion-server",
+      "@emotion/server",
       "create-emotion-server",
       "babel-plugin-emotion",
+      "@emotion/babel-plugin",
       "@emotion/babel-preset-css-prop",
       "jest-emotion",
+      "@emotion/jest",
       "@emotion/native",
       "@emotion/primitives",
       "@emotion/primitives-core",
       "eslint-plugin-emotion",
+      "@emotion/eslint-plugin",
       "emotion-theming"
     ]
   ],

diff --git a/.changeset/flat-adults-add.md b/.changeset/flat-adults-add.md
@@ -1,5 +1,5 @@
 ---
-'jest-emotion': patch
+'@emotion/jest': patch
 ---
 
 Take specificity into account when matching styles
diff --git a/.changeset/four-cars-tell.md b/.changeset/four-cars-tell.md
@@ -1,12 +1,12 @@
 ---
-'@emotion/core': major
+'@emotion/react': major
 '@emotion/styled': major
 ---
 
 Reworked TypeScript definitions so it's easier to provide a type for Theme. Instead of creating custom instances (like before) you can augment builtin Theme interface like this:
 
 ```ts
-declare module '@emotion/core' {
+declare module '@emotion/react' {
   export interface Theme {
     primaryColor: string
     secondaryColor: string

diff --git a/.changeset/giant-oranges-impress.md b/.changeset/giant-oranges-impress.md
@@ -1,5 +1,5 @@
 ---
-'babel-plugin-emotion': major
+'@emotion/babel-plugin': major
 '@emotion/babel-preset-css-prop': major
 ---
 

diff --git a/.changeset/grumpy-news-wonder.md b/.changeset/grumpy-news-wonder.md
@@ -0,0 +1,6 @@
+---
+'@emotion/babel-plugin': major
+'babel-plugin-emotion': major
+---
+
+Rename `babel-plugin-emotion` to `@emotion/babel-plugin`. Please replace `"plugins": ["emotion"]` with `"plugins": ["@emotion"]` in your Babel config.
diff --git a/.changeset/large-snakes-ring.md b/.changeset/large-snakes-ring.md
@@ -1,5 +1,5 @@
 ---
-'babel-plugin-emotion': minor
+'@emotion/babel-plugin': minor
 '@emotion/babel-preset-css-prop': minor
 ---
 

diff --git a/.changeset/lazy-elephants-stare.md b/.changeset/lazy-elephants-stare.md
@@ -1,5 +1,5 @@
 ---
-'@emotion/core': patch
+'@emotion/react': patch
 '@emotion/serialize': patch
 ---
 

diff --git a/.changeset/light-mice-relate.md b/.changeset/light-mice-relate.md
@@ -1,5 +1,5 @@
 ---
-'babel-plugin-emotion': patch
+'@emotion/babel-plugin': patch
 ---
 
 Avoid transpiling vanilla emotion calls in already transpiled code to avoid double labels and such
diff --git a/.changeset/long-apes-admire/changes.json b/.changeset/long-apes-admire/changes.json
@@ -13,7 +13,7 @@
       "dependencies": ["@emotion/serialize"]
     },
     {
-      "name": "@emotion/core",
+      "name": "@emotion/react",
       "type": "patch",
       "dependencies": [
         "@emotion/css",

diff --git a/.changeset/lovely-owls-remember.md b/.changeset/lovely-owls-remember.md
@@ -1,5 +1,5 @@
 ---
-'@emotion/core': minor
+'@emotion/react': minor
 ---
 
 Support functions in arrays passed to css prop and Global's styles prop. This allows for composition of theme-accepting functions.
diff --git a/.changeset/mean-deers-confess.md b/.changeset/mean-deers-confess.md
@@ -1,5 +1,5 @@
 ---
-'jest-emotion': major
+'@emotion/jest': major
 ---
 
 Added the `T` parameter to the `Matchers` interface in the TypeScript definitions to make this module compatible with `@types/jest@^24.0.20`.
diff --git a/.changeset/modern-grapes-obey.md b/.changeset/modern-grapes-obey.md
@@ -1,5 +1,5 @@
 ---
-'babel-plugin-emotion': major
+'@emotion/babel-plugin': major
 ---
 
 Drop Babel 6 support
diff --git a/.changeset/moody-stingrays-sort.md b/.changeset/moody-stingrays-sort.md
@@ -1,5 +1,5 @@
 ---
-'@emotion/core': minor
+'@emotion/react': minor
 ---
 
-`Global` imported from macro entry (`@emotion/core/macro`) gets source maps generated now when inline css-less expression is used as value of the `styles` prop.
+`Global` imported from macro entry (`@emotion/react/macro`) gets source maps generated now when inline css-less expression is used as value of the `styles` prop.
diff --git a/.changeset/neat-ligers-film.md b/.changeset/neat-ligers-film.md
@@ -1,5 +1,5 @@
 ---
-'babel-plugin-emotion': patch
+'@emotion/babel-plugin': patch
 ---
 
 Fix issue with not updating referenced import when bailing out on already transpiled vanilla emotion nodes (a regression introduced in #1602)
diff --git a/.changeset/nervous-clouds-brush.md b/.changeset/nervous-clouds-brush.md
@@ -0,0 +1,6 @@
+---
+'@emotion/react': major
+'@emotion/core': major
+---
+
+Rename `@emotion/core` to `@emotion/react`. Please change any imports of `@emotion/core` to import `@emotion/react` or use the `@emotion/pkg-renaming` ESLint rule from `@emotion/eslint-plugin`.
diff --git a/.changeset/nine-mugs-care.md b/.changeset/nine-mugs-care.md
@@ -1,5 +1,5 @@
 ---
-'@emotion/core': patch
+'@emotion/react': patch
 '@emotion/is-prop-valid': patch
 '@emotion/serialize': patch
 ---

diff --git a/.changeset/odd-flowers-breathe.md b/.changeset/odd-flowers-breathe.md
@@ -0,0 +1,6 @@
+---
+'@emotion/css': major
+'create-emotion': major
+---
+
+Move create `create-emotion` to `@emotion/css/create-instance`. Please change any imports of `create-emotion` to import `@emotion/css/create-instance` or use the `@emotion/pkg-renaming` ESLint rule from `@emotion/eslint-plugin`.
diff --git a/.changeset/purple-teachers-clean.md b/.changeset/purple-teachers-clean.md
@@ -0,0 +1,6 @@
+---
+'@emotion/jest': major
+'jest-emotion': major
+---
+
+Rename `jest-emotion` to `@emotion/jest`. Please replace `"snapshotSerializers": ["jest-emotion"]` with `"snapshotSerializers": ["@emotion/jest"]` if you're using the snapshot serializer. Also replace any imports of `jest-emotion` with `@emotion/jest` or use the `@emotion/pkg-renaming` ESLint rule from `@emotion/eslint-plugin`.
diff --git a/.changeset/rare-books-own.md b/.changeset/rare-books-own.md
@@ -1,13 +1,15 @@
 ---
-'babel-plugin-emotion': major
+'@emotion/babel-plugin': major
 '@emotion/cache': major
-'@emotion/core': major
+'@emotion/react': major
 'create-emotion': major
 'create-emotion-server': major
 '@emotion/css': major
 'emotion': major
 'emotion-server': major
+'@emotion/server': major
 'emotion-theming': major
+'@emotion/jest': major
 'jest-emotion': major
 '@emotion/native': major
 '@emotion/primitives': major

diff --git a/.changeset/rare-toes-grow.md b/.changeset/rare-toes-grow.md
@@ -1,5 +1,5 @@
 ---
-'jest-emotion': patch
+'@emotion/jest': patch
 ---
 
 Match rules in declarations with component used as a selector
diff --git a/.changeset/rich-hotels-sing.md b/.changeset/rich-hotels-sing.md
@@ -1,5 +1,5 @@
 ---
-'@emotion/core': patch
+'@emotion/react': patch
 ---
 
 Fix issue with published TypeScript test files augmenting Theme interface.
diff --git a/.changeset/rotten-adults-guess.md b/.changeset/rotten-adults-guess.md
@@ -0,0 +1,6 @@
+---
+'@emotion/server': major
+'emotion-server': major
+---
+
+Rename `emotion-server` to `@emotion/server`. Please change any imports of `emotion-server` to import `@emotion/server` or use the `@emotion/pkg-renaming` ESLint rule from `@emotion/eslint-plugin`.
diff --git a/.changeset/shaggy-cheetahs-vanish.md b/.changeset/shaggy-cheetahs-vanish.md
@@ -0,0 +1,6 @@
+---
+'@emotion/css': major
+'emotion': major
+---
+
+Rename `emotion` to `@emotion/css`. Please change any imports of `emotion` to import `@emotion/css` or use the `@emotion/pkg-renaming` ESLint rule from `@emotion/eslint-plugin`.
diff --git a/.changeset/silver-bulldogs-beg.md b/.changeset/silver-bulldogs-beg.md
@@ -1,5 +1,5 @@
 ---
-'eslint-plugin-emotion': minor
+'@emotion/eslint-plugin': minor
 ---
 
 Respect `syntax-preference` rule when using css prop.
diff --git a/.changeset/smooth-carpets-matter.md b/.changeset/smooth-carpets-matter.md
@@ -1,18 +1,20 @@
 ---
-'babel-plugin-emotion': major
-'@emotion/core': major
+'@emotion/babel-plugin': major
+'@emotion/react': major
 '@emotion/css': major
 ---
 
-Removed `@emotion/css` - it's main purpose was to allow `css` to be a Babel macro, but since babel-plugin-macros allows us to keep imports nowadays this is no longer needed. `@emotion/core/macro` has been added to account for this use case and appropriate changes has been made to `babel-plugin-emotion` to facilitate those changes.
+Removed default export from `@emotion/css` - it's main purpose was to allow `css` to be a Babel macro, but since babel-plugin-macros allows us to keep imports nowadays this is no longer needed. `@emotion/react/macro` has been added to account for this use case and appropriate changes has been made to `@emotion/babel-plugin` to facilitate those changes.
 
-If you have used `@emotion/css` directly (it was always reexported from `@emotion/core`) or you have been using its macro then you should update your code like this:
+If you have used `@emotion/css` directly (it was always reexported from `@emotion/react`) or you have been using its macro then you should update your code like this:
 
 ```diff
 -import css from '@emotion/css'
-+import { css } from '@emotion/core'
++import { css } from '@emotion/react'
 
 // or
 -import css from '@emotion/css/macro'
-+import { css } from '@emotion/core/macro'
++import { css } from '@emotion/react/macro'
 ```
+
+You can also use the `@emotion/pkg-renaming` ESLint rule from `@emotion/eslint-plugin` to do this for you.
diff --git a/.changeset/soft-moose-attend.md b/.changeset/soft-moose-attend.md
@@ -0,0 +1,6 @@
+---
+'@emotion/server': major
+'create-emotion-server': major
+---
+
+Move `create-emotion-server` to `@emotion/server/create-instance`. Please change any imports of `create-emotion-server` to import `@emotion/server/create-instance` or use the `@emotion/pkg-renaming` ESLint rule from `@emotion/eslint-plugin`.
diff --git a/.changeset/sour-poets-move.md b/.changeset/sour-poets-move.md
@@ -1,5 +1,5 @@
 ---
-'@emotion/core': patch
+'@emotion/react': patch
 ---
 
-Warn if @emotion/core is initialized more than once in the same development environment.
+Warn if @emotion/react is initialized more than once in the same development environment.
diff --git a/.changeset/spotty-llamas-mate.md b/.changeset/spotty-llamas-mate.md
@@ -1,5 +1,5 @@
 ---
-'babel-plugin-emotion': major
+'@emotion/babel-plugin': major
 '@emotion/styled-base': major
 '@emotion/styled': major
 ---

diff --git a/.changeset/stupid-radios-draw.md b/.changeset/stupid-radios-draw.md
@@ -1,6 +1,6 @@
 ---
-'babel-plugin-emotion': minor
+'@emotion/babel-plugin': minor
 '@emotion/babel-preset-css-prop': minor
 ---
 
-Added the `importMap` option which allows you to tell babel-plugin-emotion what imports it should look at to determine what it should transform so if you re-export Emotion's exports, you can still use the Babel transforms
+Added the `importMap` option which allows you to tell @emotion/babel-plugin what imports it should look at to determine what it should transform so if you re-export Emotion's exports, you can still use the Babel transforms
diff --git a/.changeset/two-baboons-mate.md b/.changeset/two-baboons-mate.md
@@ -1,5 +1,5 @@
 ---
-'@emotion/core': major
+'@emotion/react': major
 'emotion-theming': major
 '@emotion/native': major
 '@emotion/primitives-core': major

diff --git a/.changeset/two-kiwis-give.md b/.changeset/two-kiwis-give.md
@@ -1,5 +1,5 @@
 ---
-'babel-plugin-emotion': minor
+'@emotion/babel-plugin': minor
 ---
 
 `Global` gets handled by the Babel plugin now - this gives inline css-less expressions source maps.
diff --git a/.changeset/violet-spiders-itch.md b/.changeset/violet-spiders-itch.md
@@ -0,0 +1,5 @@
+---
+'@emotion/eslint-plugin': minor
+---
+
+Add @emotion/pkg-renaming rule for Emotion 11 migration
diff --git a/.changeset/weak-islands-confess.md b/.changeset/weak-islands-confess.md
@@ -1,6 +1,6 @@
 ---
-'@emotion/core': major
+'@emotion/react': major
 'emotion-theming': major
 ---
 
-`emotion-theming` has been removed and all its exports were moved to `@emotion/core` package. Please import them like this `import { useTheme, ThemeProvider, withTheme } from '@emotion/core'` from now on.
+`emotion-theming` has been removed and all its exports were moved to `@emotion/react` package. Please import them like this `import { useTheme, ThemeProvider, withTheme } from '@emotion/react'` from now on.
diff --git a/.codesandbox/ci.json b/.codesandbox/ci.json
@@ -1,14 +1,4 @@
 {
-  "packages": [
-    "packages/babel-plugin-emotion",
-    "packages/cache",
-    "packages/core",
-    "packages/create-emotion",
-    "packages/css",
-    "packages/emotion",
-    "packages/emotion-theming",
-    "packages/serialize",
-    "packages/styled"
-  ],
+  "packages": ["packages/*"],
   "sandboxes": ["pk1qjqpw67"]
 }
diff --git a/.github/ISSUE_TEMPLATE/--bug-report.md b/.github/ISSUE_TEMPLATE/--bug-report.md
@@ -41,7 +41,7 @@ assignees: ''
 
 **Environment information:**
 
-<!-- Provide the `react` and `emotion` or `@emotion/*` packages versions -->
+<!-- Provide the `react` and `@emotion/*` packages versions -->
 
 - `react` version:
-- `emotion` version:
+- `@emotion/react` version:
diff --git a/README.md b/README.md
@@ -37,12 +37,12 @@ Frequently viewed docs:
 Get up and running with a single import.
 
 ```bash
-npm install --save @emotion/core
+npm install --save @emotion/react
 ```
 
 ```jsx
 /** @jsx jsx */
-import { jsx } from '@emotion/core'
+import { jsx } from '@emotion/react'
 
 let SomeComponent = props => {
   return (
@@ -60,7 +60,7 @@ let SomeComponent = props => {
 
 The babel plugin is not required, but enables some optimizations and customizations that could be beneficial for your project.
 
-Look here 👉 _[emotion babel plugin feature table and documentation](https://github.com/emotion-js/emotion/tree/master/packages/babel-plugin-emotion)_
+Look here 👉 _[emotion babel plugin feature table and documentation](https://github.com/emotion-js/emotion/tree/master/packages/babel-plugin)_
 
 ### Demo Sandbox
 

diff --git a/babel.config.js b/babel.config.js
@@ -14,14 +14,14 @@ module.exports = api => {
           ((!filename.includes('no-babel') &&
             needsBabelPluginEmotion(filename)) ||
             filename.includes(path.join('__tests__', 'babel'))),
-        plugins: ['babel-plugin-emotion']
+        plugins: ['@emotion/babel-plugin']
       },
       {
         test: filename =>
           filename &&
           filename.includes('source-map') &&
           needsBabelPluginEmotion(filename),
-        plugins: [['babel-plugin-emotion', { sourceMap: true }]]
+        plugins: [['@emotion/babel-plugin', { sourceMap: true }]]
       }
     ]
   }

diff --git a/docs/babel-macros.mdx b/docs/babel-macros.mdx
@@ -8,10 +8,10 @@ All of Emotion's Babel Macros are available by adding `/macro` to the end of the
 
 ```jsx
 import styled from '@emotion/styled/macro'
-import { jsx, css, Global, keyframes } from '@emotion/core/macro'
-import { css, keyframes, injectGlobal } from 'emotion/macro'
+import { jsx, css, Global, keyframes } from '@emotion/react/macro'
+import { css, keyframes, injectGlobal } from '@emotion/css/macro'
 ```
 
 > Note
 >
-> There are some optimisations which aren't possible with Babel Macros, so if it's possible, we still recommend using babel-plugin-emotion
+> There are some optimisations which aren't possible with Babel Macros, so if it's possible, we still recommend using @emotion/babel-plugin