Merge branch 'master' into 3.1.1

styled-components · Jan 29, 2018 · 07b4867 · 07b4867
2 parents d9cfb2f + 03cbfef
commit 07b4867
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,7 @@ All notable changes to this project will be documented in this file. If a contri
 
 ## Unreleased
 
--
+- Disable "speedy" mode for non-production cases (see [#1460](https://github.com/styled-components/styled-components/pull/1460))
 
 ## [v3.1.1] - 2018-01-29
 

diff --git a/sandbox/src/App.js b/sandbox/src/App.js
@@ -101,6 +101,11 @@ const LiveEditor = LiveBlock.withComponent(_LiveEditor).extend`
 
 const LivePreview = LiveBlock.withComponent(_LivePreview).extend`
   background-color: white;
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  flex-wrap: wrap;
+  align-items: center;
 `
 
 const LiveError = styled(_LiveError)`

diff --git a/sandbox/src/Button.example.js b/sandbox/src/Button.example.js
@@ -4,7 +4,7 @@ const Button = styled.button`
   font-size: 16px;
   border-radius: 5px;
   padding: 0.25em 1em;
-  margin: 0 1em;
+  margin: 1em 1em;
   background: transparent;
   color: palevioletred;
   border: 2px solid palevioletred;
@@ -17,11 +17,9 @@ const Button = styled.button`
     `};
 `
 
-const content = (
-  <div>
-    <Button>Normal Button</Button>
-    <Button primary>Primary Button</Button>
-  </div>
-)
+const content = [
+  <Button>Normal Button</Button>,
+  <Button primary>Primary Button</Button>,
+]
 
 render(content)
diff --git a/src/models/BrowserStyleSheet.js b/src/models/BrowserStyleSheet.js
@@ -26,7 +26,7 @@ declare var __DEV__: ?string
 
 const DISABLE_SPEEDY =
   (typeof __DEV__ === 'boolean' && __DEV__) ||
-  process.env.NODE_ENV === 'development'
+  process.env.NODE_ENV !== 'production'
 
 const COMPONENTS_PER_TAG = 40
 const SPEEDY_COMPONENTS_PER_TAG = 1000 // insertRule allows more injections before a perf slowdown

diff --git a/test-results.json b/test-results.json