Commit f3682eba authored by Florent POITTEVIN's avatar Florent POITTEVIN
Browse files

feat: [DLCM-1774] migrate to angular 11

parent 592687ed
......@@ -77,7 +77,6 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"extractLicenses": true,
"vendorChunk": false,
......@@ -106,7 +105,6 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"extractLicenses": true,
"vendorChunk": false,
......@@ -152,7 +150,7 @@
"with": "src/environments/environment.dlcmtest-local.ts"
}
]
},
}
}
},
"serve": {
......
This diff is collapsed.
......@@ -6,7 +6,6 @@
},
"scripts": {
"ng": "ng",
"postinstall": "patch-package",
"sync-version": "sync-pom-version",
"serve": "node --max-old-space-size=8192 node_modules/@angular/cli/bin/ng serve --port 4200",
"start": "npm run prepare && npm run generate-models && npm run serve",
......@@ -49,18 +48,18 @@
"build-solidify": "rm -rf ./node_modules/Solidify-Frontend && cd ../Solidify-Frontend && npm run build && cp -fr dist/solidify-frontend ../DLCM-Portal/node_modules"
},
"dependencies": {
"@angular/animations": "10.0.5",
"@angular/cdk": "10.1.0",
"@angular/common": "10.0.5",
"@angular/compiler": "10.0.5",
"@angular/core": "10.0.5",
"@angular/forms": "10.0.5",
"@angular/material": "10.1.0",
"@angular/material-moment-adapter": "10.1.0",
"@angular/platform-browser": "10.0.5",
"@angular/platform-browser-dynamic": "10.0.5",
"@angular/router": "10.0.5",
"@angular/service-worker": "10.0.5",
"@angular/animations": "11.2.14",
"@angular/cdk": "11.2.13",
"@angular/common": "11.2.14",
"@angular/compiler": "11.2.14",
"@angular/core": "11.2.14",
"@angular/forms": "11.2.14",
"@angular/material": "11.2.13",
"@angular/material-moment-adapter": "11.2.13",
"@angular/platform-browser": "11.2.14",
"@angular/platform-browser-dynamic": "11.2.14",
"@angular/router": "11.2.14",
"@angular/service-worker": "11.2.14",
"@fortawesome/angular-fontawesome": "0.7.0",
"@fortawesome/fontawesome-svg-core": "1.2.30",
"@fortawesome/free-solid-svg-icons": "5.14.0",
......@@ -69,9 +68,9 @@
"@ngx-formly/schematics": "5.9.3",
"@ngx-translate/core": "13.0.0",
"@ngx-translate/http-loader": "6.0.0",
"@ngxs/logger-plugin": "3.6.2",
"@ngxs/router-plugin": "3.6.2",
"@ngxs/store": "3.6.2",
"@ngxs/logger-plugin": "3.7.2",
"@ngxs/router-plugin": "3.7.2",
"@ngxs/store": "3.7.2",
"backoff-rxjs": "6.5.7",
"blobjs": "1.1.1",
"change-case": "4.1.1",
......@@ -90,13 +89,10 @@
"ngx-doc-viewer": "1.2.3",
"ngx-highlightjs": "4.1.1",
"ngx-image-cropper": "3.2.1",
"ngx-tour-core": "4.1.1",
"ngx-tour-md-menu": "4.1.1",
"ngx-xml2json": "1.0.2",
"ngx-tour-core": "4.2.0",
"normalize.css": "8.0.1",
"patch-package": "6.2.2",
"rxjs": "6.6.0",
"solidify-frontend": "1.8.4",
"streamsaver": "2.0.4",
"sync-pom-version-to-package": "1.5.0",
"ts-key-enum": "2.0.3",
......@@ -107,15 +103,15 @@
"zone.js": "0.10.3"
},
"devDependencies": {
"@angular-devkit/build-angular": "0.1000.4",
"@angular/cli": "10.0.4",
"@angular/compiler-cli": "10.0.5",
"@angular/language-service": "10.0.5",
"@angular-devkit/build-angular": "0.1102.14",
"@angular/cli": "11.2.14",
"@angular/compiler-cli": "11.2.14",
"@angular/language-service": "11.2.14",
"@biesbjerg/ngx-translate-extract": "3.0.2",
"@cypress/webpack-preprocessor": "5.4.2",
"@ngxs/devtools-plugin": "3.6.2",
"@ngxs/devtools-plugin": "3.7.2",
"@openapitools/openapi-generator-cli": "cli-4.3.1",
"@types/jasmine": "3.5.11",
"@types/jasmine": "3.9.1",
"@types/jasminewd2": "2.0.8",
"@types/node": "14.0.26",
"codelyzer": "6.0.0",
......@@ -123,12 +119,12 @@
"cypress": "4.11.0",
"cypress-file-upload": "4.0.7",
"jasmine-core": "3.6.0",
"jasmine-spec-reporter": "5.0.2",
"karma": "5.1.0",
"jasmine-spec-reporter": "7.0.0",
"karma": "6.3.4",
"karma-chrome-launcher": "3.1.0",
"karma-coverage-istanbul-reporter": "3.0.3",
"karma-jasmine": "3.3.1",
"karma-jasmine-html-reporter": "1.5.4",
"karma-jasmine": "4.0.1",
"karma-jasmine-html-reporter": "1.7.0",
"karma-junit-reporter": "2.0.1",
"local-web-server": "4.2.1",
"ngx-translate-extract-csv": "1.1.1",
......@@ -136,7 +132,7 @@
"ts-loader": "8.0.1",
"ts-node": "8.10.2",
"tslint": "6.1.2",
"typescript": "3.9.7",
"typescript": "4.1.6",
"webpack": "4.44.0"
}
}
......@@ -95,13 +95,11 @@ const routes: DlcmRoutes = [
path: AppRoutesEnum.root,
redirectTo: "/" + AppRoutesEnum.home + UrlQueryParamHelper.getQueryParamOAuth2(),
pathMatch: "full",
canActivate: [ApplicationMaintenanceGuardService],
},
{
path: AppRoutesEnum.index,
redirectTo: "/" + AppRoutesEnum.home + UrlQueryParamHelper.getQueryParamOAuth2(),
pathMatch: "full",
canActivate: [ApplicationMaintenanceGuardService],
},
{
path: "**",
......@@ -112,6 +110,7 @@ const routes: DlcmRoutes = [
@NgModule({
imports: [RouterModule.forRoot(routes, {
useHash: true,
relativeLinkResolution: "legacy",
})],
exports: [RouterModule],
})
......
import {
async,
TestBed,
} from "@angular/core/testing";
import { TestBed, waitForAsync } from "@angular/core/testing";
import {RouterTestingModule} from "@angular/router/testing";
import {
AppModule,
......@@ -13,7 +10,7 @@ import {ENVIRONMENT} from "solidify-frontend";
import {AppComponent} from "./app.component";
describe("AppComponent", () => {
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
RouterTestingModule,
......
import {HttpClientTestingModule} from "@angular/common/http/testing";
import {
async,
ComponentFixture,
TestBed,
waitForAsync,
} from "@angular/core/testing";
import {MatSnackBar} from "@angular/material/snack-bar";
import {NoopAnimationsModule} from "@angular/platform-browser/animations";
......@@ -29,7 +29,7 @@ xdescribe("FooterPresentational", () => {
let component: FooterContainer;
let fixture: ComponentFixture<FooterContainer>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [FooterContainer],
imports: [
......
import {HttpClientTestingModule} from "@angular/common/http/testing";
import {NO_ERRORS_SCHEMA} from "@angular/core";
import {
async,
ComponentFixture,
TestBed,
waitForAsync,
} from "@angular/core/testing";
import {MatSnackBar} from "@angular/material/snack-bar";
import {
......@@ -20,7 +20,7 @@ describe("MainToolbarDesktopHorizontalPresentational", () => {
let component: MainToolbarDesktopHorizontalPresentational;
let fixture: ComponentFixture<MainToolbarDesktopHorizontalPresentational>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [HttpClientTestingModule],
declarations: [MainToolbarDesktopHorizontalPresentational, LanguageSelectorPresentational, MockTranslatePipe],
......
import {HttpClientTestingModule} from "@angular/common/http/testing";
import {NO_ERRORS_SCHEMA} from "@angular/core";
import {
async,
ComponentFixture,
TestBed,
waitForAsync,
} from "@angular/core/testing";
import {MatSnackBar} from "@angular/material/snack-bar";
import {MainToolbarDesktopHorizontalPresentational} from "@app/components/presentationals/main-toolbar/main-toolbar-desktop-horizontal/main-toolbar-desktop-horizontal.presentational";
......@@ -21,7 +21,7 @@ describe("MainToolbarDesktopVerticalPresentational", () => {
let component: MainToolbarDesktopHorizontalPresentational;
let fixture: ComponentFixture<MainToolbarDesktopHorizontalPresentational>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [HttpClientTestingModule],
declarations: [MainToolbarDesktopHorizontalPresentational, LanguageSelectorPresentational, MockTranslatePipe],
......
import {HttpClientTestingModule} from "@angular/common/http/testing";
import {NO_ERRORS_SCHEMA} from "@angular/core";
import {
async,
ComponentFixture,
TestBed,
waitForAsync,
} from "@angular/core/testing";
import {MatSnackBar} from "@angular/material/snack-bar";
import {FontAwesomeModule} from "@fortawesome/angular-fontawesome";
......@@ -20,7 +20,7 @@ describe("MainToolbarMobilePresentational", () => {
let component: MainToolbarMobilePresentational;
let fixture: ComponentFixture<MainToolbarMobilePresentational>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [MainToolbarMobilePresentational, LanguageSelectorPresentational, MockTranslatePipe],
imports: [HttpClientTestingModule, FontAwesomeModule],
......
import {HttpClientTestingModule} from "@angular/common/http/testing";
import {NO_ERRORS_SCHEMA} from "@angular/core";
import {
async,
ComponentFixture,
TestBed,
waitForAsync,
} from "@angular/core/testing";
import {ReactiveFormsModule} from "@angular/forms";
import {SharedSearchPresentational} from "@app/shared/components/presentationals/shared-search/shared-search.presentational";
......@@ -18,7 +18,7 @@ describe("AdminHomeRoutable", () => {
let component: AdminHomeRoutable;
let fixture: ComponentFixture<AdminHomeRoutable>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [ReactiveFormsModule, HttpClientTestingModule, NgxsModule.forRoot([])],
declarations: [AdminHomeRoutable, SharedSearchPresentational, MockTranslatePipe],
......
import {NO_ERRORS_SCHEMA} from "@angular/core";
import {
async,
ComponentFixture,
TestBed,
waitForAsync,
} from "@angular/core/testing";
import {ReactiveFormsModule} from "@angular/forms";
import {MatDialogModule} from "@angular/material/dialog";
......@@ -16,7 +16,7 @@ xdescribe("DepositFilePresentational", () => {
let component: DepositFilePresentational;
let fixture: ComponentFixture<DepositFilePresentational>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [ReactiveFormsModule, MatDialogModule],
declarations: [DepositFilePresentational, MockTranslatePipe],
......
import {NO_ERRORS_SCHEMA} from "@angular/core";
import {
async,
ComponentFixture,
TestBed,
waitForAsync,
} from "@angular/core/testing";
import {ReactiveFormsModule} from "@angular/forms";
import {MatDialogModule} from "@angular/material/dialog";
......@@ -14,7 +14,7 @@ xdescribe("DepositFilesUploadInProgressPresentational", () => {
let component: DepositFilesUploadInProgressPresentational;
let fixture: ComponentFixture<DepositFilesUploadInProgressPresentational>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [ReactiveFormsModule, MatDialogModule],
declarations: [DepositFilesUploadInProgressPresentational, MockTranslatePipe],
......
import {
async,
ComponentFixture,
TestBed,
waitForAsync,
} from "@angular/core/testing";
import {HomeRssDetailPresentational} from "./home-rss-detail.presentational";
......@@ -10,7 +10,7 @@ describe("HomeRssDetailPresentational", () => {
let component: HomeRssDetailPresentational;
let fixture: ComponentFixture<HomeRssDetailPresentational>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [HomeRssDetailPresentational],
})
......
import {NO_ERRORS_SCHEMA} from "@angular/core";
import {
async,
ComponentFixture,
TestBed,
waitForAsync,
} from "@angular/core/testing";
import {HomeRssWrapperPresentational} from "./home-rss-wrapper.presentational";
......@@ -11,7 +11,7 @@ describe("HomeRssWrapperPresentational", () => {
let component: HomeRssWrapperPresentational;
let fixture: ComponentFixture<HomeRssWrapperPresentational>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [HomeRssWrapperPresentational],
schemas: [NO_ERRORS_SCHEMA],
......
import {
async,
ComponentFixture,
TestBed,
waitForAsync,
} from "@angular/core/testing";
import {TwitterService} from "@app/features/home/services/twitter.service";
import {MockTwitterService} from "../../../../../../test-helpers/mock-twitter.service";
......@@ -12,7 +12,7 @@ describe("HomeTwitterWidgetPresentational", () => {
let component: HomeTwitterWidgetPresentational;
let fixture: ComponentFixture<HomeTwitterWidgetPresentational>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [HomeTwitterWidgetPresentational],
providers: [
......
import {NO_ERRORS_SCHEMA} from "@angular/core";
import {
async,
ComponentFixture,
TestBed,
waitForAsync,
} from "@angular/core/testing";
import {HomeTwitterWrapperPresentational} from "./home-tweeter-wrapper.presentational";
......@@ -11,7 +11,7 @@ describe("HomeTwitterWrapperPresentational", () => {
let component: HomeTwitterWrapperPresentational;
let fixture: ComponentFixture<HomeTwitterWrapperPresentational>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [HomeTwitterWrapperPresentational],
schemas: [NO_ERRORS_SCHEMA],
......
import {HttpClientTestingModule} from "@angular/common/http/testing";
import {NO_ERRORS_SCHEMA} from "@angular/core";
import {
async,
ComponentFixture,
TestBed,
waitForAsync,
} from "@angular/core/testing";
import {ReactiveFormsModule} from "@angular/forms";
import {
......@@ -22,7 +22,7 @@ xdescribe("HomeArchiveDetailRoutable", () => {
let component: HomeArchiveDetailRoutable;
let fixture: ComponentFixture<HomeArchiveDetailRoutable>;
const activatedRoute: ActivatedRouteStub = new ActivatedRouteStub({id: "test"} as Params);
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [ReactiveFormsModule, HttpClientTestingModule, NgxsModule.forRoot([])],
declarations: [HomeArchiveDetailRoutable, MockTranslatePipe],
......
import {HttpClientTestingModule} from "@angular/common/http/testing";
import {NO_ERRORS_SCHEMA} from "@angular/core";
import {
async,
ComponentFixture,
TestBed,
waitForAsync,
} from "@angular/core/testing";
import {ReactiveFormsModule} from "@angular/forms";
import {SharedSearchPresentational} from "@app/shared/components/presentationals/shared-search/shared-search.presentational";
......@@ -18,7 +18,7 @@ describe("HomePageRoutable", () => {
let component: HomePageRoutable;
let fixture: ComponentFixture<HomePageRoutable>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [ReactiveFormsModule, HttpClientTestingModule, NgxsModule.forRoot([])],
declarations: [HomePageRoutable, SharedSearchPresentational, MockTranslatePipe],
......
import {HttpClientTestingModule} from "@angular/common/http/testing";
import {NO_ERRORS_SCHEMA} from "@angular/core";
import {
async,
ComponentFixture,
TestBed,
waitForAsync,
} from "@angular/core/testing";
import {ReactiveFormsModule} from "@angular/forms";
import {SharedSearchPresentational} from "@app/shared/components/presentationals/shared-search/shared-search.presentational";
......@@ -18,7 +18,7 @@ describe("AdminHomeRoutable", () => {
let component: PreservationSpaceHomeRoutable;
let fixture: ComponentFixture<PreservationSpaceHomeRoutable>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [ReactiveFormsModule, HttpClientTestingModule, NgxsModule.forRoot([])],
declarations: [PreservationSpaceHomeRoutable, SharedSearchPresentational, MockTranslatePipe],
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment