Update deps for CVEs in cryptiles, handlebars, immer, lodash, merge-deep (#477)

dkempner · web-flow · commit 880e1d3a48c5 · 2022-02-14T10:00:38.000-08:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/node:8.11.4
+      - image: circleci/node:14.18.2
 
     working_directory: ~/repo
 
diff --git a/package.json b/package.json
@@ -103,6 +103,11 @@
     "underscore": "^1.8.3",
     "validator": "^9.1.1"
   },
+  "resolutions": {
+    "lodash": "4.17.21",
+    "immer": "9.0.6",
+    "merge-deep": "3.0.3"
+  },
   "peerDependencies": {
     "@instacart/radium": "^0.26.1",
     "prop-types": "^15.0.0 || ^16.0.0",
diff --git a/src/components/Forms/__tests__/__snapshots__/DateField.spec.js.snap b/src/components/Forms/__tests__/__snapshots__/DateField.spec.js.snap
@@ -2,7 +2,7 @@
 
 exports[`renders correctly 1`] = `
 <StyleRoot>
-  <ForwardRef>
+  <Component>
     <div
       data-radium={true}
     >
@@ -522,13 +522,13 @@ exports[`renders correctly 1`] = `
         </StyleSheet>
       </withRadiumContexts(StyleSheet)>
     </div>
-  </ForwardRef>
+  </Component>
 </StyleRoot>
 `;
 
 exports[`renders correctly with focus state 1`] = `
 <StyleRoot>
-  <ForwardRef>
+  <Component>
     <div
       data-radium={true}
     >
@@ -1053,13 +1053,13 @@ exports[`renders correctly with focus state 1`] = `
         </StyleSheet>
       </withRadiumContexts(StyleSheet)>
     </div>
-  </ForwardRef>
+  </Component>
 </StyleRoot>
 `;
 
 exports[`uses a custom theme for all child components if one is provided 1`] = `
 <StyleRoot>
-  <ForwardRef>
+  <Component>
     <div
       data-radium={true}
     >
@@ -1623,6 +1623,6 @@ exports[`uses a custom theme for all child components if one is provided 1`] = `
         </StyleSheet>
       </withRadiumContexts(StyleSheet)>
     </div>
-  </ForwardRef>
+  </Component>
 </StyleRoot>
 `;
diff --git a/src/components/Forms/__tests__/__snapshots__/MaskedTextField.spec.js.snap b/src/components/Forms/__tests__/__snapshots__/MaskedTextField.spec.js.snap
@@ -2,7 +2,7 @@
 
 exports[`renders correctly 1`] = `
 <StyleRoot>
-  <ForwardRef>
+  <Component>
     <div
       data-radium={true}
     >
@@ -503,13 +503,13 @@ exports[`renders correctly 1`] = `
         </StyleSheet>
       </withRadiumContexts(StyleSheet)>
     </div>
-  </ForwardRef>
+  </Component>
 </StyleRoot>
 `;
 
 exports[`renders correctly with focus state 1`] = `
 <StyleRoot>
-  <ForwardRef>
+  <Component>
     <div
       data-radium={true}
     >
@@ -1015,13 +1015,13 @@ exports[`renders correctly with focus state 1`] = `
         </StyleSheet>
       </withRadiumContexts(StyleSheet)>
     </div>
-  </ForwardRef>
+  </Component>
 </StyleRoot>
 `;
 
 exports[`uses a custom theme for all child components if one is provided 1`] = `
 <StyleRoot>
-  <ForwardRef>
+  <Component>
     <div
       data-radium={true}
     >
@@ -1552,6 +1552,6 @@ exports[`uses a custom theme for all child components if one is provided 1`] = `
         </StyleSheet>
       </withRadiumContexts(StyleSheet)>
     </div>
-  </ForwardRef>
+  </Component>
 </StyleRoot>
 `;
diff --git a/src/components/Forms/__tests__/__snapshots__/PhoneNumberField.spec.js.snap b/src/components/Forms/__tests__/__snapshots__/PhoneNumberField.spec.js.snap
@@ -2,7 +2,7 @@
 
 exports[`renders correctly 1`] = `
 <StyleRoot>
-  <ForwardRef>
+  <Component>
     <div
       data-radium={true}
     >
@@ -540,13 +540,13 @@ exports[`renders correctly 1`] = `
         </StyleSheet>
       </withRadiumContexts(StyleSheet)>
     </div>
-  </ForwardRef>
+  </Component>
 </StyleRoot>
 `;
 
 exports[`renders correctly with focus state 1`] = `
 <StyleRoot>
-  <ForwardRef>
+  <Component>
     <div
       data-radium={true}
     >
@@ -1089,13 +1089,13 @@ exports[`renders correctly with focus state 1`] = `
         </StyleSheet>
       </withRadiumContexts(StyleSheet)>
     </div>
-  </ForwardRef>
+  </Component>
 </StyleRoot>
 `;
 
 exports[`uses a custom theme for all child components if one is provided 1`] = `
 <StyleRoot>
-  <ForwardRef>
+  <Component>
     <div
       data-radium={true}
     >
@@ -1677,6 +1677,6 @@ exports[`uses a custom theme for all child components if one is provided 1`] = `
         </StyleSheet>
       </withRadiumContexts(StyleSheet)>
     </div>
-  </ForwardRef>
+  </Component>
 </StyleRoot>
 `;
diff --git a/src/components/Menus/__tests__/__snapshots__/DropdownMenu.spec.js.snap b/src/components/Menus/__tests__/__snapshots__/DropdownMenu.spec.js.snap
@@ -2,7 +2,7 @@
 
 exports[`renders DropdownMenu in open state correctly 1`] = `
 <StyleRoot>
-  <ForwardRef>
+  <Component>
     <div
       data-radium={true}
     >
@@ -16,11 +16,11 @@ exports[`renders DropdownMenu in open state correctly 1`] = `
             }
           }
           triggerElement={
-            <withTheme(Component)
+            <withTheme(Button)
               id="trigger"
             >
                Share 
-            </withTheme(Component)>
+            </withTheme(Button)>
           }
         >
           <DropdownMenu
@@ -40,11 +40,11 @@ exports[`renders DropdownMenu in open state correctly 1`] = `
               }
             }
             triggerElement={
-              <withTheme(Component)
+              <withTheme(Button)
                 id="trigger"
               >
                  Share 
-              </withTheme(Component)>
+              </withTheme(Button)>
             }
           >
             <div
@@ -60,7 +60,7 @@ exports[`renders DropdownMenu in open state correctly 1`] = `
                   }
                 }
               >
-                <withTheme(Component)
+                <withTheme(Button)
                   aria-expanded={true}
                   aria-haspopup={true}
                   elementAttributes={
@@ -72,7 +72,7 @@ exports[`renders DropdownMenu in open state correctly 1`] = `
                   id="trigger"
                   onMouseDown={[Function]}
                 >
-                  <ForwardRef
+                  <Button
                     aria-expanded={true}
                     aria-haspopup={true}
                     disabled={false}
@@ -146,8 +146,8 @@ exports[`renders DropdownMenu in open state correctly 1`] = `
                     >
                        Share 
                     </button>
-                  </ForwardRef>
-                </withTheme(Component)>
+                  </Button>
+                </withTheme(Button)>
               </div>
               <div
                 data-radium={true}
@@ -366,7 +366,7 @@ exports[`renders DropdownMenu in open state correctly 1`] = `
                                                 }
                                               }
                                             >
-                                              <ForwardRef
+                                              <Icon
                                                 name="emailFilled"
                                                 style={
                                                   Array [
@@ -398,7 +398,7 @@ exports[`renders DropdownMenu in open state correctly 1`] = `
                                                 >
                                                   
                                                 </i>
-                                              </ForwardRef>
+                                              </Icon>
                                             </div>
                                           </div>
                                           <div
@@ -509,7 +509,7 @@ exports[`renders DropdownMenu in open state correctly 1`] = `
                                                 }
                                               }
                                             >
-                                              <ForwardRef
+                                              <Icon
                                                 name="facebookFilled"
                                                 style={
                                                   Array [
@@ -544,7 +544,7 @@ exports[`renders DropdownMenu in open state correctly 1`] = `
                                                 >
                                                   
                                                 </i>
-                                              </ForwardRef>
+                                              </Icon>
                                             </div>
                                           </div>
                                           <div
@@ -655,7 +655,7 @@ exports[`renders DropdownMenu in open state correctly 1`] = `
                                                 }
                                               }
                                             >
-                                              <ForwardRef
+                                              <Icon
                                                 name="twitterFilled"
                                                 style={
                                                   Array [
@@ -690,7 +690,7 @@ exports[`renders DropdownMenu in open state correctly 1`] = `
                                                 >
                                                   
                                                 </i>
-                                              </ForwardRef>
+                                              </Icon>
                                             </div>
                                           </div>
                                           <div
@@ -750,7 +750,7 @@ exports[`renders DropdownMenu in open state correctly 1`] = `
         </StyleSheet>
       </withRadiumContexts(StyleSheet)>
     </div>
-  </ForwardRef>
+  </Component>
 </StyleRoot>
 `;
 
diff --git a/src/components/Tooltip/__tests__/__snapshots__/Tooltip.spec.js.snap b/src/components/Tooltip/__tests__/__snapshots__/Tooltip.spec.js.snap
@@ -46,10 +46,10 @@ exports[`Tooltip expect overlay to appear correctly when shown 1`] = `
                 style="position: absolute; z-index: 99999;"
               >
                 <div
-                  style="opacity: 0;"
+                  style="opacity: 0; transition: all 400ms ease-in-out;"
                 >
                   <div
-                    style="position: absolute; display: block; height: 12px; width: 12px; background-color: rgb(255, 255, 255); border-left: 1px solid #BDBDBD; border-top: 1px solid #BDBDBD; left: -6px; top: -7px;"
+                    style="position: absolute; display: block; height: 12px; width: 12px; background-color: rgb(255, 255, 255); transform: rotate(-45deg); border-left: 1px solid #BDBDBD; border-top: 1px solid #BDBDBD; left: -6px; top: -7px;"
                   />
                   <div
                     style="text-align: center; border-radius: 4px; white-space: nowrap; font-weight: 600; font-size: 14px; padding: 9px 8px 9px 8px; background: rgb(255, 255, 255); color: rgb(117, 117, 117); border: 1px solid #bdbdbd;"
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	exports[`renders DropdownMenu in open state correctly 1`] = `
`4`	`4`	`<StyleRoot>`
`5`		`- <ForwardRef>`
	`5`	`+ <Component>`
`6`	`6`	`<div`
`7`	`7`	`data-radium={true}`
`8`	`8`	`>`
@@ -16,11 +16,11 @@ exports[`renders DropdownMenu in open state correctly 1`] = `
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`	`triggerElement={`
`19`		`- <withTheme(Component)`
	`19`	`+ <withTheme(Button)`
`20`	`20`	`id="trigger"`
`21`	`21`	`>`
`22`	`22`	`Share`
`23`		`- </withTheme(Component)>`
	`23`	`+ </withTheme(Button)>`
`24`	`24`	`}`
`25`	`25`	`>`
`26`	`26`	`<DropdownMenu`
@@ -40,11 +40,11 @@ exports[`renders DropdownMenu in open state correctly 1`] = `
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`triggerElement={`
`43`		`- <withTheme(Component)`
	`43`	`+ <withTheme(Button)`
`44`	`44`	`id="trigger"`
`45`	`45`	`>`
`46`	`46`	`Share`
`47`		`- </withTheme(Component)>`
	`47`	`+ </withTheme(Button)>`
`48`	`48`	`}`
`49`	`49`	`>`
`50`	`50`	`<div`
@@ -60,7 +60,7 @@ exports[`renders DropdownMenu in open state correctly 1`] = `
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`	`>`
`63`		`- <withTheme(Component)`
	`63`	`+ <withTheme(Button)`
`64`	`64`	`aria-expanded={true}`
`65`	`65`	`aria-haspopup={true}`
`66`	`66`	`elementAttributes={`
@@ -72,7 +72,7 @@ exports[`renders DropdownMenu in open state correctly 1`] = `
`72`	`72`	`id="trigger"`
`73`	`73`	`onMouseDown={[Function]}`
`74`	`74`	`>`
`75`		`- <ForwardRef`
	`75`	`+ <Button`
`76`	`76`	`aria-expanded={true}`
`77`	`77`	`aria-haspopup={true}`
`78`	`78`	`disabled={false}`
@@ -146,8 +146,8 @@ exports[`renders DropdownMenu in open state correctly 1`] = `
`146`	`146`	`>`
`147`	`147`	`Share`
`148`	`148`	`</button>`
`149`		`- </ForwardRef>`
`150`		`- </withTheme(Component)>`
	`149`	`+ </Button>`
	`150`	`+ </withTheme(Button)>`
`151`	`151`	`</div>`
`152`	`152`	`<div`
`153`	`153`	`data-radium={true}`
@@ -366,7 +366,7 @@ exports[`renders DropdownMenu in open state correctly 1`] = `
`366`	`366`	`}`
`367`	`367`	`}`
`368`	`368`	`>`
`369`		`- <ForwardRef`
	`369`	`+ <Icon`
`370`	`370`	`name="emailFilled"`
`371`	`371`	`style={`
`372`	`372`	`Array [`
@@ -398,7 +398,7 @@ exports[`renders DropdownMenu in open state correctly 1`] = `
`398`	`398`	`>`
`399`	`399`	``
`400`	`400`	`</i>`
`401`		`- </ForwardRef>`
	`401`	`+ </Icon>`
`402`	`402`	`</div>`
`403`	`403`	`</div>`
`404`	`404`	`<div`
@@ -509,7 +509,7 @@ exports[`renders DropdownMenu in open state correctly 1`] = `
`509`	`509`	`}`
`510`	`510`	`}`
`511`	`511`	`>`
`512`		`- <ForwardRef`
	`512`	`+ <Icon`
`513`	`513`	`name="facebookFilled"`
`514`	`514`	`style={`
`515`	`515`	`Array [`
@@ -544,7 +544,7 @@ exports[`renders DropdownMenu in open state correctly 1`] = `
`544`	`544`	`>`
`545`	`545`	``
`546`	`546`	`</i>`
`547`		`- </ForwardRef>`
	`547`	`+ </Icon>`
`548`	`548`	`</div>`
`549`	`549`	`</div>`
`550`	`550`	`<div`
@@ -655,7 +655,7 @@ exports[`renders DropdownMenu in open state correctly 1`] = `
`655`	`655`	`}`
`656`	`656`	`}`
`657`	`657`	`>`
`658`		`- <ForwardRef`
	`658`	`+ <Icon`
`659`	`659`	`name="twitterFilled"`
`660`	`660`	`style={`
`661`	`661`	`Array [`
@@ -690,7 +690,7 @@ exports[`renders DropdownMenu in open state correctly 1`] = `
`690`	`690`	`>`
`691`	`691`	``
`692`	`692`	`</i>`
`693`		`- </ForwardRef>`
	`693`	`+ </Icon>`
`694`	`694`	`</div>`
`695`	`695`	`</div>`
`696`	`696`	`<div`
@@ -750,7 +750,7 @@ exports[`renders DropdownMenu in open state correctly 1`] = `
`750`	`750`	`</StyleSheet>`
`751`	`751`	`</withRadiumContexts(StyleSheet)>`
`752`	`752`	`</div>`
`753`		`- </ForwardRef>`
	`753`	`+ </Component>`
`754`	`754`	`</StyleRoot>`
`755`	`755`	`;
`756`	`756`
Original file line number	Diff line number	Diff line change
@@ -46,10 +46,10 @@ exports[`Tooltip expect overlay to appear correctly when shown 1`] = `
`46`	`46`	`style="position: absolute; z-index: 99999;"`
`47`	`47`	`>`
`48`	`48`	`<div`
`49`		`- style="opacity: 0;"`
	`49`	`+ style="opacity: 0; transition: all 400ms ease-in-out;"`
`50`	`50`	`>`
`51`	`51`	`<div`
`52`		`- style="position: absolute; display: block; height: 12px; width: 12px; background-color: rgb(255, 255, 255); border-left: 1px solid #BDBDBD; border-top: 1px solid #BDBDBD; left: -6px; top: -7px;"`
	`52`	`+ style="position: absolute; display: block; height: 12px; width: 12px; background-color: rgb(255, 255, 255); transform: rotate(-45deg); border-left: 1px solid #BDBDBD; border-top: 1px solid #BDBDBD; left: -6px; top: -7px;"`
`53`	`53`	`/>`
`54`	`54`	`<div`
`55`	`55`	`style="text-align: center; border-radius: 4px; white-space: nowrap; font-weight: 600; font-size: 14px; padding: 9px 8px 9px 8px; background: rgb(255, 255, 255); color: rgb(117, 117, 117); border: 1px solid #bdbdbd;"`