Skip to content
GitLab
Commit d86c4e39 authored by Matthieu Benoist's avatar Matthieu Benoist
Browse files

updating to angular 11

parent c41bc2f3
Expand all Hide whitespace changes
Inline Side-by-side
angular.json
View file @ d86c4e39
......@@ -50,16 +50,17 @@
"optimization": false,
"outputHashing": "all",
"sourceMap": true,
"extractCss": false,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": false,
"fileReplacements": [{
"replace": "src/i18n/traductions.ts",
"with": "src/i18n/traductions.fr.ts"
}]
"fileReplacements": [
{
"replace": "src/i18n/traductions.ts",
"with": "src/i18n/traductions.fr.ts"
}
]
},
"aot-en": {
"budgets": [
......@@ -74,7 +75,6 @@
"optimization": false,
"outputHashing": "all",
"sourceMap": true,
"extractCss": false,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
......@@ -94,7 +94,6 @@
"optimization": false,
"outputHashing": "all",
"sourceMap": true,
"extractCss": false,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
......@@ -116,16 +115,17 @@
"optimization": false,
"outputHashing": "all",
"sourceMap": true,
"extractCss": false,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": false,
"fileReplacements": [{
"replace": "src/i18n/traductions.ts",
"with": "src/i18n/traductions.fr.ts"
}],
"fileReplacements": [
{
"replace": "src/i18n/traductions.ts",
"with": "src/i18n/traductions.fr.ts"
}
],
"outputPath": "dist"
},
"production-en": {
......@@ -141,16 +141,17 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": false,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"fileReplacements": [{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.production.ts"
}],
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.production.ts"
}
],
"outputPath": "dist"
},
"production-fr": {
......@@ -166,13 +167,13 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": false,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"fileReplacements": [{
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.production.ts"
},
......
package-lock.json
View file @ d86c4e39
This diff is collapsed.
package.json
View file @ d86c4e39
......@@ -21,16 +21,16 @@
},
"private": true,
"dependencies": {
"@angular/animations": "10.2.4",
"@angular/animations": "11.2.5",
"@angular/cdk": "^9.0.0",
"@angular/common": "10.2.4",
"@angular/compiler": "10.2.4",
"@angular/core": "10.2.4",
"@angular/forms": "10.2.4",
"@angular/localize": "~10.2.4",
"@angular/platform-browser": "10.2.4",
"@angular/platform-browser-dynamic": "10.2.4",
"@angular/router": "10.2.4",
"@angular/common": "11.2.5",
"@angular/compiler": "11.2.5",
"@angular/core": "11.2.5",
"@angular/forms": "11.2.5",
"@angular/localize": "~11.2.5",
"@angular/platform-browser": "11.2.5",
"@angular/platform-browser-dynamic": "11.2.5",
"@angular/router": "11.2.5",
"@babel/compat-data": "^7.8.0",
"@turf/centroid": "^5.1.5",
"@turf/helpers": "^6.1.4",
......@@ -59,20 +59,20 @@
"zone.js": "~0.10.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.1002.3",
"@angular/cli": "^10.2.3",
"@angular/compiler-cli": "10.2.4",
"@angular/language-service": "10.2.4",
"@types/jasmine": "^2.8.12",
"@angular-devkit/build-angular": "~0.1102.4",
"@angular/cli": "^11.2.4",
"@angular/compiler-cli": "11.2.5",
"@angular/language-service": "11.2.5",
"@types/jasmine": "~3.6.0",
"@types/jasminewd2": "^2.0.6",
"@types/jwt-decode": "^2.2.1",
"@types/lodash.clonedeep": "^4.5.6",
"@types/mapbox-gl": "^1.7.0",
"@types/node": "^12.11.1",
"codelyzer": "^6.0.1",
"jasmine-core": "~3.5.0",
"codelyzer": "^6.0.0",
"jasmine-core": "~3.6.0",
"jasmine-spec-reporter": "~5.0.0",
"karma": "~5.0.0",
"karma": "~6.2.0",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~3.0.2",
"karma-htmlfile-reporter": "^0.3.7",
......
patch.js
View file @ d86c4e39
const fs = require('fs');
const f = 'node_modules/@angular-devkit/build-angular/src/angular-cli-files/models/webpack-configs/browser.js';
const f = 'node_modules/@angular-devkit/build-angular/src/webpack/configs/browser.js';
fs.readFile(f, 'utf8', function (err,data) {
if (err) {
......@@ -10,4 +10,4 @@ fs.readFile(f, 'utf8', function (err,data) {
fs.writeFile(f, result, 'utf8', function (err) {
if (err) return console.log(err);
});
});
\ No newline at end of file
});
src/app/app-routing.module.ts
View file @ d86c4e39
......@@ -14,7 +14,8 @@ export const routes: Routes = [
scrollPositionRestoration: 'enabled',
preloadingStrategy: PreloadAllModules,
anchorScrolling: 'enabled',
})],
relativeLinkResolution: 'legacy'
})],
exports: [RouterModule],
})
export class AppRoutingModule { }
src/app/app.component.spec.ts
View file @ d86c4e39
import { TestBed, async } from '@angular/core/testing';
import { TestBed, waitForAsync } from '@angular/core/testing';
import { AppComponent } from './app.component';
import { MockComponent } from 'ng2-mock-component';
import { RouterTestingModule } from '@angular/router/testing';
......@@ -7,7 +7,7 @@ import { Angulartics2Piwik } from 'angulartics2/piwik';
import { NavigationHistoryService } from './core/services';
describe('AppComponent', () => {
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [
AppComponent,
......@@ -25,7 +25,7 @@ describe('AppComponent', () => {
],
}).compileComponents();
}));
it('should create the app', async(() => {
it('should create the app', waitForAsync(() => {
const fixture = TestBed.createComponent(AppComponent);
const app = fixture.debugElement.componentInstance;
expect(app).toBeTruthy();
......
src/app/core/components/contact/contact.component.spec.ts
View file @ d86c4e39
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { ContactComponent } from './contact.component';
import { ReactiveFormsModule, AbstractControl } from '@angular/forms';
......@@ -50,7 +50,7 @@ describe('ContactComponent', () => {
let text: AbstractControl;
describe('Template', () => {
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
ReactiveFormsModule,
......
src/app/core/components/feedback/feedback.component.spec.ts
View file @ d86c4e39
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { FeedbackComponent } from './feedback.component';
......@@ -6,7 +6,7 @@ describe('FeedbackComponent', () => {
let component: FeedbackComponent;
let fixture: ComponentFixture<FeedbackComponent>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [FeedbackComponent],
})
......
src/app/core/components/main/footer/footer.component.spec.ts
View file @ d86c4e39
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { DebugElement } from '@angular/core';
import { RouterTestingModule } from '@angular/router/testing';
......@@ -12,7 +12,7 @@ describe('FooterComponent', () => {
let fixture: ComponentFixture<FooterComponent>;
let de: DebugElement;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [
FooterComponent,
......
src/app/core/components/main/header/header.component.spec.ts
View file @ d86c4e39
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { DebugElement } from '@angular/core';
import { RouterTestingModule } from '@angular/router/testing';
import { HeaderComponent } from './header.component';
......@@ -21,7 +21,7 @@ describe('HeaderComponent', () => {
let fixture: ComponentFixture<HeaderComponent>;
let debugElement: DebugElement;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [
HeaderComponent,
......
src/app/core/components/main/main.component.spec.ts
View file @ d86c4e39
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { MainComponent } from './main.component';
......@@ -9,7 +9,7 @@ describe('MainComponent', () => {
let component: MainComponent;
let fixture: ComponentFixture<MainComponent>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [
MainComponent,
......
src/app/core/components/main/side-menu/side-menu.component.spec.ts
View file @ d86c4e39
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { SideMenuComponent } from './side-menu.component';
import { MockComponent } from 'ng2-mock-component';
......@@ -23,7 +23,7 @@ describe('SideMenuComponent', () => {
let component: SideMenuComponent;
let fixture: ComponentFixture<SideMenuComponent>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
RouterTestingModule.withRoutes([]),
......
src/app/core/components/notifications/notifications.component.spec.ts
View file @ d86c4e39
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { NotificationsComponent } from './notifications.component';
import { NotificationService } from '../../services';
......@@ -30,7 +30,7 @@ describe('NotificationsComponent', () => {
let fixture: ComponentFixture<NotificationsComponent>;
let debugElement: DebugElement;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
providers: [
{
......
src/app/datasets/components/filter-list/filter-detail/filter-detail.component.spec.ts
View file @ d86c4e39
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { FilterDetailComponent } from './filter-detail.component';
import { DatasetResearchService, ElasticsearchService } from '../../../services';
......@@ -12,7 +12,7 @@ describe('FilterDetailComponent', () => {
let component: FilterDetailComponent;
let fixture: ComponentFixture<FilterDetailComponent>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [
FilterDetailComponent,
......
src/app/datasets/components/filter-list/filter-list.component.spec.ts
View file @ d86c4e39
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { FilterListComponent } from './filter-list.component';
import { FilterDetailComponent } from './filter-detail/filter-detail.component';
......@@ -13,7 +13,7 @@ describe('FilterListComponent', () => {
let component: FilterListComponent;
let fixture: ComponentFixture<FilterListComponent>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [
FilterListComponent,
......
src/app/datasets/components/results/result-dataset/result-dataset.component.spec.ts
View file @ d86c4e39
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { ResultDatasetComponent } from '../..';
import { RouterTestingModule } from '@angular/router/testing';
......@@ -6,7 +6,7 @@ describe('ResultDatasetComponent', () => {
let component: ResultDatasetComponent;
let fixture: ComponentFixture<ResultDatasetComponent>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ResultDatasetComponent],
imports: [
......
src/app/datasets/components/results/results-tab-scope/results-tab-scope.component.spec.ts
View file @ d86c4e39
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { ResultsTabScopeComponent } from './results-tab-scope.component';
......@@ -6,7 +6,7 @@ describe('ResultsTabScopeComponent', () => {
let component: ResultsTabScopeComponent;
let fixture: ComponentFixture<ResultsTabScopeComponent>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ResultsTabScopeComponent],
})
......
src/app/datasets/components/search-bar/search-bar.component.spec.ts
View file @ d86c4e39
import { DatasetResearchService } from '../../services';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { SearchBarComponent } from './search-bar.component';
import { MockComponent } from 'ng2-mock-component';
......@@ -14,7 +14,7 @@ describe('SearchBarComponent', () => {
let component: SearchBarComponent;
let fixture: ComponentFixture<SearchBarComponent>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
FormsModule,
......
src/app/datasets/components/sort/sort.component.spec.ts
View file @ d86c4e39
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { SortComponent } from './sort.component';
import { DatasetResearchService, ElasticsearchService } from '../../services';
......@@ -12,7 +12,7 @@ describe('SortComponent', () => {
let component: SortComponent;
let fixture: ComponentFixture<SortComponent>;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
HttpClientModule,
......
src/app/editorialisation/components/cms-page/cms-page.component.spec.ts
View file @ d86c4e39
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { CMSPageComponent } from './cms-page.component';
import { MockComponent } from 'ng2-mock-component';
......@@ -38,7 +38,7 @@ describe('CMSPageComponent', () => {
let fixture: ComponentFixture<CMSPageComponent>;
let debugElement: DebugElement;
beforeEach(async(() => {
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
imports: [
BrowserModule,
......
Supports Markdown
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