Skip to content
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.

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

issue-1987: Upgrade to Angular 11 #51

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
2 changes: 1 addition & 1 deletion .browserslistrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
last 2 versions
Firefox ESR
not dead
IE 9-11
IE 11
6 changes: 1 addition & 5 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
Expand All @@ -81,7 +80,6 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
Expand All @@ -95,9 +93,7 @@
"options": {
"browserTarget": "strongbox-web-ui:build",
"proxyConfig": "./tools/proxy.conf.js",
"servePath": "/static/assets",
"baseHref": "/",
"deployUrl": "/static/assets/"
"servePath": "/static/assets"
},
"configurations": {
"production": {
Expand Down
36 changes: 18 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@
},
"private": true,
"dependencies": {
"@angular/animations": "10.1.6",
"@angular/cdk": "~10.2.5",
"@angular/common": "10.1.6",
"@angular/compiler": "10.1.6",
"@angular/core": "10.1.6",
"@angular/animations": "11.2.0",
"@angular/cdk": "~11.2.0",
"@angular/common": "11.2.0",
"@angular/compiler": "11.2.0",
"@angular/core": "11.2.0",
"@angular/flex-layout": "^10.0.0-beta.32",
"@angular/forms": "10.1.6",
"@angular/material": "~10.2.5",
"@angular/platform-browser": "10.1.6",
"@angular/platform-browser-dynamic": "10.1.6",
"@angular/router": "10.1.6",
"@angular/forms": "11.2.0",
"@angular/material": "~11.2.0",
"@angular/platform-browser": "11.2.0",
"@angular/platform-browser-dynamic": "11.2.0",
"@angular/router": "11.2.0",
"@ng-select/ng-select": "^4.0.4",
"@ngx-progressbar/core": "^5.3.2",
"@ngx-progressbar/http": "^5.3.2",
Expand All @@ -60,27 +60,27 @@
"zone.js": "~0.10.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.1002.0",
"@angular/cli": "~10.1.7",
"@angular/compiler-cli": "10.1.6",
"@angular/language-service": "10.1.6",
"@angular-devkit/build-angular": "~0.1102.0",
"@angular/cli": "~11.2.0",
"@angular/compiler-cli": "11.2.0",
"@angular/language-service": "11.2.0",
"@ngxs/devtools-plugin": "^3.7.0",
"@ngxs/logger-plugin": "^3.7.0",
"@types/antlr4-autosuggest": "0.0.0",
"@types/jasmine": "~3.3.0",
"@types/jasmine": "~3.6.0",
"@types/jasminewd2": "~2.0.6",
"@types/node": "^12.11.1",
"antlr4-tool": "~1.0.21",
"codelyzer": "^5.1.2",
"codelyzer": "^6.0.0",
"compass-mixins": "^0.12.10",
"compression-webpack-plugin": "^2.0.0",
"filemanager-webpack-plugin": "^2.0.5",
"find-chrome-version": "^1.0.2",
"glob": "^7.1.3",
"http-server": "^0.12.3",
"jasmine-core": "~3.5.0",
"jasmine-core": "~3.6.0",
"jasmine-spec-reporter": "~5.0.0",
"karma": "~5.0.0",
"karma": "~6.1.1",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~3.0.2",
"karma-firefox-launcher": "~1.1.0",
Expand Down
2 changes: 1 addition & 1 deletion src/app/app.routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ const routes: Routes = [

@NgModule({
// TODO Preload modules to which we actually have access to.
imports: [RouterModule.forRoot(routes, {urlUpdateStrategy: 'eager', scrollPositionRestoration: 'top'})],
imports: [RouterModule.forRoot(routes, { urlUpdateStrategy: 'eager', scrollPositionRestoration: 'top', relativeLinkResolution: 'legacy' })],
exports: [RouterModule],
providers: [
RepositorySearchResultResolver
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {AbstractAuthorityGuard} from './abstract-authority-guard';
import {async, TestBed, waitForAsync} from '@angular/core/testing';
import { async, TestBed, waitForAsync } from '@angular/core/testing';
import {NgxsModule, Store} from '@ngxs/store';
import {HttpClientTestingModule} from '@angular/common/http/testing';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {HttpClientTestingModule} from '@angular/common/http/testing';
import {RouterTestingModule} from '@angular/router/testing';
import {ReactiveFormsModule} from '@angular/forms';
Expand Down
2 changes: 1 addition & 1 deletion src/app/modules/core/pages/browse/browse.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {HttpClientTestingModule} from '@angular/common/http/testing';
import {RouterTestingModule} from '@angular/router/testing';
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';

import { PageNotFoundComponent } from './page-not-found.component';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {HttpClientTestingModule, HttpTestingController} from '@angular/common/http/testing';
import {async, ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {RouterTestingModule} from '@angular/router/testing';
import {HttpClient} from '@angular/common/http';
import {NgxsModule} from '@ngxs/store';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {HttpClientTestingModule, HttpTestingController} from '@angular/common/http/testing';
import {async, TestBed, waitForAsync} from '@angular/core/testing';
import { async, TestBed, waitForAsync } from '@angular/core/testing';

import {RepositorySearchService} from './repository-search.service';
import {SearchResponse, SearchResult} from './search-result-interfaces';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {HttpClientTestingModule, HttpTestingController} from '@angular/common/http/testing';
import {async, TestBed, waitForAsync} from '@angular/core/testing';
import { async, TestBed, waitForAsync } from '@angular/core/testing';
import {HTTP_INTERCEPTORS, HttpClient, HttpErrorResponse} from '@angular/common/http';
import {Actions, NgxsModule, ofActionDispatched, Store} from '@ngxs/store';
import {NgxsFormPluginModule} from '@ngxs/form-plugin';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {HttpClientTestingModule, HttpTestingController, TestRequest} from '@angular/common/http/testing';
import {async, fakeAsync, TestBed, waitForAsync} from '@angular/core/testing';
import { async, fakeAsync, TestBed, waitForAsync } from '@angular/core/testing';
import {HTTP_INTERCEPTORS, HttpClient} from '@angular/common/http';
import {RouterTestingModule} from '@angular/router/testing';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
import {RouterTestingModule} from '@angular/router/testing';
import {HttpClientTestingModule} from '@angular/common/http/testing';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {CommonModule} from '@angular/common';

import {EnvironmentInfoComponent} from './environment-info.component';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {RouterTestingModule} from '@angular/router/testing';
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {RouterTestingModule} from '@angular/router/testing';
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
import {HttpClientTestingModule} from '@angular/common/http/testing';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {RouterTestingModule} from '@angular/router/testing';
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {RouterTestingModule} from '@angular/router/testing';
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {RouterTestingModule} from '@angular/router/testing';
import {HttpClientTestingModule} from '@angular/common/http/testing';
import {ToastrModule} from 'ngx-toastr';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
import {async, ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {FormControl, FormGroup, ReactiveFormsModule} from '@angular/forms';
import {Component, ViewChild} from '@angular/core';
import {HttpClientTestingModule} from '@angular/common/http/testing';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
import {RouterTestingModule} from '@angular/router/testing';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {RouterTestingModule} from '@angular/router/testing';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {RouterTestingModule} from '@angular/router/testing';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {HttpClientTestingModule} from '@angular/common/http/testing';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {RouterTestingModule} from '@angular/router/testing';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {HttpClientTestingModule} from '@angular/common/http/testing';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {RouterTestingModule} from '@angular/router/testing';
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
import {HttpClientTestingModule} from '@angular/common/http/testing';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {RouterTestingModule} from '@angular/router/testing';
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {RouterTestingModule} from '@angular/router/testing';
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
import {HttpClientTestingModule} from '@angular/common/http/testing';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {RouterTestingModule} from '@angular/router/testing';
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
import {HttpClientTestingModule} from '@angular/common/http/testing';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {RouterTestingModule} from '@angular/router/testing';
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {RouterTestingModule} from '@angular/router/testing';
import {HttpClientTestingModule} from '@angular/common/http/testing';
import {ToastrModule} from 'ngx-toastr';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {RouterTestingModule} from '@angular/router/testing';
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
import {HttpClientTestingModule} from '@angular/common/http/testing';
import {ToastrModule} from 'ngx-toastr';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {RouterTestingModule} from '@angular/router/testing';
import {HttpClientTestingModule} from '@angular/common/http/testing';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';

import {AqlAutocompleteComponent} from './aql-autocomplete.component';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
import {CommonModule} from '@angular/common';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';

import {FormFieldErrorsComponent} from './form-field-errors.component';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {RouterTestingModule} from '@angular/router/testing';

import {BreadcrumbComponent} from './breadcrumb.component';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {HttpClientTestingModule} from '@angular/common/http/testing';
import {async, ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {RouterTestingModule} from '@angular/router/testing';
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
import {NgxsModule} from '@ngxs/store';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {async, ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import {RouterTestingModule} from '@angular/router/testing';

import {PageContainerComponent} from './page-container.component';
Expand Down