Skip to content

Add missing ModuleWithProviders<T> type for ng2+ #657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
schinkentanz wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add missing ModuleWithProviders<T> type for ng2+ #657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1d42cfc
Add missing ModuleWithProviders<T> type for ng2
schinkentanz Jul 24, 2020
0e05fb6
Improve ng2 error handler.
schinkentanz Aug 10, 2020
73c0727
Update dependencies.
schinkentanz Jan 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
*.pid
*.swp
*.swo
*package-lock.json
node_modules
bower_component
checkstyle.xml
Expand Down Expand Up @@ -45,4 +44,4 @@ typings

#Generated test code
tests/ng2web/src/app/shared/sdk
tests/react-web/app/shared/sdk
tests/react-web/app/shared/sdk
2 changes: 1 addition & 1 deletion lib/angular2/shared/index.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export class SDKBrowserModule {
static forRoot(internalStorageProvider: any = {
provide: InternalStorage,
useClass: CookieBrowser
}): ModuleWithProviders {
}): ModuleWithProviders<SDKBrowserModule> {
return {
ngModule : SDKBrowserModule,
providers : [
Expand Down
9 changes: 8 additions & 1 deletion lib/angular2/shared/services/core/error.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@ import { Observable, throwError } from 'rxjs';
@Injectable()
export class ErrorHandler {
public handleError(errorResponse: HttpErrorResponse): Observable<never> {
return throwError(errorResponse.error.error || 'Server error');
if (errorResponse instanceof Error) {
return throwError(errorResponse);
}

const error = errorResponse?.error?.error;
const errorMessage = error?.message || error?.stack || error || 'Unknown error occured';

return throwError(new Error(errorMessage));
}
}
Loading