refactor(lodash): remove (#323)

* refactor(lodash): remove

* chore(mson): v2.12.1

* fix(bundle-size): bump

Author: redgeoff

package.json

@@ -16,8 +16,7 @@
     "@material-ui/pickers": "^3.2.10",
     "classnames": "^2.2.6",
     "date-fns": "^2.15.0",
-    "lodash": "^4.17.20",
-    "mson": "^2.12.0",
+    "mson": "^2.12.1",
     "react-beautiful-dnd": "^13.0.0",
     "react-google-recaptcha": "^2.1.0",
     "react-markdown": "^5.0.3",

scripts/bundle-size.sh

@@ -1,14 +1,8 @@
 #!/usr/bin/env bash
 
-mainMaxBytes=410000
-chunkMaxBytes=1390000
+maxBytes=1270000
 
-if [ $(wc -c < build/static/js/main.*.js) -gt ${mainMaxBytes} ]; then
-  echo 'Error: main bundle too large!'
+if [ $(wc -c < dist/msonreact.js) -gt ${maxBytes} ]; then
+  echo 'Error: bundle too large!'
   exit 1
-fi
-
-if [ $(wc -c < build/static/js/2.*.chunk.js) -gt ${chunkMaxBytes} ]; then
-  echo 'Error: chunk bundle too large!'
-  exit 1
-fi
+fi

src/attach.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import difference from 'lodash/difference';
+import utils from 'mson/lib/utils/utils';
 
 // Usage: attach(['prop1', 'prop2', ...], componentOrName)(Component)
 
@@ -34,7 +34,10 @@ const attach = (_watchProps, componentOrName) => {
 
         // The field props that we want to expose in the state. Remove any names that are in
         // this.props so that we can override those values.
-        this.watchProps = difference(_watchProps, Object.keys(this.props));
+        this.watchProps = utils.difference(
+          _watchProps,
+          Object.keys(this.props)
+        );
 
         // These values need to be in the state so that the component is rerendered when they change.
         if (this.hasComponent()) {

src/field-editor-form.js

@@ -6,7 +6,6 @@ import Form from './form';
 import withStyles from '@material-ui/core/styles/withStyles';
 import Field from './fields/field';
 import compiler from 'mson/lib/compiler';
-import each from 'lodash/each';
 import attach from './attach';
 import ComponentField from 'mson/lib/fields/component-field';
 
@@ -68,7 +67,7 @@ class FieldEditorForm extends React.PureComponent {
         field.getClassName() === 'ComponentField'
           ? field.get('content')
           : field;
-      each(values, (value, name) => {
+      Object.entries(values).forEach(([name, value]) => {
         if (component.has(name)) {
           component.set({ [name]: value });
         }

src/submenu.js

@@ -6,8 +6,8 @@ import ListItemText from '@material-ui/core/ListItemText';
 import Collapse from '@material-ui/core/Collapse';
 import Typography from '@material-ui/core/Typography';
 import Icon from './icon';
-import each from 'lodash/each';
 import registrar from 'mson/lib/compiler/registrar';
+import utils from 'mson/lib/utils/utils';
 
 const styles = (theme) => ({
   nested: {
@@ -38,7 +38,7 @@ class Submenu extends React.PureComponent {
 
     let childSelected = false;
 
-    each(item.items, (item) => {
+    utils.each(item.items, (item) => {
       if (path === item.path) {
         childSelected = true;
         return false; // exit loop

src/utils.js

@@ -1,8 +1,7 @@
-import each from 'lodash/each';
 class Utils {
   getIfDefined(props) {
     const definedProps = {};
-    each(props, (value, name) => {
+    Object.keys(props).forEach(([name, value]) => {
       if (value !== undefined) {
         definedProps[name] = value;
       }

yarn.lock

@@ -9191,10 +9191,10 @@ ms@2.1.3, ms@^2.0.0, ms@^2.1.1, ms@^2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
-mson@^2.12.0:
-  version "2.12.0"
-  resolved "https://registry.yarnpkg.com/mson/-/mson-2.12.0.tgz#86ab1ccf8123e0ea77bc3dc57c78858077168b3d"
-  integrity sha512-2ZpiScfgiqG/PiNgsgjHteDmXRZv0jead0gnE98gvpx7P55jZuJDPy7o2sa5V1Hp0veMx+cbEnqek+/KbkUgdQ==
+mson@^2.12.1:
+  version "2.12.1"
+  resolved "https://registry.yarnpkg.com/mson/-/mson-2.12.1.tgz#a62d027bfb558870e9fc53ae414b917578051c5d"
+  integrity sha512-EFt7SHuvlAiaWf0WOajQhi9btfYxGSi1A2beqaQOkoAhBNrq0qW+ghFG07lxlveXA0ZU5gSH3lQr5rA9fJ9xDg==
   dependencies:
     country-telephone-data "^0.6.3"
     date-fns "^2.15.0"