Commit 6f732414 authored by Matthieu Benoist's avatar Matthieu Benoist
Browse files

update to angular 9.1 and other concerns

parent 500986f1
......@@ -4,6 +4,15 @@
"newProjectRoot": "projects",
"projects": {
"webapp": {
"i18n": {
"locales": {
"fr": {
"translation": "src/i18n/messages.fr.xlf",
"baseHref": ""
},
"en": "src/i18n/messages.en.xlf"
}
},
"root": "",
"sourceRoot": "src",
"projectType": "application",
......@@ -11,6 +20,7 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"aot": true,
"outputPath": "dist",
"index": "src/index.html",
"main": "src/main.ts",
......@@ -28,6 +38,15 @@
},
"configurations": {
"aot-fr": {
"budgets": [
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
],
"localize": [
"fr"
],
"optimization": false,
"outputHashing": "all",
"sourceMap": true,
......@@ -37,15 +56,21 @@
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": false,
"i18nFile": "src/i18n/messages.fr.xlf",
"i18nFormat": "xlf",
"i18nLocale": "fr",
"fileReplacements": [{
"replace": "src/i18n/traductions.ts",
"with": "src/i18n/traductions.fr.ts"
}]
},
"aot-en": {
"budgets": [
{
"type": "anyComponentStyle",
"maximumWarning": "26kb"
}
],
"localize": [
"en"
],
"optimization": false,
"outputHashing": "all",
"sourceMap": true,
......@@ -54,12 +79,17 @@
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": false,
"i18nFile": "src/i18n/messages.en.xlf",
"i18nFormat": "xlf",
"i18nLocale": "en"
},
"buildOptimizer": false},
"development-en": {
"budgets": [
{
"type": "anyComponentStyle",
"maximumWarning": "10kb"
}
],
"localize": [
"en"
],
"optimization": false,
"outputHashing": "all",
"sourceMap": true,
......@@ -70,13 +100,17 @@
"vendorChunk": false,
"buildOptimizer": false,
"fileReplacements": [],
"outputPath": "dist/en",
"i18nFile": "src/i18n/messages.en.xlf",
"i18nFormat": "xlf",
"i18nLocale": "en",
"baseHref": "/en/"
},
"outputPath": "dist"},
"development-fr": {
"budgets": [
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
],
"localize": [
"fr"
],
"optimization": false,
"outputHashing": "all",
"sourceMap": true,
......@@ -90,12 +124,17 @@
"replace": "src/i18n/traductions.ts",
"with": "src/i18n/traductions.fr.ts"
}],
"outputPath": "dist/fr",
"i18nFile": "src/i18n/messages.fr.xlf",
"i18nFormat": "xlf",
"i18nLocale": "fr"
},
"outputPath": "dist"},
"production-en": {
"budgets": [
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
],
"localize": [
"en"
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
......@@ -109,13 +148,17 @@
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.production.ts"
}],
"outputPath": "dist/en",
"i18nFile": "src/i18n/messages.en.xlf",
"i18nFormat": "xlf",
"i18nLocale": "en",
"baseHref": "/en/"
},
"outputPath": "dist"},
"production-fr": {
"budgets": [
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
],
"localize": [
"fr"
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
......@@ -134,11 +177,7 @@
"with": "src/i18n/traductions.fr.ts"
}
],
"outputPath": "dist/fr",
"i18nFile": "src/i18n/messages.fr.xlf",
"i18nFormat": "xlf",
"i18nLocale": "fr"
}
"outputPath": "dist"}
}
},
"serve": {
......@@ -226,10 +265,10 @@
"schematics": {
"@schematics/angular:component": {
"prefix": "app",
"styleext": "scss"
"style": "scss"
},
"@schematics/angular:directive": {
"prefix": "app"
}
}
}
\ No newline at end of file
}
This diff is collapsed.
......@@ -21,21 +21,22 @@
},
"private": true,
"dependencies": {
"@angular/animations": "8.2.14",
"@angular/cdk": "^7.3.1",
"@angular/common": "8.2.14",
"@angular/compiler": "8.2.14",
"@angular/core": "8.2.14",
"@angular/forms": "8.2.14",
"@angular/platform-browser": "8.2.14",
"@angular/platform-browser-dynamic": "8.2.14",
"@angular/router": "8.2.14",
"@angular/animations": "9.1.12",
"@angular/cdk": "^9.0.0",
"@angular/common": "9.1.12",
"@angular/compiler": "9.1.12",
"@angular/core": "9.1.12",
"@angular/forms": "9.1.12",
"@angular/localize": "~9.1.12",
"@angular/platform-browser": "9.1.12",
"@angular/platform-browser-dynamic": "9.1.12",
"@angular/router": "9.1.12",
"@babel/compat-data": "^7.8.0",
"@turf/centroid": "^5.1.5",
"@turf/helpers": "^6.1.4",
"@turf/projection": "^6.0.1",
"@turf/turf": "^5.1.6",
"angulartics2": "^7.5.2",
"angulartics2": "^9.1.0",
"bulma": "^0.7.5",
"bulma-checkradio": "^2.1.0",
"bulma-slider": "^2.0.4",
......@@ -54,21 +55,22 @@
"ngx-infinite-scroll": "^6.0.1",
"node-rsa": "^1.0.3",
"rxjs": "^6.5.4",
"tslib": "^1.10.0",
"xml2js": "^0.4.19",
"zone.js": "~0.9.1"
"zone.js": "~0.10.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.803.29",
"@angular/cli": "^8.3.29",
"@angular/compiler-cli": "8.2.14",
"@angular/language-service": "8.2.14",
"@angular-devkit/build-angular": "~0.901.12",
"@angular/cli": "^9.1.12",
"@angular/compiler-cli": "9.1.12",
"@angular/language-service": "9.1.12",
"@types/jasmine": "^2.8.12",
"@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": "^6.14.2",
"codelyzer": "^5.0.1",
"@types/node": "^12.11.1",
"codelyzer": "^5.1.2",
"jasmine-core": "~2.8.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "^4.0.0",
......@@ -78,7 +80,7 @@
"karma-jasmine": "^1.1.2",
"karma-jasmine-html-reporter": "^0.2.2",
"ng2-mock-component": "0.0.6",
"protractor": "^5.4.1",
"protractor": "^5.4.4",
"rxjs-tslint": "^0.1.8",
"sass-recursive-map-merge": "^1.0.1",
"stylelint-config-recommended": "^2.2.0",
......@@ -86,7 +88,7 @@
"ts-node": "~4.1.0",
"tslint": "^5.12.1",
"tslint-config-airbnb": "^5.11.1",
"typescript": "3.5.3",
"typescript": "3.8.3",
"webpack-bundle-analyzer": "^3.1.0"
}
}
import { Injectable } from '../../../../node_modules/@angular/core';
import { Injectable as Injectable_1 } from "@angular/core";
@Injectable_1()
@Injectable()
export class NavigationHistoryService {
history: string[] = [];
......
......@@ -24,7 +24,7 @@ export class DatasetMapComponent implements OnInit, OnDestroy {
@Output() featureClicked = new EventEmitter<mapboxgl.MapboxGeoJSONFeature>();
@ViewChild(MapComponent, { static: false }) mapComponent: MapComponent;
@ViewChild(MapComponent) mapComponent: MapComponent;
private _selectedFeature = null; // Contains the gid of the selected feature
private subscriptions: Subscription[] = [];
......
......@@ -12,7 +12,7 @@ import { DatasetMapComponent } from '../dataset-map/dataset-map.component';
})
export class DatasetTableMapComponent implements OnInit, OnDestroy {
@ViewChild(DatasetMapComponent, { static: false }) datasetMapComponent: DatasetMapComponent;
@ViewChild(DatasetMapComponent) datasetMapComponent: DatasetMapComponent;
// Component state
fullscreen = false;
......
......@@ -5,8 +5,11 @@
"baseUrl": "./",
"types": []
},
"exclude": [
"test.ts",
"**/*.spec.ts"
"files": [
"main.ts",
"polyfills.ts"
],
"include": [
"src/**/*.d.ts"
]
}
\ No newline at end of file
......@@ -10,6 +10,7 @@
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"target": "es2015",
"resolveJsonModule": true,
"typeRoots": [
"node_modules/@types"
],
......@@ -22,4 +23,4 @@
"angularCompilerOptions": {
"preserveWhitespaces": false
}
}
\ No newline at end of file
}
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