Actually use officially published Stylis v4

emotion-js · Apr 24, 2020 · 5e39d81 · 5e39d81
1 parent 0654b2a
commit 5e39d81
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 1,576 deletions.
diff --git a/package.json b/package.json
@@ -257,8 +257,6 @@
     "react-router-dom": "^4.2.2",
     "react-scripts": "1.1.5",
     "react-test-renderer": "16.8.6",
-    "stylis": "3.5.4",
-    "stylis-rule-sheet": "^0.0.10",
     "svg-tag-names": "^1.1.1",
     "through": "^2.3.8",
     "unified": "^6.1.6",

diff --git a/packages/babel-plugin/package.json b/packages/babel-plugin/package.json
@@ -19,12 +19,12 @@
     "@emotion/hash": "0.8.0",
     "@emotion/memoize": "0.7.4",
     "@emotion/serialize": "^1.0.0-next.1",
-    "@emotion/stylis": "0.8.5",
     "babel-plugin-macros": "^2.6.1",
     "convert-source-map": "^1.5.0",
     "escape-string-regexp": "^1.0.5",
     "find-root": "^1.1.0",
-    "source-map": "^0.5.7"
+    "source-map": "^0.5.7",
+    "stylis": "^4.0.0"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0"

diff --git a/packages/babel-plugin/src/utils/minify.js b/packages/babel-plugin/src/utils/minify.js
@@ -1,5 +1,5 @@
 // @flow
-import { compile } from '@emotion/stylis'
+import { compile } from 'stylis'
 
 const isAutoInsertedRule = element => {
   if (element.type !== 'rule' || !element.parent) {

diff --git a/packages/cache/package.json b/packages/cache/package.json
@@ -16,9 +16,9 @@
   },
   "dependencies": {
     "@emotion/sheet": "0.10.0-next.1",
-    "@emotion/stylis": "0.8.5",
     "@emotion/utils": "0.11.3",
-    "@emotion/weak-memoize": "0.2.5"
+    "@emotion/weak-memoize": "0.2.5",
+    "stylis": "^4.0.0"
   },
   "devDependencies": {
     "@emotion/hash": "*",

diff --git a/packages/cache/src/index.js b/packages/cache/src/index.js
@@ -8,7 +8,7 @@ import {
   rulesheet,
   stringify,
   prefixer
-} from '@emotion/stylis'
+} from 'stylis'
 import weakMemoize from '@emotion/weak-memoize'
 import {
   compat,

diff --git a/packages/cache/src/stylis-plugins.js b/packages/cache/src/stylis-plugins.js
@@ -10,7 +10,7 @@ import {
   identifier,
   peek,
   position
-} from '@emotion/stylis'
+} from 'stylis'
 
 const last = arr => (arr.length ? arr[arr.length - 1] : null)
 

diff --git a/packages/css/package.json b/packages/css/package.json
@@ -34,11 +34,9 @@
   },
   "devDependencies": {
     "@babel/core": "^7.7.2",
-    "@emotion/stylis": "*",
     "babel-plugin-transform-define": "^1.3.0",
     "dtslint": "^0.3.0",
-    "stylis": "3.5.4",
-    "stylis-rule-sheet": "^0.0.10"
+    "stylis": "^4.0.0"
   },
   "author": "Kye Hohenberger",
   "homepage": "https://emotion.sh",

diff --git a/packages/stylis/CHANGELOG.md b/packages/stylis/CHANGELOG.md
diff --git a/packages/stylis/LICENSE b/packages/stylis/LICENSE
diff --git a/packages/stylis/README.md b/packages/stylis/README.md
diff --git a/packages/stylis/package.json b/packages/stylis/package.json