Merge pull request #263 from aihowes/master

Use per-method files when importing lodash
ericblade · Oct 11, 2020 · 8226a04 · 8226a04
2 parents 6be19fe + 41de21b
commit 8226a04
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -128,7 +128,8 @@
     "Taylor Southwick <twsouthwick@outlook.com>",
     "Youri Westerman <tetracon@gmail.com>",
     "Stefano Calì <stefanocali@gmail.com>",
-    "Tony Brix <tony@brix.ninja>"
+    "Tony Brix <tony@brix.ninja>",
+    "Alex Howes <alex@alexhowes.co.uk>"
   ],
   "license": "MIT",
   "engines": {

diff --git a/src/input/camera_access.ts b/src/input/camera_access.ts
@@ -1,4 +1,4 @@
-import { pick } from 'lodash';
+import pick from 'lodash/pick';
 import { getUserMedia, enumerateDevices } from '../common/mediaDevices';
 import { MediaTrackConstraintsWithDeprecated } from '../../type-definitions/quagga.d';
 

diff --git a/src/locator/test/barcode_locator.spec.ts b/src/locator/test/barcode_locator.spec.ts
@@ -4,7 +4,7 @@ if (typeof (globalThis as any).ENV === 'undefined') {
 
 import BarcodeLocator from '../barcode_locator';
 import QuaggaConfig from '../../config/config';
-import {merge} from 'lodash';
+import merge from 'lodash/merge';
 import sinon, {SinonSpy} from 'sinon';
 import { expect } from 'chai';
 import { QuaggaJSConfigObject } from '../../../type-definitions/quagga';

diff --git a/src/quagga.js b/src/quagga.js
@@ -7,7 +7,7 @@ import CameraAccess from './input/camera_access';
 import ImageDebug from './common/image_debug';
 import ResultCollector from './analytics/result_collector';
 import Config from './config/config';
-import { merge } from 'lodash';
+import merge from 'lodash/merge';
 
 import Quagga from './quagga/quagga';
 

diff --git a/src/reader/ean_reader.ts b/src/reader/ean_reader.ts
@@ -1,5 +1,5 @@
 import BarcodeReader, { BarcodeReaderConfig, BarcodeInfo, BarcodePosition, Barcode } from './barcode_reader';
-import { merge } from 'lodash';
+import merge from 'lodash/merge';
 
 // const CODE_L_START = 0;
 const CODE_G_START = 10;

diff --git a/src/reader/i2of5_reader.ts b/src/reader/i2of5_reader.ts
@@ -1,7 +1,7 @@
 // TODO: i2of5_reader and 2of5_reader share very similar code, make use of that
 
 import BarcodeReader, { BarcodeReaderConfig, BarcodeInfo, BarcodePosition, Barcode } from './barcode_reader';
-import {merge} from 'lodash';
+import merge from 'lodash/merge';
 
 const N = 1;
 const W = 3;