Compare commits

..

1 Commits

Author SHA1 Message Date
8df1657170 chore(deps): update dependency @types/node to v17
Some checks reported errors
charlyghislain/charlyghislaindotcom/pipeline/pr-master Something is wrong with the build of this commit
2022-04-17 22:14:43 +00:00
5 changed files with 19 additions and 18 deletions

View File

@ -1,4 +1,4 @@
FROM docker.valuya.com/apache-front:2.4.52
FROM docker.valuya.com/apache-front:2.4.48
ARG CLANG=en
COPY docker/httpd.conf /var/run/httpd.conf.tmp

2
Jenkinsfile vendored
View File

@ -24,7 +24,7 @@ pipeline {
stages {
stage ('Build') {
steps {
nodejs(nodeJSInstallationName: 'node 16', configId: 'npm-global-config') { catchError {
nodejs(nodeJSInstallationName: 'node 15', configId: 'npm-global-config') { catchError {
ansiColor('xterm') {
sh '''
rm -rfv dist*

24
package-lock.json generated
View File

@ -2029,12 +2029,6 @@
"integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
"dev": true
},
"@types/luxon": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-2.3.1.tgz",
"integrity": "sha512-nAPUltOT28fal2eDZz8yyzNhBjHw1NEymFBP7Q9iCShqpflWPybxHbD7pw/46jQmT+HXOy1QN5hNTms8MOTlOQ==",
"dev": true
},
"@types/mime": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
@ -6206,11 +6200,6 @@
"yallist": "^4.0.0"
}
},
"luxon": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/luxon/-/luxon-2.3.2.tgz",
"integrity": "sha512-MlAQQVMFhGk4WUA6gpfsy0QycnKP0+NlCBJRVRNPxxSIbjrCbQ65nrpJD3FVyJNZLuJ0uoqL57ye6BmDYgHaSw=="
},
"magic-string": {
"version": "0.25.7",
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
@ -6499,6 +6488,19 @@
"minimist": "^1.2.6"
}
},
"moment": {
"version": "2.22.2",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz",
"integrity": "sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y="
},
"moment-es6": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/moment-es6/-/moment-es6-1.0.0.tgz",
"integrity": "sha1-VS/PQF1iVlsKH+hObB5peseTMt8=",
"requires": {
"moment": "*"
}
},
"ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",

View File

@ -21,7 +21,7 @@
"@angular/platform-browser-dynamic": "^13.3.3",
"@angular/router": "^13.3.3",
"core-js": "^2.6.12",
"luxon": "^2.3.2",
"moment-es6": "^1.0.0",
"rxjs": "^6.6.7",
"tslib": "^2.0.0",
"zone.js": "~0.11.5"
@ -34,7 +34,6 @@
"@types/jasmine": "~3.6.11",
"@types/jasminewd2": "^2.0.10",
"@types/node": "^17.0.0",
"@types/luxon": "^2.3.1",
"codelyzer": "^6.0.2",
"jasmine-core": "~3.6.0",
"jasmine-spec-reporter": "~5.0.0",

View File

@ -3,7 +3,7 @@ import {BuildInfoService} from './build-info.service';
import {Observable, of} from 'rxjs';
import {catchError, defaultIfEmpty, filter, map, publishReplay, refCount} from 'rxjs/operators';
import {BuildInfo} from './build-info';
import {DateTime} from 'luxon';
import moment from 'moment-es6';
@Component({
selector: 'app-root',
@ -36,7 +36,7 @@ export class AppComponent implements OnInit {
}
private parseDate(dateString: string) {
const parsedDateString = dateString == null ? undefined : DateTime.fromISO(dateString).toISODate();
return parsedDateString;
const dateMoment = dateString == null ? moment() : moment(dateString);
return dateMoment.format('DD/MM/YYYY HH:mm:ss');
}
}