From 643e1e86f63d1b564fabcd19451d9668a4ac9eea Mon Sep 17 00:00:00 2001 From: OleWendland Date: Mon, 1 Apr 2019 10:46:19 +0200 Subject: [PATCH 1/7] Change Obserable import at RestService I changed the import of Observable from "import { Observable } from 'rxjs/internal/Observable';" to "import { Observable } from 'rxjs';" to improve the usability. --- src/rest.service.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/rest.service.ts b/src/rest.service.ts index c014b76..23ae663 100644 --- a/src/rest.service.ts +++ b/src/rest.service.ts @@ -1,11 +1,10 @@ -import {of as observableOf, throwError as observableThrowError} from 'rxjs'; +import {of as observableOf, throwError as observableThrowError, Observable} from 'rxjs'; import {map, mergeMap} from 'rxjs/operators'; import {Resource} from './resource'; import {ResourceArray} from './resource-array'; import {Sort} from './sort'; import {ResourceService} from './resource.service'; import {SubTypeBuilder} from './subtype-builder'; -import {Observable} from 'rxjs/internal/Observable'; import {Injector} from '@angular/core'; import {Utils} from './Utils'; From 63c5d1c7ba84967e2ca5e68a66da0ab5ed14e0ec Mon Sep 17 00:00:00 2001 From: OleWendland Date: Mon, 1 Apr 2019 10:48:50 +0200 Subject: [PATCH 2/7] Change Obserable import at ResourceService I changed the import of Observable from "import { Observable } from 'rxjs/internal/Observable';" to "import { Observable } from 'rxjs';" to improve the usability. --- src/resource.service.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/resource.service.ts b/src/resource.service.ts index 8689fb5..e549766 100644 --- a/src/resource.service.ts +++ b/src/resource.service.ts @@ -1,4 +1,4 @@ -import {throwError as observableThrowError} from 'rxjs'; +import {throwError as observableThrowError, Observable} from 'rxjs'; import {catchError, map} from 'rxjs/operators'; import {Resource} from './resource'; @@ -10,7 +10,6 @@ import {ResourceArray} from './resource-array'; import {ExternalService} from './external.service'; import {HalOptions, HalParam} from './rest.service'; import {SubTypeBuilder} from './subtype-builder'; -import {Observable} from 'rxjs/internal/Observable'; import {CustomEncoder} from './CustomEncoder'; @Injectable() From 64ae720201fe307eb78e17d63d8f2b25d8376a51 Mon Sep 17 00:00:00 2001 From: OleWendland Date: Mon, 1 Apr 2019 11:07:06 +0200 Subject: [PATCH 3/7] Change Observable import at resource.ts I changed the import of Observable from "import { Observable } from 'rxjs/internal/Observable';" to "import { Observable } from 'rxjs';" to improve the usability. --- src/resource.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/resource.ts b/src/resource.ts index d44a0ea..9c24ded 100644 --- a/src/resource.ts +++ b/src/resource.ts @@ -1,4 +1,4 @@ -import {of as observableOf, throwError as observableThrowError} from 'rxjs'; +import {of as observableOf, throwError as observableThrowError, Observable} from 'rxjs'; import {catchError, map} from 'rxjs/operators'; import {HttpParams} from '@angular/common/http'; @@ -10,7 +10,6 @@ import {SubTypeBuilder} from './subtype-builder'; import {Injectable} from '@angular/core'; import {CustomEncoder} from './CustomEncoder'; import {Utils} from './Utils'; -import {Observable} from 'rxjs/internal/Observable'; import {CacheHelper} from './cache/cache.helper'; export type Link = { href: string, templated?: boolean }; From 31c4f0dff3d030c3a9d356f355f103b242bdd057 Mon Sep 17 00:00:00 2001 From: OleWendland Date: Mon, 1 Apr 2019 11:08:24 +0200 Subject: [PATCH 4/7] Change Observable import at array-interface.ts I changed the import of Observable from "import { Observable } from 'rxjs/internal/Observable';" to "import { Observable } from 'rxjs';" to improve the usability. --- src/array-interface.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/array-interface.ts b/src/array-interface.ts index ce896fd..fc665a8 100644 --- a/src/array-interface.ts +++ b/src/array-interface.ts @@ -1,7 +1,7 @@ import {Sort} from './sort'; import {ResourceArray} from './resource-array'; import {Resource} from './resource'; -import {Observable} from 'rxjs/internal/Observable'; +import {Observable} from 'rxjs'; export interface ArrayInterface { totalElements: number; @@ -32,4 +32,4 @@ export interface ArrayInterface { sortElements(type: { new(): T }, ...sort: Sort[]): Observable>; size(type: { new(): T }, size: number): Observable>; -} \ No newline at end of file +} From c581ce45c1c830d371e87a5f084db820867941d8 Mon Sep 17 00:00:00 2001 From: OleWendland Date: Mon, 1 Apr 2019 13:37:11 +0200 Subject: [PATCH 5/7] Downgrade to Angular 7 Downgrade to Angular 7 to avoid problems with the Http-Client --- package.json | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 7cb5aa0..59ae848 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "angular4-hal", - "version": "8.0.0-beta.1", + "version": "7.2.0", "description": "This Angular module offers a HAL/JSON http-client to easily interact with a Spring Data Rest API or any API that implements the Spring Data Rest resource model", "author": "Masvis S.r.l.", "readme": "README.md", @@ -23,8 +23,7 @@ "Angular 4", "Angular 5", "Angular 6", - "Angular 7", - "Angular 8" + "Angular 7" ], "issues": { "url": "https://github.com/sante85/angular4-hal/issues" @@ -35,9 +34,9 @@ }, "devDependencies": { "@angular/cli": "7.3.0", - "@angular/compiler": "~8.0.0-beta.5", - "@angular/compiler-cli": "~8.0.0-beta.5", - "@angular/platform-server": "~8.0.0-beta.5", + "@angular/compiler": "~7.2.0", + "@angular/compiler-cli": "~7.3.0", + "@angular/platform-server": "~7.2.0", "@types/mocha": "^2.2.43", "@types/node": "10.12.21", "chai": "^4.1.2", @@ -56,11 +55,11 @@ "growl": "1.10.5" }, "dependencies": { - "@angular/animations": "~8.0.0-beta.5", - "@angular/common": "~8.0.0-beta.5", - "@angular/core": "~8.0.0-beta.5", - "@angular/platform-browser": "~8.0.0-beta.5", - "@angular/platform-browser-dynamic": "~8.0.0-beta.5", + "@angular/animations": "^7.2.4", + "@angular/common": "~7.2.0", + "@angular/core": "~7.2.0", + "@angular/platform-browser": "~7.2.0", + "@angular/platform-browser-dynamic": "~7.2.0", "cryptiles": "^4.1.3", "hash.js": "1.1.7", "query-string": "6.2.0", From 8f2cbdc849348f12ccde57624f0264cc61a822a4 Mon Sep 17 00:00:00 2001 From: OleWendland Date: Mon, 1 Apr 2019 14:16:19 +0200 Subject: [PATCH 6/7] Update package.json --- package.json | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 59ae848..badbb4b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "angular4-hal", - "version": "7.2.0", + "version": "7.8.1", "description": "This Angular module offers a HAL/JSON http-client to easily interact with a Spring Data Rest API or any API that implements the Spring Data Rest resource model", "author": "Masvis S.r.l.", "readme": "README.md", @@ -23,7 +23,8 @@ "Angular 4", "Angular 5", "Angular 6", - "Angular 7" + "Angular 7", + "Angular 8 cooming soon" ], "issues": { "url": "https://github.com/sante85/angular4-hal/issues" @@ -34,9 +35,9 @@ }, "devDependencies": { "@angular/cli": "7.3.0", - "@angular/compiler": "~7.2.0", - "@angular/compiler-cli": "~7.3.0", - "@angular/platform-server": "~7.2.0", + "@angular/compiler": "~7.2.x", + "@angular/compiler-cli": "~7.2.x", + "@angular/platform-server": "~7.2.x", "@types/mocha": "^2.2.43", "@types/node": "10.12.21", "chai": "^4.1.2", @@ -47,7 +48,7 @@ "rimraf": "^2.6.3", "tslint": "^5.12.1", "tslint-ionic-rules": "*", - "typescript": "~3.2.x", + "typescript": "~3.1.6", "coveralls": "2.13.1", "fetch-mock": "5.11.0", "jest": "20.0.4", @@ -55,15 +56,15 @@ "growl": "1.10.5" }, "dependencies": { - "@angular/animations": "^7.2.4", - "@angular/common": "~7.2.0", - "@angular/core": "~7.2.0", - "@angular/platform-browser": "~7.2.0", - "@angular/platform-browser-dynamic": "~7.2.0", + "@angular/animations": "~7.2.x", + "@angular/common": "~7.2.x", + "@angular/core": "~7.2.x", + "@angular/platform-browser": "~7.2.x", + "@angular/platform-browser-dynamic": "~7.2.x", "cryptiles": "^4.1.3", "hash.js": "1.1.7", "query-string": "6.2.0", - "rxjs": "~6.4.x", + "rxjs": "~6.3.3", "url": "0.11.0", "util": "0.11.1", "zone.js": "~0.8.29" From da58e2b9b4afbf68c263db3f0cba0438827ecaac Mon Sep 17 00:00:00 2001 From: OleWendland Date: Mon, 1 Apr 2019 14:37:48 +0200 Subject: [PATCH 7/7] Update package.json --- package.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index badbb4b..7cb5aa0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "angular4-hal", - "version": "7.8.1", + "version": "8.0.0-beta.1", "description": "This Angular module offers a HAL/JSON http-client to easily interact with a Spring Data Rest API or any API that implements the Spring Data Rest resource model", "author": "Masvis S.r.l.", "readme": "README.md", @@ -24,7 +24,7 @@ "Angular 5", "Angular 6", "Angular 7", - "Angular 8 cooming soon" + "Angular 8" ], "issues": { "url": "https://github.com/sante85/angular4-hal/issues" @@ -35,9 +35,9 @@ }, "devDependencies": { "@angular/cli": "7.3.0", - "@angular/compiler": "~7.2.x", - "@angular/compiler-cli": "~7.2.x", - "@angular/platform-server": "~7.2.x", + "@angular/compiler": "~8.0.0-beta.5", + "@angular/compiler-cli": "~8.0.0-beta.5", + "@angular/platform-server": "~8.0.0-beta.5", "@types/mocha": "^2.2.43", "@types/node": "10.12.21", "chai": "^4.1.2", @@ -48,7 +48,7 @@ "rimraf": "^2.6.3", "tslint": "^5.12.1", "tslint-ionic-rules": "*", - "typescript": "~3.1.6", + "typescript": "~3.2.x", "coveralls": "2.13.1", "fetch-mock": "5.11.0", "jest": "20.0.4", @@ -56,15 +56,15 @@ "growl": "1.10.5" }, "dependencies": { - "@angular/animations": "~7.2.x", - "@angular/common": "~7.2.x", - "@angular/core": "~7.2.x", - "@angular/platform-browser": "~7.2.x", - "@angular/platform-browser-dynamic": "~7.2.x", + "@angular/animations": "~8.0.0-beta.5", + "@angular/common": "~8.0.0-beta.5", + "@angular/core": "~8.0.0-beta.5", + "@angular/platform-browser": "~8.0.0-beta.5", + "@angular/platform-browser-dynamic": "~8.0.0-beta.5", "cryptiles": "^4.1.3", "hash.js": "1.1.7", "query-string": "6.2.0", - "rxjs": "~6.3.3", + "rxjs": "~6.4.x", "url": "0.11.0", "util": "0.11.1", "zone.js": "~0.8.29"