Merge pull request #225 from streamr-dev/validate-ethereum-config-lodash

Use `lodash/*` instead of `lodash.*`

Author: timoxley

.babel.config.js

@@ -22,7 +22,8 @@ module.exports = {
         ['@babel/preset-typescript']
     ],
     plugins: [
-         "add-module-exports",
+        'lodash',
+         'add-module-exports',
         ['@babel/plugin-transform-runtime', {
             corejs: 3,
             helpers: true,

package-lock.json

@@ -88,6 +88,7 @@
     "@typescript-eslint/parser": "^4.17.0",
     "babel-loader": "^8.2.2",
     "babel-plugin-add-module-exports": "^1.0.4",
+    "babel-plugin-lodash": "^3.3.4",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "benchmark": "^2.1.4",
     "buffer": "^6.0.3",
@@ -106,6 +107,7 @@
     "git-revision-webpack-plugin": "^3.0.6",
     "jest": "^26.6.3",
     "jest-circus": "^26.6.3",
+    "lodash-webpack-plugin": "^0.11.6",
     "nightwatch": "^1.5.1",
     "process": "^0.11.10",
     "sinon": "^9.2.4",
@@ -138,10 +140,7 @@
     "@ethersproject/web": "^5.0.13",
     "debug": "^4.3.2",
     "eventemitter3": "^4.0.7",
-    "lodash.uniqueid": "^4.0.1",
-    "lodash.has": "^4.0.1",
-    "lodash.get": "^4.0.1",
-    "lodash.set": "^4.0.1",
+    "lodash": "^4.17.21",
     "mem": "^8.0.0",
     "node-abort-controller": "^1.1.0",
     "node-fetch": "^2.6.1",

package.json

@@ -11,8 +11,8 @@ import { ConnectionInfo } from '@ethersproject/web'
 import { EthereumAddress, Todo } from './types'
 import { BytesLike } from '@ethersproject/bytes'
 import { isAddress } from '@ethersproject/address'
-import has from 'lodash.has'
-import get from 'lodash.get'
+import has from 'lodash/has'
+import get from 'lodash/get'
 
 export type EthereumConfig = ExternalProvider|JsonRpcFetchFunc
 

src/Config.ts

@@ -2,7 +2,7 @@ import { inspect } from 'util'
 import EventEmitter from 'events'
 
 import { v4 as uuidv4 } from 'uuid'
-import uniqueId from 'lodash.uniqueid'
+import uniqueId from 'lodash/uniqueId'
 import pMemoize from 'p-memoize'
 import pLimit from 'p-limit'
 import mem from 'mem'

src/utils/index.ts

@@ -1,9 +1,9 @@
+import set from 'lodash/set'
 import { arrayify, BytesLike } from '@ethersproject/bytes'
+
 import { StreamrClient } from '../../src/StreamrClient'
-import set from 'lodash.set'
 
 describe('Config', () => {
-
     describe('validate ethereum addresses', () => {
         const createClient = (propertyPaths: string, value: string|undefined|null) => {
             const opts: any = {}

test/unit/Config.test.ts

@@ -7,6 +7,7 @@ const path = require('path')
 
 const webpack = require('webpack')
 const TerserPlugin = require('terser-webpack-plugin')
+const LodashWebpackPlugin = require('lodash-webpack-plugin')
 const { merge } = require('webpack-merge')
 const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer')
 const GitRevisionPlugin = require('git-revision-webpack-plugin')
@@ -105,6 +106,7 @@ module.exports = (env, argv) => {
             }
         },
         plugins: [
+            new LodashWebpackPlugin(),
             new webpack.ProvidePlugin({
                 process: 'process/browser',
                 Buffer: ['buffer', 'Buffer'],