From a10324d591b62018b48990002b0c03b6b69b97bd Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Mon, 19 Feb 2018 15:47:50 +0100
Subject: [PATCH] Merge master into canary (#3846)

* Move security related test cases into a its own file.

* Removes the unused renderScript function

* Add a nerv example. (#3573)

* Add a nerv example.

* Fix for indentation/style

* Fix for name

* Release 5.0.0

* Add multi-zones docs. (#3688)

* with emotion example - hoist styles out of the index page component (#3821)

* Use indexOf instead of startsWith (#3758)

* Use indexOf instead of startsWith

This fixes an IE11 regression, see #3755

* Lint the code
---
 examples/with-emotion/pages/index.js | 118 +++++++++++++--------------
 lib/head.js                          |   2 +-
 2 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/examples/with-emotion/pages/index.js b/examples/with-emotion/pages/index.js
index 01208e33..bf03fdb6 100644
--- a/examples/with-emotion/pages/index.js
+++ b/examples/with-emotion/pages/index.js
@@ -7,66 +7,66 @@ if (typeof window !== 'undefined') {
   hydrate(window.__NEXT_DATA__.ids)
 }
 
+injectGlobal`
+  html, body {
+    padding: 3rem 1rem;
+    margin: 0;
+    background: papayawhip;
+    min-height: 100%;
+    font-family: Helvetica, Arial, sans-serif;
+    font-size: 24px;
+  }
+`
+
+const basicStyles = css`
+  background-color: white;
+  color: cornflowerblue;
+  border: 1px solid lightgreen;
+  border-right: none;
+  border-bottom: none;
+  box-shadow: 5px 5px 0 0 lightgreen, 10px 10px 0 0 lightyellow;
+  transition: all 0.1s linear;
+  margin: 3rem 0;
+  padding: 1rem 0.5rem;
+`
+const hoverStyles = css`
+  &:hover {
+    color: white;
+    background-color: lightgray;
+    border-color: aqua;
+    box-shadow: -15px -15px 0 0 aqua, -30px -30px 0 0 cornflowerblue;
+  }
+`
+const bounce = keyframes`
+  from {
+    transform: scale(1.01);
+  }
+  to {
+    transform: scale(0.99);
+  }
+`
+
+const Basic = styled.div`
+  ${basicStyles};
+`
+
+const Combined = styled.div`
+  ${basicStyles};
+  ${hoverStyles};
+  & code {
+    background-color: linen;
+  }
+`
+const Animated = styled.div`
+  ${basicStyles};
+  ${hoverStyles};
+  & code {
+    background-color: linen;
+  }
+  animation: ${props => props.animation} 0.2s infinite ease-in-out alternate;
+`
+
 export default () => {
-  injectGlobal`
-    html, body {
-      padding: 3rem 1rem;
-      margin: 0;
-      background: papayawhip;
-      min-height: 100%;
-      font-family: Helvetica, Arial, sans-serif;
-      font-size: 24px;
-    }
-  `
-
-  const basicStyles = css`
-    background-color: white;
-    color: cornflowerblue;
-    border: 1px solid lightgreen;
-    border-right: none;
-    border-bottom: none;
-    box-shadow: 5px 5px 0 0 lightgreen, 10px 10px 0 0 lightyellow;
-    transition: all 0.1s linear;
-    margin: 3rem 0;
-    padding: 1rem 0.5rem;
-  `
-  const hoverStyles = css`
-    &:hover {
-      color: white;
-      background-color: lightgray;
-      border-color: aqua;
-      box-shadow: -15px -15px 0 0 aqua, -30px -30px 0 0 cornflowerblue;
-    }
-  `
-  const bounce = keyframes`
-    from {
-      transform: scale(1.01);
-    }
-    to {
-      transform: scale(0.99);
-    }
-  `
-
-  const Basic = styled.div`
-    ${basicStyles};
-  `
-
-  const Combined = styled.div`
-    ${basicStyles};
-    ${hoverStyles};
-    & code {
-      background-color: linen;
-    }
-  `
-  const Animated = styled.div`
-    ${basicStyles};
-    ${hoverStyles};
-    & code {
-      background-color: linen;
-    }
-    animation: ${props => props.animation} 0.2s infinite ease-in-out alternate;
-  `
-
   return (
     <div>
       <Basic>Cool Styles</Basic>
diff --git a/lib/head.js b/lib/head.js
index 71b374f9..019cf3c1 100644
--- a/lib/head.js
+++ b/lib/head.js
@@ -60,7 +60,7 @@ function unique () {
   const metaCategories = {}
 
   return (h) => {
-    if (h.key && h.key.startsWith('.$')) {
+    if (h.key && h.key.indexOf('.$') === 0) {
       if (keys.has(h.key)) return false
       keys.add(h.key)
     }