Merge branch 'master' into allow_overriding_importName

styled-components · Sep 18, 2018 · 7a0e1af · 7a0e1af
2 parents 65cee85 + b0a1fec
commit 7a0e1af
Show file tree

Hide file tree

Showing 8 changed files with 6,613 additions and 2,705 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,6 +1,6 @@
 {
   "presets": [
-    ["env", {
+    ["@babel/preset-env", {
       "targets": {
         "node": 6
       }