Moved from js to es for Angular10 (#286)

Author: lairabella

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+## [2.1.19] - 2020-08-25
+
+### Fixed
+
+-   Changed JS modules and methods for ES
+
 ## [2.1.18] - 2020-08-13
 
 ### Fixed

jest.base.config.js

@@ -17,10 +17,12 @@ module.exports = {
       'json'
   ],
   moduleNameMapper: {
+      '^lodash-es$': 'lodash',
       '^ngx-jsonapi/(?!db)(.*)': '<rootDir>/src/$1'
   },
   transformIgnorePatterns: [
       'node_modules/(?!ngx-jsonapi)'
+
   ],
   modulePathIgnorePatterns: [
       'dist',

package.json

@@ -108,7 +108,6 @@
         "@types/fs-extra": "^2.1.0",
         "@types/glob": "^5.0.33",
         "@types/jest": "^24.0.18",
-        "@types/lodash": "^4.14.80",
         "@types/node": "^7.0.5",
         "@types/ora": "^1.3.1",
         "@types/rimraf": "^0.0.28",
@@ -154,7 +153,7 @@
     },
     "dependencies": {
         "dexie": "^2.0.4",
-        "lodash": "^4.17.19",
+        "lodash-es": "^4.17.15",
         "rxjs": "^6.2"
     }
 }

src/cloned-document-resource.ts

@@ -1,7 +1,7 @@
 import { IDocumentResource } from './interfaces/data-object';
 import { Resource } from './resource';
 import { IClonedResource, isClonedResource } from './interfaces/cloned-resource';
-import { isEqual } from 'lodash';
+import { isEqual } from 'lodash-es';
 import { IParamsResource } from './interfaces';
 import { IDataResource } from './interfaces/data-resource';
 

src/cloned-resource.ts

@@ -2,7 +2,7 @@ import { Resource } from './resource';
 import { IParamsResource } from './interfaces';
 import { IDocumentResource } from './interfaces/data-object';
 import { ClonedDocumentResource } from './cloned-document-resource';
-import { cloneDeep } from 'lodash';
+import { cloneDeep } from 'lodash-es';
 import { IClonedResource } from './interfaces/cloned-resource';
 
 export class ClonedResource<T extends Resource> extends Resource implements IClonedResource {

src/resource.ts

@@ -318,7 +318,7 @@ export class Resource implements ICacheable {
                 if ('id' in success.data) {
                     this.id = success.data.id;
                     this.fill(<IDocumentResource>success);
-                } else if (isArray(success.data)) {
+                } else if (Array.isArray(success.data)) {
                     console.warn('Server return a collection when we save()', success.data);
                 }
 

src/services/url-params-builder.ts

@@ -1,5 +1,4 @@
 import { Base } from './base';
-import { isObject } from 'util';
 
 export class UrlParamsBuilder {
     public toparams(params): string {
@@ -13,7 +12,7 @@ export class UrlParamsBuilder {
 
     private toparamsarray(params, add): string {
         let ret = '';
-        if (Array.isArray(params) || isObject(params)) {
+        if (Array.isArray(params) || params instanceof Object) {
             Base.forEach(params, (value, key) => {
                 ret += this.toparamsarray(value, add + '[' + key + ']');
             });

yarn.lock

@@ -626,11 +626,6 @@
   dependencies:
     "@types/jest-diff" "*"
 
-"@types/lodash@^4.14.80":
-  version "4.14.141"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.141.tgz#d81f4d0c562abe28713406b571ffb27692a82ae6"
-  integrity sha512-v5NYIi9qEbFEUpCyikmnOYe4YlP8BMUdTcNCAquAKzu+FA7rZ1onj9x80mbnDdOW/K5bFf3Tv5kJplP33+gAbQ==
-
 "@types/minimatch@*":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
@@ -4704,9 +4699,9 @@ https-browserify@^1.0.0:
   integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
 https-proxy-agent@^2.2.1:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
-  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz#271ea8e90f836ac9f119daccd39c19ff7dfb0793"
+  integrity sha512-c8Ndjc9Bkpfx/vCJueCPy0jlP4ccCCSNDp8xwCZzPjKJUm+B+u9WX2x98Qx4n1PiMNTWo3D7KK5ifNV/yJyRzg==
   dependencies:
     agent-base "^4.3.0"
     debug "^3.1.0"
@@ -6874,6 +6869,11 @@ locate-path@^3.0.0:
     p-locate "^3.0.0"
     path-exists "^3.0.0"
 
+lodash-es@^4.17.15:
+  version "4.17.15"
+  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.15.tgz#21bd96839354412f23d7a10340e5eac6ee455d78"
+  integrity sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ==
+
 lodash.capitalize@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/lodash.capitalize/-/lodash.capitalize-4.2.1.tgz#f826c9b4e2a8511d84e3aca29db05e1a4f3b72a9"
@@ -6919,16 +6919,11 @@ lodash.tail@^4.1.1:
   resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
   integrity sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=
 
-[email protected]:
+[email protected], lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@~4.17.10:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
-lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@~4.17.10:
-  version "4.17.19"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
-  integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
-
 log-driver@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.7.tgz#63b95021f0702fedfa2c9bb0a24e7797d71871d8"
@@ -11111,9 +11106,9 @@ websocket-driver@>=0.5.1:
     websocket-extensions ">=0.1.1"
 
 websocket-extensions@>=0.1.1:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
-  integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
+  integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
 
 whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3, whatwg-encoding@^1.0.5:
   version "1.0.5"