Skip to content

sync: release/11.14.0 (dépôt interne → usage-analytics) #noJiraCheck - #52

Merged
hebus merged 18 commits into
release/11.14.0from
sync/release/11.14.0
Aug 4, 2026
Merged

sync: release/11.14.0 (dépôt interne → usage-analytics) #noJiraCheck#52
hebus merged 18 commits into
release/11.14.0from
sync/release/11.14.0

Conversation

@hebus

@hebus hebus commented Aug 4, 2026

Copy link
Copy Markdown
Contributor

Synchronisation de la branche release/11.14.0 depuis le dépôt interne vers sinequa/usage-analytics.

Le merge a été résolu en local (branche créée depuis le tip de release/11.14.0 de ce dépôt), la PR est donc mergeable sans conflit à traiter ici.

Contenu

18 commits internes, 6 fichiers impactés :

Fichier Changement
package.json / package-lock.json Overrides npm alignés sur l'interne
projects/usage-analytics/src/app/app.module.ts Activation des locales fr et de
projects/usage-analytics/src/locales/fr.ts, de.ts Imports moment / d3-format via chemin node_modules/…
.gitlab-ci.yml Pipeline interne (check du titre de MR) — nouveau fichier

Résolution des conflits

Conflit sur package.json / package-lock.json (les overrides avaient été modifiés des deux côtés depuis la base commune bb35ce7). Les overrides internes ont été retenus :

"overrides": {
  "serialize-javascript": "^7.0.3",
  "esbuild": "0.28.1",
  "piscina": "5.2.0",
  "vite": "7.3.5",
  "uuid": ">=11.1.1"
}

Les overrides présents uniquement ici (webpack-dev-server ^5.2.5, sockjs.uuid) ont été écartés : le commit interne 6febb23 avait justement reverté ce type d'override, incompatible avec le builder legacy du projet. package-lock.json reprend le lock interne, cohérent avec ce package.json.

L'arbre de cette branche est identique à celui de release/11.14.0 du dépôt interne (git diff vide).

🤖 Generated with Claude Code

hebus and others added 18 commits April 4, 2026 15:21
… audit fix

ES-31295 #done ES-31202 #done ES-31201 #done ES-31181 #done ES-31180 #done ES-31179 #done ES-31178 #done ES-31148 #done ES-31009 #done

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…ulnerabilities

ES-31295 ES-31202 ES-31201 ES-31181 ES-31180 ES-31179 ES-31178 ES-31148 ES-31009 #done chore: fix dependabot security vulnerabilities
Bump `@angular-devkit/build-angular` from 20.3.22 to 20.3.25 along with its related packages (`@angular-devkit/architect`, `@angular-devkit/build-webpack`, `@angular-devkit/core`, `@angular/build`, `@ngtools/webpack`). Also updates `esbuild`/`esbuild-wasm` from 0.25.9 to 0.28.0, `postcss` from 8.5.6 to 8.5.12, and removes redundant nested duplicate entries (e.g. hoisted `@babel/runtime` and `rxjs`) from the lock file as a result of dependency deduplication.
ES-31761 #done ES-31760 #done vulnerabilities
- esbuild 0.28.0 → 0.28.1 (GHSA-g7r4-m6w7-qqqr)
- http-proxy-middleware 3.0.5 → 3.0.7 (GHSA-gcq2-9pq2-cxqm, GHSA-64mm-vxmg-q3vj)
- piscina 5.1.3 → 5.2.0 (GHSA-x9g3-xrwr-cwfg)
- vite 7.3.2 → 7.3.5 (GHSA-v6wh-96g9-6wx3, GHSA-fx2h-pf6j-xcff)
- ws fixed via npm audit fix (GHSA-96hv-2xvq-fx4p)
- @babel/core and uuid cannot be fixed without breaking Angular 20

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
ES-32430 #done ES-32429 #done ES-32336 #done ES-32289 #done ES-32288 #done ES-32287 #done ES-32286 #done ES-32285 #done ES-32284 #done ES-32283 #done ES-32184 #done fix: resolve npm audit high-severity vulnerabilities
Changes have been made in http-proxy-middleware not compatible with the legacy builder used in this project.

fix(locales): update locale imports to use node_modules path and enable French and German locales
…revert

chore(vulnerabilities): revert overrides http-proxy-middleware
#noJiraCheck fix(security): add uuid override for npm audit vulnerability
@hebus hebus changed the title sync: release/11.14.0 (dépôt interne → usage-analytics) sync: release/11.14.0 (dépôt interne → usage-analytics) #noJiraCheck Aug 4, 2026
@hebus
hebus merged commit 494b128 into release/11.14.0 Aug 4, 2026
0 of 2 checks passed
@hebus
hebus deleted the sync/release/11.14.0 branch August 4, 2026 07:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants