Skip to content
Snippets Groups Projects
Commit 09a7c59c authored by Bastien DUMONT's avatar Bastien DUMONT :angel:
Browse files

Merge branch 'deps/update-angular-&-typescript' into 'dev'

fix(deps): update angular & typescript

See merge request !680
parents 2950953d 5fb1ae7b
No related branches found
No related tags found
2 merge requests!783V3.0.0,!680fix(deps): update angular & typescript
...@@ -56,8 +56,6 @@ documentation ...@@ -56,8 +56,6 @@ documentation
CHANGELOG.md CHANGELOG.md
package-lock.json
# External libs # External libs
/projects /projects
......
...@@ -120,28 +120,28 @@ ...@@ -120,28 +120,28 @@
"serve": { "serve": {
"builder": "@angular-devkit/build-angular:dev-server", "builder": "@angular-devkit/build-angular:dev-server",
"options": { "options": {
"browserTarget": "pamn:build", "proxyConfig": "proxy.conf.json",
"proxyConfig": "proxy.conf.json" "buildTarget": "pamn:build"
}, },
"configurations": { "configurations": {
"production": { "production": {
"browserTarget": "pamn:build:production" "buildTarget": "pamn:build:production"
}, },
"local": { "local": {
"browserTarget": "pamn:build:local" "buildTarget": "pamn:build:local"
}, },
"fr": { "fr": {
"browserTarget": "pamn:build:fr" "buildTarget": "pamn:build:fr"
}, },
"en": { "en": {
"browserTarget": "pamn:build:en" "buildTarget": "pamn:build:en"
} }
} }
}, },
"extract-i18n": { "extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n", "builder": "@angular-devkit/build-angular:extract-i18n",
"options": { "options": {
"browserTarget": "pamn:build" "buildTarget": "pamn:build"
} }
}, },
"lint": { "lint": {
......
This diff is collapsed.
...@@ -19,17 +19,17 @@ ...@@ -19,17 +19,17 @@
"private": true, "private": true,
"dependencies": { "dependencies": {
"@ag-grid-community/csv-export": "^29.0.0", "@ag-grid-community/csv-export": "^29.0.0",
"@angular/animations": "^16.2.12", "@angular/animations": "^17.0.7",
"@angular/common": "^16.2.12", "@angular/common": "^17.0.7",
"@angular/compiler": "^16.2.12", "@angular/compiler": "^17.0.7",
"@angular/core": "^16.2.12", "@angular/core": "^17.0.7",
"@angular/flex-layout": "^15.0.0-beta.42", "@angular/flex-layout": "^15.0.0-beta.42",
"@angular/forms": "^16.2.12", "@angular/forms": "^17.0.7",
"@angular/platform-browser": "^16.2.12", "@angular/platform-browser": "^17.0.7",
"@angular/platform-browser-dynamic": "^16.2.12", "@angular/platform-browser-dynamic": "^17.0.7",
"@angular/router": "^16.2.12", "@angular/router": "^17.0.7",
"@angular/service-worker": "^16.2.12", "@angular/service-worker": "^17.0.7",
"@asymmetrik/ngx-leaflet": "^16.0.1", "@asymmetrik/ngx-leaflet": "^17.0.0",
"@ngx-translate/core": "^14.0.0", "@ngx-translate/core": "^14.0.0",
"ag-grid-angular": "^29.0.0", "ag-grid-angular": "^29.0.0",
"ag-grid-community": "^29.0.0", "ag-grid-community": "^29.0.0",
...@@ -38,23 +38,23 @@ ...@@ -38,23 +38,23 @@
"leaflet.locatecontrol": "^0.79.0", "leaflet.locatecontrol": "^0.79.0",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"luxon": "^1.25.0", "luxon": "^1.25.0",
"ngx-matomo-client": "^5.0.4", "ngx-matomo-client": "^6.0.0",
"ngx-toastr": "^15.0.0", "ngx-toastr": "^15.0.0",
"runtime-config-loader": "^5.0.2", "runtime-config-loader": "^5.0.2",
"rxjs": "~7.6.0", "rxjs": "~7.6.0",
"tslib": "^2.4.0", "tslib": "^2.4.0",
"zone.js": "~0.13.3" "zone.js": "~0.14.0"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "^16.2.10", "@angular-devkit/build-angular": "^17.0.7",
"@angular-eslint/builder": "^16.3.1", "@angular-eslint/builder": "^17.0.1",
"@angular-eslint/eslint-plugin": "^16.3.1", "@angular-eslint/eslint-plugin": "^17.0.1",
"@angular-eslint/eslint-plugin-template": "^16.3.1", "@angular-eslint/eslint-plugin-template": "^17.0.1",
"@angular-eslint/schematics": "^16.3.1", "@angular-eslint/schematics": "^17.0.1",
"@angular-eslint/template-parser": "^16.3.1", "@angular-eslint/template-parser": "^17.0.1",
"@angular/cli": "^16.2.10", "@angular/cli": "^17.0.7",
"@angular/compiler-cli": "^16.2.12", "@angular/compiler-cli": "^17.0.7",
"@angular/localize": "^16.2.12", "@angular/localize": "^17.0.7",
"@compodoc/compodoc": "^1.1.16", "@compodoc/compodoc": "^1.1.16",
"@storybook/addon-essentials": "^7.6.7", "@storybook/addon-essentials": "^7.6.7",
"@storybook/addon-interactions": "^7.6.7", "@storybook/addon-interactions": "^7.6.7",
...@@ -75,12 +75,12 @@ ...@@ -75,12 +75,12 @@
"eslint-plugin-jsdoc": "^46.8.1", "eslint-plugin-jsdoc": "^46.8.1",
"eslint-plugin-storybook": "^0.6.15", "eslint-plugin-storybook": "^0.6.15",
"http-server": "^14.1.0", "http-server": "^14.1.0",
"ng-packagr": "^16.2.3", "ng-packagr": "^17.0.3",
"prettier": "^3.1.0", "prettier": "^3.1.0",
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"standard-version": "^9.3.2", "standard-version": "^9.3.2",
"storybook": "^7.6.7", "storybook": "^7.6.7",
"typescript": "~4.9.4" "typescript": "~5.2.0"
} }
} }
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<p> <p>
Métropole de Lyon - 20 rue du Lac – CS 33569 - 69505 Lyon cedex 03<br /> Métropole de Lyon - 20 rue du Lac – CS 33569 - 69505 Lyon cedex 03<br />
Tél. : (33) 4 78 63 40 40<br /> Tél. : (33) 4 78 63 40 40<br />
<a href="mailto:inclusionnumerique@grandlyon.com">inclusionnumerique@grandlyon.com</a> <a href="mailto:inclusionnumerique@grandlyon.com">inclusionnumerique&#64;grandlyon.com</a>
</p> </p>
<p> <p>
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
Nos services mettent tout en œuvre pour offrir aux visiteurs de ce site web des informations fiables et vérifiées. Nos services mettent tout en œuvre pour offrir aux visiteurs de ce site web des informations fiables et vérifiées.
Cependant, malgré tous les soins apportés, le site peut comporter des inexactitudes, des défauts de mise à jour ou Cependant, malgré tous les soins apportés, le site peut comporter des inexactitudes, des défauts de mise à jour ou
des erreurs. Nous remercions les utilisateurs du site de nous faire part d&#39;éventuelles omissions, erreurs ou des erreurs. Nous remercions les utilisateurs du site de nous faire part d&#39;éventuelles omissions, erreurs ou
corrections par mail sur la boite aux lettres du webmestre, inclusionnumerique@grandlyon.com corrections par mail sur la boite aux lettres du webmestre, inclusionnumerique&#64;grandlyon.com
</p> </p>
</div> </div>
</div> </div>
...@@ -15,8 +15,10 @@ export class UpdateService { ...@@ -15,8 +15,10 @@ export class UpdateService {
subscribeUpdate(): void { subscribeUpdate(): void {
if (this.swUpdate.isEnabled) { if (this.swUpdate.isEnabled) {
this.swUpdate.available.subscribe(() => { this.swUpdate.checkForUpdate().then((result) => {
this.showUpdateToast(); if (result) {
this.showUpdateToast();
}
}); });
} }
} }
......
...@@ -4,7 +4,7 @@ import { Component } from '@angular/core'; ...@@ -4,7 +4,7 @@ import { Component } from '@angular/core';
@Component({ @Component({
selector: 'app-collapse-content', selector: 'app-collapse-content',
template: `<div style="overflow: hidden" [@collapse]="expanded"> template: `<div style="overflow: hidden" [@collapse]="expanded">
<ng-content></ng-content> <ng-content />
</div>`, </div>`,
animations: [ animations: [
trigger('collapse', [ trigger('collapse', [
......
...@@ -10,7 +10,7 @@ import { Component, EventEmitter, Output } from '@angular/core'; ...@@ -10,7 +10,7 @@ import { Component, EventEmitter, Output } from '@angular/core';
(click)="toggle.emit()" (click)="toggle.emit()"
(keyup.enter)="toggle.emit()" (keyup.enter)="toggle.emit()"
> >
<ng-content></ng-content> <ng-content />
<app-svg-icon [ngClass]="expanded && 'expanded'" [type]="'ico'" [icon]="'fold'" [iconClass]="'icon-32'" /> <app-svg-icon [ngClass]="expanded && 'expanded'" [type]="'ico'" [icon]="'fold'" [iconClass]="'icon-32'" />
</div>`, </div>`,
styleUrls: ['collapse-header.component.scss'], styleUrls: ['collapse-header.component.scss'],
......
...@@ -6,7 +6,7 @@ import { CollapseType } from './collapse.type'; ...@@ -6,7 +6,7 @@ import { CollapseType } from './collapse.type';
@Component({ @Component({
selector: 'app-collapse', selector: 'app-collapse',
template: `<div class="collapse" [ngClass]="classes"> template: `<div class="collapse" [ngClass]="classes">
<ng-content></ng-content> <ng-content />
</div>`, </div>`,
styleUrls: ['collapse.component.scss'], styleUrls: ['collapse.component.scss'],
}) })
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
(click)="closeModal(false)" (click)="closeModal(false)"
/> />
</div> </div>
<p><ng-content></ng-content></p> <p><ng-content /></p>
<div class="footerModal"> <div class="footerModal">
<app-v3-button <app-v3-button
*ngIf="!singleButton" *ngIf="!singleButton"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment