v1.4.0

egodact · Jul 12, 2019 · 3e0165b · 3e0165b
1 parent c9b9366
commit 3e0165b
Show file tree

Hide file tree

Showing 8 changed files with 143 additions and 157 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# Version 1.4.0
+Released 2019-07-12
+
+- Migrated to Emotion 10
+
 # Version 1.3.1
 Released 2019-05-18
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-multi-bar-slider",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "description": "Slider component with multiple bars for React",
   "repository": {
     "type": "git",
@@ -19,11 +19,11 @@
     "react multi slider"
   ],
   "peerDependencies": {
-    "emotion": "^9.x",
+    "@emotion/core": "^10.x",
+    "@emotion/styled": "^10.x",
     "prop-types": "^15.x",
     "react": "^15.3.x || ^16.x",
-    "react-dom": "^15.3.x || ^16.x",
-    "react-emotion": "^9.x"
+    "react-dom": "^15.3.x || ^16.x"
   },
   "scripts": {
     "build": "webpack --config webpack.config.babel.js",
@@ -33,6 +33,8 @@
     "lint": "eslint ./src"
   },
   "devDependencies": {
+    "@emotion/core": "^10.0.14",
+    "@emotion/styled": "^10.0.14",
     "babel-core": "^6.26.0",
     "babel-eslint": "^8.0.1",
     "babel-jest": "^22.1.0",
@@ -41,7 +43,6 @@
     "babel-preset-react": "^6.24.1",
     "babel-preset-stage-0": "^6.24.1",
     "clean-webpack-plugin": "^0.1.16",
-    "emotion": "^9.2.8",
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.1.1",
     "eslint": "^4.9.0",
@@ -51,7 +52,6 @@
     "prop-types": "^15.6.1",
     "react": "^16.2.0",
     "react-dom": "^16.2.0",
-    "react-emotion": "^9.2.8",
     "react-test-renderer": "^16.2.0",
     "webpack": "^3.8.1"
   },

diff --git a/src/Dot/DotIcon.js b/src/Dot/DotIcon.js
@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import styled from 'react-emotion';
+import styled from '@emotion/styled';
 
 const DotIcon = styled('img')({
   position: 'absolute',

diff --git a/src/Dot/StyledDot.js b/src/Dot/StyledDot.js
@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import styled from 'react-emotion';
+import styled from '@emotion/styled';
 import transition from '../utils/transition';
 
 const StyledDot = styled('span')({

diff --git a/src/MultiSlider/SlidableZone.js b/src/MultiSlider/SlidableZone.js
@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import styled from 'react-emotion';
+import styled from '@emotion/styled';
 
 const SlidableZone = styled('div')({
   position: 'absolute',

diff --git a/src/MultiSlider/StyledSlider.js b/src/MultiSlider/StyledSlider.js
@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import styled from 'react-emotion';
+import styled from '@emotion/styled';
 import transition from '../utils/transition';
 import getHalf from '../utils/getHalf';
 

diff --git a/src/Progress/StyledProgress.js b/src/Progress/StyledProgress.js
@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import styled from 'react-emotion';
+import styled from '@emotion/styled';
 import transition from '../utils/transition';
 import getHalf from '../utils/getHalf';