diff --git a/CHANGELOG.md b/CHANGELOG.md index 6782a6f57..f02b9a9db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. If a contri *The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).* +## Unreleased + +- Upgrade stylis to 2.3 and use constructor to fix bugs with multiple libs using stylis simultaneously (see [#962](https://github.com/styled-components/styled-components/pull/962)) + ## [v2.1.0] - 2017-06-15 - Added missing v2.0 APIs to TypeScript typings, thanks to [@patrick91](https://github.com/patrick91), [@igorbek](https://github.com/igorbek) (see [#837](https://github.com/styled-components/styled-components/pull/837), [#882](https://github.com/styled-components/styled-components/pull/882)) diff --git a/package.json b/package.json index 62580f50e..0857a9dce 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "is-function": "^1.0.1", "is-plain-object": "^2.0.1", "prop-types": "^15.5.4", - "stylis": "^3.0.19", + "stylis": "^3.2.1", "supports-color": "^3.2.3" }, "devDependencies": { diff --git a/src/utils/stringifyRules.js b/src/utils/stringifyRules.js index d7238badb..63022a0ad 100644 --- a/src/utils/stringifyRules.js +++ b/src/utils/stringifyRules.js @@ -1,8 +1,8 @@ // @flow -import stylis from 'stylis' +import Stylis from 'stylis' import type { Interpolation } from '../types' -stylis.set({ +const stylis = new Stylis({ global: false, cascade: true, keyframe: false, diff --git a/yarn.lock b/yarn.lock index edf731103..1f36bdf2c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5861,9 +5861,9 @@ strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" -stylis@^3.0.19: - version "3.0.19" - resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.0.19.tgz#36013520bb19c209d374c629e97f190e8797a287" +stylis@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.2.1.tgz#7a88988f8ccb5c238be3cc3cec173735cc594740" supports-color@^2.0.0: version "2.0.0"