Skip to content

Commit

Permalink
release: v8.1.2-rc.3
Browse files Browse the repository at this point in the history
  • Loading branch information
oscar-guerin committed Nov 15, 2024
1 parent 796450e commit 015c997
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 10 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions projects/ngx-firestore-repository/package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
1 change: 1 addition & 0 deletions projects/ngx-http-repository/ng-package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
"entryFile": "src/public-api.ts"
},
"allowedNonPeerDependencies": [
"lodash.merge"
]
}
7 changes: 4 additions & 3 deletions projects/ngx-http-repository/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion projects/ngx-repository/package.json
Original file line number Diff line number Diff line change
@@ -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"
Expand Down

0 comments on commit 015c997

Please sign in to comment.