From 419076fe842bfc3c0deb381ff31b72449488ea36 Mon Sep 17 00:00:00 2001 From: Julien Palmas Date: Thu, 2 Jun 2022 17:45:18 +0200 Subject: [PATCH 1/3] =?UTF-8?q?=E2=9E=96=20remove=20lodash=20dependency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../addon/serializers/ember-data-serializer.js | 3 +-- packages/ember-cli-mirage/package.json | 1 - yarn.lock | 5 ----- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/packages/ember-cli-mirage/addon/serializers/ember-data-serializer.js b/packages/ember-cli-mirage/addon/serializers/ember-data-serializer.js index ccf7756c3..41abfb1f4 100644 --- a/packages/ember-cli-mirage/addon/serializers/ember-data-serializer.js +++ b/packages/ember-cli-mirage/addon/serializers/ember-data-serializer.js @@ -3,7 +3,6 @@ import { _utilsInflectorCamelize as camelize, _utilsInflectorDasherize as dasherize, } from 'miragejs'; -import { isFunction } from 'lodash-es'; import { get } from '@ember/object'; /** @@ -67,7 +66,7 @@ let EmberDataSerializer = RestSerializer.extend({ }, getKeysForIncluded() { - return isFunction(this.include) + return (typeof this.include === "function") ? this.include(this.request, this.primaryResource) : this.include; }, diff --git a/packages/ember-cli-mirage/package.json b/packages/ember-cli-mirage/package.json index bd387f630..65387f54b 100644 --- a/packages/ember-cli-mirage/package.json +++ b/packages/ember-cli-mirage/package.json @@ -47,7 +47,6 @@ "ember-destroyable-polyfill": "^2.0.3", "ember-get-config": "0.2.4 - 0.5.0 || ^1.0.0", "ember-inflector": "^2.0.0 || ^3.0.0 || ^4.0.2", - "lodash-es": "^4.17.11", "miragejs": "^0.1.43" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 064e844c3..dce5a4c9b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11376,11 +11376,6 @@ locate-path@^7.1.0: dependencies: p-locate "^6.0.0" -lodash-es@^4.17.11: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" - integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== - lodash._baseassign@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e" From 768ff443853647ce8c084de5565d08f9e34a71b9 Mon Sep 17 00:00:00 2001 From: Julien Palmas Date: Thu, 2 Jun 2022 18:21:44 +0200 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=9A=A8=20Fix=20prettier?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ember-cli-mirage/addon/serializers/ember-data-serializer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ember-cli-mirage/addon/serializers/ember-data-serializer.js b/packages/ember-cli-mirage/addon/serializers/ember-data-serializer.js index 41abfb1f4..eb81626e0 100644 --- a/packages/ember-cli-mirage/addon/serializers/ember-data-serializer.js +++ b/packages/ember-cli-mirage/addon/serializers/ember-data-serializer.js @@ -66,7 +66,7 @@ let EmberDataSerializer = RestSerializer.extend({ }, getKeysForIncluded() { - return (typeof this.include === "function") + return typeof this.include === 'function' ? this.include(this.request, this.primaryResource) : this.include; }, From aeec781e9ac1a826d047f4653e34890548a71b48 Mon Sep 17 00:00:00 2001 From: Sergey Astapov Date: Tue, 12 Sep 2023 21:25:55 -0400 Subject: [PATCH 3/3] update pnpm-lock.yaml --- pnpm-lock.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f848aa8e2..944e8d8fd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -47,9 +47,6 @@ importers: ember-inflector: specifier: ^2.0.0 || ^3.0.0 || ^4.0.2 version: 4.0.2 - lodash-es: - specifier: ^4.17.11 - version: 4.17.11 miragejs: specifier: ^0.1.47 version: 0.1.47 @@ -13888,10 +13885,6 @@ packages: p-locate: 6.0.0 dev: true - /lodash-es@4.17.11: - resolution: {integrity: sha512-DHb1ub+rMjjrxqlB3H56/6MXtm1lSksDp2rA2cNWjG8mlDUYFhUj3Di2Zn5IwSU87xLv8tNIQ7sSwE/YOX/D/Q==} - dev: false - /lodash._baseassign@3.2.0: resolution: {integrity: sha512-t3N26QR2IdSN+gqSy9Ds9pBu/J1EAFEshKlUHpJG3rvyJOYgcELIxcIeKKfZk7sjOz11cFfzJRsyFry/JyabJQ==} dependencies: