release: v8.1.2-rc.3

oscar-guerin · oscar-guerin · commit 6ffede282d2a · 2024-11-15T15:28:09.000+01:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -46,6 +46,7 @@
     "angular-in-memory-web-api": "^0.18.0",
     "chance": "^1.1.4",
     "firebase": "^9.9.2",
+    "lodash.merge": "^4.6.2",
     "object-hash": "^2.0.3",
     "rxjs": "7.5.3",
     "tslib": "^2.6.3",
diff --git a/projects/ngx-firestore-repository/package.json b/projects/ngx-firestore-repository/package.json
@@ -1,10 +1,10 @@
 {
   "name": "@paddls/ngx-firestore-repository",
-  "version": "8.1.2-rc.2",
+  "version": "8.1.2-rc.3",
   "peerDependencies": {
     "@angular/common": ">= 18.0.0",
     "@angular/core": ">= 18.0.0",
-    "@paddls/ngx-repository": "^8.0.0 || 8.1.2-rc.2",
+    "@paddls/ngx-repository": "^8.0.0 || 8.1.2-rc.3",
     "firebase": ">= 9.9.2"
   },
   "dependencies": {
diff --git a/projects/ngx-http-repository/ng-package.json b/projects/ngx-http-repository/ng-package.json
@@ -5,5 +5,6 @@
     "entryFile": "src/public-api.ts"
   },
   "allowedNonPeerDependencies": [
+    "lodash.merge"
   ]
 }
diff --git a/projects/ngx-http-repository/package.json b/projects/ngx-http-repository/package.json
@@ -1,13 +1,14 @@
 {
   "name": "@paddls/ngx-http-repository",
-  "version": "8.1.2-rc.2",
+  "version": "8.1.2-rc.3",
   "peerDependencies": {
     "@angular/common": ">= 18.0.0",
     "@angular/core": ">= 18.0.0",
-    "@paddls/ngx-repository": "^8.0.0 || 8.1.2-rc.2"
+    "@paddls/ngx-repository": "^8.0.0 || 8.1.2-rc.3"
   },
   "dependencies": {
-    "tslib": "^2.0.0"
+    "tslib": "^2.0.0",
+    "lodash.merge": "^4.6.2"
   },
   "repository": {
     "type": "git",
diff --git a/projects/ngx-http-repository/src/lib/repository/http.repository.ts b/projects/ngx-http-repository/src/lib/repository/http.repository.ts
@@ -45,7 +45,7 @@ import { OnHttpResourceChange } from '../decorator/on-http-resource-change.decor
 import { Inject, Type } from '@angular/core';
 import { createHttpRepositoryConfiguration } from '../configuration/context/http-repository-context.configuration';
 import { HTTP_REPOSITORY_CONFIGURATION } from '../configuration/http-repository.configuration';
-import { mergeDeep } from '../utils/merge-deep';
+import merge from 'lodash.merge';
 
 @Repository(null, {
   requestBuilder: HttpRequestBuilder,
@@ -262,7 +262,7 @@ export class HttpRepository<T, K> extends AbstractRepository<T> implements FindA
   }
 
   protected getResourceConfiguration(resourceType: Type<any>, configuration: ResourceConfiguration): ResourceConfiguration {
-    const config = mergeDeep(configuration, Reflect.getMetadata(HTTP_RESOURCE_METADATA_KEY, resourceType));
+    const config = merge({}, configuration, Reflect.getMetadata(HTTP_RESOURCE_METADATA_KEY, resourceType));
 
     return createHttpRepositoryConfiguration(config);
   }
diff --git a/projects/ngx-repository/package.json b/projects/ngx-repository/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@paddls/ngx-repository",
-  "version": "8.1.2-rc.2",
+  "version": "8.1.2-rc.3",
   "peerDependencies": {
     "@angular/common": ">=18.0.0",
     "@angular/core": ">=18.0.0"

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,6 @@`
`5`	`5`	`"entryFile": "src/public-api.ts"`
`6`	`6`	`},`
`7`	`7`	`"allowedNonPeerDependencies": [`
	`8`	`+ "lodash.merge"`
`8`	`9`	`]`
`9`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ import { OnHttpResourceChange } from '../decorator/on-http-resource-change.decor`
`45`	`45`	`import { Inject, Type } from '@angular/core';`
`46`	`46`	`import { createHttpRepositoryConfiguration } from '../configuration/context/http-repository-context.configuration';`
`47`	`47`	`import { HTTP_REPOSITORY_CONFIGURATION } from '../configuration/http-repository.configuration';`
`48`		`-import { mergeDeep } from '../utils/merge-deep';`
	`48`	`+import merge from 'lodash.merge';`
`49`	`49`
`50`	`50`	`@Repository(null, {`
`51`	`51`	`requestBuilder: HttpRequestBuilder,`
`@@ -262,7 +262,7 @@ export class HttpRepository<T, K> extends AbstractRepository<T> implements FindA`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`protected getResourceConfiguration(resourceType: Type<any>, configuration: ResourceConfiguration): ResourceConfiguration {`
`265`		`- const config = mergeDeep(configuration, Reflect.getMetadata(HTTP_RESOURCE_METADATA_KEY, resourceType));`
	`265`	`+ const config = merge({}, configuration, Reflect.getMetadata(HTTP_RESOURCE_METADATA_KEY, resourceType));`
`266`	`266`
`267`	`267`	`return createHttpRepositoryConfiguration(config);`
`268`	`268`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@paddls/ngx-repository",`
`3`		`- "version": "8.1.2-rc.2",`
	`3`	`+ "version": "8.1.2-rc.3",`
`4`	`4`	`"peerDependencies": {`
`5`	`5`	`"@angular/common": ">=18.0.0",`
`6`	`6`	`"@angular/core": ">=18.0.0"`