Merge pull request #114 from zapier/fix-merge-security-vulnerability

Relock to fix security vulnerability
zapier · Feb 22, 2019 · 430a220 · 430a220
2 parents 640008d + da758b2
commit 430a220
Show file tree

Hide file tree

Showing 4 changed files with 633 additions and 1,194 deletions.
diff --git a/__tests__/components/fields/__snapshots__/code.js.snap b/__tests__/components/fields/__snapshots__/code.js.snap
@@ -27,8 +27,8 @@ exports[`code field should render correctly 1`] = `
               <div class="CodeMirror cm-s-default CodeMirror-wrap">
                 <div style="overflow: hidden; position: relative; width: 3px; height: 0px;">
                   <textarea style="position: absolute; bottom: -1em; padding: 0px; width: 1000px; height: 1em; outline: none;"
-                            autocorrect="off"
-                            autocapitalize="off"
+                            autocorrect="false"
+                            autocapitalize="false"
                             spellcheck="false"
                             tabindex="0"
                   >

diff --git a/__tests__/components/fields/__snapshots__/pretty-select.js.snap b/__tests__/components/fields/__snapshots__/pretty-select.js.snap
@@ -506,7 +506,7 @@ exports[`pretty-select field should render open choices correctly (Alphabet) 1`]
           </div>
           <div role="presentation"
                class="choices-container"
-               style="position: absolute; max-height: 768px;"
+               style="user-select: none; position: absolute; max-height: 768px;"
           >
             <div class="choices-search">
               <input type="text"
@@ -861,7 +861,7 @@ exports[`pretty-select field should render open choices correctly (Colors (R)) 1
           </div>
           <div role="presentation"
                class="choices-container"
-               style="position: absolute; max-height: 768px;"
+               style="user-select: none; position: absolute; max-height: 768px;"
           >
             <div class="choices-search">
               <input type="text"
@@ -962,7 +962,7 @@ exports[`pretty-select field should render open choices correctly (Colors 2) 1`]
           </div>
           <div role="presentation"
                class="choices-container"
-               style="position: absolute; max-height: 768px;"
+               style="user-select: none; position: absolute; max-height: 768px;"
           >
             <ul class="choices">
               <li class="choice">
@@ -1053,7 +1053,7 @@ exports[`pretty-select field should render open choices correctly (Colors 3) 1`]
           </div>
           <div role="presentation"
                class="choices-container"
-               style="position: absolute; max-height: 768px;"
+               style="user-select: none; position: absolute; max-height: 768px;"
           >
             <div class="choices-search">
               <input type="text"
@@ -1197,7 +1197,7 @@ exports[`pretty-select field should render open choices correctly (Empty) 1`] =
           </div>
           <div role="presentation"
                class="choices-container"
-               style="position: absolute; max-height: 768px;"
+               style="user-select: none; position: absolute; max-height: 768px;"
           >
             <ul class="choices">
               <li class="choice">
@@ -1269,7 +1269,7 @@ exports[`pretty-select field should render open choices correctly (Loading) 1`]
           </div>
           <div role="presentation"
                class="choices-container"
-               style="position: absolute; max-height: 768px;"
+               style="user-select: none; position: absolute; max-height: 768px;"
           >
             <ul class="choices">
               <li class="choice">
@@ -1403,7 +1403,7 @@ exports[`pretty-select field should render open choices correctly (Select with N
           </div>
           <div role="presentation"
                class="choices-container"
-               style="position: absolute; max-height: 768px;"
+               style="user-select: none; position: absolute; max-height: 768px;"
           >
             <ul class="choices">
               <li class="choice">
@@ -1502,7 +1502,7 @@ exports[`pretty-select field should render open choices correctly (Select with S
           </div>
           <div role="presentation"
                class="choices-container"
-               style="position: absolute; max-height: 768px;"
+               style="user-select: none; position: absolute; max-height: 768px;"
           >
             <div class="choices-search">
               <input type="text"
@@ -1657,7 +1657,7 @@ exports[`pretty-select field should render open choices correctly (Size) 1`] = `
           </div>
           <div role="presentation"
                class="choices-container"
-               style="position: absolute; max-height: 768px;"
+               style="user-select: none; position: absolute; max-height: 768px;"
           >
             <div class="choices-search">
               <input type="text"
@@ -1761,7 +1761,7 @@ exports[`pretty-select field should render open choices correctly (Yes/No) 1`] =
           </div>
           <div role="presentation"
                class="choices-container"
-               style="position: absolute; max-height: 768px;"
+               style="user-select: none; position: absolute; max-height: 768px;"
           >
             <div class="choices-search">
               <input type="text"

diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
     "@babel/preset-es2015": "^7.0.0-beta.53",
     "@babel/preset-react": "^7.0.0",
     "@babel/register": "^7.0.0",
-    "@emotion/core": "10.0.0-beta.5",
+    "@emotion/core": "10.0.7",
     "@zeit/next-css": "^1.0.1",
     "babel-core": "7.0.0-bridge.0",
     "babel-jest": "^23.6.0",