Migrate instances of lodash.assign to object.assign (#2757)

FormidableLabs · Jan 30, 2024 · c8c2eb2 · c8c2eb2
1 parent 365f34b
commit c8c2eb2
Show file tree

Hide file tree

Showing 95 changed files with 627 additions and 504 deletions.
diff --git a/.changeset/brave-cycles-matter.md b/.changeset/brave-cycles-matter.md
@@ -0,0 +1,34 @@
+---
+"victory-area": patch
+"victory-axis": patch
+"victory-bar": patch
+"victory-box-plot": patch
+"victory-brush-container": patch
+"victory-brush-line": patch
+"victory-candlestick": patch
+"victory-canvas": patch
+"victory-chart": patch
+"victory-core": patch
+"victory-cursor-container": patch
+"victory-errorbar": patch
+"victory-group": patch
+"victory-histogram": patch
+"victory-legend": patch
+"victory-line": patch
+"victory-native": patch
+"victory-pie": patch
+"victory-polar-axis": patch
+"victory-scatter": patch
+"victory-selection-container": patch
+"victory-shared-events": patch
+"victory-stack": patch
+"victory-tooltip": patch
+"victory-voronoi": patch
+"victory-voronoi-container": patch
+"victory": patch
+"victory-create-container": patch
+"victory-vendor": patch
+"victory-zoom-container": patch
+---
+
+Replace instances of lodash.assign with Object.assign
diff --git a/demo/js/components/events-demo.js b/demo/js/components/events-demo.js
@@ -6,7 +6,6 @@ import { VictoryArea } from "victory-area";
 import { VictoryBar } from "victory-bar";
 import { VictoryLine } from "victory-line";
 import { VictoryTheme, VictoryLabel } from "victory-core";
-import { merge } from "lodash";
 
 class App extends React.Component {
   render() {
@@ -104,7 +103,7 @@ class App extends React.Component {
                         target: "data",
                         mutation: (props) => {
                           return {
-                            style: merge({}, props.style, { stroke: "lime" }),
+                            style: Object.assign({}, props.style, { stroke: "lime" }),
                           };
                         },
                       },
@@ -113,7 +112,7 @@ class App extends React.Component {
                         target: "labels",
                         mutation: (props) => {
                           return {
-                            style: merge({}, props.style, { fill: "green" }),
+                            style: Object.assign({}, props.style, { fill: "green" }),
                             text: "waddup",
                           };
                         },

diff --git a/demo/js/components/external-events-demo.js b/demo/js/components/external-events-demo.js
@@ -8,7 +8,7 @@ import { VictoryBar } from "victory-bar";
 import { VictoryLine } from "victory-line";
 import { VictoryZoomContainer } from "victory-zoom-container";
 import { VictoryVoronoiContainer } from "victory-voronoi-container";
-import { range, assign } from "lodash";
+import { range } from "lodash";
 
 class App extends React.Component {
   constructor() {
@@ -52,8 +52,8 @@ class App extends React.Component {
           mutation: (props) => {
             const fill = props.style && props.style.fill;
             return fill === "blue"
-              ? { style: assign({}, props.style, { fill: "red" }) }
-              : { style: assign({}, props.style, { fill: "blue" }) };
+              ? { style: Object.assign({}, props.style, { fill: "red" }) }
+              : { style: Object.assign({}, props.style, { fill: "blue" }) };
           },
           callback,
         },

diff --git a/demo/js/components/immutable-demo.js b/demo/js/components/immutable-demo.js
@@ -1,7 +1,7 @@
 /* eslint-disable no-magic-numbers, react/no-multi-comp */
 import React from "react";
 import PropTypes from "prop-types";
-import { assign, merge, keys, random, range, round } from "lodash";
+import { keys, random, range, round } from "lodash";
 import { fromJS } from "immutable";
 import { VictoryClipContainer, VictoryLabel, VictoryTheme } from "victory-core";
 
@@ -36,7 +36,7 @@ class Wrapper extends React.Component {
   renderChildren(props) {
     const children = React.Children.toArray(props.children);
     return children.map((child) => {
-      return React.cloneElement(child, assign({}, child.props, props));
+      return React.cloneElement(child, Object.assign({}, child.props, props));
     });
   }
 
@@ -214,7 +214,7 @@ class App extends React.Component {
                         target: "data",
                         mutation: (props) => {
                           return {
-                            style: merge({}, props.style, { fill: "gold" }),
+                            style: Object.assign({}, props.style, { fill: "gold" }),
                           };
                         },
                       },
@@ -223,7 +223,7 @@ class App extends React.Component {
                         target: "data",
                         mutation: (props) => {
                           return {
-                            style: merge({}, props.style, { fill: "orange" }),
+                            style: Object.assign({}, props.style, { fill: "orange" }),
                           };
                         },
                       },
@@ -232,7 +232,7 @@ class App extends React.Component {
                         target: "data",
                         mutation: (props) => {
                           return {
-                            style: merge({}, props.style, { fill: "red" }),
+                            style: Object.assign({}, props.style, { fill: "red" }),
                           };
                         },
                       },
@@ -344,7 +344,7 @@ class App extends React.Component {
 
           <svg height={500} width={500}>
             <VictoryCandlestick
-              style={merge({}, chartStyle, { data: { width: 10 } })}
+              style={Object.assign({}, chartStyle, { data: { width: 10 } })}
               data={fromJS([
                 {
                   x: new Date(2016, 6, 1),
@@ -414,7 +414,7 @@ class App extends React.Component {
                         {
                           mutation: (props) => {
                             return {
-                              style: merge({}, props.style.labels, {
+                              style: Object.assign({}, props.style.labels, {
                                 fill: "orange",
                               }),
                             };
@@ -432,7 +432,7 @@ class App extends React.Component {
                         {
                           mutation: (props) => {
                             return {
-                              style: merge({}, props.style, { fill: "blue" }),
+                              style: Object.assign({}, props.style, { fill: "blue" }),
                             };
                           },
                         },
@@ -468,7 +468,7 @@ class App extends React.Component {
                         target: "data",
                         mutation: (props) => {
                           return {
-                            style: merge({}, props.style, { stroke: "lime" }),
+                            style: Object.assign({}, props.style, { stroke: "lime" }),
                           };
                         },
                       },
@@ -477,7 +477,7 @@ class App extends React.Component {
                         target: "labels",
                         mutation: (props) => {
                           return {
-                            style: merge({}, props.style, { fill: "green" }),
+                            style: Object.assign({}, props.style, { fill: "green" }),
                             text: "waddup",
                           };
                         },
@@ -572,7 +572,7 @@ class App extends React.Component {
           </VictoryChart>
 
           <VictoryVoronoi
-            style={merge({}, chartStyle, {
+            style={Object.assign({}, chartStyle, {
               data: {
                 fill: "gray",
                 opacity: 0.1,
@@ -631,7 +631,7 @@ class App extends React.Component {
                       target: "data",
                       mutation: (props) => {
                         return {
-                          style: merge({}, props.style, { fill: "gold" }),
+                          style: Object.assign({}, props.style, { fill: "gold" }),
                         };
                       },
                     },
@@ -640,7 +640,7 @@ class App extends React.Component {
                       target: "data",
                       mutation: (props) => {
                         return {
-                          style: merge({}, props.style, { fill: "orange" }),
+                          style: Object.assign({}, props.style, { fill: "orange" }),
                         };
                       },
                     },
@@ -649,7 +649,7 @@ class App extends React.Component {
                       target: "data",
                       mutation: (props) => {
                         return {
-                          style: merge({}, props.style, { fill: "red" }),
+                          style: Object.assign({}, props.style, { fill: "red" }),
                         };
                       },
                     },

diff --git a/demo/js/components/victory-area-demo.js b/demo/js/components/victory-area-demo.js
@@ -1,6 +1,6 @@
 /* eslint-disable no-magic-numbers */
 import React from "react";
-import { merge, random, range } from "lodash";
+import { random, range } from "lodash";
 import { VictoryChart } from "victory-chart";
 import { VictoryStack } from "victory-stack";
 import { VictoryGroup } from "victory-group";
@@ -278,7 +278,7 @@ export default class App extends React.Component {
                       target: "data",
                       mutation: (props) => {
                         return {
-                          style: merge({}, props.style, { fill: "orange" }),
+                          style: Object.assign({}, props.style, { fill: "orange" }),
                         };
                       },
                     },

diff --git a/demo/js/components/victory-axis-demo.js b/demo/js/components/victory-axis-demo.js
@@ -6,7 +6,7 @@ import {
   VictoryContainer,
   VictoryTheme,
 } from "victory-core";
-import { merge, random, range } from "lodash";
+import { random, range } from "lodash";
 import XYTheme from "../theme/victory-axis-differential-styling-theme";
 
 export default class App extends React.Component {
@@ -122,7 +122,7 @@ export default class App extends React.Component {
                       {
                         mutation: (props) => {
                           return {
-                            style: merge({}, props.style, { stroke: "orange" }),
+                            style: Object.assign({}, props.style, { stroke: "orange" }),
                           };
                         },
                       },

diff --git a/demo/js/components/victory-bar-demo.js b/demo/js/components/victory-bar-demo.js
@@ -12,7 +12,7 @@ import {
   VictoryTheme,
   VictoryLabel,
 } from "victory-core";
-import { assign, random, range, merge } from "lodash";
+import { random, range } from "lodash";
 
 class Wrapper extends React.Component {
   static propTypes = {
@@ -25,7 +25,7 @@ class Wrapper extends React.Component {
   renderChildren(props) {
     const children = React.Children.toArray(props.children);
     return children.map((child) => {
-      return React.cloneElement(child, assign({}, child.props, props));
+      return React.cloneElement(child, Object.assign({}, child.props, props));
     });
   }
 
@@ -262,7 +262,7 @@ export default class App extends React.Component {
                     {
                       mutation: (props) => {
                         return {
-                          style: merge({}, props.style, { fill: "orange" }),
+                          style: Object.assign({}, props.style, { fill: "orange" }),
                         };
                       },
                     },
@@ -399,7 +399,7 @@ export default class App extends React.Component {
                         {
                           mutation: (props) => {
                             return {
-                              style: merge({}, props.style, { fill: "orange" }),
+                              style: Object.assign({}, props.style, { fill: "orange" }),
                             };
                           },
                         },
@@ -425,7 +425,7 @@ export default class App extends React.Component {
                       {
                         mutation: (props) => {
                           return {
-                            style: merge({}, props.style, { fill: "blue" }),
+                            style: Object.assign({}, props.style, { fill: "blue" }),
                           };
                         },
                       },
@@ -449,7 +449,7 @@ export default class App extends React.Component {
                       childName: "secondBar",
                       mutation: (props) => {
                         return {
-                          style: merge({}, props.style, { fill: "blue" }),
+                          style: Object.assign({}, props.style, { fill: "blue" }),
                         };
                       },
                     };
@@ -469,14 +469,14 @@ export default class App extends React.Component {
                           return props.style.fill === "cyan"
                             ? null
                             : {
-                                style: merge({}, props.style, { fill: "cyan" }),
+                                style: Object.assign({}, props.style, { fill: "cyan" }),
                               };
                         },
                       },
                       {
                         mutation: (props) => {
                           return {
-                            style: merge({}, props.style, { fill: "orange" }),
+                            style: Object.assign({}, props.style, { fill: "orange" }),
                           };
                         },
                       },

diff --git a/demo/js/components/victory-candlestick-demo.js b/demo/js/components/victory-candlestick-demo.js
@@ -1,7 +1,7 @@
 /* eslint-disable no-magic-numbers */
 import React from "react";
 import PropTypes from "prop-types";
-import { random, range, merge } from "lodash";
+import { random, range } from "lodash";
 import { VictoryChart } from "victory-chart";
 import { VictoryCandlestick } from "victory-candlestick";
 import { VictoryTheme } from "victory-core";
@@ -98,7 +98,7 @@ export default class App extends React.Component {
                       {
                         mutation: (props) => {
                           return {
-                            style: merge({}, props.style.labels, {
+                            style: Object.assign({}, props.style.labels, {
                               fill: "orange",
                             }),
                           };
@@ -116,7 +116,7 @@ export default class App extends React.Component {
                       {
                         mutation: (props) => {
                           return {
-                            style: merge({}, props.style, { fill: "blue" }),
+                            style: Object.assign({}, props.style, { fill: "blue" }),
                           };
                         },
                       },
@@ -149,7 +149,7 @@ export default class App extends React.Component {
                     {
                       mutation: (props) => {
                         return {
-                          style: merge({}, props.style.labels, {
+                          style: Object.assign({}, props.style.labels, {
                             fill: "orange",
                           }),
                         };
@@ -167,7 +167,7 @@ export default class App extends React.Component {
                     {
                       mutation: (props) => {
                         return {
-                          style: merge({}, props.style, { fill: "blue" }),
+                          style: Object.assign({}, props.style, { fill: "blue" }),
                         };
                       },
                     },