From f6919b427befcc3a298aec3ac4182b2d392b8e34 Mon Sep 17 00:00:00 2001 From: Maxime Golfier <25312957+maxgfr@users.noreply.github.com> Date: Fri, 22 Dec 2023 16:46:50 +0100 Subject: [PATCH] feat(export): ajout du code du `@shared/elastic-document-adapter` dans le code de l'`export-elasticsearch` (#1183) * fix(export): done * remise de lexport * fix: erreur * Update targets/frontend/src/components/export-es/Status.tsx Co-authored-by: Martial Maillot * fix: linked * fix: dataset * fix: dataset * fix: doc * fix: doc * fix: merge * fix: merge * fix: simpliest way * fix: simpliest way * fix: build * fix: conv * fix: merge * fix: merge * fix: contrib --------- Co-authored-by: Martial Maillot --- .github/workflows/quality.yml | 6 - README-dev.md | 372 --- README.md | 331 ++- shared/dila-resolver/.eslintignore | 2 - shared/dila-resolver/.eslintrc.json | 3 - shared/dila-resolver/.gitignore | 2 - shared/dila-resolver/CHANGELOG.md | 422 --- shared/dila-resolver/package.json | 57 - shared/dila-resolver/tsconfig.build.json | 7 - shared/dila-resolver/tsconfig.json | 11 - .../.eslintignore | 2 - .../.eslintrc.json | 6 - .../elasticsearch-document-adapter/.gitignore | 3 - .../CHANGELOG.md | 465 ---- .../babel.config.js | 6 - .../jest.config.js | 11 - .../package.json | 60 - .../tsconfig.json | 20 - shared/elasticsearch/package.json | 2 +- shared/elasticsearch/src/esClientUtils.js | 2 +- shared/elasticsearch/src/vectorizer/index.js | 2 +- shared/logger/.eslintignore | 2 - shared/logger/.eslintrc.json | 3 - shared/logger/.gitignore | 3 - shared/logger/CHANGELOG.md | 424 --- shared/logger/package.json | 60 - shared/logger/src/index.test.ts | 78 - shared/logger/tsconfig.build.json | 5 - shared/logger/tsconfig.json | 9 - .../src/types.ts => types/dila-resolver.ts} | 0 shared/types/index.ts | 1 + shared/utils/jest.config.js | 14 + shared/utils/package.json | 9 +- .../src/__tests__/__mocks__/kaliArticle.json} | 0 .../src/__tests__/__mocks__/legiArticle.json} | 0 .../src/__tests__/dila-resolver.test.ts} | 7 +- .../index.ts => utils/src/dila-resolver.ts} | 15 +- shared/utils/src/index.ts | 2 + .../src/index.ts => utils/src/logger.ts} | 7 +- shared/utils/tsconfig.json | 3 +- targets/alert-cli/Dockerfile | 12 +- targets/alert-cli/README.md | 22 - targets/alert-cli/package.json | 2 +- .../__tests__/editorialContents.test.ts | 13 +- .../__tests__/mailTemplates.test.ts | 13 +- .../extractReferences/editorialContents.ts | 5 +- .../dila/extractReferences/mailTemplates.ts | 5 +- targets/contributions/Dockerfile | 5 + targets/contributions/README.md | 1 - targets/export-elasticsearch/Dockerfile | 29 +- targets/export-elasticsearch/README.md | 119 - targets/export-elasticsearch/package.json | 16 +- .../__fixtures__/suggestion_data_test.txt | 0 .../ingester}/__tests__/breadcrumbs.test.ts | 0 .../ingester}/__tests__/cdtnDocuments.test.ts | 2 +- .../__tests__/generateArticleByTheme.test.ts | 0 .../agreements/__tests__/getArticleId.test.ts | 0 .../getArticleNumberWithPath.test.ts | 0 .../agreements/__tests__/getIdcc.test.ts | 0 .../__tests__/getInfoMessage.test.ts | 0 .../agreements/__tests__/getTheme.test.ts | 0 .../src/ingester}/agreements/generate.ts | 0 .../getAgreementsArticlesByTheme.ts | 3 +- .../src/ingester}/agreements/getIdcc.ts | 0 .../ingester}/agreements/getInfoMessage.ts | 0 .../src/ingester}/agreements/getTheme.ts | 0 .../src/ingester}/agreements/index.ts | 0 .../src/ingester}/breadcrumbs.ts | 0 .../src/ingester}/buildThemes.js | 0 .../src/ingester}/cdtnDocuments.ts | 2 +- .../src/ingester}/context.ts | 0 .../__tests__/addGlossaryToContent.test.ts | 0 .../__tests__/generateContent.test.ts | 0 .../__tests__/generateLinkedContent.test.ts | 0 .../__tests__/generateMessageBlock.test.ts | 0 .../__tests__/generateMetadata.test.ts | 0 .../__tests__/getCcInfos.test.ts | 0 .../__tests__/getCcSupported.test.ts | 0 .../contributions/__tests__/helpers.test.ts | 0 .../contributions/addGlossaryToContent.ts | 0 .../fetchContributionsWithNoContent.ts | 0 .../ingester}/contributions/fetchFicheSp.ts | 0 .../contributions/fetchLinkedContent.ts | 3 +- .../contributions/fetchMessageBlock.ts | 0 .../src/ingester}/contributions/generate.ts | 0 .../contributions/generateContent.ts | 0 .../contributions/generateLinkedContent.ts | 0 .../contributions/generateMessageBlock.ts | 0 .../contributions/generateMetadata.ts | 0 .../src/ingester}/contributions/getCcInfos.ts | 0 .../ingester}/contributions/getCcSupported.ts | 0 .../getCcSupportedWithNoContent.ts | 0 .../src/ingester}/contributions/helpers.ts | 0 .../src/ingester}/contributions/index.ts | 0 .../src/ingester}/fetchCdtnAdminDocuments.ts | 0 .../src/ingester}/fichesTravailSplitter.js | 0 .../glossary/__mock__}/glossaryData.ts | 0 .../glossary/__tests__/glossary.test.ts | 4 +- .../glossary/createGlossaryTransform.ts | 0 .../glossary/explodeGlossaryTerms.ts | 0 .../src/ingester}/glossary/index.ts | 0 .../glossary/insertWebComponentGlossary.ts | 0 .../src/ingester}/glossary/types.ts | 0 .../src/ingester}/index.ts | 0 .../src/ingester}/ingest.ts | 2 +- .../src/ingester}/markdown.ts | 0 .../src/ingester}/monolog.js | 2 +- .../src/ingester}/plan-de-contenu.js | 0 .../src/ingester}/suggestion-cli.js | 0 .../src/ingester}/suggestion.test.ts | 2 +- .../src/ingester}/suggestion.ts | 0 .../src/ingester}/types.ts | 0 .../src/ingester}/types/Glossary.ts | 0 .../src/ingester}/types/GraphQL.ts | 0 .../src/ingester}/types/themes.ts | 0 .../__tests__/detectNullInObject.test.ts | 0 .../ingester}/utils/__tests__/index.test.ts | 0 .../src/ingester}/utils/detectNullInObject.ts | 0 .../src/ingester}/utils/index.ts | 0 .../src/ingester}/utils/isHtml.ts | 0 .../src/ingester}/utils/keyParser.ts | 0 .../src/ingester}/versions.js | 2 +- .../src/ingester}/versions.test.js | 2 +- .../src/repositories/status.ts | 2 +- .../src/services/export.ts | 2 +- .../src/workers/ingester-preprod.ts | 2 +- .../src/workers/ingester-prod.ts | 2 +- targets/export-elasticsearch/tsconfig.json | 1 + targets/frontend/Dockerfile | 1 + targets/frontend/README.md | 33 - targets/frontend/next.config.js | 6 + targets/ingester/Dockerfile | 1 + yarn.lock | 2351 +++++++---------- 133 files changed, 1363 insertions(+), 3738 deletions(-) delete mode 100644 README-dev.md delete mode 100644 shared/dila-resolver/.eslintignore delete mode 100644 shared/dila-resolver/.eslintrc.json delete mode 100644 shared/dila-resolver/.gitignore delete mode 100644 shared/dila-resolver/CHANGELOG.md delete mode 100644 shared/dila-resolver/package.json delete mode 100644 shared/dila-resolver/tsconfig.build.json delete mode 100644 shared/dila-resolver/tsconfig.json delete mode 100644 shared/elasticsearch-document-adapter/.eslintignore delete mode 100644 shared/elasticsearch-document-adapter/.eslintrc.json delete mode 100644 shared/elasticsearch-document-adapter/.gitignore delete mode 100644 shared/elasticsearch-document-adapter/CHANGELOG.md delete mode 100644 shared/elasticsearch-document-adapter/babel.config.js delete mode 100644 shared/elasticsearch-document-adapter/jest.config.js delete mode 100644 shared/elasticsearch-document-adapter/package.json delete mode 100644 shared/elasticsearch-document-adapter/tsconfig.json delete mode 100644 shared/logger/.eslintignore delete mode 100644 shared/logger/.eslintrc.json delete mode 100644 shared/logger/.gitignore delete mode 100644 shared/logger/CHANGELOG.md delete mode 100644 shared/logger/package.json delete mode 100644 shared/logger/src/index.test.ts delete mode 100644 shared/logger/tsconfig.build.json delete mode 100644 shared/logger/tsconfig.json rename shared/{dila-resolver/src/types.ts => types/dila-resolver.ts} (100%) create mode 100644 shared/utils/jest.config.js rename shared/{dila-resolver/src/mocks/kaliArticle.payload.json => utils/src/__tests__/__mocks__/kaliArticle.json} (100%) rename shared/{dila-resolver/src/mocks/legiArticle.payload.json => utils/src/__tests__/__mocks__/legiArticle.json} (100%) rename shared/{dila-resolver/src/index.test.ts => utils/src/__tests__/dila-resolver.test.ts} (88%) rename shared/{dila-resolver/src/index.ts => utils/src/dila-resolver.ts} (85%) rename shared/{logger/src/index.ts => utils/src/logger.ts} (81%) delete mode 100644 targets/alert-cli/README.md delete mode 100644 targets/contributions/README.md delete mode 100644 targets/export-elasticsearch/README.md rename {shared/elasticsearch-document-adapter => targets/export-elasticsearch/src/ingester}/__fixtures__/suggestion_data_test.txt (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/__tests__/breadcrumbs.test.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/__tests__/cdtnDocuments.test.ts (98%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/agreements/__tests__/generateArticleByTheme.test.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/agreements/__tests__/getArticleId.test.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/agreements/__tests__/getArticleNumberWithPath.test.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/agreements/__tests__/getIdcc.test.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/agreements/__tests__/getInfoMessage.test.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/agreements/__tests__/getTheme.test.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/agreements/generate.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/agreements/getAgreementsArticlesByTheme.ts (97%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/agreements/getIdcc.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/agreements/getInfoMessage.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/agreements/getTheme.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/agreements/index.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/breadcrumbs.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/buildThemes.js (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/cdtnDocuments.ts (99%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/context.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/contributions/__tests__/addGlossaryToContent.test.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/contributions/__tests__/generateContent.test.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/contributions/__tests__/generateLinkedContent.test.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/contributions/__tests__/generateMessageBlock.test.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/contributions/__tests__/generateMetadata.test.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/contributions/__tests__/getCcInfos.test.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/contributions/__tests__/getCcSupported.test.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/contributions/__tests__/helpers.test.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/contributions/addGlossaryToContent.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/contributions/fetchContributionsWithNoContent.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/contributions/fetchFicheSp.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/contributions/fetchLinkedContent.ts (94%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/contributions/fetchMessageBlock.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/contributions/generate.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/contributions/generateContent.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/contributions/generateLinkedContent.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/contributions/generateMessageBlock.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/contributions/generateMetadata.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/contributions/getCcInfos.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/contributions/getCcSupported.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/contributions/getCcSupportedWithNoContent.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/contributions/helpers.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/contributions/index.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/fetchCdtnAdminDocuments.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/fichesTravailSplitter.js (100%) rename {shared/elasticsearch-document-adapter/src/glossary/__tests__ => targets/export-elasticsearch/src/ingester/glossary/__mock__}/glossaryData.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/glossary/__tests__/glossary.test.ts (99%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/glossary/createGlossaryTransform.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/glossary/explodeGlossaryTerms.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/glossary/index.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/glossary/insertWebComponentGlossary.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/glossary/types.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/index.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/ingest.ts (99%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/markdown.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/monolog.js (97%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/plan-de-contenu.js (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/suggestion-cli.js (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/suggestion.test.ts (98%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/suggestion.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/types.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/types/Glossary.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/types/GraphQL.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/types/themes.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/utils/__tests__/detectNullInObject.test.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/utils/__tests__/index.test.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/utils/detectNullInObject.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/utils/index.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/utils/isHtml.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/utils/keyParser.ts (100%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/versions.js (81%) rename {shared/elasticsearch-document-adapter/src => targets/export-elasticsearch/src/ingester}/versions.test.js (93%) delete mode 100644 targets/frontend/README.md diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml index 44fff24dd..acd387493 100644 --- a/.github/workflows/quality.yml +++ b/.github/workflows/quality.yml @@ -48,10 +48,7 @@ jobs: "alert-cli", "ingester", "export-elasticsearch", - "@shared/dila-resolver", "@socialgouv/cdtn-elasticsearch", - "@shared/elasticsearch-document-adapter", - "@socialgouv/cdtn-logger", ] steps: - uses: actions/cache@v2 @@ -81,10 +78,7 @@ jobs: "alert-cli", "ingester", "export-elasticsearch", - "@shared/dila-resolver", "@socialgouv/cdtn-elasticsearch", - "@shared/elasticsearch-document-adapter", - "@socialgouv/cdtn-logger", ] steps: - uses: actions/cache@v2 diff --git a/README-dev.md b/README-dev.md deleted file mode 100644 index ca2508b4f..000000000 --- a/README-dev.md +++ /dev/null @@ -1,372 +0,0 @@ -# Code du travail numérique - Administration - dev - -## Setup - -Pour intialiser le projet, nous avons besoin d'une dépendance depuis le registry privé de [tiptap](https://tiptap.dev/). Suivez les étapes suivantes : - -- [Créer un compte (gratuit)](https://tiptap.dev/register) sur tiptap. -- Se rendre sur la page [Pro Extensions](https://collab.tiptap.dev/pro-extensions) de votre compte pour récupérer le token -- Créer un fichier `.npmTiptapToken.secret` contenant le token. Il sera utile pour `docker compose` et pour direnv (si l'on souhaite automatiser le chargement de la variable `NPM_TIPTAP_TOKEN`) -- Exporter la variable `NPM_TIPTAP_TOKEN` dans votre shell courant ou, pour automatiser cette étape, passer à l'étape suivante -- (optionnel) Pour automatiser la chargement de cette variable lorsque l'on est dans le dossier du projet, il est possible d'installer [direnv](https://direnv.net/). - ```sh - curl -sfL https://direnv.net/install.sh | bash - ``` - Le fichier `.npmTiptapToken.secret` contenant le token sera chargé par le fichier .envrc déjà présent à la racine. - Il faut ensuite executer `direnv allow` (et il faudra exécuter cette commande après chaque changement du fichier .envrc pour autoriser direnv à charger son contenu automatiquement lorsque le shell est dans le dossier) - -Vous pouvez maintenant lancer la commande `yarn install` pour installer les packages du projet. - -## URLs - -| Environnement | URL | -| -------------------------------------------------- | --------------------------------------------------------- | -| Production (access granted only for authorized IP) | | -| Preproduction | | - -## Overview - -This git repository is a monorepo composed of 5 projects. - -### Hasura - -Used to expose data through a GraphQL API. It contains the metadata and migrations for Hasura. - -See the [Hasura documentation](https://hasura.io/docs/1.0/graphql/core/index.html) for more information. We recommend -to [install the hasura console](https://hasura.io/docs/1.0/graphql/core/hasura-cli/install-hasura-cli.html) which -provides a graphql sandbox and an administration UI for hasura. - -### Ingester - -Used to populate the database with documents provided by external sources. - -There is, at this moment (February 2021), 5 sources: - -- [@SocialGouv/contributions-data](https://github.com/SocialGouv/contributions-data) -- [@SocialGouv/fiches-travail-data](https://github.com/SocialGouv/fiches-travail-data) -- [@SocialGouv/fiches-vdd](https://github.com/SocialGouv/fiches-vdd) -- [@SocialGouv/kali-data](https://github.com/SocialGouv/kali-data) -- [@SocialGouv/legi-data](https://github.com/SocialGouv/legi-data) - -Each GitHub repo uses releases to track changes. Each release exposes content as JSON. Ingester retrieves the last -version and inject data into Hasura. - -### alert-cli - -Used to detect changes between external source packages. For each new release of an external packages, this script -compares the content and insert diff in the database. - -See [documentation](targets/alert-cli/README.md) for more detail. - -## Setup - -Make sure you're using the last NodeJS. - -```sh -# Install all the packages -$ yarn -$ yarn build -``` - -It's easy to setup a new environment with docker compose : - -```sh -docker compose up -``` - -The docker compose performs several steps. - -### Configure a postgreSQL database - -A postgreSQL database is used to store the data exposed through a Hasura instance. - -> Start only the postgreSQL instance: -> -> ```sh -> docker compose up postgres -> ``` - -### Configure a Hasura instance - -A Hasura instance is used to expose the data stored in postgreSQL through a GraphQL API. See -the [Hasura documentation](https://hasura.io/docs/1.0/graphql/core/index.html) for more information. - -This step creates a new Hasura instance with the schema, and some data (see [metadata](targets/hasura/metadata) -and [migrations](targets/hasura/migrations) files of hasura target). - -To access to the Hasura console, run this command: - -```sh -hasura console --envfile ../../.env --project targets/hasura -``` - -A webpage is opened in your browser. The password is `admin1` as set in the `.env` file (`HASURA_GRAPHQL_ADMIN_SECRET` -key). - -> Start only the Hasura instance (it starts the postgreSQL as dependency): -> -> ```sh -> docker compose up hasura -> ``` - -### Inject documents - -A part of the content is based on documents retrieved from another services (code du travail, contributions, fiche -travail/emploi...). - -This step runs the Ingester script and populate the documentation. - -> Run the Ingester (/!\ hasura must be started): -> -> ```sh -> yarn workspace ingester run cli:dev -> ``` - -### Frontend - -An administration website is available to configure and inject custom data. - -This step starts the frontend project (based on `next.js`). User and admin accounts are automatically created by the -Hasura step. - -| Type | Username | Password | -| ----- | -------------------------------------- | -------- | -| Admin | codedutravailnumerique@travail.gouv.fr | admin | -| User | utilisateur@travail.gouv.fr | user | - -Frontend is reachable at the address - -> Run the frontend (it starts Hasura as dependency): -> -> ```sh -> docker compose up www -> ``` -> -> or via npm -> -> ```sh -> yarn workspace frontend dev -> ``` - -That's all 🎉 - -## Données - -### Table public.documents - -La table documents dans le schéma public contient les documents qui se transforment (pour la plus grande partie) en page sur le site du code du travail numérique. - -Voici un tableau descriptif des champs de cette table : - -| Nom du champ | type | Description | -| ---------------- | ------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| cdtn_id | text | Identifiant unique générer par la méthode `generateCdtnId` dans le package `shared/id-generator` | -| initial_id | text | L'identifiant externe du document (pour les contenus legifrance c'est le `KALIARTI` renvoyé par l'API, pour la fiche service publique c'est l'identifiant `FXXX` fourni, pour les contenus internes c'est un UUID généré...) | -| title | text | Le titre de la page qui sera affiché dans le H1. Attention, il y a également le `meta_title` qui peut être présent dans le champ `document` | -| meta_description | text | La meta description de la page | -| source | text | L'identifiant de la source, voici la liste: (`dossiers`, `prequalified`, `conventions_collectives`, `external`, `themes`, `contributions`, `page_fiche_ministere_travail`, `information`, `outils`, `highlights`, `modeles_de_courriers`, `fiches_service_public`, `code_du_travail`) | -| slug | text | Le slug présent dans l'URL utilisé comme identifiant unique pour récupérer le contenu dans la page depuis le front | -| text | text | Contenu de la page en format texte brut pour générer les vecteurs de recherche | -| document | jsonb | Contenu de la page dans un format `jsonb` (attention, ça peut être un peu un fourre-tout) | -| is_published | boolean | Permet d'activer/désactiver la génération d'une page sur le site associé au contenu. Utilisé pour dépublier du contenu par l'équipe métier. Attention, actuellement utilisé également pour permettre la recherche de convention collective qui ne possèdent pas de page associée issue du projet `kali-data` | -| is_searchable | boolean | Permet de recherche la page depuis le moteur globale du site code du travail numérique. Cela ne permet pas de désactiver la recherche depuis un moteur externe. | -| created_at | timestamp with time zone | Date de création du document | -| updated_at | timestamp with time zone | Date de mise à jour du document | -| is_available | boolean | **Flag technique**. Il est utilisé par l'ingester. Il permet d'identifier les contenus externes (fiche SP, convention collective...) qui ne sont plus disponibles. L'ingester va mettre le flag à false dans ce cas. On ne supprime pas le contenu car il y a des thèmes associés et si le contenu revient, on ne souhaite pas perdre les thèmes associés | - -## Auditabilité - -Lorsqu'on rajoute une table, ne pas oublier de rajouter dans la migration l'appel à la fonction d'audit - -```sql - --- ajout des triggers d'audit sur la table documents -select audit.audit_table('documents'); - --- Le trigger peut être configuré pour -select audit.audit_table('documents', --- se declencher au niveau ROW ou STATEMENT - 'false', --- enregistrer le text de la requête - 'false', --- ignorer d'enregistrer certains champs - '{text}'); -``` - -Pour voir la [configuration du trigger](targets/hasura/migrations/1613474820206_audit_trigger/up.sql) - -## Suppression des données anciennes - -Les données de certaines tables sont nettoyées automatiquement. - -Pour l'instant seulement 2 triggers sont en place: - -- nettoyage de la table `alerts` (alertes traitées conservés pour 3mois) -- nettoyage de la table `audit.logged_action` (actions conservées pour 3mois) - -## How to ? - -### Injecter les données depuis la production - -Actuellement, l'ingester permet d'alimenter la base de données avec les documents externes (contributions, code du -travail...). Toutes les données écrites par l'équipe (thèmes, dossiers, modèles...) doivent, par contre, être récupéré -depuis la base de données en production. - -Une [issue](https://github.com/SocialGouv/cdtn-admin/issues/320) a été ouverte pour trouver la meilleure façon de -récupérer les données de production dans un environnement de dev. Actuellement, la meilleure solution est de demander un -backup de la base de données à l'équipe SRE et d'exécuter les commandes suivantes : - -```sh -docker compose exec -T postgres pg_restore \ - --dbname postgres --clean --if-exists --user postgres \ - --no-owner --no-acl --verbose < ~/Downloads/hasura_prod_db.psql -``` - -et pour remettre les utilisateurs par défaut - -```sh -docker compose exec -T postgres psql \ - --dbname postgres --user postgres \ - < .kontinuous/sql/post-restore.sql -``` - -### Alimenter l'elasticsearch en local (pour le CDTN frontend) - -Dans un premier temps, il faut lancer un elasticsearch. La documentation est disponible dans le -projet [readme dev](https://github.com/SocialGouv/code-du-travail-numerique/blob/master/README-dev.md) du -projet [code-du-travail-numerique](https://github.com/SocialGouv/code-du-travail-numerique). - -Il faut ensuite lancer l'`ingester-elasticsearch` pour alimenter l'elasticsearch. Ce dernier récupérant les données -depuis hasura, il est préférable de récupérer les données de prod ( -cf : [Injecter les données depuis la production](https://github.com/SocialGouv/cdtn-admin/blob/master/README-dev.md#injecter-les-donnees-depuis-la-production)) - -Pour lancer l'`ingester-elasticsearch`, reporter vous à la [documentation `export-elasticsearch`](./targets/export-elasticsearch/README.md) - -**Note :** La durée d'exécution prend du temps (environ 15 minutes) - -Par défaut, la commande va alimenter l'elasticsearch en local sur le port 9200 qui est le port utilisé par -l'elasticsearch du projet [code-du-travail-numerique](https://github.com/SocialGouv/code-du-travail-numerique). - -Ce script utilise les variables suivantes : - -| Variable | Description | Par défaut | -| --------------------------- | -------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------- | -| CDTN_ADMIN_ENDPOINT | URL vers l'endpoint de l'admin (ou d'hasura) | http://localhost:8080/v1/graphql | -| HASURA_GRAPHQL_ENDPOINT | URL vers l'endpoint GraphQL d'Hasura | http://localhost:8082/v1/graphql | -| HASURA_GRAPHQL_ADMIN_SECRET | L'admin secret pour se connected à Hasura | admin1 | -| HASURA_GRAPHQL_JWT_SECRET | Le JWT secret pour se connected à Hasura | `{"type": "HS256", "key": "a_pretty_long_secret_key_that_should_be_at_least_32_char"}` | -| NLP_URL | URL vers le [serving-ml](https://github.com/SocialGouv/serving-ml) permettant de vectoriser les documents | vide | -| ES_LOGS | URL ver le [monolog](https://github.com/SocialGouv/cdtn-monolog) permettant de récupérer les covisites sur les pages | vide | -| ES_LOGS_TOKEN | Token pour se connecter au monolog | vide | - -Certaines variables permettent d'activer une fonctionnalité : - -- `NLP_URL` permet d'activer la vectorisation des documents pour la recherche. Pour l'activer, vous pouvez utiliser l'URL . -- `ES_LOGS` et `ES_LOGS_TOKEN` permettent d'activer les `Articles liés`. Pour l'activer, vous pouvez récupérer ces informations depuis Rancher. - -#### Tester localement l'ingester ES avec le frontend - -```sh -yarn build # build code -``` - -Then, follow instruction in the README.md of `export-elasticsearch`. - -On the client, you need to run this command : - -```sh -NLP_URL=https://serving-ml-preprod.dev.fabrique.social.gouv.fr yarn dev:api # côté cdtn-frontend -API_URL=http://localhost:1337/api/v1 yarn workspace @cdt/frontend dev # côté cdtn-frontend -``` - -## Troubleshooting - -### Désynchronisation des PRs et des pipelines Gitlab - -**Symptômes:** - -À chaque PR Github, le check `ci/gitlab/gitlab.factory.social.gouv.fr` reste bloqué -sur `Expected — Waiting for status to be reported`. Sur Gitlab, la branche est bien présente et la pipeline associée -fonctionne. - -**Résolution:** - -Il faut mettre à jour le token Github. Commencez par créer -un [nouveau token Github](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token) -, sélectionnez le scope `repo` sans expiration. - -Puis dans Gitlab, `cdtn-admin > Settings > Integrations > Github`, copiez le token Github, cliquez sur `Test settings` -et si OK, cliquez sur `Save changes`. - -Pour relancer les checks sur les PRs, vous pouvez supprimer la branche dans gitlab et relancer le check 🇫🇷 sur Github. - -## Compter le nombre de documents totaux - -```gql -query GetAllDocuments($sources: [String!]) { - documents(where: { source: { _in: $sources } }) { - cdtn_id - } -} -``` - -With published documents: - -```gql -query GetAllDocumentsPublished($sources: [String!]) { - documents(where: { is_published: { _eq: true }, source: { _in: $sources } }) { - cdtn_id - } -} -``` - -Avec comme paramètres : - -```json -{ - "sources": ["page_fiche_ministere_travail", "information", "fiches_service_public", "modeles_de_courriers", "contributions", "conventions_collectives"] -} -``` - -Pour la partie sql, il faut utiliser la requête suivante : - -```sql -SELECT COUNT(*) -FROM documents -WHERE source IN ('page_fiche_ministere_travail', 'information', 'fiches_service_public', 'modeles_de_courriers', 'contributions', 'conventions_collectives') - AND is_published = TRUE; -``` - -## Lier une branche de test de l'admin à une branche du frontend CDTN fonctionnelle - -Le but est de pouvoir exporter les données de la branche dans elasticsearch et d'avoir une instance du site cdtn qui est lié à ces données. - -### Bien nommer sa branche - -Afin de lier les deux environnements, il est nécessaire de nommer identiquement ses branches (admin et cdtn) en commençant par le mot `linked` (exemple : `linked-my-feature`, `linked/my-feature`). -Cela permet de lier l'index elasticsearch automatiquement entre les deux branches. - -### Exporter les données sur une branche déployée - -L'export des données se fait depuis l'admin dans la section `Contenus > Mise à jour`. Il faut ensuite cliquer sur le bouton `Mettre à jour la pre-production`. - -> Note: Le glossary (injection des tooltips) et le NLP (vectorisation des données) sont par défaut désactivé en dev. - -#### Activer le glossary et le NLP - -Il faut commencer par donner les ressources nécessaires au processus dans l'environnement de dev : - -- Ouvrir le fichier `.kontinous/env/dev/values.yaml` -- Appliquer ce que les commentaires indiquent pour les ressources sur hasura et export - -L'export des données se fait depuis l'admin dans la section `Contenus > Mise à jour`. Il faut ensuite cliquer sur le bouton `Mettre à jour la production`. - -/!\ /!\ /!\ ATTENTION /!\ /!\ /!\ : Bien penser à remettre les lignes en commentaire avant de merger dans master ! - -> Pourquoi changer les ressources ? -> L'export avec glossary et NLP est un processus qui demande beaucoup de RAM/CPU. Afin de ne pas surcharger le cluster de dev, on ne va pas demander ces ressources car l'export est peu utilisé pour les tests. Il n'existe aucun mécanisme sur la CI à l'heure actuelle pour permettre de faire le switch autrement. - -### Limitations connues - -- Les fichiers du site sont stockés au même endroit pour l'ensemble des branches. Si on ajoute/modifie/supprime un fichier, cela sera également le cas sur l'ensemble des branches -- Le sitemap du site est stocké au même endroit pour l'ensemble des branches. Les branches sur le site CDTN récupérera le dernier sitemap généré. diff --git a/README.md b/README.md index 1ded5cb89..1bf6c3f62 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,330 @@ -# Code du travail numérique - Administration +# Code du travail numérique - Outil d'administration -> Administrating [code.travail.gouv.fr](https://code.travail.gouv.fr) content. +## Setup -## Développement +Pour initialiser le projet, nous avons besoin d'une dépendance depuis le registry privé de [tiptap](https://tiptap.dev/). Suivez les étapes suivantes : -Retrouvez toutes les infos techniques pour démarrer le projet sur [README-dev](./README-dev.md) +- [Créer un compte (gratuit)](https://tiptap.dev/register) sur tiptap. +- Se rendre sur la page [Pro Extensions](https://collab.tiptap.dev/pro-extensions) de votre compte pour récupérer le token +- Créer un fichier `.npmTiptapToken.secret` contenant le token. Il sera utile pour `docker compose` et pour direnv (si l'on souhaite automatiser le chargement de la variable `NPM_TIPTAP_TOKEN`) +- Exporter la variable `NPM_TIPTAP_TOKEN` dans votre shell courant ou, pour automatiser cette étape, passer à l'étape suivante +- (optionnel) Pour automatiser la chargement de cette variable lorsque l'on est dans le dossier du projet, il est possible d'installer [direnv](https://direnv.net/). + +```sh + curl -sfL https://direnv.net/install.sh | bash +``` + +Le fichier `.npmTiptapToken.secret` contenant le token sera chargé par le fichier .envrc déjà présent à la racine. +Il faut ensuite executer `direnv allow` (et il faudra exécuter cette commande après chaque changement du fichier .envrc pour autoriser direnv à charger son contenu automatiquement lorsque le shell est dans le dossier) + +Vous pouvez maintenant lancer la commande `yarn install` pour installer les packages du projet et `yarn build` pour build les packages. + +## URLs + +| Environnement | URL | +| -------------------------------------------------- | --------------------------------------------------------- | +| Production (access granted only for authorized IP) | | +| Preproduction | | + +## Projets + +### ingester + +Used to populate the database with documents provided by external sources. + +- [@SocialGouv/fiches-travail-data](https://github.com/SocialGouv/fiches-travail-data) +- [@SocialGouv/fiches-vdd](https://github.com/SocialGouv/fiches-vdd) +- [@SocialGouv/kali-data](https://github.com/SocialGouv/kali-data) +- [@SocialGouv/legi-data](https://github.com/SocialGouv/legi-data) + +Each GitHub repo uses releases to track changes. Each release exposes content as JSON. Ingester retrieves the last +version and inject data into Hasura. + +A part of the content is based on documents retrieved from another services (code du travail, contributions, fiche +travail/emploi...). + +This step runs the Ingester script and populate the documentation. + +> Run the Ingester (/!\ hasura must be started): +> +> ```sh +> yarn workspace ingester run cli:dev +> ``` + +### alert-cli + +Used to detect changes between external source packages. For each new release of an external packages, this script +compares the content and insert diff in the database. + +### hasura + +To access to the Hasura console, run this command: + +```sh +hasura console --envfile ../../.env --project targets/hasura +``` + +A webpage is opened in your browser. The password is `admin1` as set in the `.env` file (`HASURA_GRAPHQL_ADMIN_SECRET` +key). + +> Start only the Hasura instance (it starts the postgreSQL as dependency): +> +> ```sh +> docker compose up hasura +> ``` + +### frontend + +An administration website is available to configure and inject custom data. + +This step starts the frontend project (based on `next.js`). User and admin accounts are automatically created by the +Hasura step. + +| Type | Username | Password | +| ----- | -------------------------------------- | -------- | +| Admin | codedutravailnumerique@travail.gouv.fr | admin | +| User | utilisateur@travail.gouv.fr | user | + +Frontend is reachable at the address + +> Run the frontend (it starts Hasura as dependency): +> +> ```sh +> docker compose up www +> ``` +> +> or via npm +> +> ```sh +> yarn workspace frontend dev +> ``` + +## export-elasticsearch + +This service exposes an API which handle to trigger the export of the data from Postgres to Elasticsearch. Then, copy sitemap.xml from a container azure to an other container azure. To finish, it copies a container azure to an other container azure. + +### Environment variable + +| Name | Description | Default value | +| ---------------------- | ----------------------------------------------------------------------------------------------- | ------------- | +| `DISABLE_LIMIT_EXPORT` | It allows you to disable concurrent run in ingester (by default it's one hour between each run) | undefined | +| `DISABLE_INGESTER` | It allows you to disable ingester in the process of export | undefined | +| `DISABLE_SITEMAP` | It allows you to disable copy of the sitemap | undefined | +| `DISABLE_COPY` | It allows you to disable copy between two containers | undefined | +| `DISABLE_GLOSSARY` | It allows you to disable the glossary (inject tooltips in contents) | undefined | + +### Running an export + +#### 1. Install and build dependencies + +At the root of the project + +```sh +yarn # to install dep +yarn workspace export-elasticsearch build # to build project +``` + +#### 2. Run the postgres to add data + +At the root of the project, please run this command: + +```sh +docker-compose up -d postgres +``` + +#### 3. Load data from production to local + +##### 1. Restore data + +```sh +docker-compose exec -T postgres pg_restore \ + --dbname postgres --clean --if-exists --user postgres \ + --no-owner --no-acl --verbose < ~/MY_PATH/hasura_prod_db.psql +``` + +##### 2. Restore roles + +```sh +docker-compose exec -T postgres psql \ + --dbname postgres --user postgres \ + < .kontinuous/sql/post-restore.sql +``` + +#### 4. Run the other containers + +```sh +docker-compose up -d hasura azurite elasticsearch +``` + +#### 5. Run ingester in development mode + +```sh +GLOSSARY_PREPROD_DISABLE=true DISABLE_LIMIT_EXPORT=true DISABLE_SITEMAP=true DISABLE_COPY=true NLP_URL=https://serving-ml-preprod.dev.fabrique.social.gouv.fr HASURA_GRAPHQL_ENDPOINT="http://localhost:8080/v1/graphql" HASURA_GRAPHQL_ADMIN_SECRET="admin1" ELASTICSEARCH_URL_PREPROD="http://localhost:9200" ELASTICSEARCH_URL_PROD="http://localhost:9200" AZ_ACCOUNT_KEY_FROM="Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==" AZ_ACCOUNT_NAME_FROM="devstoreaccount1" AZ_URL_FROM="http://localhost:10000/devstoreaccount1" AZ_ACCOUNT_KEY_TO="Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==" AZ_ACCOUNT_NAME_TO="devstoreaccount1" AZ_URL_TO="http://localhost:10000/devstoreaccount1" SITEMAP_DESTINATION_CONTAINER="sitemap" SITEMAP_DESTINATION_NAME="sitemap.xml" SITEMAP_ENDPOINT="http://localhost:3001/api/sitemap" CDTN_ADMIN_ENDPOINT="http://localhost:8080/v1/graphql" SOURCE_CONTAINER_COPY="sitemap" DESTINATION_CONTAINER_COPY="testcopy" ELASTICSEARCH_INDEX_PREPROD="cdtn-v2" ELASTICSEARCH_INDEX_PROD="cdtn-v2" yarn workspace export-elasticsearch dev +``` + +- `DISABLE_LIMIT_EXPORT` is used to disable the limit to run two export in less than one hour +- `DISABLE_COPY` is used to disable copy between two containers +- `DISABLE_SITEMAP` is used to disable copy of the sitemap +- `GLOSSARY_PREPROD_DISABLE` is used to disable glossary to gain time. + +> **Note**: You can remove `NLP_URL` from your environment variables if you don't want to use the NLP service and gain time during the process of ingester elasticsearch. + +#### 6. Run the export elasticsearch + +##### With cli + +```sh +yarn workspace export-elasticsearch run:ingester +``` + +##### On admin + +```sh +yarn workspace frontend dev +``` + +#### On client + +```sh +NLP_URL=https://serving-ml-preprod.dev.fabrique.social.gouv.fr yarn workspace @cdt/frontend dev +``` + +1. Go to `http://localhost:3001/` +2. Connect to the frontend ui with `codedutravailnumerique@travail.gouv.fr` and `admin` as password. +3. Navigate to `Mise à jour` +4. Click on `Mettre à jour la pre-production` or `Mettre à jour la production` + +### Générer un backup en local + +1. Se connecter à teleport : `tsh login --proxy=teleport.fabrique.social.gouv.fr --auth=github` +2. Lancer la commande pour faire un proxy avec la database de prod : `tsh proxy db --db-user=PostgresAdmins --db-name=postgres cdtnadminprodserver --tunnel` +3. Utiliser pg_dump pour faire un backup de la database en remplaçant par le bon port : `docker-compose exec -T postgres pg_dump --no-owner --no-acl -v -Fc postgres://PostgresAdmins@host.docker.internal:PORT/hasura_prod > hasura_cdtn_admin_prod_db.psql` + +La documentation pour teleport est disponible ici : + +## Données + +### Table public.documents + +La table documents dans le schéma public contient les documents qui se transforment (pour la plus grande partie) en page sur le site du code du travail numérique. + +Voici un tableau descriptif des champs de cette table : + +| Nom du champ | type | Description | +| ---------------- | ------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| cdtn_id | text | Identifiant unique générer par la méthode `generateCdtnId` dans le package `shared/id-generator` | +| initial_id | text | L'identifiant externe du document (pour les contenus legifrance c'est le `KALIARTI` renvoyé par l'API, pour la fiche service publique c'est l'identifiant `FXXX` fourni, pour les contenus internes c'est un UUID généré...) | +| title | text | Le titre de la page qui sera affiché dans le H1. Attention, il y a également le `meta_title` qui peut être présent dans le champ `document` | +| meta_description | text | La meta description de la page | +| source | text | L'identifiant de la source, voici la liste: (`dossiers`, `prequalified`, `conventions_collectives`, `external`, `themes`, `contributions`, `page_fiche_ministere_travail`, `information`, `outils`, `highlights`, `modeles_de_courriers`, `fiches_service_public`, `code_du_travail`) | +| slug | text | Le slug présent dans l'URL utilisé comme identifiant unique pour récupérer le contenu dans la page depuis le front | +| text | text | Contenu de la page en format texte brut pour générer les vecteurs de recherche | +| document | jsonb | Contenu de la page dans un format `jsonb` (attention, ça peut être un peu un fourre-tout) | +| is_published | boolean | Permet d'activer/désactiver la génération d'une page sur le site associé au contenu. Utilisé pour dépublier du contenu par l'équipe métier. Attention, actuellement utilisé également pour permettre la recherche de convention collective qui ne possèdent pas de page associée issue du projet `kali-data` | +| is_searchable | boolean | Permet de recherche la page depuis le moteur globale du site code du travail numérique. Cela ne permet pas de désactiver la recherche depuis un moteur externe. | +| created_at | timestamp with time zone | Date de création du document | +| updated_at | timestamp with time zone | Date de mise à jour du document | +| is_available | boolean | **Flag technique**. Il est utilisé par l'ingester. Il permet d'identifier les contenus externes (fiche SP, convention collective...) qui ne sont plus disponibles. L'ingester va mettre le flag à false dans ce cas. On ne supprime pas le contenu car il y a des thèmes associés et si le contenu revient, on ne souhaite pas perdre les thèmes associés | + +## Auditabilité + +Lorsqu'on rajoute une table, ne pas oublier de rajouter dans la migration l'appel à la fonction d'audit + +```sql + +-- ajout des triggers d'audit sur la table documents +select audit.audit_table('documents'); + +-- Le trigger peut être configuré pour +select audit.audit_table('documents', +-- se declencher au niveau ROW ou STATEMENT + 'false', +-- enregistrer le text de la requête + 'false', +-- ignorer d'enregistrer certains champs + '{text}'); +``` + +Pour voir la [configuration du trigger](targets/hasura/migrations/1613474820206_audit_trigger/up.sql) + +## Suppression des données anciennes + +Les données de certaines tables sont nettoyées automatiquement. + +Pour l'instant seulement 2 triggers sont en place: + +- nettoyage de la table `alerts` (alertes traitées conservés pour 3mois) +- nettoyage de la table `audit.logged_action` (actions conservées pour 3mois) + +## Requêtes hasura utiles + +### Compter le nombre de documents totaux + +```gql +query GetAllDocuments($sources: [String!]) { + documents(where: { source: { _in: $sources } }) { + cdtn_id + } +} +``` + +With published documents: + +```gql +query GetAllDocumentsPublished($sources: [String!]) { + documents(where: { is_published: { _eq: true }, source: { _in: $sources } }) { + cdtn_id + } +} +``` + +Avec comme paramètres : + +```json +{ + "sources": ["page_fiche_ministere_travail", "information", "fiches_service_public", "modeles_de_courriers", "contributions", "conventions_collectives"] +} +``` + +Pour la partie sql, il faut utiliser la requête suivante : + +```sql +SELECT COUNT(*) +FROM documents +WHERE source IN ('page_fiche_ministere_travail', 'information', 'fiches_service_public', 'modeles_de_courriers', 'contributions', 'conventions_collectives') + AND is_published = TRUE; +``` + +## Lier une branche de test de l'admin à une branche du frontend CDTN fonctionnelle + +Le but est de pouvoir exporter les données de la branche dans elasticsearch et d'avoir une instance du site cdtn qui est lié à ces données. + +### Bien nommer sa branche + +Afin de lier les deux environnements, il est nécessaire de nommer identiquement ses branches (admin et cdtn) en commençant par le mot `linked` (exemple : `linked-my-feature`, `linked/my-feature`). +Cela permet de lier l'index elasticsearch automatiquement entre les deux branches. + +### Exporter les données sur une branche déployée + +L'export des données se fait depuis l'admin dans la section `Contenus > Mise à jour`. Il faut ensuite cliquer sur le bouton `Mettre à jour la pre-production`. + +> Note: Le glossary (injection des tooltips) et le NLP (vectorisation des données) sont par défaut désactivé en dev. + +#### Activer le glossary et le NLP + +Il faut commencer par donner les ressources nécessaires au processus dans l'environnement de dev : + +- Ouvrir le fichier `.kontinous/env/dev/values.yaml` +- Appliquer ce que les commentaires indiquent pour les ressources sur hasura et export + +L'export des données se fait depuis l'admin dans la section `Contenus > Mise à jour`. Il faut ensuite cliquer sur le bouton `Mettre à jour la production`. + +/!\ /!\ /!\ ATTENTION /!\ /!\ /!\ : Bien penser à remettre les lignes en commentaire avant de merger dans master ! + +> Pourquoi changer les ressources ? +> L'export avec glossary et NLP est un processus qui demande beaucoup de RAM/CPU. Afin de ne pas surcharger le cluster de dev, on ne va pas demander ces ressources car l'export est peu utilisé pour les tests. Il n'existe aucun mécanisme sur la CI à l'heure actuelle pour permettre de faire le switch autrement. + +### Limitations connues + +- Les fichiers du site sont stockés au même endroit pour l'ensemble des branches. Si on ajoute/modifie/supprime un fichier, cela sera également le cas sur l'ensemble des branches +- Le sitemap du site est stocké au même endroit pour l'ensemble des branches. Les branches sur le site CDTN récupérera le dernier sitemap généré. diff --git a/shared/dila-resolver/.eslintignore b/shared/dila-resolver/.eslintignore deleted file mode 100644 index 3063f07d5..000000000 --- a/shared/dila-resolver/.eslintignore +++ /dev/null @@ -1,2 +0,0 @@ -lib -node_modules diff --git a/shared/dila-resolver/.eslintrc.json b/shared/dila-resolver/.eslintrc.json deleted file mode 100644 index ec20fc733..000000000 --- a/shared/dila-resolver/.eslintrc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": ["@shared/eslint-config"] -} diff --git a/shared/dila-resolver/.gitignore b/shared/dila-resolver/.gitignore deleted file mode 100644 index 039ca72b0..000000000 --- a/shared/dila-resolver/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -.eslintcache -lib diff --git a/shared/dila-resolver/CHANGELOG.md b/shared/dila-resolver/CHANGELOG.md deleted file mode 100644 index f9b807d20..000000000 --- a/shared/dila-resolver/CHANGELOG.md +++ /dev/null @@ -1,422 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -## [2.28.4](https://github.com/SocialGouv/cdtn-admin/compare/v2.28.3...v2.28.4) (2023-12-21) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.28.3](https://github.com/SocialGouv/cdtn-admin/compare/v2.28.2...v2.28.3) (2023-12-20) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.28.2](https://github.com/SocialGouv/cdtn-admin/compare/v2.28.1...v2.28.2) (2023-12-19) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.28.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.28.0...v2.28.1) (2023-12-18) - -**Note:** Version bump only for package @shared/dila-resolver - -# [2.28.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.27.2...v2.28.0) (2023-12-18) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.27.2](https://github.com/SocialGouv/cdtn-admin/compare/v2.27.1...v2.27.2) (2023-12-08) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.27.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.27.0...v2.27.1) (2023-12-08) - -**Note:** Version bump only for package @shared/dila-resolver - -# [2.27.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.26.2...v2.27.0) (2023-12-07) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.26.2](https://github.com/SocialGouv/cdtn-admin/compare/v2.26.1...v2.26.2) (2023-12-05) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.26.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.26.0...v2.26.1) (2023-12-05) - -**Note:** Version bump only for package @shared/dila-resolver - -# [2.26.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.25.1...v2.26.0) (2023-12-04) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.25.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.25.0...v2.25.1) (2023-11-29) - -**Note:** Version bump only for package @shared/dila-resolver - -# [2.25.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.24.2...v2.25.0) (2023-11-24) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.24.2](https://github.com/SocialGouv/cdtn-admin/compare/v2.24.1...v2.24.2) (2023-11-20) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.24.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.24.0...v2.24.1) (2023-11-20) - -**Note:** Version bump only for package @shared/dila-resolver - -# [2.24.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.23.0...v2.24.0) (2023-11-15) - -**Note:** Version bump only for package @shared/dila-resolver - -# [2.23.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.22.0...v2.23.0) (2023-11-10) - -**Note:** Version bump only for package @shared/dila-resolver - -# [2.22.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.21.0...v2.22.0) (2023-11-08) - -**Note:** Version bump only for package @shared/dila-resolver - -# [2.21.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.20.1...v2.21.0) (2023-10-27) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.20.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.20.0...v2.20.1) (2023-10-23) - -**Note:** Version bump only for package @shared/dila-resolver - -# [2.20.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.19.1...v2.20.0) (2023-10-19) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.19.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.19.0...v2.19.1) (2023-10-10) - -**Note:** Version bump only for package @shared/dila-resolver - -# [2.19.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.18.0...v2.19.0) (2023-10-09) - -**Note:** Version bump only for package @shared/dila-resolver - -# [2.18.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.9...v2.18.0) (2023-10-09) - -### Bug Fixes - -- **dependencies:** remove un-used dependencies ([#1034](https://github.com/SocialGouv/cdtn-admin/issues/1034)) ([529ffb4](https://github.com/SocialGouv/cdtn-admin/commit/529ffb40bcf79738494d745b0bb756ebd43ab3a4)) - -## [2.17.9](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.8...v2.17.9) (2023-09-29) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.17.8](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.7...v2.17.8) (2023-09-28) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.17.7](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.6...v2.17.7) (2023-09-27) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.17.6](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.5...v2.17.6) (2023-09-27) - -### Bug Fixes - -- **env:** remove env in targets ([2262e45](https://github.com/SocialGouv/cdtn-admin/commit/2262e4515c01224af115f72b74eedcceca871f9e)) - -## [2.17.5](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.4...v2.17.5) (2023-09-27) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.17.4](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.3...v2.17.4) (2023-09-27) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.17.3](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.2...v2.17.3) (2023-09-27) - -### Bug Fixes - -- yarn berry + fetch + docker opti + sec ([#1012](https://github.com/SocialGouv/cdtn-admin/issues/1012)) ([81bce48](https://github.com/SocialGouv/cdtn-admin/commit/81bce4838781e60c05a084769a35cf0d2a26609c)) - -## [2.17.2](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.1...v2.17.2) (2023-09-25) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.17.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.0...v2.17.1) (2023-09-25) - -**Note:** Version bump only for package @shared/dila-resolver - -# [2.17.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.16.1...v2.17.0) (2023-09-25) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.16.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.16.0...v2.16.1) (2023-09-20) - -**Note:** Version bump only for package @shared/dila-resolver - -# [2.16.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.15.1...v2.16.0) (2023-09-18) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.15.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.15.0...v2.15.1) (2023-09-18) - -**Note:** Version bump only for package @shared/dila-resolver - -# [2.15.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.14.0...v2.15.0) (2023-09-15) - -**Note:** Version bump only for package @shared/dila-resolver - -# [2.14.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.13.0...v2.14.0) (2023-09-05) - -**Note:** Version bump only for package @shared/dila-resolver - -# [2.13.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.12.1...v2.13.0) (2023-08-25) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.12.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.12.0...v2.12.1) (2023-08-04) - -**Note:** Version bump only for package @shared/dila-resolver - -# [2.12.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.11.4...v2.12.0) (2023-08-02) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.11.4](https://github.com/SocialGouv/cdtn-admin/compare/v2.11.3...v2.11.4) (2023-07-31) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.11.3](https://github.com/SocialGouv/cdtn-admin/compare/v2.11.2...v2.11.3) (2023-07-28) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.11.2](https://github.com/SocialGouv/cdtn-admin/compare/v2.11.1...v2.11.2) (2023-07-25) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.11.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.11.0...v2.11.1) (2023-07-18) - -**Note:** Version bump only for package @shared/dila-resolver - -# [2.11.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.10.2...v2.11.0) (2023-07-12) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.10.2](https://github.com/SocialGouv/cdtn-admin/compare/v2.10.1...v2.10.2) (2023-07-04) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.10.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.10.0...v2.10.1) (2023-07-03) - -**Note:** Version bump only for package @shared/dila-resolver - -# [2.10.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.9.1...v2.10.0) (2023-07-03) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.9.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.9.0...v2.9.1) (2023-06-26) - -**Note:** Version bump only for package @shared/dila-resolver - -# [2.9.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.8.0...v2.9.0) (2023-06-26) - -### Bug Fixes - -- **lerna:** modify internals dependencies ([c39b77d](https://github.com/SocialGouv/cdtn-admin/commit/c39b77d65692619463f96b3f5eb51e7b1ea976ef)) - -### Features - -- **dep:** update package.json ([69c69ac](https://github.com/SocialGouv/cdtn-admin/commit/69c69ac26b7ac857d1a06c8bbb80e73811460038)) - -# [2.8.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.7.1...v2.8.0) (2023-06-26) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.7.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.7.0...v2.7.1) (2023-06-01) - -### Bug Fixes - -- **dila-api-client:** upgrade to latest version ([#922](https://github.com/SocialGouv/cdtn-admin/issues/922)) ([d19fe83](https://github.com/SocialGouv/cdtn-admin/commit/d19fe830171b107c15702308fc5380334fe26810)) - -# [2.7.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.6.1...v2.7.0) (2023-05-30) - -### Features - -- implementation contribution list ([#897](https://github.com/SocialGouv/cdtn-admin/issues/897)) ([1643d85](https://github.com/SocialGouv/cdtn-admin/commit/1643d853ab9cfbb61bde03394aaf60adade968d4)), closes [#912](https://github.com/SocialGouv/cdtn-admin/issues/912) [#907](https://github.com/SocialGouv/cdtn-admin/issues/907) [#913](https://github.com/SocialGouv/cdtn-admin/issues/913) [#915](https://github.com/SocialGouv/cdtn-admin/issues/915) [#916](https://github.com/SocialGouv/cdtn-admin/issues/916) - -## [2.6.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.6.0...v2.6.1) (2023-05-04) - -**Note:** Version bump only for package @shared/dila-resolver - -# [2.6.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.5.4...v2.6.0) (2023-05-04) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.5.4](https://github.com/SocialGouv/cdtn-admin/compare/v2.5.3...v2.5.4) (2023-03-23) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.5.3](https://github.com/SocialGouv/cdtn-admin/compare/v2.5.2...v2.5.3) (2023-03-02) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.5.2](https://github.com/SocialGouv/cdtn-admin/compare/v2.5.1...v2.5.2) (2023-02-23) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.5.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.5.0...v2.5.1) (2023-02-10) - -**Note:** Version bump only for package @shared/dila-resolver - -# [2.5.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.4.5...v2.5.0) (2023-02-10) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.4.5](https://github.com/SocialGouv/cdtn-admin/compare/v2.4.4...v2.4.5) (2022-12-28) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.4.4](https://github.com/SocialGouv/cdtn-admin/compare/v2.4.3...v2.4.4) (2022-12-16) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.4.3](https://github.com/SocialGouv/cdtn-admin/compare/v2.4.2...v2.4.3) (2022-12-16) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.4.2](https://github.com/SocialGouv/cdtn-admin/compare/v2.4.1...v2.4.2) (2022-12-15) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.4.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.4.0...v2.4.1) (2022-12-15) - -**Note:** Version bump only for package @shared/dila-resolver - -# [2.4.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.3.8...v2.4.0) (2022-12-15) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.3.8](https://github.com/SocialGouv/cdtn-admin/compare/v2.3.7...v2.3.8) (2022-12-07) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.3.7](https://github.com/SocialGouv/cdtn-admin/compare/v2.3.6...v2.3.7) (2022-12-06) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.3.6](https://github.com/SocialGouv/cdtn-admin/compare/v2.3.5...v2.3.6) (2022-12-06) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.3.5](https://github.com/SocialGouv/cdtn-admin/compare/v2.3.4...v2.3.5) (2022-11-08) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.3.4](https://github.com/SocialGouv/cdtn-admin/compare/v2.3.3...v2.3.4) (2022-10-13) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.3.3](https://github.com/SocialGouv/cdtn-admin/compare/v2.3.2...v2.3.3) (2022-10-12) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.3.2](https://github.com/SocialGouv/cdtn-admin/compare/v2.3.1...v2.3.2) (2022-10-12) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.3.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.3.0...v2.3.1) (2022-10-10) - -**Note:** Version bump only for package @shared/dila-resolver - -# [2.3.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.2.0...v2.3.0) (2022-10-06) - -**Note:** Version bump only for package @shared/dila-resolver - -# [2.2.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.1.0...v2.2.0) (2022-09-05) - -**Note:** Version bump only for package @shared/dila-resolver - -# [2.1.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.0.1...v2.1.0) (2022-09-02) - -**Note:** Version bump only for package @shared/dila-resolver - -## [2.0.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.0.0...v2.0.1) (2022-08-29) - -**Note:** Version bump only for package @shared/dila-resolver - -# [2.0.0](https://github.com/SocialGouv/cdtn-admin/compare/v1.20.0...v2.0.0) (2022-08-17) - -**Note:** Version bump only for package @shared/dila-resolver - -# [1.20.0](https://github.com/SocialGouv/cdtn-admin/compare/v1.19.2...v1.20.0) (2022-08-17) - -**Note:** Version bump only for package @shared/dila-resolver - -## [1.19.2](https://github.com/SocialGouv/cdtn-admin/compare/v1.19.1...v1.19.2) (2022-07-21) - -**Note:** Version bump only for package @shared/dila-resolver - -## [1.19.1](https://github.com/SocialGouv/cdtn-admin/compare/v1.19.0...v1.19.1) (2022-07-21) - -**Note:** Version bump only for package @shared/dila-resolver - -# [1.19.0](https://github.com/SocialGouv/cdtn-admin/compare/v1.18.2...v1.19.0) (2022-07-08) - -**Note:** Version bump only for package @shared/dila-resolver - -## [1.18.2](https://github.com/SocialGouv/cdtn-admin/compare/v1.18.1...v1.18.2) (2022-06-16) - -**Note:** Version bump only for package @shared/dila-resolver - -## [1.18.1](https://github.com/SocialGouv/cdtn-admin/compare/v1.18.0...v1.18.1) (2022-06-09) - -**Note:** Version bump only for package @shared/dila-resolver - -# [1.18.0](https://github.com/SocialGouv/cdtn-admin/compare/v1.17.2...v1.18.0) (2022-06-07) - -**Note:** Version bump only for package @shared/dila-resolver - -## [1.17.2](https://github.com/SocialGouv/cdtn-admin/compare/v1.17.1...v1.17.2) (2022-06-06) - -**Note:** Version bump only for package @shared/dila-resolver - -## [1.17.1](https://github.com/SocialGouv/cdtn-admin/compare/v1.17.0...v1.17.1) (2022-06-02) - -**Note:** Version bump only for package @shared/dila-resolver - -# [1.17.0](https://github.com/SocialGouv/cdtn-admin/compare/v1.16.8...v1.17.0) (2022-06-01) - -**Note:** Version bump only for package @shared/dila-resolver - -## [1.16.8](https://github.com/SocialGouv/cdtn-admin/compare/v1.16.7...v1.16.8) (2022-05-18) - -**Note:** Version bump only for package @shared/dila-resolver - -## [1.16.7](https://github.com/SocialGouv/cdtn-admin/compare/v1.16.6...v1.16.7) (2022-05-17) - -**Note:** Version bump only for package @shared/dila-resolver - -## [1.16.6](https://github.com/SocialGouv/cdtn-admin/compare/v1.16.5...v1.16.6) (2022-05-17) - -**Note:** Version bump only for package @shared/dila-resolver - -## [1.16.5](https://github.com/SocialGouv/cdtn-admin/compare/v1.16.4...v1.16.5) (2022-05-17) - -**Note:** Version bump only for package @shared/dila-resolver - -## [1.16.4](https://github.com/SocialGouv/cdtn-admin/compare/v1.16.3...v1.16.4) (2022-05-17) - -**Note:** Version bump only for package @shared/dila-resolver - -## [1.16.3](https://github.com/SocialGouv/cdtn-admin/compare/v1.16.2...v1.16.3) (2022-05-16) - -**Note:** Version bump only for package @shared/dila-resolver - -## [1.16.2](https://github.com/SocialGouv/cdtn-admin/compare/v1.16.1...v1.16.2) (2022-05-16) - -**Note:** Version bump only for package @shared/dila-resolver - -## [1.16.1](https://github.com/SocialGouv/cdtn-admin/compare/v1.16.0...v1.16.1) (2022-05-16) - -**Note:** Version bump only for package @shared/dila-resolver - -# [1.16.0](https://github.com/SocialGouv/cdtn-admin/compare/v1.15.1...v1.16.0) (2022-05-12) - -### Features - -- migration from gitlab to github ([#730](https://github.com/SocialGouv/cdtn-admin/issues/730)) ([4c6dd02](https://github.com/SocialGouv/cdtn-admin/commit/4c6dd027364b0eb31a0d7ae8ddc6c080399e6317)) diff --git a/shared/dila-resolver/package.json b/shared/dila-resolver/package.json deleted file mode 100644 index c53ae1797..000000000 --- a/shared/dila-resolver/package.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "name": "@shared/dila-resolver", - "version": "2.28.4", - "main": "lib/index.js", - "files": [ - "lib" - ], - "repository": { - "directory": "shared/dila-resolver", - "type": "git", - "url": "https://github.com/SocialGouv/cdtn-admin.git" - }, - "license": "Apache-2.0", - "private": true, - "dependencies": { - "@socialgouv/dila-api-client": "^1.2.4" - }, - "devDependencies": { - "@babel/core": "^7.15.5", - "@babel/plugin-transform-modules-commonjs": "^7.15.4", - "@babel/preset-typescript": "^7.15.0", - "@shared/eslint-config": "workspace:^", - "@shared/types": "workspace:^", - "@tsconfig/node14": "^1.0.1", - "@types/jest": "^27.0.0", - "jest": "^27.0.6", - "lint-staged": "^12.0.0", - "ts-node": "^10.2.1", - "typescript": "^4.4.3" - }, - "scripts": { - "build": "tsc -p tsconfig.build.json", - "dev": "ts-node src/main.ts", - "lint": "npx eslint \"./src/**/*.{js,ts}\"", - "lint:fix": "yarn lint --fix", - "precommit": "lint-staged", - "test": "jest" - }, - "lint-staged": { - "*.{j,t}s": [ - "npx eslint --cache --fix", - "jest --bail --findRelatedTests" - ] - }, - "babel": { - "env": { - "test": { - "presets": [ - "@babel/preset-typescript" - ], - "plugins": [ - "@babel/plugin-transform-modules-commonjs" - ] - } - } - } -} diff --git a/shared/dila-resolver/tsconfig.build.json b/shared/dila-resolver/tsconfig.build.json deleted file mode 100644 index fd2be91be..000000000 --- a/shared/dila-resolver/tsconfig.build.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig", - "extends": "./tsconfig.json", - "files": [ - "./src/index.ts" - ] -} diff --git a/shared/dila-resolver/tsconfig.json b/shared/dila-resolver/tsconfig.json deleted file mode 100644 index 0ab4e4b17..000000000 --- a/shared/dila-resolver/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig", - "extends": "@tsconfig/node14/tsconfig.json", - "compilerOptions": { - "declaration": true, - "moduleResolution": "node", - "outDir": "lib", - "resolveJsonModule": true, - "rootDir": "src" - } -} diff --git a/shared/elasticsearch-document-adapter/.eslintignore b/shared/elasticsearch-document-adapter/.eslintignore deleted file mode 100644 index 3063f07d5..000000000 --- a/shared/elasticsearch-document-adapter/.eslintignore +++ /dev/null @@ -1,2 +0,0 @@ -lib -node_modules diff --git a/shared/elasticsearch-document-adapter/.eslintrc.json b/shared/elasticsearch-document-adapter/.eslintrc.json deleted file mode 100644 index 698741309..000000000 --- a/shared/elasticsearch-document-adapter/.eslintrc.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": ["@shared/eslint-config"], - "rules": { - "@typescript-eslint/naming-convention": "off" - } -} diff --git a/shared/elasticsearch-document-adapter/.gitignore b/shared/elasticsearch-document-adapter/.gitignore deleted file mode 100644 index 7d5b692c7..000000000 --- a/shared/elasticsearch-document-adapter/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -.eslintcache -lib -node_modules diff --git a/shared/elasticsearch-document-adapter/CHANGELOG.md b/shared/elasticsearch-document-adapter/CHANGELOG.md deleted file mode 100644 index 2650ada18..000000000 --- a/shared/elasticsearch-document-adapter/CHANGELOG.md +++ /dev/null @@ -1,465 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -## [2.28.4](https://github.com/SocialGouv/cdtn-admin/compare/v2.28.3...v2.28.4) (2023-12-21) - -### Bug Fixes - -- réduction de la taille du batch de l'export ([#1206](https://github.com/SocialGouv/cdtn-admin/issues/1206)) ([6e8d968](https://github.com/SocialGouv/cdtn-admin/commit/6e8d968972d0d2c085968cea1135da94abbe7f55)) - -## [2.28.3](https://github.com/SocialGouv/cdtn-admin/compare/v2.28.2...v2.28.3) (2023-12-20) - -### Bug Fixes - -- **export:** ne pas remonter les thèmes vides sur les kali-block ([#1201](https://github.com/SocialGouv/cdtn-admin/issues/1201)) ([50496fd](https://github.com/SocialGouv/cdtn-admin/commit/50496fd7c3075f730c2f99b12249738c4659ae54)) - -## [2.28.2](https://github.com/SocialGouv/cdtn-admin/compare/v2.28.1...v2.28.2) (2023-12-19) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.28.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.28.0...v2.28.1) (2023-12-18) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -# [2.28.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.27.2...v2.28.0) (2023-12-18) - -### Bug Fixes - -- **contribution:** autoriser un message block vide ([#1165](https://github.com/SocialGouv/cdtn-admin/issues/1165)) ([aedddc4](https://github.com/SocialGouv/cdtn-admin/commit/aedddc4e6dd4672661d095ed8464591f2dfbb195)) -- **contribution:** récupération des thèmes depuis les anciennes contributions ([#1163](https://github.com/SocialGouv/cdtn-admin/issues/1163)) ([7e0efcd](https://github.com/SocialGouv/cdtn-admin/commit/7e0efcdc925c28a2e6fe0a957279f05ceb8d8a96)) -- **themes:** add url for external link ([#1180](https://github.com/SocialGouv/cdtn-admin/issues/1180)) ([720219d](https://github.com/SocialGouv/cdtn-admin/commit/720219d3bc5c03b66fa7c3dce27d27429a8f14bf)) - -### Features - -- **convention-collective:** support des contributions au nouveau format dans les pages CCs ([#1134](https://github.com/SocialGouv/cdtn-admin/issues/1134)) ([29b29cc](https://github.com/SocialGouv/cdtn-admin/commit/29b29cc1a7726e891681c65ed72830bb1a45d175)), closes [#1113](https://github.com/SocialGouv/cdtn-admin/issues/1113) [#1161](https://github.com/SocialGouv/cdtn-admin/issues/1161) - -## [2.27.2](https://github.com/SocialGouv/cdtn-admin/compare/v2.27.1...v2.27.2) (2023-12-08) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.27.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.27.0...v2.27.1) (2023-12-08) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -# [2.27.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.26.2...v2.27.0) (2023-12-07) - -### Bug Fixes - -- utiliser une version 4.0.0 de p-map ([#1149](https://github.com/SocialGouv/cdtn-admin/issues/1149)) ([7c96256](https://github.com/SocialGouv/cdtn-admin/commit/7c9625600fb26419a763d1404577659a18bb53d3)) - -## [2.26.2](https://github.com/SocialGouv/cdtn-admin/compare/v2.26.1...v2.26.2) (2023-12-05) - -### Bug Fixes - -- limite la concurrency lors de la récupération des contenus liés ([#1148](https://github.com/SocialGouv/cdtn-admin/issues/1148)) ([74874b1](https://github.com/SocialGouv/cdtn-admin/commit/74874b1bf4356a8d5ee2f468cd55da4470ee320c)) - -## [2.26.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.26.0...v2.26.1) (2023-12-05) - -### Bug Fixes - -- ne pas récupérer les contenus liés dépubliés ([#1147](https://github.com/SocialGouv/cdtn-admin/issues/1147)) ([2fa0af5](https://github.com/SocialGouv/cdtn-admin/commit/2fa0af52c269791c684ca232e67526193fdaa169)) - -# [2.26.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.25.1...v2.26.0) (2023-12-04) - -### Features - -- **contributions:** ajout des contributions à l'api publish ([#1110](https://github.com/SocialGouv/cdtn-admin/issues/1110)) ([2ed595c](https://github.com/SocialGouv/cdtn-admin/commit/2ed595cf98720e960dc7d74f28da1a8c3a1b3bd4)), closes [#1113](https://github.com/SocialGouv/cdtn-admin/issues/1113) - -## [2.25.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.25.0...v2.25.1) (2023-11-29) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -# [2.25.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.24.2...v2.25.0) (2023-11-24) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.24.2](https://github.com/SocialGouv/cdtn-admin/compare/v2.24.1...v2.24.2) (2023-11-20) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.24.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.24.0...v2.24.1) (2023-11-20) - -### Bug Fixes - -- **contributions:** correction des liens vers les conventions collectives ([#1126](https://github.com/SocialGouv/cdtn-admin/issues/1126)) ([7ad182f](https://github.com/SocialGouv/cdtn-admin/commit/7ad182fe434d76950e5a697490c0acfca15863e6)) - -# [2.24.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.23.0...v2.24.0) (2023-11-15) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -# [2.23.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.22.0...v2.23.0) (2023-11-10) - -### Bug Fixes - -- inject highlights on contributions ([#1107](https://github.com/SocialGouv/cdtn-admin/issues/1107)) ([ca7d70a](https://github.com/SocialGouv/cdtn-admin/commit/ca7d70a5f6d4159d182d64a2f14691733a998ae0)) - -# [2.22.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.21.0...v2.22.0) (2023-11-08) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -# [2.21.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.20.1...v2.21.0) (2023-10-27) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.20.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.20.0...v2.20.1) (2023-10-23) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -# [2.20.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.19.1...v2.20.0) (2023-10-19) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.19.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.19.0...v2.19.1) (2023-10-10) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -# [2.19.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.18.0...v2.19.0) (2023-10-09) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -# [2.18.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.9...v2.18.0) (2023-10-09) - -### Bug Fixes - -- **dependencies:** remove un-used dependencies ([#1034](https://github.com/SocialGouv/cdtn-admin/issues/1034)) ([529ffb4](https://github.com/SocialGouv/cdtn-admin/commit/529ffb40bcf79738494d745b0bb756ebd43ab3a4)) - -## [2.17.9](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.8...v2.17.9) (2023-09-29) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.17.8](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.7...v2.17.8) (2023-09-28) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.17.7](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.6...v2.17.7) (2023-09-27) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.17.6](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.5...v2.17.6) (2023-09-27) - -### Bug Fixes - -- **env:** remove env in targets ([2262e45](https://github.com/SocialGouv/cdtn-admin/commit/2262e4515c01224af115f72b74eedcceca871f9e)) - -## [2.17.5](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.4...v2.17.5) (2023-09-27) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.17.4](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.3...v2.17.4) (2023-09-27) - -### Bug Fixes - -- **package.json:** set document-adapter to private ([a49917d](https://github.com/SocialGouv/cdtn-admin/commit/a49917d795263d8fe374ac69c628c78fe89b8166)) - -## [2.17.3](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.2...v2.17.3) (2023-09-27) - -### Bug Fixes - -- yarn berry + fetch + docker opti + sec ([#1012](https://github.com/SocialGouv/cdtn-admin/issues/1012)) ([81bce48](https://github.com/SocialGouv/cdtn-admin/commit/81bce4838781e60c05a084769a35cf0d2a26609c)) - -## [2.17.2](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.1...v2.17.2) (2023-09-25) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.17.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.0...v2.17.1) (2023-09-25) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -# [2.17.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.16.1...v2.17.0) (2023-09-25) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.16.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.16.0...v2.16.1) (2023-09-20) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -# [2.16.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.15.1...v2.16.0) (2023-09-18) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.15.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.15.0...v2.15.1) (2023-09-18) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -# [2.15.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.14.0...v2.15.0) (2023-09-15) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -# [2.14.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.13.0...v2.14.0) (2023-09-05) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -# [2.13.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.12.1...v2.13.0) (2023-08-25) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.12.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.12.0...v2.12.1) (2023-08-04) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -# [2.12.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.11.4...v2.12.0) (2023-08-02) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.11.4](https://github.com/SocialGouv/cdtn-admin/compare/v2.11.3...v2.11.4) (2023-07-31) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.11.3](https://github.com/SocialGouv/cdtn-admin/compare/v2.11.2...v2.11.3) (2023-07-28) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.11.2](https://github.com/SocialGouv/cdtn-admin/compare/v2.11.1...v2.11.2) (2023-07-25) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.11.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.11.0...v2.11.1) (2023-07-18) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -# [2.11.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.10.2...v2.11.0) (2023-07-12) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.10.2](https://github.com/SocialGouv/cdtn-admin/compare/v2.10.1...v2.10.2) (2023-07-04) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.10.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.10.0...v2.10.1) (2023-07-03) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -# [2.10.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.9.1...v2.10.0) (2023-07-03) - -### Bug Fixes - -- **contributions:** add slug for all idcc (even when starting with 0) ([#961](https://github.com/SocialGouv/cdtn-admin/issues/961)) ([1bb8628](https://github.com/SocialGouv/cdtn-admin/commit/1bb86286b3f5c76c4d1c18d5426ada4ba9331e96)) - -## [2.9.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.9.0...v2.9.1) (2023-06-26) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -# [2.9.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.8.0...v2.9.0) (2023-06-26) - -### Bug Fixes - -- **lerna:** modify internals dependencies ([c39b77d](https://github.com/SocialGouv/cdtn-admin/commit/c39b77d65692619463f96b3f5eb51e7b1ea976ef)) - -### Features - -- **dep:** update package.json ([69c69ac](https://github.com/SocialGouv/cdtn-admin/commit/69c69ac26b7ac857d1a06c8bbb80e73811460038)) - -# [2.8.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.7.1...v2.8.0) (2023-06-26) - -### Bug Fixes - -- **contribs page:** add slug to cc in contribs answer so we can show a link on the contrib page on the frontend ([#946](https://github.com/SocialGouv/cdtn-admin/issues/946)) ([5517722](https://github.com/SocialGouv/cdtn-admin/commit/5517722a4ff9d472c7e2a51cf3a81b42da415bcc)) - -## [2.7.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.7.0...v2.7.1) (2023-06-01) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -# [2.7.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.6.1...v2.7.0) (2023-05-30) - -### Features - -- 895 outil de contrib création page édition réponses ([#903](https://github.com/SocialGouv/cdtn-admin/issues/903)) ([4b2f5d4](https://github.com/SocialGouv/cdtn-admin/commit/4b2f5d4735c797b7e049e6908c5256200e7e0c4e)), closes [#907](https://github.com/SocialGouv/cdtn-admin/issues/907) -- implementation contribution list ([#897](https://github.com/SocialGouv/cdtn-admin/issues/897)) ([1643d85](https://github.com/SocialGouv/cdtn-admin/commit/1643d853ab9cfbb61bde03394aaf60adade968d4)), closes [#912](https://github.com/SocialGouv/cdtn-admin/issues/912) [#907](https://github.com/SocialGouv/cdtn-admin/issues/907) [#913](https://github.com/SocialGouv/cdtn-admin/issues/913) [#915](https://github.com/SocialGouv/cdtn-admin/issues/915) [#916](https://github.com/SocialGouv/cdtn-admin/issues/916) - -## [2.6.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.6.0...v2.6.1) (2023-05-04) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -# [2.6.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.5.4...v2.6.0) (2023-05-04) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.5.4](https://github.com/SocialGouv/cdtn-admin/compare/v2.5.3...v2.5.4) (2023-03-23) - -### Bug Fixes - -- **glossaire:** remove check for webcomponent tags as we insert them all together in one time ([#882](https://github.com/SocialGouv/cdtn-admin/issues/882)) ([02b20b7](https://github.com/SocialGouv/cdtn-admin/commit/02b20b73d476895e1be6d5b2a04cb1fc62d0a2e9)) - -## [2.5.3](https://github.com/SocialGouv/cdtn-admin/compare/v2.5.2...v2.5.3) (2023-03-02) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.5.2](https://github.com/SocialGouv/cdtn-admin/compare/v2.5.1...v2.5.2) (2023-02-23) - -### Bug Fixes - -- amélioration des performances dans la génération des tooltips ([#869](https://github.com/SocialGouv/cdtn-admin/issues/869)) ([3dd4450](https://github.com/SocialGouv/cdtn-admin/commit/3dd4450d0e1aabb27f84b069bc95971c50e9de25)) - -## [2.5.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.5.0...v2.5.1) (2023-02-10) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -# [2.5.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.4.5...v2.5.0) (2023-02-10) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.4.5](https://github.com/SocialGouv/cdtn-admin/compare/v2.4.4...v2.4.5) (2022-12-28) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.4.4](https://github.com/SocialGouv/cdtn-admin/compare/v2.4.3...v2.4.4) (2022-12-16) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.4.3](https://github.com/SocialGouv/cdtn-admin/compare/v2.4.2...v2.4.3) (2022-12-16) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.4.2](https://github.com/SocialGouv/cdtn-admin/compare/v2.4.1...v2.4.2) (2022-12-15) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.4.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.4.0...v2.4.1) (2022-12-15) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -# [2.4.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.3.8...v2.4.0) (2022-12-15) - -### Bug Fixes - -- Balise & glossaire ([#849](https://github.com/SocialGouv/cdtn-admin/issues/849)) ([d14595f](https://github.com/SocialGouv/cdtn-admin/commit/d14595f2b284367cf734962a49c65610b64f1e27)) - -## [2.3.8](https://github.com/SocialGouv/cdtn-admin/compare/v2.3.7...v2.3.8) (2022-12-07) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.3.7](https://github.com/SocialGouv/cdtn-admin/compare/v2.3.6...v2.3.7) (2022-12-06) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.3.6](https://github.com/SocialGouv/cdtn-admin/compare/v2.3.5...v2.3.6) (2022-12-06) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.3.5](https://github.com/SocialGouv/cdtn-admin/compare/v2.3.4...v2.3.5) (2022-11-08) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.3.4](https://github.com/SocialGouv/cdtn-admin/compare/v2.3.3...v2.3.4) (2022-10-13) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.3.3](https://github.com/SocialGouv/cdtn-admin/compare/v2.3.2...v2.3.3) (2022-10-12) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.3.2](https://github.com/SocialGouv/cdtn-admin/compare/v2.3.1...v2.3.2) (2022-10-12) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.3.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.3.0...v2.3.1) (2022-10-10) - -### Bug Fixes - -- **ccn:** add default effectif / update ccn stopword and synos ([#827](https://github.com/SocialGouv/cdtn-admin/issues/827)) ([352d66d](https://github.com/SocialGouv/cdtn-admin/commit/352d66d13deca01296b9d789ea2dcaf0eaed079e)), closes [#4440](https://github.com/SocialGouv/cdtn-admin/issues/4440) - -# [2.3.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.2.0...v2.3.0) (2022-10-06) - -### Bug Fixes - -- **covisits:** update ES logs reading mechanism ([#823](https://github.com/SocialGouv/cdtn-admin/issues/823)) ([ff9e50b](https://github.com/SocialGouv/cdtn-admin/commit/ff9e50b1687130fce0b65da4cc5e29d4899b51fb)) - -# [2.2.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.1.0...v2.2.0) (2022-09-05) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -# [2.1.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.0.1...v2.1.0) (2022-09-02) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [2.0.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.0.0...v2.0.1) (2022-08-29) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -# [2.0.0](https://github.com/SocialGouv/cdtn-admin/compare/v1.20.0...v2.0.0) (2022-08-17) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -# [1.20.0](https://github.com/SocialGouv/cdtn-admin/compare/v1.19.2...v1.20.0) (2022-08-17) - -### Features - -- ajout de blocs multiple dans les sections admin page info ([#785](https://github.com/SocialGouv/cdtn-admin/issues/785)) ([a2e7894](https://github.com/SocialGouv/cdtn-admin/commit/a2e7894d306fa7d378bd7268d4da514befd4f30b)), closes [#789](https://github.com/SocialGouv/cdtn-admin/issues/789) [#786](https://github.com/SocialGouv/cdtn-admin/issues/786) [#795](https://github.com/SocialGouv/cdtn-admin/issues/795) - -## [1.19.2](https://github.com/SocialGouv/cdtn-admin/compare/v1.19.1...v1.19.2) (2022-07-21) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [1.19.1](https://github.com/SocialGouv/cdtn-admin/compare/v1.19.0...v1.19.1) (2022-07-21) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -# [1.19.0](https://github.com/SocialGouv/cdtn-admin/compare/v1.18.2...v1.19.0) (2022-07-08) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [1.18.2](https://github.com/SocialGouv/cdtn-admin/compare/v1.18.1...v1.18.2) (2022-06-16) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [1.18.1](https://github.com/SocialGouv/cdtn-admin/compare/v1.18.0...v1.18.1) (2022-06-09) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -# [1.18.0](https://github.com/SocialGouv/cdtn-admin/compare/v1.17.2...v1.18.0) (2022-06-07) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [1.17.2](https://github.com/SocialGouv/cdtn-admin/compare/v1.17.1...v1.17.2) (2022-06-06) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [1.17.1](https://github.com/SocialGouv/cdtn-admin/compare/v1.17.0...v1.17.1) (2022-06-02) - -### Bug Fixes - -- **alert:** correction suite aux problèmes sur les jobs ([#769](https://github.com/SocialGouv/cdtn-admin/issues/769)) ([d89be61](https://github.com/SocialGouv/cdtn-admin/commit/d89be6101fa3a78affc0543e600887e491690cd2)) - -# [1.17.0](https://github.com/SocialGouv/cdtn-admin/compare/v1.16.8...v1.17.0) (2022-06-01) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [1.16.8](https://github.com/SocialGouv/cdtn-admin/compare/v1.16.7...v1.16.8) (2022-05-18) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [1.16.7](https://github.com/SocialGouv/cdtn-admin/compare/v1.16.6...v1.16.7) (2022-05-17) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [1.16.6](https://github.com/SocialGouv/cdtn-admin/compare/v1.16.5...v1.16.6) (2022-05-17) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [1.16.5](https://github.com/SocialGouv/cdtn-admin/compare/v1.16.4...v1.16.5) (2022-05-17) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [1.16.4](https://github.com/SocialGouv/cdtn-admin/compare/v1.16.3...v1.16.4) (2022-05-17) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [1.16.3](https://github.com/SocialGouv/cdtn-admin/compare/v1.16.2...v1.16.3) (2022-05-16) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [1.16.2](https://github.com/SocialGouv/cdtn-admin/compare/v1.16.1...v1.16.2) (2022-05-16) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -## [1.16.1](https://github.com/SocialGouv/cdtn-admin/compare/v1.16.0...v1.16.1) (2022-05-16) - -**Note:** Version bump only for package @shared/elasticsearch-document-adapter - -# [1.16.0](https://github.com/SocialGouv/cdtn-admin/compare/v1.15.1...v1.16.0) (2022-05-12) - -### Features - -- migration from gitlab to github ([#730](https://github.com/SocialGouv/cdtn-admin/issues/730)) ([4c6dd02](https://github.com/SocialGouv/cdtn-admin/commit/4c6dd027364b0eb31a0d7ae8ddc6c080399e6317)) diff --git a/shared/elasticsearch-document-adapter/babel.config.js b/shared/elasticsearch-document-adapter/babel.config.js deleted file mode 100644 index dd242dc90..000000000 --- a/shared/elasticsearch-document-adapter/babel.config.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - presets: [ - ["@babel/preset-env", { targets: { node: "current" } }], - "@babel/preset-typescript", - ], -}; diff --git a/shared/elasticsearch-document-adapter/jest.config.js b/shared/elasticsearch-document-adapter/jest.config.js deleted file mode 100644 index 4c070642b..000000000 --- a/shared/elasticsearch-document-adapter/jest.config.js +++ /dev/null @@ -1,11 +0,0 @@ -/** @type {import('ts-jest').JestConfigWithTsJest} */ -module.exports = { - preset: "ts-jest", - rootDir: "src", - testEnvironment: "node", - testMatch: ["**/?(*.)+(spec|test).+(ts|tsx|js)"], - transform: { - "^.+\\.jsx?$": "babel-jest", - "^.+\\.tsx?$": "ts-jest", - }, -}; diff --git a/shared/elasticsearch-document-adapter/package.json b/shared/elasticsearch-document-adapter/package.json deleted file mode 100644 index 67f0599d5..000000000 --- a/shared/elasticsearch-document-adapter/package.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "name": "@shared/elasticsearch-document-adapter", - "private": true, - "description": "SocialGouv - Code du travail numerique - Modules - ingester", - "version": "2.28.4", - "dependencies": { - "@elastic/elasticsearch": "^7.14.1", - "@shared/types": "workspace:^", - "@shared/utils": "workspace:^", - "@socialgouv/cdtn-elasticsearch": "workspace:^", - "@socialgouv/cdtn-logger": "workspace:^", - "@socialgouv/cdtn-slugify": "^4.52.1", - "@socialgouv/cdtn-sources": "^4.52.1", - "nctx": "^1.2.0", - "node-fetch": "^2.6.5", - "p-map": "^4.0.0", - "p-queue": "^6.6.2", - "rehype-raw": "^5.1.0", - "rehype-stringify": "^8.0.0", - "remark-parse": "^9.0.0", - "remark-rehype": "^8.1.0", - "remark-stringify": "^9.0.1", - "unified": "^9.2.2" - }, - "devDependencies": { - "@babel/cli": "^7.15.7", - "@babel/core": "^7.15.5", - "@babel/preset-env": "^7.16.11", - "@babel/preset-typescript": "^7.16.7", - "@shared/eslint-config": "workspace:^", - "@types/jest": "^29.2.3", - "@types/node-fetch": "^2.5.12", - "@vercel/ncc": "0.34.0", - "jest": "^27.1.1", - "lint-staged": "^12.0.0", - "ts-jest": "^29.0.3", - "typescript": "^4.9.5" - }, - "license": "Apache-2.0", - "main": "lib/index.js", - "repository": { - "directory": "shared/elasticsearch-document-adapter", - "type": "git", - "url": "https://github.com/SocialGouv/cdtn-admin.git" - }, - "scripts": { - "build": "ncc build src/index.ts -o lib", - "build:watch": "ncc build src/index.ts -o lib -w", - "lint": "npx eslint src/**/*.{js,ts}", - "precommit": "lint-staged", - "test": "jest" - }, - "lint-staged": { - "src/**": [ - "yarn lint --cache --fix" - ] - }, - "sideEffects": false, - "typings": "lib/index.d.ts" -} diff --git a/shared/elasticsearch-document-adapter/tsconfig.json b/shared/elasticsearch-document-adapter/tsconfig.json deleted file mode 100644 index 4660b9355..000000000 --- a/shared/elasticsearch-document-adapter/tsconfig.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "compilerOptions": { - // Target latest version of ECMAScript. - "target": "es2020", - // Search under node_modules for non-relative imports. - "moduleResolution": "node", - // Process & infer types from .js files. - "allowJs": true, - // Don't emit; allow Babel to transform files. - "noEmit": true, - // Enable strictest settings like strictNullChecks & noImplicitAny. - "strict": true, - // Disallow features that require cross-file information for emit. - "isolatedModules": true, - // Import non-ES modules as default imports. - "esModuleInterop": true, - "declaration": true - }, - "include": ["src"] -} diff --git a/shared/elasticsearch/package.json b/shared/elasticsearch/package.json index 1956e9448..bc53d47f3 100644 --- a/shared/elasticsearch/package.json +++ b/shared/elasticsearch/package.json @@ -8,7 +8,7 @@ ] }, "dependencies": { - "@socialgouv/cdtn-logger": "workspace:^", + "@shared/utils": "workspace:^", "got": "^11.8.2" }, "license": "Apache-2.0", diff --git a/shared/elasticsearch/src/esClientUtils.js b/shared/elasticsearch/src/esClientUtils.js index b1798eea5..76a8b537a 100644 --- a/shared/elasticsearch/src/esClientUtils.js +++ b/shared/elasticsearch/src/esClientUtils.js @@ -1,4 +1,4 @@ -const { logger } = require("@socialgouv/cdtn-logger"); +const { logger } = require("@shared/utils"); const { analyzer, char_filter, filter, tokenizer } = require("./analysis"); diff --git a/shared/elasticsearch/src/vectorizer/index.js b/shared/elasticsearch/src/vectorizer/index.js index 2b08402b5..35aa353bc 100644 --- a/shared/elasticsearch/src/vectorizer/index.js +++ b/shared/elasticsearch/src/vectorizer/index.js @@ -6,7 +6,7 @@ const { stopwords: semantic_stopwords } = require("../dataset/stop_words"); // URL of the TF serve deployment const NLP_URL = process.env.NLP_URL || "https://serving-ml.fabrique.social.gouv.fr"; -console.log("@shared/elasticsearch - NLP URL:", NLP_URL); +console.log("NLP URL:", NLP_URL); const tfServeURL = NLP_URL + "/v1/models/sentqam:predict"; function stripAccents(text) { diff --git a/shared/logger/.eslintignore b/shared/logger/.eslintignore deleted file mode 100644 index 3063f07d5..000000000 --- a/shared/logger/.eslintignore +++ /dev/null @@ -1,2 +0,0 @@ -lib -node_modules diff --git a/shared/logger/.eslintrc.json b/shared/logger/.eslintrc.json deleted file mode 100644 index ec20fc733..000000000 --- a/shared/logger/.eslintrc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": ["@shared/eslint-config"] -} diff --git a/shared/logger/.gitignore b/shared/logger/.gitignore deleted file mode 100644 index 7d5b692c7..000000000 --- a/shared/logger/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -.eslintcache -lib -node_modules diff --git a/shared/logger/CHANGELOG.md b/shared/logger/CHANGELOG.md deleted file mode 100644 index cb16d5b35..000000000 --- a/shared/logger/CHANGELOG.md +++ /dev/null @@ -1,424 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -## [2.28.4](https://github.com/SocialGouv/cdtn-admin/compare/v2.28.3...v2.28.4) (2023-12-21) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.28.3](https://github.com/SocialGouv/cdtn-admin/compare/v2.28.2...v2.28.3) (2023-12-20) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.28.2](https://github.com/SocialGouv/cdtn-admin/compare/v2.28.1...v2.28.2) (2023-12-19) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.28.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.28.0...v2.28.1) (2023-12-18) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [2.28.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.27.2...v2.28.0) (2023-12-18) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.27.2](https://github.com/SocialGouv/cdtn-admin/compare/v2.27.1...v2.27.2) (2023-12-08) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.27.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.27.0...v2.27.1) (2023-12-08) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [2.27.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.26.2...v2.27.0) (2023-12-07) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.26.2](https://github.com/SocialGouv/cdtn-admin/compare/v2.26.1...v2.26.2) (2023-12-05) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.26.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.26.0...v2.26.1) (2023-12-05) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [2.26.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.25.1...v2.26.0) (2023-12-04) - -### Features - -- **contributions:** ajout des contributions à l'api publish ([#1110](https://github.com/SocialGouv/cdtn-admin/issues/1110)) ([2ed595c](https://github.com/SocialGouv/cdtn-admin/commit/2ed595cf98720e960dc7d74f28da1a8c3a1b3bd4)), closes [#1113](https://github.com/SocialGouv/cdtn-admin/issues/1113) - -## [2.25.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.25.0...v2.25.1) (2023-11-29) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [2.25.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.24.2...v2.25.0) (2023-11-24) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.24.2](https://github.com/SocialGouv/cdtn-admin/compare/v2.24.1...v2.24.2) (2023-11-20) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.24.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.24.0...v2.24.1) (2023-11-20) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [2.24.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.23.0...v2.24.0) (2023-11-15) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [2.23.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.22.0...v2.23.0) (2023-11-10) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [2.22.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.21.0...v2.22.0) (2023-11-08) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [2.21.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.20.1...v2.21.0) (2023-10-27) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.20.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.20.0...v2.20.1) (2023-10-23) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [2.20.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.19.1...v2.20.0) (2023-10-19) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.19.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.19.0...v2.19.1) (2023-10-10) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [2.19.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.18.0...v2.19.0) (2023-10-09) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [2.18.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.9...v2.18.0) (2023-10-09) - -### Bug Fixes - -- **dependencies:** remove un-used dependencies ([#1034](https://github.com/SocialGouv/cdtn-admin/issues/1034)) ([529ffb4](https://github.com/SocialGouv/cdtn-admin/commit/529ffb40bcf79738494d745b0bb756ebd43ab3a4)) - -## [2.17.9](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.8...v2.17.9) (2023-09-29) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.17.8](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.7...v2.17.8) (2023-09-28) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.17.7](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.6...v2.17.7) (2023-09-27) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.17.6](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.5...v2.17.6) (2023-09-27) - -### Bug Fixes - -- **env:** remove env in targets ([2262e45](https://github.com/SocialGouv/cdtn-admin/commit/2262e4515c01224af115f72b74eedcceca871f9e)) - -## [2.17.5](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.4...v2.17.5) (2023-09-27) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.17.4](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.3...v2.17.4) (2023-09-27) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.17.3](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.2...v2.17.3) (2023-09-27) - -### Bug Fixes - -- yarn berry + fetch + docker opti + sec ([#1012](https://github.com/SocialGouv/cdtn-admin/issues/1012)) ([81bce48](https://github.com/SocialGouv/cdtn-admin/commit/81bce4838781e60c05a084769a35cf0d2a26609c)) - -## [2.17.2](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.1...v2.17.2) (2023-09-25) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.17.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.17.0...v2.17.1) (2023-09-25) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [2.17.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.16.1...v2.17.0) (2023-09-25) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.16.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.16.0...v2.16.1) (2023-09-20) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [2.16.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.15.1...v2.16.0) (2023-09-18) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.15.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.15.0...v2.15.1) (2023-09-18) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [2.15.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.14.0...v2.15.0) (2023-09-15) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [2.14.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.13.0...v2.14.0) (2023-09-05) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [2.13.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.12.1...v2.13.0) (2023-08-25) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.12.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.12.0...v2.12.1) (2023-08-04) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [2.12.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.11.4...v2.12.0) (2023-08-02) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.11.4](https://github.com/SocialGouv/cdtn-admin/compare/v2.11.3...v2.11.4) (2023-07-31) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.11.3](https://github.com/SocialGouv/cdtn-admin/compare/v2.11.2...v2.11.3) (2023-07-28) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.11.2](https://github.com/SocialGouv/cdtn-admin/compare/v2.11.1...v2.11.2) (2023-07-25) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.11.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.11.0...v2.11.1) (2023-07-18) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [2.11.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.10.2...v2.11.0) (2023-07-12) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.10.2](https://github.com/SocialGouv/cdtn-admin/compare/v2.10.1...v2.10.2) (2023-07-04) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.10.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.10.0...v2.10.1) (2023-07-03) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [2.10.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.9.1...v2.10.0) (2023-07-03) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.9.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.9.0...v2.9.1) (2023-06-26) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [2.9.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.8.0...v2.9.0) (2023-06-26) - -### Bug Fixes - -- **lerna:** modify internals dependencies ([c39b77d](https://github.com/SocialGouv/cdtn-admin/commit/c39b77d65692619463f96b3f5eb51e7b1ea976ef)) - -### Features - -- **dep:** update package.json ([69c69ac](https://github.com/SocialGouv/cdtn-admin/commit/69c69ac26b7ac857d1a06c8bbb80e73811460038)) - -# [2.8.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.7.1...v2.8.0) (2023-06-26) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.7.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.7.0...v2.7.1) (2023-06-01) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [2.7.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.6.1...v2.7.0) (2023-05-30) - -### Features - -- implementation contribution list ([#897](https://github.com/SocialGouv/cdtn-admin/issues/897)) ([1643d85](https://github.com/SocialGouv/cdtn-admin/commit/1643d853ab9cfbb61bde03394aaf60adade968d4)), closes [#912](https://github.com/SocialGouv/cdtn-admin/issues/912) [#907](https://github.com/SocialGouv/cdtn-admin/issues/907) [#913](https://github.com/SocialGouv/cdtn-admin/issues/913) [#915](https://github.com/SocialGouv/cdtn-admin/issues/915) [#916](https://github.com/SocialGouv/cdtn-admin/issues/916) - -## [2.6.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.6.0...v2.6.1) (2023-05-04) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [2.6.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.5.4...v2.6.0) (2023-05-04) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.5.4](https://github.com/SocialGouv/cdtn-admin/compare/v2.5.3...v2.5.4) (2023-03-23) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.5.3](https://github.com/SocialGouv/cdtn-admin/compare/v2.5.2...v2.5.3) (2023-03-02) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.5.2](https://github.com/SocialGouv/cdtn-admin/compare/v2.5.1...v2.5.2) (2023-02-23) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.5.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.5.0...v2.5.1) (2023-02-10) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [2.5.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.4.5...v2.5.0) (2023-02-10) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.4.5](https://github.com/SocialGouv/cdtn-admin/compare/v2.4.4...v2.4.5) (2022-12-28) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.4.4](https://github.com/SocialGouv/cdtn-admin/compare/v2.4.3...v2.4.4) (2022-12-16) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.4.3](https://github.com/SocialGouv/cdtn-admin/compare/v2.4.2...v2.4.3) (2022-12-16) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.4.2](https://github.com/SocialGouv/cdtn-admin/compare/v2.4.1...v2.4.2) (2022-12-15) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.4.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.4.0...v2.4.1) (2022-12-15) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [2.4.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.3.8...v2.4.0) (2022-12-15) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.3.8](https://github.com/SocialGouv/cdtn-admin/compare/v2.3.7...v2.3.8) (2022-12-07) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.3.7](https://github.com/SocialGouv/cdtn-admin/compare/v2.3.6...v2.3.7) (2022-12-06) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.3.6](https://github.com/SocialGouv/cdtn-admin/compare/v2.3.5...v2.3.6) (2022-12-06) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.3.5](https://github.com/SocialGouv/cdtn-admin/compare/v2.3.4...v2.3.5) (2022-11-08) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.3.4](https://github.com/SocialGouv/cdtn-admin/compare/v2.3.3...v2.3.4) (2022-10-13) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.3.3](https://github.com/SocialGouv/cdtn-admin/compare/v2.3.2...v2.3.3) (2022-10-12) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.3.2](https://github.com/SocialGouv/cdtn-admin/compare/v2.3.1...v2.3.2) (2022-10-12) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.3.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.3.0...v2.3.1) (2022-10-10) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [2.3.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.2.0...v2.3.0) (2022-10-06) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [2.2.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.1.0...v2.2.0) (2022-09-05) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [2.1.0](https://github.com/SocialGouv/cdtn-admin/compare/v2.0.1...v2.1.0) (2022-09-02) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [2.0.1](https://github.com/SocialGouv/cdtn-admin/compare/v2.0.0...v2.0.1) (2022-08-29) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [2.0.0](https://github.com/SocialGouv/cdtn-admin/compare/v1.20.0...v2.0.0) (2022-08-17) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [1.20.0](https://github.com/SocialGouv/cdtn-admin/compare/v1.19.2...v1.20.0) (2022-08-17) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [1.19.2](https://github.com/SocialGouv/cdtn-admin/compare/v1.19.1...v1.19.2) (2022-07-21) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [1.19.1](https://github.com/SocialGouv/cdtn-admin/compare/v1.19.0...v1.19.1) (2022-07-21) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [1.19.0](https://github.com/SocialGouv/cdtn-admin/compare/v1.18.2...v1.19.0) (2022-07-08) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [1.18.2](https://github.com/SocialGouv/cdtn-admin/compare/v1.18.1...v1.18.2) (2022-06-16) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [1.18.1](https://github.com/SocialGouv/cdtn-admin/compare/v1.18.0...v1.18.1) (2022-06-09) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [1.18.0](https://github.com/SocialGouv/cdtn-admin/compare/v1.17.2...v1.18.0) (2022-06-07) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [1.17.2](https://github.com/SocialGouv/cdtn-admin/compare/v1.17.1...v1.17.2) (2022-06-06) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [1.17.1](https://github.com/SocialGouv/cdtn-admin/compare/v1.17.0...v1.17.1) (2022-06-02) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [1.17.0](https://github.com/SocialGouv/cdtn-admin/compare/v1.16.8...v1.17.0) (2022-06-01) - -### Features - -- migration de l'outil de contrib ([#766](https://github.com/SocialGouv/cdtn-admin/issues/766)) ([3fe04a7](https://github.com/SocialGouv/cdtn-admin/commit/3fe04a7bfb7f58b3a0227a18a1999aebabe109c5)) - -## [1.16.8](https://github.com/SocialGouv/cdtn-admin/compare/v1.16.7...v1.16.8) (2022-05-18) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [1.16.7](https://github.com/SocialGouv/cdtn-admin/compare/v1.16.6...v1.16.7) (2022-05-17) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [1.16.6](https://github.com/SocialGouv/cdtn-admin/compare/v1.16.5...v1.16.6) (2022-05-17) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [1.16.5](https://github.com/SocialGouv/cdtn-admin/compare/v1.16.4...v1.16.5) (2022-05-17) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [1.16.4](https://github.com/SocialGouv/cdtn-admin/compare/v1.16.3...v1.16.4) (2022-05-17) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [1.16.3](https://github.com/SocialGouv/cdtn-admin/compare/v1.16.2...v1.16.3) (2022-05-16) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [1.16.2](https://github.com/SocialGouv/cdtn-admin/compare/v1.16.1...v1.16.2) (2022-05-16) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -## [1.16.1](https://github.com/SocialGouv/cdtn-admin/compare/v1.16.0...v1.16.1) (2022-05-16) - -**Note:** Version bump only for package @socialgouv/cdtn-logger - -# [1.16.0](https://github.com/SocialGouv/cdtn-admin/compare/v1.15.1...v1.16.0) (2022-05-12) - -### Features - -- migration from gitlab to github ([#730](https://github.com/SocialGouv/cdtn-admin/issues/730)) ([4c6dd02](https://github.com/SocialGouv/cdtn-admin/commit/4c6dd027364b0eb31a0d7ae8ddc6c080399e6317)) diff --git a/shared/logger/package.json b/shared/logger/package.json deleted file mode 100644 index fe67c3d9d..000000000 --- a/shared/logger/package.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "name": "@socialgouv/cdtn-logger", - "description": "SocialGouv - Code du travail numerique - Infrastructure - Logger", - "version": "2.28.4", - "babel": { - "env": { - "test": { - "presets": [ - "@babel/preset-typescript" - ], - "plugins": [ - "@babel/plugin-transform-modules-commonjs", - "babel-plugin-dynamic-import-node" - ] - } - } - }, - "dependencies": { - "winston": "^3.3.3" - }, - "devDependencies": { - "@babel/core": "^7.15.5", - "@babel/plugin-transform-modules-commonjs": "^7.15.4", - "@babel/preset-typescript": "^7.15.0", - "@shared/eslint-config": "workspace:^", - "@tsconfig/node14": "^1.0.1", - "@types/std-mocks": "^1.0.1", - "babel-plugin-dynamic-import-node": "^2.3.3", - "jest": "^27.1.1", - "lint-staged": "^12.0.0", - "std-mocks": "^1.0.1", - "typescript": "^4.9.5" - }, - "license": "Apache-2.0", - "main": "lib/index.js", - "files": [ - "lib" - ], - "repository": { - "directory": "shared/logger", - "type": "git", - "url": "https://github.com/SocialGouv/cdtn-admin.git" - }, - "scripts": { - "build": "tsc -p tsconfig.build.json", - "lint": "npx eslint \"./src/**/*.{js,ts}\"", - "lint:fix": "yarn lint --fix", - "precommit": "lint-staged", - "test": "jest", - "watch": "yarn build --watch --preserveWatchOutput" - }, - "lint-staged": { - "src/**": [ - "yarn lint --cache --fix", - "yarn test --bail --findRelatedTests" - ] - }, - "sideEffects": false, - "typings": "lib/index.d.ts" -} diff --git a/shared/logger/src/index.test.ts b/shared/logger/src/index.test.ts deleted file mode 100644 index a413e7323..000000000 --- a/shared/logger/src/index.test.ts +++ /dev/null @@ -1,78 +0,0 @@ -// - -import { flush, restore, use } from "std-mocks"; - -process.env.NODE_ENV = "production"; - -test("should log less than or equal to info level to stdout", async () => { - // NOTE(douglasduteil): remove any LOG_LEVEL set in the env - // Ensure that the external env does not interfer with the test. - delete process.env.LOG_LEVEL; - - const { logger } = await import("./index"); - - use(); - - logger.error("an error"); - logger.warn("an warn"); - logger.info("an info"); - logger.http("an http"); - logger.verbose("an verbose"); - logger.debug("an debug"); - logger.silly("an debug"); - - restore(); - - const output = flush(); - expect(output.stderr).toMatchInlineSnapshot(`Array []`); - expect(output.stdout).toMatchInlineSnapshot(` - Array [ - "{\\"level\\":\\"error\\",\\"message\\":\\"an error\\"} - ", - "{\\"level\\":\\"warn\\",\\"message\\":\\"an warn\\"} - ", - "{\\"level\\":\\"info\\",\\"message\\":\\"an info\\"} - ", - ] - `); -}); - -test("should log all levels to stdout", async () => { - jest.resetModules(); - - process.env.LOG_LEVEL = "silly"; - const { logger } = await import("./index"); - - use(); - - logger.error("an error"); - logger.warn("an warn"); - logger.info("an info"); - logger.http("an http"); - logger.verbose("an verbose"); - logger.debug("an debug"); - logger.silly("an debug"); - - restore(); - - const output = flush(); - expect(output.stderr).toMatchInlineSnapshot(`Array []`); - expect(output.stdout).toMatchInlineSnapshot(` - Array [ - "{\\"level\\":\\"error\\",\\"message\\":\\"an error\\"} - ", - "{\\"level\\":\\"warn\\",\\"message\\":\\"an warn\\"} - ", - "{\\"level\\":\\"info\\",\\"message\\":\\"an info\\"} - ", - "{\\"level\\":\\"http\\",\\"message\\":\\"an http\\"} - ", - "{\\"level\\":\\"verbose\\",\\"message\\":\\"an verbose\\"} - ", - "{\\"level\\":\\"debug\\",\\"message\\":\\"an debug\\"} - ", - "{\\"level\\":\\"silly\\",\\"message\\":\\"an debug\\"} - ", - ] - `); -}); diff --git a/shared/logger/tsconfig.build.json b/shared/logger/tsconfig.build.json deleted file mode 100644 index 33cb77c77..000000000 --- a/shared/logger/tsconfig.build.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig", - "extends": "./tsconfig.json", - "files": ["./src/index.ts"] -} diff --git a/shared/logger/tsconfig.json b/shared/logger/tsconfig.json deleted file mode 100644 index a34fff854..000000000 --- a/shared/logger/tsconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig", - "extends": "@tsconfig/node14/tsconfig.json", - "compilerOptions": { - "declaration": true, - "outDir": "lib", - "rootDir": "src" - } -} diff --git a/shared/dila-resolver/src/types.ts b/shared/types/dila-resolver.ts similarity index 100% rename from shared/dila-resolver/src/types.ts rename to shared/types/dila-resolver.ts diff --git a/shared/types/index.ts b/shared/types/index.ts index a7b519f1e..b597d1a90 100644 --- a/shared/types/index.ts +++ b/shared/types/index.ts @@ -20,6 +20,7 @@ export * from "./utils"; export * from "./contributions"; export * from "./documents"; export * from "./export"; +export * from "./dila-resolver"; export enum DOCUMENT_SOURCE { fiches_ministere_travail = "fiches_ministere_travail", diff --git a/shared/utils/jest.config.js b/shared/utils/jest.config.js new file mode 100644 index 000000000..823ad8944 --- /dev/null +++ b/shared/utils/jest.config.js @@ -0,0 +1,14 @@ +/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */ +module.exports = { + transform: { + "^.+\\.(t|j)s$": [ + "@swc/jest", + { + jsc: { + target: "es2021", + }, + }, + ], + }, + testPathIgnorePatterns: ["/node_modules/", "/build/"], +}; diff --git a/shared/utils/package.json b/shared/utils/package.json index b484e7dd7..2a232e888 100644 --- a/shared/utils/package.json +++ b/shared/utils/package.json @@ -4,10 +4,12 @@ "dependencies": { "@socialgouv/cdtn-sources": "^4.91.1", "@socialgouv/cdtn-utils": "^4.109.0", + "@socialgouv/dila-api-client": "^1.2.4", "@urql/core": "^2.4.3", "graphql": "^16.3.0", "isomorphic-unfetch": "^3.1.0", "uuid": "^9.0.1", + "winston": "3.3.3", "xxhashjs": "^0.2.2" }, "private": true, @@ -16,12 +18,15 @@ "types": "build/src/index.d.ts", "scripts": { "build": "tsc", - "build:watch": "tsc -w" + "build:watch": "tsc -w", + "test": "jest" }, "devDependencies": { "@shared/types": "workspace:^", + "@swc/jest": "^0.2.29", "@types/uuid": "^9.0.5", "@types/xxhashjs": "^0.2.2", - "typescript": "^5.2.2" + "jest": "^29.7.0", + "typescript": "^5.3.3" } } diff --git a/shared/dila-resolver/src/mocks/kaliArticle.payload.json b/shared/utils/src/__tests__/__mocks__/kaliArticle.json similarity index 100% rename from shared/dila-resolver/src/mocks/kaliArticle.payload.json rename to shared/utils/src/__tests__/__mocks__/kaliArticle.json diff --git a/shared/dila-resolver/src/mocks/legiArticle.payload.json b/shared/utils/src/__tests__/__mocks__/legiArticle.json similarity index 100% rename from shared/dila-resolver/src/mocks/legiArticle.payload.json rename to shared/utils/src/__tests__/__mocks__/legiArticle.json diff --git a/shared/dila-resolver/src/index.test.ts b/shared/utils/src/__tests__/dila-resolver.test.ts similarity index 88% rename from shared/dila-resolver/src/index.test.ts rename to shared/utils/src/__tests__/dila-resolver.test.ts index d192dd5dd..9bcd60f2d 100644 --- a/shared/dila-resolver/src/index.test.ts +++ b/shared/utils/src/__tests__/dila-resolver.test.ts @@ -1,9 +1,8 @@ -/* eslint-disable @typescript-eslint/naming-convention */ import type DilaApiClient from "@socialgouv/dila-api-client"; -import { createGetArticleReference, extractArticleId } from "."; -import getKaliArticlePayload from "./mocks/kaliArticle.payload.json"; -import getLegiArticlePayload from "./mocks/legiArticle.payload.json"; +import { createGetArticleReference, extractArticleId } from "../dila-resolver"; +import getKaliArticlePayload from "./__mocks__/kaliArticle.json"; +import getLegiArticlePayload from "./__mocks__/legiArticle.json"; test("extractArticleId with legi ref", () => { const ref = "LEGIARTI000042683537"; diff --git a/shared/dila-resolver/src/index.ts b/shared/utils/src/dila-resolver.ts similarity index 85% rename from shared/dila-resolver/src/index.ts rename to shared/utils/src/dila-resolver.ts index 928d96411..13cca01c7 100644 --- a/shared/dila-resolver/src/index.ts +++ b/shared/utils/src/dila-resolver.ts @@ -1,9 +1,10 @@ -/* eslint-disable @typescript-eslint/naming-convention */ -import type { DocumentReference } from "@shared/types"; +import type { + DocumentReference, + ArticlePayload, + ArticleVersion, +} from "@shared/types"; import type DilaApiClient from "@socialgouv/dila-api-client"; -import type { ArticlePayload, ArticleVersion } from "./types"; - function createGetArticleReference(client: DilaApiClient) { return async function getArticle( id: string @@ -20,12 +21,12 @@ function createGetArticleReference(client: DilaApiClient) { const [lastVersion] = data.article.articleVersions.slice(-1); const containerId = data.article.conteneurs.length > 0 - ? data.article.conteneurs[0].cid - : data.article.textTitles[0].id; + ? data.article.conteneurs[0]!.cid + : data.article.textTitles[0]!.id; return { dila_cid: data.article.cid, dila_container_id: containerId, - dila_id: lastVersion.id, + dila_id: lastVersion!.id, title: `${data.article.nature} ${data.article.num}`, url: "", }; diff --git a/shared/utils/src/index.ts b/shared/utils/src/index.ts index c3eb45248..59aa26acc 100644 --- a/shared/utils/src/index.ts +++ b/shared/utils/src/index.ts @@ -2,3 +2,5 @@ export * from "./id-generator"; export * from "./url-generator"; export * from "./gql-client"; export * from "./config"; +export * from "./logger"; +export * from "./dila-resolver"; diff --git a/shared/logger/src/index.ts b/shared/utils/src/logger.ts similarity index 81% rename from shared/logger/src/index.ts rename to shared/utils/src/logger.ts index 41ebe3e1d..bc8c6f85d 100644 --- a/shared/logger/src/index.ts +++ b/shared/utils/src/logger.ts @@ -14,8 +14,9 @@ const consoleTransport = new transports.Console({ ), }); -export const LOG_LEVEL = process.env.LOG_LEVEL ?? "info"; -export const logger = createLogger({ level: LOG_LEVEL, transports: [] }); +const LOG_LEVEL = process.env.LOG_LEVEL ?? "info"; + +const logger = createLogger({ level: LOG_LEVEL, transports: [] }); if (process.env.NODE_ENV !== "production") { logger.add(consoleTransport); @@ -26,3 +27,5 @@ if (process.env.NODE_ENV !== "production") { }) ); } + +export { logger }; diff --git a/shared/utils/tsconfig.json b/shared/utils/tsconfig.json index 723c9875b..1d00dbd3c 100644 --- a/shared/utils/tsconfig.json +++ b/shared/utils/tsconfig.json @@ -17,5 +17,6 @@ "sourceMap": true, "composite": true, "declarationMap": true - } + }, + "include": ["src/**/*.ts", "src/**/*.json"] } diff --git a/targets/alert-cli/Dockerfile b/targets/alert-cli/Dockerfile index c6020a218..50e44ccf3 100644 --- a/targets/alert-cli/Dockerfile +++ b/targets/alert-cli/Dockerfile @@ -10,20 +10,18 @@ COPY .yarn .yarn # hadolint ignore=SC2046 RUN yarn fetch workspaces focus alert-cli +FROM deps AS build-types +COPY shared/types ./shared/types/ +RUN yarn workspace @shared/types build + FROM deps AS build-utils +COPY --from=build-types /app/shared/types /app/shared/types COPY shared/utils ./shared/utils RUN yarn workspace @shared/utils build - -FROM deps AS build-dila-resolver -COPY shared/types ./shared/types -COPY shared/dila-resolver ./shared/dila-resolver -RUN yarn workspace @shared/dila-resolver build - FROM deps AS dist COPY --from=build-utils /app/shared/utils /app/shared/utils -COPY --from=build-dila-resolver /app/shared/dila-resolver /app/shared/dila-resolver COPY shared/types ./shared/types COPY targets/alert-cli ./targets/alert-cli diff --git a/targets/alert-cli/README.md b/targets/alert-cli/README.md deleted file mode 100644 index 8d08b71ea..000000000 --- a/targets/alert-cli/README.md +++ /dev/null @@ -1,22 +0,0 @@ -# Migration scripts - -## Usage - -```sh -# from project root dir -$ docker run --rm registry.gitlab.factory.social.gouv.fr/socialgouv/cdtn-admin/scripts -``` - -## Build - -```sh -# from project root dir -$ docker build -f targets/alert-cli/Dockerfile --shm-size 512M -t registry.gitlab.factory.social.gouv.fr/socialgouv/cdtn-admin/scripts . -``` - -## To run locally - -```sh -# from project cdtn-admin/targets/alert-cli dir -yarn start:debug -``` diff --git a/targets/alert-cli/package.json b/targets/alert-cli/package.json index 40765a1f8..fab10f652 100644 --- a/targets/alert-cli/package.json +++ b/targets/alert-cli/package.json @@ -24,9 +24,9 @@ "unist-util-select": "4.0.1" }, "devDependencies": { - "@shared/dila-resolver": "workspace:^", "@shared/eslint-config": "workspace:^", "@shared/types": "workspace:^", + "@shared/utils": "workspace:^", "@socialgouv/contributions-data-types": "3.27.0", "@socialgouv/fiches-travail-data-types": "4.191.0", "@socialgouv/kali-data-types": "2.127.0", diff --git a/targets/alert-cli/src/diff/dila/extractReferences/__tests__/editorialContents.test.ts b/targets/alert-cli/src/diff/dila/extractReferences/__tests__/editorialContents.test.ts index 971c52ce8..269d1d037 100644 --- a/targets/alert-cli/src/diff/dila/extractReferences/__tests__/editorialContents.test.ts +++ b/targets/alert-cli/src/diff/dila/extractReferences/__tests__/editorialContents.test.ts @@ -4,17 +4,10 @@ import type { EditorialContentSubset } from "../editorialContents"; import { extractEditorialContentTemplateRef } from "../editorialContents"; import payload from "./mocks/editorialContent.payload.json"; -jest.mock("@shared/utils", () => ({ - __esModule: true, // this property makes it work - gqlClient: jest.fn(), -})); - -jest.mock("@shared/dila-resolver", () => { - const originalModule = jest.requireActual("@shared/dila-resolver"); - /* eslint-disable-next-line */ +jest.mock("@shared/utils", () => { return { - __esModule: true, // this property makes it work - ...originalModule, + ...jest.requireActual("@shared/utils"), + gqlClient: jest.fn(), createGetArticleReference: () => async function (id: string): Promise { return Promise.resolve({ diff --git a/targets/alert-cli/src/diff/dila/extractReferences/__tests__/mailTemplates.test.ts b/targets/alert-cli/src/diff/dila/extractReferences/__tests__/mailTemplates.test.ts index 4ead74e60..aa44fa0b9 100644 --- a/targets/alert-cli/src/diff/dila/extractReferences/__tests__/mailTemplates.test.ts +++ b/targets/alert-cli/src/diff/dila/extractReferences/__tests__/mailTemplates.test.ts @@ -4,17 +4,10 @@ import type { MailTemplateSubset } from "../mailTemplates"; import { extractMailTemplateRef } from "../mailTemplates"; import payload from "./mocks/mailTemplate.payload.json"; -jest.mock("@shared/utils", () => ({ - __esModule: true, // this property makes it work - gqlClient: jest.fn(), -})); - -jest.mock("@shared/dila-resolver", () => { - const originalModule = jest.requireActual("@shared/dila-resolver"); - /* eslint-disable-next-line */ +jest.mock("@shared/utils", () => { return { - __esModule: true, // this property makes it work - ...originalModule, + ...jest.requireActual("@shared/utils"), + gqlClient: jest.fn(), createGetArticleReference: () => async function (id: string): Promise { return Promise.resolve({ diff --git a/targets/alert-cli/src/diff/dila/extractReferences/editorialContents.ts b/targets/alert-cli/src/diff/dila/extractReferences/editorialContents.ts index 282d96cf9..af7bb683d 100644 --- a/targets/alert-cli/src/diff/dila/extractReferences/editorialContents.ts +++ b/targets/alert-cli/src/diff/dila/extractReferences/editorialContents.ts @@ -1,7 +1,4 @@ -import { - createGetArticleReference, - extractArticleId, -} from "@shared/dila-resolver"; +import { createGetArticleReference, extractArticleId } from "@shared/utils"; import type { DocumentReferences, EditoralContentReferenceBloc, diff --git a/targets/alert-cli/src/diff/dila/extractReferences/mailTemplates.ts b/targets/alert-cli/src/diff/dila/extractReferences/mailTemplates.ts index f01f36eed..13c8bb287 100644 --- a/targets/alert-cli/src/diff/dila/extractReferences/mailTemplates.ts +++ b/targets/alert-cli/src/diff/dila/extractReferences/mailTemplates.ts @@ -1,7 +1,4 @@ -import { - createGetArticleReference, - extractArticleId, -} from "@shared/dila-resolver"; +import { createGetArticleReference, extractArticleId } from "@shared/utils"; import type { DocumentReferences, MailTemplate } from "@shared/types"; import { SOURCES } from "@socialgouv/cdtn-sources"; import { DilaApiClient } from "@socialgouv/dila-api-client"; diff --git a/targets/contributions/Dockerfile b/targets/contributions/Dockerfile index 89dc607cc..146d2280f 100644 --- a/targets/contributions/Dockerfile +++ b/targets/contributions/Dockerfile @@ -10,7 +10,12 @@ COPY .yarn .yarn # hadolint ignore=SC2046 RUN yarn fetch workspaces focus @socialgouv/contibutions +FROM deps AS build-types +COPY shared/types ./shared/types/ +RUN yarn workspace @shared/types build + FROM deps AS build-utils +COPY --from=build-types /app/shared/types /app/shared/types COPY shared/utils ./shared/utils RUN yarn workspace @shared/utils build diff --git a/targets/contributions/README.md b/targets/contributions/README.md deleted file mode 100644 index b5c148042..000000000 --- a/targets/contributions/README.md +++ /dev/null @@ -1 +0,0 @@ -# @socialgouv/code-du-travail-backoffice__app diff --git a/targets/export-elasticsearch/Dockerfile b/targets/export-elasticsearch/Dockerfile index 2a0fbba84..0fb64dacf 100644 --- a/targets/export-elasticsearch/Dockerfile +++ b/targets/export-elasticsearch/Dockerfile @@ -12,31 +12,18 @@ COPY .yarn .yarn # hadolint ignore=SC2046 RUN yarn fetch workspaces focus export-elasticsearch -FROM deps AS build-utils -COPY shared/utils ./shared/utils -RUN yarn workspace @shared/utils build - FROM deps AS build-types -COPY shared/types ./shared/types +COPY shared/types ./shared/types/ RUN yarn workspace @shared/types build -FROM deps AS build-cdtn-logger -COPY shared/logger ./shared/logger -RUN yarn workspace @socialgouv/cdtn-logger build - -FROM deps AS build-elasticsearch-document-adapter -COPY --from=build-types /app/shared/types ./shared/types -COPY --from=build-cdtn-logger /app/shared/logger ./shared/logger -COPY --from=build-utils /app/shared/utils ./shared/utils -COPY shared/elasticsearch ./shared/elasticsearch -COPY shared/elasticsearch-document-adapter ./shared/elasticsearch-document-adapter -RUN yarn workspace @shared/elasticsearch-document-adapter build +FROM deps AS build-utils +COPY --from=build-types /app/shared/types /app/shared/types +COPY shared/utils ./shared/utils +RUN yarn workspace @shared/utils build FROM deps as dist COPY --from=build-utils /app/shared/utils ./shared/utils COPY --from=build-types /app/shared/types ./shared/types -COPY --from=build-elasticsearch-document-adapter /app/shared/elasticsearch-document-adapter ./shared/elasticsearch-document-adapter -COPY --from=build-cdtn-logger /app/shared/logger ./shared/logger COPY shared/eslint-config ./shared/eslint-config/ COPY targets/export-elasticsearch ./targets/export-elasticsearch/ @@ -54,16 +41,14 @@ COPY --from=dist /app/shared/utils/build /app/shared/utils/build COPY --from=dist /app/shared/utils/package.json /app/shared/utils/package.json COPY --from=dist /app/shared/types/build /app/shared/types/build COPY --from=dist /app/shared/types/package.json /app/shared/types/package.json -COPY --from=dist /app/shared/logger/package.json /app/shared/logger/package.json -COPY --from=dist /app/shared/logger/lib /app/shared/logger/lib -COPY --from=dist /app/shared/elasticsearch-document-adapter/lib /app/shared/elasticsearch-document-adapter/lib -COPY --from=dist /app/shared/elasticsearch-document-adapter/package.json /app/shared/elasticsearch-document-adapter/package.json +COPY shared/elasticsearch /app/shared/elasticsearch COPY --from=dist /app/targets/export-elasticsearch/dataset /app/targets/export-elasticsearch/dataset COPY --from=dist /app/targets/export-elasticsearch/package.json /app/targets/export-elasticsearch/package.json COPY --from=dist /app/targets/export-elasticsearch/build /app/targets/export-elasticsearch/build COPY --from=dist /app/targets/export-elasticsearch/node_modules /app/targets/export-elasticsearch/node_modules COPY --from=dist /app/node_modules /app/node_modules + USER 1000 ENV NODE_ENV=production diff --git a/targets/export-elasticsearch/README.md b/targets/export-elasticsearch/README.md deleted file mode 100644 index db0437955..000000000 --- a/targets/export-elasticsearch/README.md +++ /dev/null @@ -1,119 +0,0 @@ -# export-elasticsearch - -This service exposes an API which handle to trigger the export of the data from Postgres to Elasticsearch. Then, copy sitemap.xml from a container azure to an other container azure. To finish, it copies a container azure to an other container azure. - -## Building and running the code - -```sh -yarn build # For building the code with typechecking -yarn build:swc # For building without typechecking -yarn start # For running the code builded -``` - -Or in `development` mode: - -```sh -yarn dev # For running the code in development thanks to swc and nodemon -``` - -> **/!\ No typechecking made in dev mode** - -## Testing the code - -```sh -yarn test # For running unit test -yarn test:watch # For watching unit test -``` - -## Environment variable - -| Name | Description | Default value | -| ---------------------- | ----------------------------------------------------------------------------------------------- | ------------- | -| `DISABLE_LIMIT_EXPORT` | It allows you to disable concurrent run in ingester (by default it's one hour between each run) | undefined | -| `DISABLE_INGESTER` | It allows you to disable ingester in the process of export | undefined | -| `DISABLE_SITEMAP` | It allows you to disable copy of the sitemap | undefined | -| `DISABLE_COPY` | It allows you to disable copy between two containers | undefined | -| `DISABLE_GLOSSARY` | It allows you to disable the glossary (inject tooltips in contents) | undefined | - -## Testing in real - -### 1. Install and build dependencies - -At the root of the project - -```sh -yarn # to install dep -yarn build # to build project -``` - -### 2. Run the postgres to add data - -At the root of the project, please run this command: - -```sh -docker-compose up -d postgres -``` - -### 3. Load data from production to local - -#### 1. Restore data - -```sh -docker-compose exec -T postgres pg_restore \ - --dbname postgres --clean --if-exists --user postgres \ - --no-owner --no-acl --verbose < ~/MY_PATH/hasura_prod_db.psql -``` - -#### 2. Restore roles - -```sh -docker-compose exec -T postgres psql \ - --dbname postgres --user postgres \ - < .kontinuous/sql/post-restore.sql -``` - -### 4. Run the other containers - -```sh -docker-compose up -d hasura azurite elasticsearch -``` - -### 5. Run ingester in development mode - -```sh -GLOSSARY_PREPROD_DISABLE=true DISABLE_LIMIT_EXPORT=true DISABLE_SITEMAP=true DISABLE_COPY=true NLP_URL=https://serving-ml-preprod.dev.fabrique.social.gouv.fr HASURA_GRAPHQL_ENDPOINT="http://localhost:8080/v1/graphql" HASURA_GRAPHQL_ADMIN_SECRET="admin1" ELASTICSEARCH_URL_PREPROD="http://localhost:9200" ELASTICSEARCH_URL_PROD="http://localhost:9200" AZ_ACCOUNT_KEY_FROM="Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==" AZ_ACCOUNT_NAME_FROM="devstoreaccount1" AZ_URL_FROM="http://localhost:10000/devstoreaccount1" AZ_ACCOUNT_KEY_TO="Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==" AZ_ACCOUNT_NAME_TO="devstoreaccount1" AZ_URL_TO="http://localhost:10000/devstoreaccount1" SITEMAP_DESTINATION_CONTAINER="sitemap" SITEMAP_DESTINATION_NAME="sitemap.xml" SITEMAP_ENDPOINT="http://localhost:3001/api/sitemap" CDTN_ADMIN_ENDPOINT="http://localhost:8080/v1/graphql" SOURCE_CONTAINER_COPY="sitemap" DESTINATION_CONTAINER_COPY="testcopy" ELASTICSEARCH_INDEX_PREPROD="cdtn-v2" ELASTICSEARCH_INDEX_PROD="cdtn-v2" yarn workspace export-elasticsearch dev -``` - -- `DISABLE_LIMIT_EXPORT` is used to disable the limit to run two export in less than one hour -- `DISABLE_COPY` is used to disable copy between two containers -- `DISABLE_SITEMAP` is used to disable copy of the sitemap -- `GLOSSARY_PREPROD_DISABLE` is used to disable glossary to gain time. - -> **Note**: You can remove `NLP_URL` from your environment variables if you don't want to use the NLP service and gain time during the process of ingester elasticsearch. - -### 6. Run the export elasticsearch - -#### With cli - -```sh -yarn workspace export-elasticsearch run:ingester -``` - -#### With frontend ui - -```sh -yarn workspace frontend dev -``` - -1. Go to `http://localhost:3001/` -2. Connect to the frontend ui with `codedutravailnumerique@travail.gouv.fr` and `admin` as password. -3. Navigate to `Mise à jour` -4. Click on `Mettre à jour la pre-production` or `Mettre à jour la production` - -## Générer un backup en local - -1. Se connecter à teleport : `tsh login --proxy=teleport.fabrique.social.gouv.fr --auth=github` -2. Lancer la commande pour faire un proxy avec la database de prod : `tsh proxy db --db-user=PostgresAdmins --db-name=postgres cdtnadminprodserver --tunnel` -3. Utiliser pg_dump pour faire un backup de la database en remplaçant par le bon port : `docker-compose exec -T postgres pg_dump --no-owner --no-acl -v -Fc postgres://PostgresAdmins@host.docker.internal:PORT/hasura_prod > hasura_cdtn_admin_prod_db.psql` - -La documentation pour teleport est disponible ici : diff --git a/targets/export-elasticsearch/package.json b/targets/export-elasticsearch/package.json index 052185ccd..7603b2360 100644 --- a/targets/export-elasticsearch/package.json +++ b/targets/export-elasticsearch/package.json @@ -24,17 +24,29 @@ }, "dependencies": { "@azure/storage-blob": "^12.9.0", - "@shared/elasticsearch-document-adapter": "workspace:^", + "@elastic/elasticsearch": "^7.14.1", "@shared/types": "workspace:^", "@shared/utils": "workspace:^", - "@socialgouv/cdtn-logger": "workspace:^", + "@socialgouv/cdtn-elasticsearch": "workspace:^", + "@socialgouv/cdtn-slugify": "^4.52.1", + "@socialgouv/cdtn-sources": "^4.52.1", "axios": "^0.26.1", "body-parser": "^1.19.2", "cors": "^2.8.5", "express": "^4.17.3", "inversify": "^6.0.1", "inversify-express-utils": "^6.4.3", + "nctx": "^1.2.0", + "node-fetch": "^2.6.5", + "p-map": "^4.0.0", + "p-queue": "^6.6.2", "reflect-metadata": "^0.1.13", + "rehype-raw": "^5.1.0", + "rehype-stringify": "^8.0.0", + "remark-parse": "^9.0.0", + "remark-rehype": "^8.1.0", + "remark-stringify": "^9.0.1", + "unified": "^9.2.2", "zod": "^3.14.2" }, "devDependencies": { diff --git a/shared/elasticsearch-document-adapter/__fixtures__/suggestion_data_test.txt b/targets/export-elasticsearch/src/ingester/__fixtures__/suggestion_data_test.txt similarity index 100% rename from shared/elasticsearch-document-adapter/__fixtures__/suggestion_data_test.txt rename to targets/export-elasticsearch/src/ingester/__fixtures__/suggestion_data_test.txt diff --git a/shared/elasticsearch-document-adapter/src/__tests__/breadcrumbs.test.ts b/targets/export-elasticsearch/src/ingester/__tests__/breadcrumbs.test.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/__tests__/breadcrumbs.test.ts rename to targets/export-elasticsearch/src/ingester/__tests__/breadcrumbs.test.ts diff --git a/shared/elasticsearch-document-adapter/src/__tests__/cdtnDocuments.test.ts b/targets/export-elasticsearch/src/ingester/__tests__/cdtnDocuments.test.ts similarity index 98% rename from shared/elasticsearch-document-adapter/src/__tests__/cdtnDocuments.test.ts rename to targets/export-elasticsearch/src/ingester/__tests__/cdtnDocuments.test.ts index d6fcecf95..c7e9e0d20 100644 --- a/shared/elasticsearch-document-adapter/src/__tests__/cdtnDocuments.test.ts +++ b/targets/export-elasticsearch/src/ingester/__tests__/cdtnDocuments.test.ts @@ -2,7 +2,7 @@ import { getIDCCs } from "../agreements/getIdcc"; import { getDuplicateSlugs } from "../cdtnDocuments"; import { context } from "../context"; -jest.mock("@socialgouv/cdtn-logger"); +jest.mock("@shared/utils"); describe("cdtnDocuments", () => { describe("getDuplicateSlug", () => { diff --git a/shared/elasticsearch-document-adapter/src/agreements/__tests__/generateArticleByTheme.test.ts b/targets/export-elasticsearch/src/ingester/agreements/__tests__/generateArticleByTheme.test.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/agreements/__tests__/generateArticleByTheme.test.ts rename to targets/export-elasticsearch/src/ingester/agreements/__tests__/generateArticleByTheme.test.ts diff --git a/shared/elasticsearch-document-adapter/src/agreements/__tests__/getArticleId.test.ts b/targets/export-elasticsearch/src/ingester/agreements/__tests__/getArticleId.test.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/agreements/__tests__/getArticleId.test.ts rename to targets/export-elasticsearch/src/ingester/agreements/__tests__/getArticleId.test.ts diff --git a/shared/elasticsearch-document-adapter/src/agreements/__tests__/getArticleNumberWithPath.test.ts b/targets/export-elasticsearch/src/ingester/agreements/__tests__/getArticleNumberWithPath.test.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/agreements/__tests__/getArticleNumberWithPath.test.ts rename to targets/export-elasticsearch/src/ingester/agreements/__tests__/getArticleNumberWithPath.test.ts diff --git a/shared/elasticsearch-document-adapter/src/agreements/__tests__/getIdcc.test.ts b/targets/export-elasticsearch/src/ingester/agreements/__tests__/getIdcc.test.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/agreements/__tests__/getIdcc.test.ts rename to targets/export-elasticsearch/src/ingester/agreements/__tests__/getIdcc.test.ts diff --git a/shared/elasticsearch-document-adapter/src/agreements/__tests__/getInfoMessage.test.ts b/targets/export-elasticsearch/src/ingester/agreements/__tests__/getInfoMessage.test.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/agreements/__tests__/getInfoMessage.test.ts rename to targets/export-elasticsearch/src/ingester/agreements/__tests__/getInfoMessage.test.ts diff --git a/shared/elasticsearch-document-adapter/src/agreements/__tests__/getTheme.test.ts b/targets/export-elasticsearch/src/ingester/agreements/__tests__/getTheme.test.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/agreements/__tests__/getTheme.test.ts rename to targets/export-elasticsearch/src/ingester/agreements/__tests__/getTheme.test.ts diff --git a/shared/elasticsearch-document-adapter/src/agreements/generate.ts b/targets/export-elasticsearch/src/ingester/agreements/generate.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/agreements/generate.ts rename to targets/export-elasticsearch/src/ingester/agreements/generate.ts diff --git a/shared/elasticsearch-document-adapter/src/agreements/getAgreementsArticlesByTheme.ts b/targets/export-elasticsearch/src/ingester/agreements/getAgreementsArticlesByTheme.ts similarity index 97% rename from shared/elasticsearch-document-adapter/src/agreements/getAgreementsArticlesByTheme.ts rename to targets/export-elasticsearch/src/ingester/agreements/getAgreementsArticlesByTheme.ts index 89d55466e..2d2a23966 100644 --- a/shared/elasticsearch-document-adapter/src/agreements/getAgreementsArticlesByTheme.ts +++ b/targets/export-elasticsearch/src/ingester/agreements/getAgreementsArticlesByTheme.ts @@ -3,10 +3,9 @@ import { KaliArticlesByIdResult, ArticleByTheme, } from "@shared/types"; -import { gqlClient } from "@shared/utils"; +import { gqlClient, logger } from "@shared/utils"; import { context } from "../context"; import { detectNullInObject } from "../utils/detectNullInObject"; -import { logger } from "@socialgouv/cdtn-logger"; const getKaliBlocksQueryByIdcc = ` query getKaliBlocksByIdcc($idcc: Int!) { diff --git a/shared/elasticsearch-document-adapter/src/agreements/getIdcc.ts b/targets/export-elasticsearch/src/ingester/agreements/getIdcc.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/agreements/getIdcc.ts rename to targets/export-elasticsearch/src/ingester/agreements/getIdcc.ts diff --git a/shared/elasticsearch-document-adapter/src/agreements/getInfoMessage.ts b/targets/export-elasticsearch/src/ingester/agreements/getInfoMessage.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/agreements/getInfoMessage.ts rename to targets/export-elasticsearch/src/ingester/agreements/getInfoMessage.ts diff --git a/shared/elasticsearch-document-adapter/src/agreements/getTheme.ts b/targets/export-elasticsearch/src/ingester/agreements/getTheme.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/agreements/getTheme.ts rename to targets/export-elasticsearch/src/ingester/agreements/getTheme.ts diff --git a/shared/elasticsearch-document-adapter/src/agreements/index.ts b/targets/export-elasticsearch/src/ingester/agreements/index.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/agreements/index.ts rename to targets/export-elasticsearch/src/ingester/agreements/index.ts diff --git a/shared/elasticsearch-document-adapter/src/breadcrumbs.ts b/targets/export-elasticsearch/src/ingester/breadcrumbs.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/breadcrumbs.ts rename to targets/export-elasticsearch/src/ingester/breadcrumbs.ts diff --git a/shared/elasticsearch-document-adapter/src/buildThemes.js b/targets/export-elasticsearch/src/ingester/buildThemes.js similarity index 100% rename from shared/elasticsearch-document-adapter/src/buildThemes.js rename to targets/export-elasticsearch/src/ingester/buildThemes.js diff --git a/shared/elasticsearch-document-adapter/src/cdtnDocuments.ts b/targets/export-elasticsearch/src/ingester/cdtnDocuments.ts similarity index 99% rename from shared/elasticsearch-document-adapter/src/cdtnDocuments.ts rename to targets/export-elasticsearch/src/ingester/cdtnDocuments.ts index 11959c5c9..64b045e56 100644 --- a/shared/elasticsearch-document-adapter/src/cdtnDocuments.ts +++ b/targets/export-elasticsearch/src/ingester/cdtnDocuments.ts @@ -8,7 +8,7 @@ import { FicheTravailEmploiDoc, OldContributionElasticDocument, } from "@shared/types"; -import { logger } from "@socialgouv/cdtn-logger"; +import { logger } from "@shared/utils"; import { SOURCES } from "@socialgouv/cdtn-sources"; import fetch from "node-fetch"; diff --git a/shared/elasticsearch-document-adapter/src/context.ts b/targets/export-elasticsearch/src/ingester/context.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/context.ts rename to targets/export-elasticsearch/src/ingester/context.ts diff --git a/shared/elasticsearch-document-adapter/src/contributions/__tests__/addGlossaryToContent.test.ts b/targets/export-elasticsearch/src/ingester/contributions/__tests__/addGlossaryToContent.test.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/contributions/__tests__/addGlossaryToContent.test.ts rename to targets/export-elasticsearch/src/ingester/contributions/__tests__/addGlossaryToContent.test.ts diff --git a/shared/elasticsearch-document-adapter/src/contributions/__tests__/generateContent.test.ts b/targets/export-elasticsearch/src/ingester/contributions/__tests__/generateContent.test.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/contributions/__tests__/generateContent.test.ts rename to targets/export-elasticsearch/src/ingester/contributions/__tests__/generateContent.test.ts diff --git a/shared/elasticsearch-document-adapter/src/contributions/__tests__/generateLinkedContent.test.ts b/targets/export-elasticsearch/src/ingester/contributions/__tests__/generateLinkedContent.test.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/contributions/__tests__/generateLinkedContent.test.ts rename to targets/export-elasticsearch/src/ingester/contributions/__tests__/generateLinkedContent.test.ts diff --git a/shared/elasticsearch-document-adapter/src/contributions/__tests__/generateMessageBlock.test.ts b/targets/export-elasticsearch/src/ingester/contributions/__tests__/generateMessageBlock.test.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/contributions/__tests__/generateMessageBlock.test.ts rename to targets/export-elasticsearch/src/ingester/contributions/__tests__/generateMessageBlock.test.ts diff --git a/shared/elasticsearch-document-adapter/src/contributions/__tests__/generateMetadata.test.ts b/targets/export-elasticsearch/src/ingester/contributions/__tests__/generateMetadata.test.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/contributions/__tests__/generateMetadata.test.ts rename to targets/export-elasticsearch/src/ingester/contributions/__tests__/generateMetadata.test.ts diff --git a/shared/elasticsearch-document-adapter/src/contributions/__tests__/getCcInfos.test.ts b/targets/export-elasticsearch/src/ingester/contributions/__tests__/getCcInfos.test.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/contributions/__tests__/getCcInfos.test.ts rename to targets/export-elasticsearch/src/ingester/contributions/__tests__/getCcInfos.test.ts diff --git a/shared/elasticsearch-document-adapter/src/contributions/__tests__/getCcSupported.test.ts b/targets/export-elasticsearch/src/ingester/contributions/__tests__/getCcSupported.test.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/contributions/__tests__/getCcSupported.test.ts rename to targets/export-elasticsearch/src/ingester/contributions/__tests__/getCcSupported.test.ts diff --git a/shared/elasticsearch-document-adapter/src/contributions/__tests__/helpers.test.ts b/targets/export-elasticsearch/src/ingester/contributions/__tests__/helpers.test.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/contributions/__tests__/helpers.test.ts rename to targets/export-elasticsearch/src/ingester/contributions/__tests__/helpers.test.ts diff --git a/shared/elasticsearch-document-adapter/src/contributions/addGlossaryToContent.ts b/targets/export-elasticsearch/src/ingester/contributions/addGlossaryToContent.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/contributions/addGlossaryToContent.ts rename to targets/export-elasticsearch/src/ingester/contributions/addGlossaryToContent.ts diff --git a/shared/elasticsearch-document-adapter/src/contributions/fetchContributionsWithNoContent.ts b/targets/export-elasticsearch/src/ingester/contributions/fetchContributionsWithNoContent.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/contributions/fetchContributionsWithNoContent.ts rename to targets/export-elasticsearch/src/ingester/contributions/fetchContributionsWithNoContent.ts diff --git a/shared/elasticsearch-document-adapter/src/contributions/fetchFicheSp.ts b/targets/export-elasticsearch/src/ingester/contributions/fetchFicheSp.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/contributions/fetchFicheSp.ts rename to targets/export-elasticsearch/src/ingester/contributions/fetchFicheSp.ts diff --git a/shared/elasticsearch-document-adapter/src/contributions/fetchLinkedContent.ts b/targets/export-elasticsearch/src/ingester/contributions/fetchLinkedContent.ts similarity index 94% rename from shared/elasticsearch-document-adapter/src/contributions/fetchLinkedContent.ts rename to targets/export-elasticsearch/src/ingester/contributions/fetchLinkedContent.ts index 8525196a8..2041e9c8b 100644 --- a/shared/elasticsearch-document-adapter/src/contributions/fetchLinkedContent.ts +++ b/targets/export-elasticsearch/src/ingester/contributions/fetchLinkedContent.ts @@ -1,6 +1,5 @@ -import { gqlClient } from "@shared/utils"; +import { gqlClient, logger } from "@shared/utils"; import { context } from "../context"; -import { logger } from "@socialgouv/cdtn-logger"; const fetchLinkedContentById = ` query get_linked_document($cdtnId: String!) { diff --git a/shared/elasticsearch-document-adapter/src/contributions/fetchMessageBlock.ts b/targets/export-elasticsearch/src/ingester/contributions/fetchMessageBlock.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/contributions/fetchMessageBlock.ts rename to targets/export-elasticsearch/src/ingester/contributions/fetchMessageBlock.ts diff --git a/shared/elasticsearch-document-adapter/src/contributions/generate.ts b/targets/export-elasticsearch/src/ingester/contributions/generate.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/contributions/generate.ts rename to targets/export-elasticsearch/src/ingester/contributions/generate.ts diff --git a/shared/elasticsearch-document-adapter/src/contributions/generateContent.ts b/targets/export-elasticsearch/src/ingester/contributions/generateContent.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/contributions/generateContent.ts rename to targets/export-elasticsearch/src/ingester/contributions/generateContent.ts diff --git a/shared/elasticsearch-document-adapter/src/contributions/generateLinkedContent.ts b/targets/export-elasticsearch/src/ingester/contributions/generateLinkedContent.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/contributions/generateLinkedContent.ts rename to targets/export-elasticsearch/src/ingester/contributions/generateLinkedContent.ts diff --git a/shared/elasticsearch-document-adapter/src/contributions/generateMessageBlock.ts b/targets/export-elasticsearch/src/ingester/contributions/generateMessageBlock.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/contributions/generateMessageBlock.ts rename to targets/export-elasticsearch/src/ingester/contributions/generateMessageBlock.ts diff --git a/shared/elasticsearch-document-adapter/src/contributions/generateMetadata.ts b/targets/export-elasticsearch/src/ingester/contributions/generateMetadata.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/contributions/generateMetadata.ts rename to targets/export-elasticsearch/src/ingester/contributions/generateMetadata.ts diff --git a/shared/elasticsearch-document-adapter/src/contributions/getCcInfos.ts b/targets/export-elasticsearch/src/ingester/contributions/getCcInfos.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/contributions/getCcInfos.ts rename to targets/export-elasticsearch/src/ingester/contributions/getCcInfos.ts diff --git a/shared/elasticsearch-document-adapter/src/contributions/getCcSupported.ts b/targets/export-elasticsearch/src/ingester/contributions/getCcSupported.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/contributions/getCcSupported.ts rename to targets/export-elasticsearch/src/ingester/contributions/getCcSupported.ts diff --git a/shared/elasticsearch-document-adapter/src/contributions/getCcSupportedWithNoContent.ts b/targets/export-elasticsearch/src/ingester/contributions/getCcSupportedWithNoContent.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/contributions/getCcSupportedWithNoContent.ts rename to targets/export-elasticsearch/src/ingester/contributions/getCcSupportedWithNoContent.ts diff --git a/shared/elasticsearch-document-adapter/src/contributions/helpers.ts b/targets/export-elasticsearch/src/ingester/contributions/helpers.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/contributions/helpers.ts rename to targets/export-elasticsearch/src/ingester/contributions/helpers.ts diff --git a/shared/elasticsearch-document-adapter/src/contributions/index.ts b/targets/export-elasticsearch/src/ingester/contributions/index.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/contributions/index.ts rename to targets/export-elasticsearch/src/ingester/contributions/index.ts diff --git a/shared/elasticsearch-document-adapter/src/fetchCdtnAdminDocuments.ts b/targets/export-elasticsearch/src/ingester/fetchCdtnAdminDocuments.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/fetchCdtnAdminDocuments.ts rename to targets/export-elasticsearch/src/ingester/fetchCdtnAdminDocuments.ts diff --git a/shared/elasticsearch-document-adapter/src/fichesTravailSplitter.js b/targets/export-elasticsearch/src/ingester/fichesTravailSplitter.js similarity index 100% rename from shared/elasticsearch-document-adapter/src/fichesTravailSplitter.js rename to targets/export-elasticsearch/src/ingester/fichesTravailSplitter.js diff --git a/shared/elasticsearch-document-adapter/src/glossary/__tests__/glossaryData.ts b/targets/export-elasticsearch/src/ingester/glossary/__mock__/glossaryData.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/glossary/__tests__/glossaryData.ts rename to targets/export-elasticsearch/src/ingester/glossary/__mock__/glossaryData.ts diff --git a/shared/elasticsearch-document-adapter/src/glossary/__tests__/glossary.test.ts b/targets/export-elasticsearch/src/ingester/glossary/__tests__/glossary.test.ts similarity index 99% rename from shared/elasticsearch-document-adapter/src/glossary/__tests__/glossary.test.ts rename to targets/export-elasticsearch/src/ingester/glossary/__tests__/glossary.test.ts index 39d88141b..1fbd00e77 100644 --- a/shared/elasticsearch-document-adapter/src/glossary/__tests__/glossary.test.ts +++ b/targets/export-elasticsearch/src/ingester/glossary/__tests__/glossary.test.ts @@ -1,6 +1,6 @@ import { context } from "../../context"; -import { createGlossaryTransform } from "../"; -import { glossaryData } from "./glossaryData"; +import { createGlossaryTransform } from ".."; +import { glossaryData } from "../__mock__/glossaryData"; describe("Glossary", () => { describe("addGlossary", () => { diff --git a/shared/elasticsearch-document-adapter/src/glossary/createGlossaryTransform.ts b/targets/export-elasticsearch/src/ingester/glossary/createGlossaryTransform.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/glossary/createGlossaryTransform.ts rename to targets/export-elasticsearch/src/ingester/glossary/createGlossaryTransform.ts diff --git a/shared/elasticsearch-document-adapter/src/glossary/explodeGlossaryTerms.ts b/targets/export-elasticsearch/src/ingester/glossary/explodeGlossaryTerms.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/glossary/explodeGlossaryTerms.ts rename to targets/export-elasticsearch/src/ingester/glossary/explodeGlossaryTerms.ts diff --git a/shared/elasticsearch-document-adapter/src/glossary/index.ts b/targets/export-elasticsearch/src/ingester/glossary/index.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/glossary/index.ts rename to targets/export-elasticsearch/src/ingester/glossary/index.ts diff --git a/shared/elasticsearch-document-adapter/src/glossary/insertWebComponentGlossary.ts b/targets/export-elasticsearch/src/ingester/glossary/insertWebComponentGlossary.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/glossary/insertWebComponentGlossary.ts rename to targets/export-elasticsearch/src/ingester/glossary/insertWebComponentGlossary.ts diff --git a/shared/elasticsearch-document-adapter/src/glossary/types.ts b/targets/export-elasticsearch/src/ingester/glossary/types.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/glossary/types.ts rename to targets/export-elasticsearch/src/ingester/glossary/types.ts diff --git a/shared/elasticsearch-document-adapter/src/index.ts b/targets/export-elasticsearch/src/ingester/index.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/index.ts rename to targets/export-elasticsearch/src/ingester/index.ts diff --git a/shared/elasticsearch-document-adapter/src/ingest.ts b/targets/export-elasticsearch/src/ingester/ingest.ts similarity index 99% rename from shared/elasticsearch-document-adapter/src/ingest.ts rename to targets/export-elasticsearch/src/ingester/ingest.ts index a6bc91c64..971fe6842 100644 --- a/shared/elasticsearch-document-adapter/src/ingest.ts +++ b/targets/export-elasticsearch/src/ingester/ingest.ts @@ -10,7 +10,7 @@ import { version, //@ts-expect-error } from "@socialgouv/cdtn-elasticsearch"; -import { logger } from "@socialgouv/cdtn-logger"; +import { logger } from "@shared/utils"; import { SOURCES } from "@socialgouv/cdtn-sources"; import pMap from "p-map"; diff --git a/shared/elasticsearch-document-adapter/src/markdown.ts b/targets/export-elasticsearch/src/ingester/markdown.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/markdown.ts rename to targets/export-elasticsearch/src/ingester/markdown.ts diff --git a/shared/elasticsearch-document-adapter/src/monolog.js b/targets/export-elasticsearch/src/ingester/monolog.js similarity index 97% rename from shared/elasticsearch-document-adapter/src/monolog.js rename to targets/export-elasticsearch/src/ingester/monolog.js index e1a7d02a5..c6992dc67 100644 --- a/shared/elasticsearch-document-adapter/src/monolog.js +++ b/targets/export-elasticsearch/src/ingester/monolog.js @@ -1,5 +1,5 @@ import { Client } from "@elastic/elasticsearch"; -import { logger } from "@socialgouv/cdtn-logger"; +import { logger } from "@shared/utils"; import { getRouteBySource, SOURCES } from "@socialgouv/cdtn-sources"; const COVISIT_BATCH_SIZE = 500; diff --git a/shared/elasticsearch-document-adapter/src/plan-de-contenu.js b/targets/export-elasticsearch/src/ingester/plan-de-contenu.js similarity index 100% rename from shared/elasticsearch-document-adapter/src/plan-de-contenu.js rename to targets/export-elasticsearch/src/ingester/plan-de-contenu.js diff --git a/shared/elasticsearch-document-adapter/src/suggestion-cli.js b/targets/export-elasticsearch/src/ingester/suggestion-cli.js similarity index 100% rename from shared/elasticsearch-document-adapter/src/suggestion-cli.js rename to targets/export-elasticsearch/src/ingester/suggestion-cli.js diff --git a/shared/elasticsearch-document-adapter/src/suggestion.test.ts b/targets/export-elasticsearch/src/ingester/suggestion.test.ts similarity index 98% rename from shared/elasticsearch-document-adapter/src/suggestion.test.ts rename to targets/export-elasticsearch/src/ingester/suggestion.test.ts index 0cb0e9b1d..53eed9efb 100644 --- a/shared/elasticsearch-document-adapter/src/suggestion.test.ts +++ b/targets/export-elasticsearch/src/ingester/suggestion.test.ts @@ -9,7 +9,7 @@ import { populateSuggestions } from "./suggestion"; jest.mock("@socialgouv/cdtn-elasticsearch"); -const suggestFile = "./__fixtures__/suggestion_data_test.txt"; +const suggestFile = "src/ingester/__fixtures__/suggestion_data_test.txt"; const bufferSize = 10; const testCasesCount = 25; diff --git a/shared/elasticsearch-document-adapter/src/suggestion.ts b/targets/export-elasticsearch/src/ingester/suggestion.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/suggestion.ts rename to targets/export-elasticsearch/src/ingester/suggestion.ts diff --git a/shared/elasticsearch-document-adapter/src/types.ts b/targets/export-elasticsearch/src/ingester/types.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/types.ts rename to targets/export-elasticsearch/src/ingester/types.ts diff --git a/shared/elasticsearch-document-adapter/src/types/Glossary.ts b/targets/export-elasticsearch/src/ingester/types/Glossary.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/types/Glossary.ts rename to targets/export-elasticsearch/src/ingester/types/Glossary.ts diff --git a/shared/elasticsearch-document-adapter/src/types/GraphQL.ts b/targets/export-elasticsearch/src/ingester/types/GraphQL.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/types/GraphQL.ts rename to targets/export-elasticsearch/src/ingester/types/GraphQL.ts diff --git a/shared/elasticsearch-document-adapter/src/types/themes.ts b/targets/export-elasticsearch/src/ingester/types/themes.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/types/themes.ts rename to targets/export-elasticsearch/src/ingester/types/themes.ts diff --git a/shared/elasticsearch-document-adapter/src/utils/__tests__/detectNullInObject.test.ts b/targets/export-elasticsearch/src/ingester/utils/__tests__/detectNullInObject.test.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/utils/__tests__/detectNullInObject.test.ts rename to targets/export-elasticsearch/src/ingester/utils/__tests__/detectNullInObject.test.ts diff --git a/shared/elasticsearch-document-adapter/src/utils/__tests__/index.test.ts b/targets/export-elasticsearch/src/ingester/utils/__tests__/index.test.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/utils/__tests__/index.test.ts rename to targets/export-elasticsearch/src/ingester/utils/__tests__/index.test.ts diff --git a/shared/elasticsearch-document-adapter/src/utils/detectNullInObject.ts b/targets/export-elasticsearch/src/ingester/utils/detectNullInObject.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/utils/detectNullInObject.ts rename to targets/export-elasticsearch/src/ingester/utils/detectNullInObject.ts diff --git a/shared/elasticsearch-document-adapter/src/utils/index.ts b/targets/export-elasticsearch/src/ingester/utils/index.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/utils/index.ts rename to targets/export-elasticsearch/src/ingester/utils/index.ts diff --git a/shared/elasticsearch-document-adapter/src/utils/isHtml.ts b/targets/export-elasticsearch/src/ingester/utils/isHtml.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/utils/isHtml.ts rename to targets/export-elasticsearch/src/ingester/utils/isHtml.ts diff --git a/shared/elasticsearch-document-adapter/src/utils/keyParser.ts b/targets/export-elasticsearch/src/ingester/utils/keyParser.ts similarity index 100% rename from shared/elasticsearch-document-adapter/src/utils/keyParser.ts rename to targets/export-elasticsearch/src/ingester/utils/keyParser.ts diff --git a/shared/elasticsearch-document-adapter/src/versions.js b/targets/export-elasticsearch/src/ingester/versions.js similarity index 81% rename from shared/elasticsearch-document-adapter/src/versions.js rename to targets/export-elasticsearch/src/ingester/versions.js index a865119bf..faec0486c 100644 --- a/shared/elasticsearch-document-adapter/src/versions.js +++ b/targets/export-elasticsearch/src/ingester/versions.js @@ -1,4 +1,4 @@ -const dependencies = require("../package.json").dependencies; +const dependencies = require("../../package.json").dependencies; export function getVersions(pattern = "^@socialgouv/") { const packageRule = new RegExp(pattern); diff --git a/shared/elasticsearch-document-adapter/src/versions.test.js b/targets/export-elasticsearch/src/ingester/versions.test.js similarity index 93% rename from shared/elasticsearch-document-adapter/src/versions.test.js rename to targets/export-elasticsearch/src/ingester/versions.test.js index b4fbf99a7..be76a30e8 100644 --- a/shared/elasticsearch-document-adapter/src/versions.test.js +++ b/targets/export-elasticsearch/src/ingester/versions.test.js @@ -1,6 +1,6 @@ import { getVersions } from "./versions"; -jest.mock("../package.json", () => ({ +jest.mock("../../package.json", () => ({ dependencies: { "@socialgouv/lib-a": "1", "@socialgouv/lib-b": "2", diff --git a/targets/export-elasticsearch/src/repositories/status.ts b/targets/export-elasticsearch/src/repositories/status.ts index 5f506a239..0fe591ffe 100644 --- a/targets/export-elasticsearch/src/repositories/status.ts +++ b/targets/export-elasticsearch/src/repositories/status.ts @@ -1,6 +1,6 @@ import { gqlClient } from "@shared/utils"; import type { Environment, ExportEsStatus, Status } from "@shared/types"; -import { logger } from "@socialgouv/cdtn-logger"; +import { logger } from "@shared/utils"; import { injectable } from "inversify"; import { name } from "../utils"; diff --git a/targets/export-elasticsearch/src/services/export.ts b/targets/export-elasticsearch/src/services/export.ts index c5dce4465..6dd90d337 100644 --- a/targets/export-elasticsearch/src/services/export.ts +++ b/targets/export-elasticsearch/src/services/export.ts @@ -1,6 +1,6 @@ import type { ExportEsStatus } from "@shared/types"; import { Environment, Status } from "@shared/types"; -import { logger } from "@socialgouv/cdtn-logger"; +import { logger } from "@shared/utils"; import { randomUUID } from "crypto"; import { inject, injectable } from "inversify"; diff --git a/targets/export-elasticsearch/src/workers/ingester-preprod.ts b/targets/export-elasticsearch/src/workers/ingester-preprod.ts index d9dad069c..dd8d487db 100644 --- a/targets/export-elasticsearch/src/workers/ingester-preprod.ts +++ b/targets/export-elasticsearch/src/workers/ingester-preprod.ts @@ -1,4 +1,4 @@ -import { ingest } from "@shared/elasticsearch-document-adapter"; +import { ingest } from "../ingester"; import { parentPort } from "worker_threads"; const ingester = async (): Promise => { diff --git a/targets/export-elasticsearch/src/workers/ingester-prod.ts b/targets/export-elasticsearch/src/workers/ingester-prod.ts index 11b16f360..76159d274 100644 --- a/targets/export-elasticsearch/src/workers/ingester-prod.ts +++ b/targets/export-elasticsearch/src/workers/ingester-prod.ts @@ -1,4 +1,4 @@ -import { ingest } from "@shared/elasticsearch-document-adapter"; +import { ingest } from "../ingester"; import { parentPort } from "worker_threads"; const ingester = async (): Promise => { diff --git a/targets/export-elasticsearch/tsconfig.json b/targets/export-elasticsearch/tsconfig.json index 8a8e1e702..a9a9285d0 100644 --- a/targets/export-elasticsearch/tsconfig.json +++ b/targets/export-elasticsearch/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "allowJs": true /* Allow javascript files to be compiled. */, "target": "es6" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */, "experimentalDecorators": true /* Enable experimental support for TC39 stage 2 draft decorators. */, "emitDecoratorMetadata": true /* Emit design-type metadata for decorated declarations in source files. */, diff --git a/targets/frontend/Dockerfile b/targets/frontend/Dockerfile index b09f26a3a..509451730 100644 --- a/targets/frontend/Dockerfile +++ b/targets/frontend/Dockerfile @@ -17,6 +17,7 @@ COPY shared/types ./shared/types/ RUN yarn workspace @shared/types build FROM deps AS build-utils +COPY --from=build-types /app/shared/types /app/shared/types COPY shared/utils ./shared/utils RUN yarn workspace @shared/utils build diff --git a/targets/frontend/README.md b/targets/frontend/README.md deleted file mode 100644 index 527475f31..000000000 --- a/targets/frontend/README.md +++ /dev/null @@ -1,33 +0,0 @@ -# Gestion des fichiers dans les différents environemments - -Les url des fichiers sauvegardée en base sont relatives. -Pour chaque environnement, il faudra spécifier, l'url du serveur ainsi que le nom du container. - -## Organisation - -### cdtn - -| déploiement | container | instance azure | -| ----------- | --------- | -------------- | -| branche | cdtn-dev | dev | -| master | cdtn | dev | -| preprod | cdtn | dev | -| prod | cdtn | prod | - -### cdtn-admin - -| déploiement | container | instance | -| ----------- | --------- | -------- | -| branche | cdtn-dev | dev | -| master | cdtn | dev | - -## Synchronisation (job ci de copie) - -### cdtn - -**mep** : copie des fichiers cdtn (dev) › cdtn (prod) -**ingest (prod)** : copie les fichier de cdtn (dev) › cdtn (prod) - -### cdtn-admin - -**branche**: copie de cdtn (dev) › cdtn-dev (dev) diff --git a/targets/frontend/next.config.js b/targets/frontend/next.config.js index 66501741c..c6bbaf341 100644 --- a/targets/frontend/next.config.js +++ b/targets/frontend/next.config.js @@ -28,6 +28,12 @@ module.exports = { test: /\.woff2$/, type: "asset/resource", }); + config.resolve = { + ...config.resolve, + fallback: { + fs: false, + }, + }; return config; }, transpilePackages: [ diff --git a/targets/ingester/Dockerfile b/targets/ingester/Dockerfile index 2d466e684..93182e205 100644 --- a/targets/ingester/Dockerfile +++ b/targets/ingester/Dockerfile @@ -17,6 +17,7 @@ COPY shared/types ./shared/types RUN yarn workspace @shared/types build FROM deps AS build-utils +COPY --from=build-types /app/shared/types /app/shared/types COPY shared/utils ./shared/utils RUN yarn workspace @shared/utils build diff --git a/yarn.lock b/yarn.lock index c1ada8abd..53d4a7770 100644 --- a/yarn.lock +++ b/yarn.lock @@ -141,33 +141,6 @@ __metadata: languageName: node linkType: hard -"@babel/cli@npm:^7.15.7": - version: 7.22.5 - resolution: "@babel/cli@npm:7.22.5" - dependencies: - "@jridgewell/trace-mapping": ^0.3.17 - "@nicolo-ribaudo/chokidar-2": 2.1.8-no-fsevents.3 - chokidar: ^3.4.0 - commander: ^4.0.1 - convert-source-map: ^1.1.0 - fs-readdir-recursive: ^1.1.0 - glob: ^7.2.0 - make-dir: ^2.1.0 - slash: ^2.0.0 - peerDependencies: - "@babel/core": ^7.0.0-0 - dependenciesMeta: - "@nicolo-ribaudo/chokidar-2": - optional: true - chokidar: - optional: true - bin: - babel: ./bin/babel.js - babel-external-helpers: ./bin/babel-external-helpers.js - checksum: 8f436e72e15a77088c347ae189e33545d346d032dab54a10acb63dbf78c9ce5f180d7e9f7ed1fed1a3b005802700ae7c6c18727e57d805e14b412a059b3ba050 - languageName: node - linkType: hard - "@babel/code-frame@npm:7.12.11": version: 7.12.11 resolution: "@babel/code-frame@npm:7.12.11" @@ -186,7 +159,7 @@ __metadata: languageName: node linkType: hard -"@babel/compat-data@npm:^7.17.7, @babel/compat-data@npm:^7.22.5": +"@babel/compat-data@npm:^7.22.5": version: 7.22.5 resolution: "@babel/compat-data@npm:7.22.5" checksum: eb1a47ebf79ae268b4a16903e977be52629339806e248455eb9973897c503a04b701f36a9de64e19750d6e081d0561e77a514c8dc470babbeba59ae94298ed18 @@ -237,16 +210,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.22.5" - dependencies: - "@babel/types": ^7.22.5 - checksum: d753acac62399fc6dd354cf1b9441bde0c331c2fe792a4c14904c5e5eafc3cac79478f6aa038e8a51c1148b0af6710a2e619855e4b5d54497ac972eaffed5884 - languageName: node - linkType: hard - -"@babel/helper-compilation-targets@npm:^7.17.7, @babel/helper-compilation-targets@npm:^7.22.5": +"@babel/helper-compilation-targets@npm:^7.22.5": version: 7.22.5 resolution: "@babel/helper-compilation-targets@npm:7.22.5" dependencies: @@ -261,54 +225,6 @@ __metadata: languageName: node linkType: hard -"@babel/helper-create-class-features-plugin@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/helper-create-class-features-plugin@npm:7.22.5" - dependencies: - "@babel/helper-annotate-as-pure": ^7.22.5 - "@babel/helper-environment-visitor": ^7.22.5 - "@babel/helper-function-name": ^7.22.5 - "@babel/helper-member-expression-to-functions": ^7.22.5 - "@babel/helper-optimise-call-expression": ^7.22.5 - "@babel/helper-replace-supers": ^7.22.5 - "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5 - "@babel/helper-split-export-declaration": ^7.22.5 - semver: ^6.3.0 - peerDependencies: - "@babel/core": ^7.0.0 - checksum: f1e91deae06dbee6dd956c0346bca600adfbc7955427795d9d8825f0439a3c3290c789ba2b4a02a1cdf6c1a1bd163dfa16d3d5e96b02a8efb639d2a774e88ed9 - languageName: node - linkType: hard - -"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/helper-create-regexp-features-plugin@npm:7.22.5" - dependencies: - "@babel/helper-annotate-as-pure": ^7.22.5 - regexpu-core: ^5.3.1 - semver: ^6.3.0 - peerDependencies: - "@babel/core": ^7.0.0 - checksum: 94932145beeb1f91856be25fea8de30b4b81b63fbc7c5a207ed97a5ddc34cd1e9b04041ed28bd24ec09cdcfbb62e8d66f820e4fe864672afe0aa2f357c784e11 - languageName: node - linkType: hard - -"@babel/helper-define-polyfill-provider@npm:^0.4.0": - version: 0.4.0 - resolution: "@babel/helper-define-polyfill-provider@npm:0.4.0" - dependencies: - "@babel/helper-compilation-targets": ^7.17.7 - "@babel/helper-plugin-utils": ^7.16.7 - debug: ^4.1.1 - lodash.debounce: ^4.0.8 - resolve: ^1.14.2 - semver: ^6.1.2 - peerDependencies: - "@babel/core": ^7.4.0-0 - checksum: 5dca4c5e78457c5ced366bea601efa4e8c69bf5d53b0fe540283897575c49b1b88191c8ef062110de9046e886703ed3270fcda3a87f0886cdbb549204d3ff63f - languageName: node - linkType: hard - "@babel/helper-environment-visitor@npm:^7.22.5": version: 7.22.5 resolution: "@babel/helper-environment-visitor@npm:7.22.5" @@ -335,15 +251,6 @@ __metadata: languageName: node linkType: hard -"@babel/helper-member-expression-to-functions@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/helper-member-expression-to-functions@npm:7.22.5" - dependencies: - "@babel/types": ^7.22.5 - checksum: 4bd5791529c280c00743e8bdc669ef0d4cd1620d6e3d35e0d42b862f8262bc2364973e5968007f960780344c539a4b9cf92ab41f5b4f94560a9620f536de2a39 - languageName: node - linkType: hard - "@babel/helper-module-imports@npm:^7.0.0, @babel/helper-module-imports@npm:^7.16.7, @babel/helper-module-imports@npm:^7.22.5, @babel/helper-module-imports@npm:^7.7.0": version: 7.22.5 resolution: "@babel/helper-module-imports@npm:7.22.5" @@ -369,50 +276,13 @@ __metadata: languageName: node linkType: hard -"@babel/helper-optimise-call-expression@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/helper-optimise-call-expression@npm:7.22.5" - dependencies: - "@babel/types": ^7.22.5 - checksum: c70ef6cc6b6ed32eeeec4482127e8be5451d0e5282d5495d5d569d39eb04d7f1d66ec99b327f45d1d5842a9ad8c22d48567e93fc502003a47de78d122e355f7c - languageName: node - linkType: hard - -"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.16.7, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.18.9, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3": +"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.9, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3": version: 7.22.5 resolution: "@babel/helper-plugin-utils@npm:7.22.5" checksum: c0fc7227076b6041acd2f0e818145d2e8c41968cc52fb5ca70eed48e21b8fe6dd88a0a91cbddf4951e33647336eb5ae184747ca706817ca3bef5e9e905151ff5 languageName: node linkType: hard -"@babel/helper-remap-async-to-generator@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/helper-remap-async-to-generator@npm:7.22.5" - dependencies: - "@babel/helper-annotate-as-pure": ^7.22.5 - "@babel/helper-environment-visitor": ^7.22.5 - "@babel/helper-wrap-function": ^7.22.5 - "@babel/types": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0 - checksum: 1e51dcff1c22e97ea3d22034b77788048eb6d8c6860325bd7a1046b7a7135730cefd93b5c96fd9839d76031095d5ffb6f0cd6ee90a5d69a4c7de980d7f4623d9 - languageName: node - linkType: hard - -"@babel/helper-replace-supers@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/helper-replace-supers@npm:7.22.5" - dependencies: - "@babel/helper-environment-visitor": ^7.22.5 - "@babel/helper-member-expression-to-functions": ^7.22.5 - "@babel/helper-optimise-call-expression": ^7.22.5 - "@babel/template": ^7.22.5 - "@babel/traverse": ^7.22.5 - "@babel/types": ^7.22.5 - checksum: af29deff6c6dc3fa2d1a517390716aa3f4d329855e8689f1d5c3cb07c1b898e614a5e175f1826bb58e9ff1480e6552885a71a9a0ba5161787aaafa2c79b216cc - languageName: node - linkType: hard - "@babel/helper-simple-access@npm:^7.22.5": version: 7.22.5 resolution: "@babel/helper-simple-access@npm:7.22.5" @@ -422,15 +292,6 @@ __metadata: languageName: node linkType: hard -"@babel/helper-skip-transparent-expression-wrappers@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.22.5" - dependencies: - "@babel/types": ^7.22.5 - checksum: 1012ef2295eb12dc073f2b9edf3425661e9b8432a3387e62a8bc27c42963f1f216ab3124228015c748770b2257b4f1fda882ca8fa34c0bf485e929ae5bc45244 - languageName: node - linkType: hard - "@babel/helper-split-export-declaration@npm:^7.22.5": version: 7.22.5 resolution: "@babel/helper-split-export-declaration@npm:7.22.5" @@ -468,18 +329,6 @@ __metadata: languageName: node linkType: hard -"@babel/helper-wrap-function@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/helper-wrap-function@npm:7.22.5" - dependencies: - "@babel/helper-function-name": ^7.22.5 - "@babel/template": ^7.22.5 - "@babel/traverse": ^7.22.5 - "@babel/types": ^7.22.5 - checksum: a4ba2d7577ad3ce92fadaa341ffce3b0e4b389808099b07c80847f9be0852f4b42344612bc1b3d1b796ffb75be56d5957c5c56a1734f6aee5ccbb7cd9ab12691 - languageName: node - linkType: hard - "@babel/helpers@npm:^7.22.5": version: 7.22.5 resolution: "@babel/helpers@npm:7.22.5" @@ -511,30 +360,6 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0 - checksum: 1e353a060fb2cd8f1256d28cd768f16fb02513f905b9b6d656fb0242c96c341a196fa188b27c2701506a6e27515359fbcc1a5ca7fa8b9b530cf88fbd137baefc - languageName: node - linkType: hard - -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5 - "@babel/plugin-transform-optional-chaining": ^7.22.5 - peerDependencies: - "@babel/core": ^7.13.0 - checksum: 16e7a5f3bf2f2ac0ca032a70bf0ebd7e886d84dbb712b55c0643c04c495f0f221fbcbca14b5f8f8027fa6c87a3dafae0934022ad2b409384af6c5c356495b7bd - languageName: node - linkType: hard - "@babel/plugin-proposal-export-namespace-from@npm:^7.18.9": version: 7.18.9 resolution: "@babel/plugin-proposal-export-namespace-from@npm:7.18.9" @@ -547,27 +372,6 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-proposal-private-property-in-object@npm:7.21.0-placeholder-for-preset-env.2": - version: 7.21.0-placeholder-for-preset-env.2 - resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.21.0-placeholder-for-preset-env.2" - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: d97745d098b835d55033ff3a7fb2b895b9c5295b08a5759e4f20df325aa385a3e0bc9bd5ad8f2ec554a44d4e6525acfc257b8c5848a1345cb40f26a30e277e91 - languageName: node - linkType: hard - -"@babel/plugin-proposal-unicode-property-regex@npm:^7.4.4": - version: 7.18.6 - resolution: "@babel/plugin-proposal-unicode-property-regex@npm:7.18.6" - dependencies: - "@babel/helper-create-regexp-features-plugin": ^7.18.6 - "@babel/helper-plugin-utils": ^7.18.6 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: a8575ecb7ff24bf6c6e94808d5c84bb5a0c6dd7892b54f09f4646711ba0ee1e1668032b3c43e3e1dfec2c5716c302e851ac756c1645e15882d73df6ad21ae951 - languageName: node - linkType: hard - "@babel/plugin-syntax-async-generators@npm:^7.8.4": version: 7.8.4 resolution: "@babel/plugin-syntax-async-generators@npm:7.8.4" @@ -590,7 +394,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-syntax-class-properties@npm:^7.12.13, @babel/plugin-syntax-class-properties@npm:^7.8.3": +"@babel/plugin-syntax-class-properties@npm:^7.8.3": version: 7.12.13 resolution: "@babel/plugin-syntax-class-properties@npm:7.12.13" dependencies: @@ -601,17 +405,6 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-syntax-class-static-block@npm:^7.14.5": - version: 7.14.5 - resolution: "@babel/plugin-syntax-class-static-block@npm:7.14.5" - dependencies: - "@babel/helper-plugin-utils": ^7.14.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 3e80814b5b6d4fe17826093918680a351c2d34398a914ce6e55d8083d72a9bdde4fbaf6a2dcea0e23a03de26dc2917ae3efd603d27099e2b98380345703bf948 - languageName: node - linkType: hard - "@babel/plugin-syntax-dynamic-import@npm:^7.8.3": version: 7.8.3 resolution: "@babel/plugin-syntax-dynamic-import@npm:7.8.3" @@ -634,29 +427,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-syntax-import-assertions@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-syntax-import-assertions@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 2b8b5572db04a7bef1e6cd20debf447e4eef7cb012616f5eceb8fa3e23ce469b8f76ee74fd6d1e158ba17a8f58b0aec579d092fb67c5a30e83ccfbc5754916c1 - languageName: node - linkType: hard - -"@babel/plugin-syntax-import-attributes@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-syntax-import-attributes@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 197b3c5ea2a9649347f033342cb222ab47f4645633695205c0250c6bf2af29e643753b8bb24a2db39948bef08e7c540babfd365591eb57fc110cb30b425ffc47 - languageName: node - linkType: hard - -"@babel/plugin-syntax-import-meta@npm:^7.10.4, @babel/plugin-syntax-import-meta@npm:^7.8.3": +"@babel/plugin-syntax-import-meta@npm:^7.8.3": version: 7.10.4 resolution: "@babel/plugin-syntax-import-meta@npm:7.10.4" dependencies: @@ -700,7 +471,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-syntax-logical-assignment-operators@npm:^7.10.4, @babel/plugin-syntax-logical-assignment-operators@npm:^7.8.3": +"@babel/plugin-syntax-logical-assignment-operators@npm:^7.8.3": version: 7.10.4 resolution: "@babel/plugin-syntax-logical-assignment-operators@npm:7.10.4" dependencies: @@ -711,824 +482,93 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-syntax-nullish-coalescing-operator@npm:^7.8.3": - version: 7.8.3 - resolution: "@babel/plugin-syntax-nullish-coalescing-operator@npm:7.8.3" - dependencies: - "@babel/helper-plugin-utils": ^7.8.0 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 87aca4918916020d1fedba54c0e232de408df2644a425d153be368313fdde40d96088feed6c4e5ab72aac89be5d07fef2ddf329a15109c5eb65df006bf2580d1 - languageName: node - linkType: hard - -"@babel/plugin-syntax-numeric-separator@npm:^7.10.4, @babel/plugin-syntax-numeric-separator@npm:^7.8.3": - version: 7.10.4 - resolution: "@babel/plugin-syntax-numeric-separator@npm:7.10.4" - dependencies: - "@babel/helper-plugin-utils": ^7.10.4 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 01ec5547bd0497f76cc903ff4d6b02abc8c05f301c88d2622b6d834e33a5651aa7c7a3d80d8d57656a4588f7276eba357f6b7e006482f5b564b7a6488de493a1 - languageName: node - linkType: hard - -"@babel/plugin-syntax-object-rest-spread@npm:^7.8.3": - version: 7.8.3 - resolution: "@babel/plugin-syntax-object-rest-spread@npm:7.8.3" - dependencies: - "@babel/helper-plugin-utils": ^7.8.0 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: fddcf581a57f77e80eb6b981b10658421bc321ba5f0a5b754118c6a92a5448f12a0c336f77b8abf734841e102e5126d69110a306eadb03ca3e1547cab31f5cbf - languageName: node - linkType: hard - -"@babel/plugin-syntax-optional-catch-binding@npm:^7.8.3": - version: 7.8.3 - resolution: "@babel/plugin-syntax-optional-catch-binding@npm:7.8.3" - dependencies: - "@babel/helper-plugin-utils": ^7.8.0 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 910d90e72bc90ea1ce698e89c1027fed8845212d5ab588e35ef91f13b93143845f94e2539d831dc8d8ededc14ec02f04f7bd6a8179edd43a326c784e7ed7f0b9 - languageName: node - linkType: hard - -"@babel/plugin-syntax-optional-chaining@npm:^7.8.3": - version: 7.8.3 - resolution: "@babel/plugin-syntax-optional-chaining@npm:7.8.3" - dependencies: - "@babel/helper-plugin-utils": ^7.8.0 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: eef94d53a1453361553c1f98b68d17782861a04a392840341bc91780838dd4e695209c783631cf0de14c635758beafb6a3a65399846ffa4386bff90639347f30 - languageName: node - linkType: hard - -"@babel/plugin-syntax-private-property-in-object@npm:^7.14.5": - version: 7.14.5 - resolution: "@babel/plugin-syntax-private-property-in-object@npm:7.14.5" - dependencies: - "@babel/helper-plugin-utils": ^7.14.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: b317174783e6e96029b743ccff2a67d63d38756876e7e5d0ba53a322e38d9ca452c13354a57de1ad476b4c066dbae699e0ca157441da611117a47af88985ecda - languageName: node - linkType: hard - -"@babel/plugin-syntax-top-level-await@npm:^7.14.5, @babel/plugin-syntax-top-level-await@npm:^7.8.3": - version: 7.14.5 - resolution: "@babel/plugin-syntax-top-level-await@npm:7.14.5" - dependencies: - "@babel/helper-plugin-utils": ^7.14.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: bbd1a56b095be7820029b209677b194db9b1d26691fe999856462e66b25b281f031f3dfd91b1619e9dcf95bebe336211833b854d0fb8780d618e35667c2d0d7e - languageName: node - linkType: hard - -"@babel/plugin-syntax-typescript@npm:^7.22.5, @babel/plugin-syntax-typescript@npm:^7.7.2": - version: 7.22.5 - resolution: "@babel/plugin-syntax-typescript@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 8ab7718fbb026d64da93681a57797d60326097fd7cb930380c8bffd9eb101689e90142c760a14b51e8e69c88a73ba3da956cb4520a3b0c65743aee5c71ef360a - languageName: node - linkType: hard - -"@babel/plugin-syntax-unicode-sets-regex@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-syntax-unicode-sets-regex@npm:7.18.6" - dependencies: - "@babel/helper-create-regexp-features-plugin": ^7.18.6 - "@babel/helper-plugin-utils": ^7.18.6 - peerDependencies: - "@babel/core": ^7.0.0 - checksum: a651d700fe63ff0ddfd7186f4ebc24447ca734f114433139e3c027bc94a900d013cf1ef2e2db8430425ba542e39ae160c3b05f06b59fd4656273a3df97679e9c - languageName: node - linkType: hard - -"@babel/plugin-transform-arrow-functions@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-arrow-functions@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 35abb6c57062802c7ce8bd96b2ef2883e3124370c688bbd67609f7d2453802fb73944df8808f893b6c67de978eb2bcf87bbfe325e46d6f39b5fcb09ece11d01a - languageName: node - linkType: hard - -"@babel/plugin-transform-async-generator-functions@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-async-generator-functions@npm:7.22.5" - dependencies: - "@babel/helper-environment-visitor": ^7.22.5 - "@babel/helper-plugin-utils": ^7.22.5 - "@babel/helper-remap-async-to-generator": ^7.22.5 - "@babel/plugin-syntax-async-generators": ^7.8.4 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 32890b69ec5627eb46ee8e084bddc6b98d85b66cae5e015f3a23924611a759789d2ff836406605f5293b5c2bad306b20cb1f5b7a46ed549b07bfec634bcd31f9 - languageName: node - linkType: hard - -"@babel/plugin-transform-async-to-generator@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-async-to-generator@npm:7.22.5" - dependencies: - "@babel/helper-module-imports": ^7.22.5 - "@babel/helper-plugin-utils": ^7.22.5 - "@babel/helper-remap-async-to-generator": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: b95f23f99dcb379a9f0a1c2a3bbea3f8dc0e1b16dc1ac8b484fe378370169290a7a63d520959a9ba1232837cf74a80e23f6facbe14fd42a3cda6d3c2d7168e62 - languageName: node - linkType: hard - -"@babel/plugin-transform-block-scoped-functions@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 416b1341858e8ca4e524dee66044735956ced5f478b2c3b9bc11ec2285b0c25d7dbb96d79887169eb938084c95d0a89338c8b2fe70d473bd9dc92e5d9db1732c - languageName: node - linkType: hard - -"@babel/plugin-transform-block-scoping@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-block-scoping@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 26987002cfe6e24544e60fa35f07052b6557f590c1a1cc5cf35d6dc341d7fea163c1222a2d70d5d2692f0b9860d942fd3ba979848b2995d4debffa387b9b19ae - languageName: node - linkType: hard - -"@babel/plugin-transform-class-properties@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-class-properties@npm:7.22.5" - dependencies: - "@babel/helper-create-class-features-plugin": ^7.22.5 - "@babel/helper-plugin-utils": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: b830152dfc2ff2f647f0abe76e6251babdfbef54d18c4b2c73a6bf76b1a00050a5d998dac80dc901a48514e95604324943a9dd39317073fe0928b559e0e0c579 - languageName: node - linkType: hard - -"@babel/plugin-transform-class-static-block@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-class-static-block@npm:7.22.5" - dependencies: - "@babel/helper-create-class-features-plugin": ^7.22.5 - "@babel/helper-plugin-utils": ^7.22.5 - "@babel/plugin-syntax-class-static-block": ^7.14.5 - peerDependencies: - "@babel/core": ^7.12.0 - checksum: bc48b92dbaf625a14f2bf62382384eef01e0515802426841636ae9146e27395d068c7a8a45e9e15699491b0a01d990f38f179cbc9dc89274a393f85648772f12 - languageName: node - linkType: hard - -"@babel/plugin-transform-classes@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-classes@npm:7.22.5" - dependencies: - "@babel/helper-annotate-as-pure": ^7.22.5 - "@babel/helper-compilation-targets": ^7.22.5 - "@babel/helper-environment-visitor": ^7.22.5 - "@babel/helper-function-name": ^7.22.5 - "@babel/helper-optimise-call-expression": ^7.22.5 - "@babel/helper-plugin-utils": ^7.22.5 - "@babel/helper-replace-supers": ^7.22.5 - "@babel/helper-split-export-declaration": ^7.22.5 - globals: ^11.1.0 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 124b1b79180524cc9d08155cecde92c7f2ab0db02cbe0f8befa187ef3c7320909ce1a6d6daf5ce73e8330f9b40cf9991f424c6e572b8dddc1f14e2758fa80d20 - languageName: node - linkType: hard - -"@babel/plugin-transform-computed-properties@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-computed-properties@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - "@babel/template": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: c2a77a0f94ec71efbc569109ec14ea2aa925b333289272ced8b33c6108bdbb02caf01830ffc7e49486b62dec51911924d13f3a76f1149f40daace1898009e131 - languageName: node - linkType: hard - -"@babel/plugin-transform-destructuring@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-destructuring@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 76f6ea2aee1fcfa1c3791eb7a5b89703c6472650b993e8666fff0f1d6e9d737a84134edf89f63c92297f3e75064c1263219463b02dd9bc7434b6e5b9935e3f20 - languageName: node - linkType: hard - -"@babel/plugin-transform-dotall-regex@npm:^7.22.5, @babel/plugin-transform-dotall-regex@npm:^7.4.4": - version: 7.22.5 - resolution: "@babel/plugin-transform-dotall-regex@npm:7.22.5" - dependencies: - "@babel/helper-create-regexp-features-plugin": ^7.22.5 - "@babel/helper-plugin-utils": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 409b658d11e3082c8f69e9cdef2d96e4d6d11256f005772425fb230cc48fd05945edbfbcb709dab293a1a2f01f9c8a5bb7b4131e632b23264039d9f95864b453 - languageName: node - linkType: hard - -"@babel/plugin-transform-duplicate-keys@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-duplicate-keys@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: bb1280fbabaab6fab2ede585df34900712698210a3bd413f4df5bae6d8c24be36b496c92722ae676a7a67d060a4624f4d6c23b923485f906bfba8773c69f55b4 - languageName: node - linkType: hard - -"@babel/plugin-transform-dynamic-import@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-dynamic-import@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - "@babel/plugin-syntax-dynamic-import": ^7.8.3 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 186a6d59f36eb3c5824739fc9c22ed0f4ca68e001662aa3a302634346a8b785cb9579b23b0c158f4570604d697d19598ca09b58c60a7fa2894da1163c4eb1907 - languageName: node - linkType: hard - -"@babel/plugin-transform-exponentiation-operator@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.22.5" - dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor": ^7.22.5 - "@babel/helper-plugin-utils": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: f2d660c1b1d51ad5fec1cd5ad426a52187204068c4158f8c4aa977b31535c61b66898d532603eef21c15756827be8277f724c869b888d560f26d7fe848bb5eae - languageName: node - linkType: hard - -"@babel/plugin-transform-export-namespace-from@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-export-namespace-from@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - "@babel/plugin-syntax-export-namespace-from": ^7.8.3 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 3d197b788758044983c96b9c49bed4b456055f35a388521a405968db0f6e2ffb6fd59110e3931f4dcc5e126ae9e5e00e154a0afb47a7ea359d8d0dea79f480d7 - languageName: node - linkType: hard - -"@babel/plugin-transform-for-of@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-for-of@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: d7b8d4db010bce7273674caa95c4e6abd909362866ce297e86a2ecaa9ae636e05d525415811db9b3c942155df7f3651d19b91dd6c41f142f7308a97c7cb06023 - languageName: node - linkType: hard - -"@babel/plugin-transform-function-name@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-function-name@npm:7.22.5" - dependencies: - "@babel/helper-compilation-targets": ^7.22.5 - "@babel/helper-function-name": ^7.22.5 - "@babel/helper-plugin-utils": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: cff3b876357999cb8ae30e439c3ec6b0491a53b0aa6f722920a4675a6dd5b53af97a833051df4b34791fe5b3dd326ccf769d5c8e45b322aa50ee11a660b17845 - languageName: node - linkType: hard - -"@babel/plugin-transform-json-strings@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-json-strings@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - "@babel/plugin-syntax-json-strings": ^7.8.3 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 4e00b902487a670b6c8948f33f9108133fd745cf9d1478aca515fb460b9b2f12e137988ebc1663630fb82070a870aed8b0c1aa4d007a841c18004619798f255c - languageName: node - linkType: hard - -"@babel/plugin-transform-literals@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-literals@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: ec37cc2ffb32667af935ab32fe28f00920ec8a1eb999aa6dc6602f2bebd8ba205a558aeedcdccdebf334381d5c57106c61f52332045730393e73410892a9735b - languageName: node - linkType: hard - -"@babel/plugin-transform-logical-assignment-operators@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 18748e953c08f64885f18c224eac58df10a13eac4d845d16b5d9b6276907da7ca2530dfebe6ed41cdc5f8a75d9db3e36d8eb54ddce7cd0364af1cab09b435302 - languageName: node - linkType: hard - -"@babel/plugin-transform-member-expression-literals@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-member-expression-literals@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: ec4b0e07915ddd4fda0142fd104ee61015c208608a84cfa13643a95d18760b1dc1ceb6c6e0548898b8c49e5959a994e46367260176dbabc4467f729b21868504 - languageName: node - linkType: hard - -"@babel/plugin-transform-modules-amd@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-modules-amd@npm:7.22.5" - dependencies: - "@babel/helper-module-transforms": ^7.22.5 - "@babel/helper-plugin-utils": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 7da4c4ebbbcf7d182abb59b2046b22d86eee340caf8a22a39ef6a727da2d8acfec1f714fcdcd5054110b280e4934f735e80a6848d192b6834c5d4459a014f04d - languageName: node - linkType: hard - -"@babel/plugin-transform-modules-commonjs@npm:^7.15.4, @babel/plugin-transform-modules-commonjs@npm:^7.19.6, @babel/plugin-transform-modules-commonjs@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-modules-commonjs@npm:7.22.5" - dependencies: - "@babel/helper-module-transforms": ^7.22.5 - "@babel/helper-plugin-utils": ^7.22.5 - "@babel/helper-simple-access": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 2067aca8f6454d54ffcce69b02c457cfa61428e11372f6a1d99ff4fcfbb55c396ed2ca6ca886bf06c852e38c1a205b8095921b2364fd0243f3e66bc1dda61caa - languageName: node - linkType: hard - -"@babel/plugin-transform-modules-systemjs@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-modules-systemjs@npm:7.22.5" - dependencies: - "@babel/helper-hoist-variables": ^7.22.5 - "@babel/helper-module-transforms": ^7.22.5 - "@babel/helper-plugin-utils": ^7.22.5 - "@babel/helper-validator-identifier": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 04f4178589543396b3c24330a67a59c5e69af5e96119c9adda730c0f20122deaff54671ebbc72ad2df6495a5db8a758bd96942de95fba7ad427de9c80b1b38c8 - languageName: node - linkType: hard - -"@babel/plugin-transform-modules-umd@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-modules-umd@npm:7.22.5" - dependencies: - "@babel/helper-module-transforms": ^7.22.5 - "@babel/helper-plugin-utils": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 46622834c54c551b231963b867adbc80854881b3e516ff29984a8da989bd81665bd70e8cba6710345248e97166689310f544aee1a5773e262845a8f1b3e5b8b4 - languageName: node - linkType: hard - -"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.22.5" - dependencies: - "@babel/helper-create-regexp-features-plugin": ^7.22.5 - "@babel/helper-plugin-utils": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0 - checksum: 3ee564ddee620c035b928fdc942c5d17e9c4b98329b76f9cefac65c111135d925eb94ed324064cd7556d4f5123beec79abea1d4b97d1c8a2a5c748887a2eb623 - languageName: node - linkType: hard - -"@babel/plugin-transform-new-target@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-new-target@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 6b72112773487a881a1d6ffa680afde08bad699252020e86122180ee7a88854d5da3f15d9bca3331cf2e025df045604494a8208a2e63b486266b07c14e2ffbf3 - languageName: node - linkType: hard - -"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: e6a059169d257fc61322d0708edae423072449b7c33de396261e68dee582aec5396789a1c22bce84e5bd88a169623c2e750b513fc222930979e6accd52a44bf2 - languageName: node - linkType: hard - -"@babel/plugin-transform-numeric-separator@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-numeric-separator@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - "@babel/plugin-syntax-numeric-separator": ^7.10.4 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 9e7837d4eae04f211ebaa034fe5003d2927b6bf6d5b9dc09f2b1183c01482cdde5a75b8bd5c7ff195c2abc7b923339eb0b2a9d27cb78359d38248a3b2c2367c4 - languageName: node - linkType: hard - -"@babel/plugin-transform-object-rest-spread@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-object-rest-spread@npm:7.22.5" - dependencies: - "@babel/compat-data": ^7.22.5 - "@babel/helper-compilation-targets": ^7.22.5 - "@babel/helper-plugin-utils": ^7.22.5 - "@babel/plugin-syntax-object-rest-spread": ^7.8.3 - "@babel/plugin-transform-parameters": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 3b5e091f0dc67108f2e41ed5a97e15bbe4381a19d9a7eea80b71c7de1d8169fd28784e1e41a3d2ad12709ab212e58fc481282a5bb65d591fae7b443048de3330 - languageName: node - linkType: hard - -"@babel/plugin-transform-object-super@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-object-super@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - "@babel/helper-replace-supers": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: b71887877d74cb64dbccb5c0324fa67e31171e6a5311991f626650e44a4083e5436a1eaa89da78c0474fb095d4ec322d63ee778b202d33aa2e4194e1ed8e62d7 - languageName: node - linkType: hard - -"@babel/plugin-transform-optional-catch-binding@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - "@babel/plugin-syntax-optional-catch-binding": ^7.8.3 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: b0e8b4233ff06b5c9d285257f49c5bd441f883189b24282e6200f9ebdf5db29aeeebbffae57fbbcd5df9f4387b3e66e5d322aaae5652a78e89685ddbae46bbd1 - languageName: node - linkType: hard - -"@babel/plugin-transform-optional-chaining@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-optional-chaining@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5 - "@babel/plugin-syntax-optional-chaining": ^7.8.3 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 57b9c05fb22ae881b8a334b184fc6ee966661ed5d1eb4eed8c2fb9a12e68150d90b229efcb1aa777e246999830844fee06d7365f8bb4bb262fdcd23876ff3ea2 - languageName: node - linkType: hard - -"@babel/plugin-transform-parameters@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-parameters@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: b44f89cf97daf23903776ba27c2ab13b439d80d8c8a95be5c476ab65023b1e0c0e94c28d3745f3b60a58edc4e590fa0cd4287a0293e51401ca7d29a2ddb13b8e - languageName: node - linkType: hard - -"@babel/plugin-transform-private-methods@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-private-methods@npm:7.22.5" - dependencies: - "@babel/helper-create-class-features-plugin": ^7.22.5 - "@babel/helper-plugin-utils": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 321479b4fcb6d3b3ef622ab22fd24001e43d46e680e8e41324c033d5810c84646e470f81b44cbcbef5c22e99030784f7cac92f1829974da7a47a60a7139082c3 - languageName: node - linkType: hard - -"@babel/plugin-transform-private-property-in-object@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-private-property-in-object@npm:7.22.5" - dependencies: - "@babel/helper-annotate-as-pure": ^7.22.5 - "@babel/helper-create-class-features-plugin": ^7.22.5 - "@babel/helper-plugin-utils": ^7.22.5 - "@babel/plugin-syntax-private-property-in-object": ^7.14.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 9ac019fb2772f3af6278a7f4b8b14b0663accb3fd123d87142ceb2fbc57fd1afa07c945d1329029b026b9ee122096ef71a3f34f257a9e04cf4245b87298c38b4 - languageName: node - linkType: hard - -"@babel/plugin-transform-property-literals@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-property-literals@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 796176a3176106f77fcb8cd04eb34a8475ce82d6d03a88db089531b8f0453a2fb8b0c6ec9a52c27948bc0ea478becec449893741fc546dfc3930ab927e3f9f2e - languageName: node - linkType: hard - -"@babel/plugin-transform-regenerator@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-regenerator@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - regenerator-transform: ^0.15.1 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: f7c5ca5151321963df777cc02725d10d1ccc3b3b8323da0423aecd9ac6144cbdd2274af5281a5580db2fc2f8b234e318517b5d76b85669118906533a559f2b6a - languageName: node - linkType: hard - -"@babel/plugin-transform-reserved-words@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-reserved-words@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 3ffd7dbc425fe8132bfec118b9817572799cab1473113a635d25ab606c1f5a2341a636c04cf6b22df3813320365ed5a965b5eeb3192320a10e4cc2c137bd8bfc - languageName: node - linkType: hard - -"@babel/plugin-transform-shorthand-properties@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-shorthand-properties@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: a5ac902c56ea8effa99f681340ee61bac21094588f7aef0bc01dff98246651702e677552fa6d10e548c4ac22a3ffad047dd2f8c8f0540b68316c2c203e56818b - languageName: node - linkType: hard - -"@babel/plugin-transform-spread@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-spread@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 5587f0deb60b3dfc9b274e269031cc45ec75facccf1933ea2ea71ced9fd3ce98ed91bb36d6cd26817c14474b90ed998c5078415f0eab531caf301496ce24c95c - languageName: node - linkType: hard - -"@babel/plugin-transform-sticky-regex@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-sticky-regex@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 63b2c575e3e7f96c32d52ed45ee098fb7d354b35c2223b8c8e76840b32cc529ee0c0ceb5742fd082e56e91e3d82842a367ce177e82b05039af3d602c9627a729 - languageName: node - linkType: hard - -"@babel/plugin-transform-template-literals@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-template-literals@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 27e9bb030654cb425381c69754be4abe6a7c75b45cd7f962cd8d604b841b2f0fb7b024f2efc1c25cc53f5b16d79d5e8cfc47cacbdaa983895b3aeefa3e7e24ff - languageName: node - linkType: hard - -"@babel/plugin-transform-typeof-symbol@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-typeof-symbol@npm:7.22.5" - dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 82a53a63ffc3010b689ca9a54e5f53b2718b9f4b4a9818f36f9b7dba234f38a01876680553d2716a645a61920b5e6e4aaf8d4a0064add379b27ca0b403049512 - languageName: node - linkType: hard - -"@babel/plugin-transform-typescript@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-typescript@npm:7.22.5" - dependencies: - "@babel/helper-annotate-as-pure": ^7.22.5 - "@babel/helper-create-class-features-plugin": ^7.22.5 - "@babel/helper-plugin-utils": ^7.22.5 - "@babel/plugin-syntax-typescript": ^7.22.5 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: d12f1ca1ef1f2a54432eb044d2999705d1205ebe211c2a7f05b12e8eb2d2a461fd7657b5486b2f2f1efe7c0c0dc8e80725b767073d40fe4ae059a7af057b05e4 - languageName: node - linkType: hard - -"@babel/plugin-transform-unicode-escapes@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-unicode-escapes@npm:7.22.5" +"@babel/plugin-syntax-nullish-coalescing-operator@npm:^7.8.3": + version: 7.8.3 + resolution: "@babel/plugin-syntax-nullish-coalescing-operator@npm:7.8.3" dependencies: - "@babel/helper-plugin-utils": ^7.22.5 + "@babel/helper-plugin-utils": ^7.8.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: da5e85ab3bb33a75cbf6181bfd236b208dc934702fd304db127232f17b4e0f42c6d3f238de8589470b4190906967eea8ca27adf3ae9d8ee4de2a2eae906ed186 + checksum: 87aca4918916020d1fedba54c0e232de408df2644a425d153be368313fdde40d96088feed6c4e5ab72aac89be5d07fef2ddf329a15109c5eb65df006bf2580d1 languageName: node linkType: hard -"@babel/plugin-transform-unicode-property-regex@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.22.5" +"@babel/plugin-syntax-numeric-separator@npm:^7.8.3": + version: 7.10.4 + resolution: "@babel/plugin-syntax-numeric-separator@npm:7.10.4" dependencies: - "@babel/helper-create-regexp-features-plugin": ^7.22.5 - "@babel/helper-plugin-utils": ^7.22.5 + "@babel/helper-plugin-utils": ^7.10.4 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 2495e5f663cb388e3d888b4ba3df419ac436a5012144ac170b622ddfc221f9ea9bdba839fa2bc0185cb776b578030666406452ec7791cbf0e7a3d4c88ae9574c + checksum: 01ec5547bd0497f76cc903ff4d6b02abc8c05f301c88d2622b6d834e33a5651aa7c7a3d80d8d57656a4588f7276eba357f6b7e006482f5b564b7a6488de493a1 languageName: node linkType: hard -"@babel/plugin-transform-unicode-regex@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-unicode-regex@npm:7.22.5" +"@babel/plugin-syntax-object-rest-spread@npm:^7.8.3": + version: 7.8.3 + resolution: "@babel/plugin-syntax-object-rest-spread@npm:7.8.3" dependencies: - "@babel/helper-create-regexp-features-plugin": ^7.22.5 - "@babel/helper-plugin-utils": ^7.22.5 + "@babel/helper-plugin-utils": ^7.8.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 6b5d1404c8c623b0ec9bd436c00d885a17d6a34f3f2597996343ddb9d94f6379705b21582dfd4cec2c47fd34068872e74ab6b9580116c0566b3f9447e2a7fa06 + checksum: fddcf581a57f77e80eb6b981b10658421bc321ba5f0a5b754118c6a92a5448f12a0c336f77b8abf734841e102e5126d69110a306eadb03ca3e1547cab31f5cbf languageName: node linkType: hard -"@babel/plugin-transform-unicode-sets-regex@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.22.5" +"@babel/plugin-syntax-optional-catch-binding@npm:^7.8.3": + version: 7.8.3 + resolution: "@babel/plugin-syntax-optional-catch-binding@npm:7.8.3" dependencies: - "@babel/helper-create-regexp-features-plugin": ^7.22.5 - "@babel/helper-plugin-utils": ^7.22.5 + "@babel/helper-plugin-utils": ^7.8.0 peerDependencies: - "@babel/core": ^7.0.0 - checksum: c042070f980b139547f8b0179efbc049ac5930abec7fc26ed7a41d89a048d8ab17d362200e204b6f71c3c20d6991a0e74415e1a412a49adc8131c2a40c04822e + "@babel/core": ^7.0.0-0 + checksum: 910d90e72bc90ea1ce698e89c1027fed8845212d5ab588e35ef91f13b93143845f94e2539d831dc8d8ededc14ec02f04f7bd6a8179edd43a326c784e7ed7f0b9 languageName: node linkType: hard -"@babel/preset-env@npm:^7.16.11": - version: 7.22.5 - resolution: "@babel/preset-env@npm:7.22.5" +"@babel/plugin-syntax-optional-chaining@npm:^7.8.3": + version: 7.8.3 + resolution: "@babel/plugin-syntax-optional-chaining@npm:7.8.3" dependencies: - "@babel/compat-data": ^7.22.5 - "@babel/helper-compilation-targets": ^7.22.5 - "@babel/helper-plugin-utils": ^7.22.5 - "@babel/helper-validator-option": ^7.22.5 - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": ^7.22.5 - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.22.5 - "@babel/plugin-proposal-private-property-in-object": 7.21.0-placeholder-for-preset-env.2 - "@babel/plugin-syntax-async-generators": ^7.8.4 - "@babel/plugin-syntax-class-properties": ^7.12.13 - "@babel/plugin-syntax-class-static-block": ^7.14.5 - "@babel/plugin-syntax-dynamic-import": ^7.8.3 - "@babel/plugin-syntax-export-namespace-from": ^7.8.3 - "@babel/plugin-syntax-import-assertions": ^7.22.5 - "@babel/plugin-syntax-import-attributes": ^7.22.5 - "@babel/plugin-syntax-import-meta": ^7.10.4 - "@babel/plugin-syntax-json-strings": ^7.8.3 - "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4 - "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3 - "@babel/plugin-syntax-numeric-separator": ^7.10.4 - "@babel/plugin-syntax-object-rest-spread": ^7.8.3 - "@babel/plugin-syntax-optional-catch-binding": ^7.8.3 - "@babel/plugin-syntax-optional-chaining": ^7.8.3 - "@babel/plugin-syntax-private-property-in-object": ^7.14.5 - "@babel/plugin-syntax-top-level-await": ^7.14.5 - "@babel/plugin-syntax-unicode-sets-regex": ^7.18.6 - "@babel/plugin-transform-arrow-functions": ^7.22.5 - "@babel/plugin-transform-async-generator-functions": ^7.22.5 - "@babel/plugin-transform-async-to-generator": ^7.22.5 - "@babel/plugin-transform-block-scoped-functions": ^7.22.5 - "@babel/plugin-transform-block-scoping": ^7.22.5 - "@babel/plugin-transform-class-properties": ^7.22.5 - "@babel/plugin-transform-class-static-block": ^7.22.5 - "@babel/plugin-transform-classes": ^7.22.5 - "@babel/plugin-transform-computed-properties": ^7.22.5 - "@babel/plugin-transform-destructuring": ^7.22.5 - "@babel/plugin-transform-dotall-regex": ^7.22.5 - "@babel/plugin-transform-duplicate-keys": ^7.22.5 - "@babel/plugin-transform-dynamic-import": ^7.22.5 - "@babel/plugin-transform-exponentiation-operator": ^7.22.5 - "@babel/plugin-transform-export-namespace-from": ^7.22.5 - "@babel/plugin-transform-for-of": ^7.22.5 - "@babel/plugin-transform-function-name": ^7.22.5 - "@babel/plugin-transform-json-strings": ^7.22.5 - "@babel/plugin-transform-literals": ^7.22.5 - "@babel/plugin-transform-logical-assignment-operators": ^7.22.5 - "@babel/plugin-transform-member-expression-literals": ^7.22.5 - "@babel/plugin-transform-modules-amd": ^7.22.5 - "@babel/plugin-transform-modules-commonjs": ^7.22.5 - "@babel/plugin-transform-modules-systemjs": ^7.22.5 - "@babel/plugin-transform-modules-umd": ^7.22.5 - "@babel/plugin-transform-named-capturing-groups-regex": ^7.22.5 - "@babel/plugin-transform-new-target": ^7.22.5 - "@babel/plugin-transform-nullish-coalescing-operator": ^7.22.5 - "@babel/plugin-transform-numeric-separator": ^7.22.5 - "@babel/plugin-transform-object-rest-spread": ^7.22.5 - "@babel/plugin-transform-object-super": ^7.22.5 - "@babel/plugin-transform-optional-catch-binding": ^7.22.5 - "@babel/plugin-transform-optional-chaining": ^7.22.5 - "@babel/plugin-transform-parameters": ^7.22.5 - "@babel/plugin-transform-private-methods": ^7.22.5 - "@babel/plugin-transform-private-property-in-object": ^7.22.5 - "@babel/plugin-transform-property-literals": ^7.22.5 - "@babel/plugin-transform-regenerator": ^7.22.5 - "@babel/plugin-transform-reserved-words": ^7.22.5 - "@babel/plugin-transform-shorthand-properties": ^7.22.5 - "@babel/plugin-transform-spread": ^7.22.5 - "@babel/plugin-transform-sticky-regex": ^7.22.5 - "@babel/plugin-transform-template-literals": ^7.22.5 - "@babel/plugin-transform-typeof-symbol": ^7.22.5 - "@babel/plugin-transform-unicode-escapes": ^7.22.5 - "@babel/plugin-transform-unicode-property-regex": ^7.22.5 - "@babel/plugin-transform-unicode-regex": ^7.22.5 - "@babel/plugin-transform-unicode-sets-regex": ^7.22.5 - "@babel/preset-modules": ^0.1.5 - "@babel/types": ^7.22.5 - babel-plugin-polyfill-corejs2: ^0.4.3 - babel-plugin-polyfill-corejs3: ^0.8.1 - babel-plugin-polyfill-regenerator: ^0.5.0 - core-js-compat: ^3.30.2 - semver: ^6.3.0 + "@babel/helper-plugin-utils": ^7.8.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 6d9d09010ababef2ab48c8830770b2a8f45d6cce51db0924a98b0d95a5b1248a99ee07ee61cb5446d8b05b562db99a8af30b3ed194546419fb9b2889b8fd1ed3 + checksum: eef94d53a1453361553c1f98b68d17782861a04a392840341bc91780838dd4e695209c783631cf0de14c635758beafb6a3a65399846ffa4386bff90639347f30 languageName: node linkType: hard -"@babel/preset-modules@npm:^0.1.5": - version: 0.1.5 - resolution: "@babel/preset-modules@npm:0.1.5" +"@babel/plugin-syntax-top-level-await@npm:^7.8.3": + version: 7.14.5 + resolution: "@babel/plugin-syntax-top-level-await@npm:7.14.5" dependencies: - "@babel/helper-plugin-utils": ^7.0.0 - "@babel/plugin-proposal-unicode-property-regex": ^7.4.4 - "@babel/plugin-transform-dotall-regex": ^7.4.4 - "@babel/types": ^7.4.4 - esutils: ^2.0.2 + "@babel/helper-plugin-utils": ^7.14.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 8430e0e9e9d520b53e22e8c4c6a5a080a12b63af6eabe559c2310b187bd62ae113f3da82ba33e9d1d0f3230930ca702843aae9dd226dec51f7d7114dc1f51c10 + checksum: bbd1a56b095be7820029b209677b194db9b1d26691fe999856462e66b25b281f031f3dfd91b1619e9dcf95bebe336211833b854d0fb8780d618e35667c2d0d7e languageName: node linkType: hard -"@babel/preset-typescript@npm:^7.15.0, @babel/preset-typescript@npm:^7.16.7": +"@babel/plugin-syntax-typescript@npm:^7.7.2": version: 7.22.5 - resolution: "@babel/preset-typescript@npm:7.22.5" + resolution: "@babel/plugin-syntax-typescript@npm:7.22.5" dependencies: "@babel/helper-plugin-utils": ^7.22.5 - "@babel/helper-validator-option": ^7.22.5 - "@babel/plugin-syntax-jsx": ^7.22.5 - "@babel/plugin-transform-modules-commonjs": ^7.22.5 - "@babel/plugin-transform-typescript": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 7be1670cb4404797d3a473bd72d66eb2b3e0f2f8a672a5e40bdb0812cc66085ec84bcd7b896709764cabf042fdc6b7f2d4755ac7cce10515eb596ff61dab5154 + checksum: 8ab7718fbb026d64da93681a57797d60326097fd7cb930380c8bffd9eb101689e90142c760a14b51e8e69c88a73ba3da956cb4520a3b0c65743aee5c71ef360a languageName: node linkType: hard -"@babel/regjsgen@npm:^0.8.0": - version: 0.8.0 - resolution: "@babel/regjsgen@npm:0.8.0" - checksum: 89c338fee774770e5a487382170711014d49a68eb281e74f2b5eac88f38300a4ad545516a7786a8dd5702e9cf009c94c2f582d200f077ac5decd74c56b973730 +"@babel/plugin-transform-modules-commonjs@npm:^7.15.4, @babel/plugin-transform-modules-commonjs@npm:^7.19.6": + version: 7.22.5 + resolution: "@babel/plugin-transform-modules-commonjs@npm:7.22.5" + dependencies: + "@babel/helper-module-transforms": ^7.22.5 + "@babel/helper-plugin-utils": ^7.22.5 + "@babel/helper-simple-access": ^7.22.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 2067aca8f6454d54ffcce69b02c457cfa61428e11372f6a1d99ff4fcfbb55c396ed2ca6ca886bf06c852e38c1a205b8095921b2364fd0243f3e66bc1dda61caa languageName: node linkType: hard @@ -1551,7 +591,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.4.4, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": +"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.4.4, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": version: 7.22.5 resolution: "@babel/runtime@npm:7.22.5" dependencies: @@ -1617,7 +657,7 @@ __metadata: languageName: node linkType: hard -"@babel/types@npm:^7.0.0, @babel/types@npm:^7.20.2, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.5, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4": +"@babel/types@npm:^7.0.0, @babel/types@npm:^7.20.2, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.5, @babel/types@npm:^7.3.3": version: 7.22.5 resolution: "@babel/types@npm:7.22.5" dependencies: @@ -2393,6 +1433,20 @@ __metadata: languageName: node linkType: hard +"@jest/console@npm:^29.7.0": + version: 29.7.0 + resolution: "@jest/console@npm:29.7.0" + dependencies: + "@jest/types": ^29.6.3 + "@types/node": "*" + chalk: ^4.0.0 + jest-message-util: ^29.7.0 + jest-util: ^29.7.0 + slash: ^3.0.0 + checksum: 0e3624e32c5a8e7361e889db70b170876401b7d70f509a2538c31d5cd50deb0c1ae4b92dc63fe18a0902e0a48c590c21d53787a0df41a52b34fa7cab96c384d6 + languageName: node + linkType: hard + "@jest/core@npm:^27.0.6, @jest/core@npm:^27.5.1": version: 27.5.1 resolution: "@jest/core@npm:27.5.1" @@ -2475,6 +1529,47 @@ __metadata: languageName: node linkType: hard +"@jest/core@npm:^29.7.0": + version: 29.7.0 + resolution: "@jest/core@npm:29.7.0" + dependencies: + "@jest/console": ^29.7.0 + "@jest/reporters": ^29.7.0 + "@jest/test-result": ^29.7.0 + "@jest/transform": ^29.7.0 + "@jest/types": ^29.6.3 + "@types/node": "*" + ansi-escapes: ^4.2.1 + chalk: ^4.0.0 + ci-info: ^3.2.0 + exit: ^0.1.2 + graceful-fs: ^4.2.9 + jest-changed-files: ^29.7.0 + jest-config: ^29.7.0 + jest-haste-map: ^29.7.0 + jest-message-util: ^29.7.0 + jest-regex-util: ^29.6.3 + jest-resolve: ^29.7.0 + jest-resolve-dependencies: ^29.7.0 + jest-runner: ^29.7.0 + jest-runtime: ^29.7.0 + jest-snapshot: ^29.7.0 + jest-util: ^29.7.0 + jest-validate: ^29.7.0 + jest-watcher: ^29.7.0 + micromatch: ^4.0.4 + pretty-format: ^29.7.0 + slash: ^3.0.0 + strip-ansi: ^6.0.0 + peerDependencies: + node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 + peerDependenciesMeta: + node-notifier: + optional: true + checksum: af759c9781cfc914553320446ce4e47775ae42779e73621c438feb1e4231a5d4862f84b1d8565926f2d1aab29b3ec3dcfdc84db28608bdf5f29867124ebcfc0d + languageName: node + linkType: hard + "@jest/create-cache-key-function@npm:^27.4.2": version: 27.5.1 resolution: "@jest/create-cache-key-function@npm:27.5.1" @@ -2508,6 +1603,18 @@ __metadata: languageName: node linkType: hard +"@jest/environment@npm:^29.7.0": + version: 29.7.0 + resolution: "@jest/environment@npm:29.7.0" + dependencies: + "@jest/fake-timers": ^29.7.0 + "@jest/types": ^29.6.3 + "@types/node": "*" + jest-mock: ^29.7.0 + checksum: 6fb398143b2543d4b9b8d1c6dbce83fa5247f84f550330604be744e24c2bd2178bb893657d62d1b97cf2f24baf85c450223f8237cccb71192c36a38ea2272934 + languageName: node + linkType: hard + "@jest/expect-utils@npm:^29.5.0": version: 29.5.0 resolution: "@jest/expect-utils@npm:29.5.0" @@ -2517,6 +1624,15 @@ __metadata: languageName: node linkType: hard +"@jest/expect-utils@npm:^29.7.0": + version: 29.7.0 + resolution: "@jest/expect-utils@npm:29.7.0" + dependencies: + jest-get-type: ^29.6.3 + checksum: 75eb177f3d00b6331bcaa057e07c0ccb0733a1d0a1943e1d8db346779039cb7f103789f16e502f888a3096fb58c2300c38d1f3748b36a7fa762eb6f6d1b160ed + languageName: node + linkType: hard + "@jest/expect@npm:^29.5.0": version: 29.5.0 resolution: "@jest/expect@npm:29.5.0" @@ -2527,6 +1643,16 @@ __metadata: languageName: node linkType: hard +"@jest/expect@npm:^29.7.0": + version: 29.7.0 + resolution: "@jest/expect@npm:29.7.0" + dependencies: + expect: ^29.7.0 + jest-snapshot: ^29.7.0 + checksum: a01cb85fd9401bab3370618f4b9013b90c93536562222d920e702a0b575d239d74cecfe98010aaec7ad464f67cf534a353d92d181646a4b792acaa7e912ae55e + languageName: node + linkType: hard + "@jest/fake-timers@npm:^27.5.1": version: 27.5.1 resolution: "@jest/fake-timers@npm:27.5.1" @@ -2555,6 +1681,20 @@ __metadata: languageName: node linkType: hard +"@jest/fake-timers@npm:^29.7.0": + version: 29.7.0 + resolution: "@jest/fake-timers@npm:29.7.0" + dependencies: + "@jest/types": ^29.6.3 + "@sinonjs/fake-timers": ^10.0.2 + "@types/node": "*" + jest-message-util: ^29.7.0 + jest-mock: ^29.7.0 + jest-util: ^29.7.0 + checksum: caf2bbd11f71c9241b458d1b5a66cbe95debc5a15d96442444b5d5c7ba774f523c76627c6931cca5e10e76f0d08761f6f1f01a608898f4751a0eee54fc3d8d00 + languageName: node + linkType: hard + "@jest/globals@npm:^27.5.1": version: 27.5.1 resolution: "@jest/globals@npm:27.5.1" @@ -2578,6 +1718,18 @@ __metadata: languageName: node linkType: hard +"@jest/globals@npm:^29.7.0": + version: 29.7.0 + resolution: "@jest/globals@npm:29.7.0" + dependencies: + "@jest/environment": ^29.7.0 + "@jest/expect": ^29.7.0 + "@jest/types": ^29.6.3 + jest-mock: ^29.7.0 + checksum: 97dbb9459135693ad3a422e65ca1c250f03d82b2a77f6207e7fa0edd2c9d2015fbe4346f3dc9ebff1678b9d8da74754d4d440b7837497f8927059c0642a22123 + languageName: node + linkType: hard + "@jest/reporters@npm:^27.5.1": version: 27.5.1 resolution: "@jest/reporters@npm:27.5.1" @@ -2653,6 +1805,43 @@ __metadata: languageName: node linkType: hard +"@jest/reporters@npm:^29.7.0": + version: 29.7.0 + resolution: "@jest/reporters@npm:29.7.0" + dependencies: + "@bcoe/v8-coverage": ^0.2.3 + "@jest/console": ^29.7.0 + "@jest/test-result": ^29.7.0 + "@jest/transform": ^29.7.0 + "@jest/types": ^29.6.3 + "@jridgewell/trace-mapping": ^0.3.18 + "@types/node": "*" + chalk: ^4.0.0 + collect-v8-coverage: ^1.0.0 + exit: ^0.1.2 + glob: ^7.1.3 + graceful-fs: ^4.2.9 + istanbul-lib-coverage: ^3.0.0 + istanbul-lib-instrument: ^6.0.0 + istanbul-lib-report: ^3.0.0 + istanbul-lib-source-maps: ^4.0.0 + istanbul-reports: ^3.1.3 + jest-message-util: ^29.7.0 + jest-util: ^29.7.0 + jest-worker: ^29.7.0 + slash: ^3.0.0 + string-length: ^4.0.1 + strip-ansi: ^6.0.0 + v8-to-istanbul: ^9.0.1 + peerDependencies: + node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 + peerDependenciesMeta: + node-notifier: + optional: true + checksum: 7eadabd62cc344f629024b8a268ecc8367dba756152b761bdcb7b7e570a3864fc51b2a9810cd310d85e0a0173ef002ba4528d5ea0329fbf66ee2a3ada9c40455 + languageName: node + linkType: hard + "@jest/schemas@npm:^29.4.3": version: 29.4.3 resolution: "@jest/schemas@npm:29.4.3" @@ -2662,6 +1851,15 @@ __metadata: languageName: node linkType: hard +"@jest/schemas@npm:^29.6.3": + version: 29.6.3 + resolution: "@jest/schemas@npm:29.6.3" + dependencies: + "@sinclair/typebox": ^0.27.8 + checksum: 910040425f0fc93cd13e68c750b7885590b8839066dfa0cd78e7def07bbb708ad869381f725945d66f2284de5663bbecf63e8fdd856e2ae6e261ba30b1687e93 + languageName: node + linkType: hard + "@jest/source-map@npm:^27.5.1": version: 27.5.1 resolution: "@jest/source-map@npm:27.5.1" @@ -2684,6 +1882,17 @@ __metadata: languageName: node linkType: hard +"@jest/source-map@npm:^29.6.3": + version: 29.6.3 + resolution: "@jest/source-map@npm:29.6.3" + dependencies: + "@jridgewell/trace-mapping": ^0.3.18 + callsites: ^3.0.0 + graceful-fs: ^4.2.9 + checksum: bcc5a8697d471396c0003b0bfa09722c3cd879ad697eb9c431e6164e2ea7008238a01a07193dfe3cbb48b1d258eb7251f6efcea36f64e1ebc464ea3c03ae2deb + languageName: node + linkType: hard + "@jest/test-result@npm:^27.5.1": version: 27.5.1 resolution: "@jest/test-result@npm:27.5.1" @@ -2708,6 +1917,18 @@ __metadata: languageName: node linkType: hard +"@jest/test-result@npm:^29.7.0": + version: 29.7.0 + resolution: "@jest/test-result@npm:29.7.0" + dependencies: + "@jest/console": ^29.7.0 + "@jest/types": ^29.6.3 + "@types/istanbul-lib-coverage": ^2.0.0 + collect-v8-coverage: ^1.0.0 + checksum: 67b6317d526e335212e5da0e768e3b8ab8a53df110361b80761353ad23b6aea4432b7c5665bdeb87658ea373b90fb1afe02ed3611ef6c858c7fba377505057fa + languageName: node + linkType: hard + "@jest/test-sequencer@npm:^27.5.1": version: 27.5.1 resolution: "@jest/test-sequencer@npm:27.5.1" @@ -2732,6 +1953,18 @@ __metadata: languageName: node linkType: hard +"@jest/test-sequencer@npm:^29.7.0": + version: 29.7.0 + resolution: "@jest/test-sequencer@npm:29.7.0" + dependencies: + "@jest/test-result": ^29.7.0 + graceful-fs: ^4.2.9 + jest-haste-map: ^29.7.0 + slash: ^3.0.0 + checksum: 73f43599017946be85c0b6357993b038f875b796e2f0950487a82f4ebcb115fa12131932dd9904026b4ad8be131fe6e28bd8d0aa93b1563705185f9804bff8bd + languageName: node + linkType: hard + "@jest/transform@npm:^27.5.1": version: 27.5.1 resolution: "@jest/transform@npm:27.5.1" @@ -2778,6 +2011,29 @@ __metadata: languageName: node linkType: hard +"@jest/transform@npm:^29.7.0": + version: 29.7.0 + resolution: "@jest/transform@npm:29.7.0" + dependencies: + "@babel/core": ^7.11.6 + "@jest/types": ^29.6.3 + "@jridgewell/trace-mapping": ^0.3.18 + babel-plugin-istanbul: ^6.1.1 + chalk: ^4.0.0 + convert-source-map: ^2.0.0 + fast-json-stable-stringify: ^2.1.0 + graceful-fs: ^4.2.9 + jest-haste-map: ^29.7.0 + jest-regex-util: ^29.6.3 + jest-util: ^29.7.0 + micromatch: ^4.0.4 + pirates: ^4.0.4 + slash: ^3.0.0 + write-file-atomic: ^4.0.2 + checksum: 0f8ac9f413903b3cb6d240102db848f2a354f63971ab885833799a9964999dd51c388162106a807f810071f864302cdd8e3f0c241c29ce02d85a36f18f3f40ab + languageName: node + linkType: hard + "@jest/types@npm:^26.6.2": version: 26.6.2 resolution: "@jest/types@npm:26.6.2" @@ -2818,6 +2074,20 @@ __metadata: languageName: node linkType: hard +"@jest/types@npm:^29.6.3": + version: 29.6.3 + resolution: "@jest/types@npm:29.6.3" + dependencies: + "@jest/schemas": ^29.6.3 + "@types/istanbul-lib-coverage": ^2.0.0 + "@types/istanbul-reports": ^3.0.0 + "@types/node": "*" + "@types/yargs": ^17.0.8 + chalk: ^4.0.0 + checksum: a0bcf15dbb0eca6bdd8ce61a3fb055349d40268622a7670a3b2eb3c3dbafe9eb26af59938366d520b86907b9505b0f9b29b85cec11579a9e580694b87cd90fcc + languageName: node + linkType: hard + "@jridgewell/gen-mapping@npm:^0.3.0, @jridgewell/gen-mapping@npm:^0.3.2": version: 0.3.3 resolution: "@jridgewell/gen-mapping@npm:0.3.3" @@ -2836,7 +2106,7 @@ __metadata: languageName: node linkType: hard -"@jridgewell/resolve-uri@npm:^3.0.3": +"@jridgewell/resolve-uri@npm:^3.0.3, @jridgewell/resolve-uri@npm:^3.1.0": version: 3.1.1 resolution: "@jridgewell/resolve-uri@npm:3.1.1" checksum: f5b441fe7900eab4f9155b3b93f9800a916257f4e8563afbcd3b5a5337b55e52bd8ae6735453b1b745457d9f6cdb16d74cd6220bbdd98cf153239e13f6cbb653 @@ -2857,7 +2127,7 @@ __metadata: languageName: node linkType: hard -"@jridgewell/sourcemap-codec@npm:^1.4.10": +"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14": version: 1.4.15 resolution: "@jridgewell/sourcemap-codec@npm:1.4.15" checksum: b881c7e503db3fc7f3c1f35a1dd2655a188cc51a3612d76efc8a6eb74728bef5606e6758ee77423e564092b4a518aba569bbb21c9bac5ab7a35b0c6ae7e344c8 @@ -2884,6 +2154,16 @@ __metadata: languageName: node linkType: hard +"@jridgewell/trace-mapping@npm:^0.3.18": + version: 0.3.20 + resolution: "@jridgewell/trace-mapping@npm:0.3.20" + dependencies: + "@jridgewell/resolve-uri": ^3.1.0 + "@jridgewell/sourcemap-codec": ^1.4.14 + checksum: cd1a7353135f385909468ff0cf20bdd37e59f2ee49a13a966dedf921943e222082c583ade2b579ff6cd0d8faafcb5461f253e1bf2a9f48fec439211fdbe788f5 + languageName: node + linkType: hard + "@koa/router@npm:10.0.0": version: 10.0.0 resolution: "@koa/router@npm:10.0.0" @@ -4121,13 +3401,6 @@ __metadata: languageName: node linkType: hard -"@nicolo-ribaudo/chokidar-2@npm:2.1.8-no-fsevents.3": - version: 2.1.8-no-fsevents.3 - resolution: "@nicolo-ribaudo/chokidar-2@npm:2.1.8-no-fsevents.3" - checksum: ee55cc9241aeea7eb94b8a8551bfa4246c56c53bc71ecda0a2104018fcc328ba5723b33686bdf9cc65d4df4ae65e8016b89e0bbdeb94e0309fe91bb9ced42344 - languageName: node - linkType: hard - "@node-rs/helper@npm:1.2.1": version: 1.2.1 resolution: "@node-rs/helper@npm:1.2.1" @@ -4935,83 +4208,28 @@ __metadata: deepmerge: ^4.3.1 fast-deep-equal: ^3.1.3 make-error: ^1.3.6 - object.omit: ^3.0.0 - object.pick: ^1.3.0 - throttle-debounce: ^3.0.1 - checksum: 666d7ee9553f3220781ff7e9af4de2c1e90141bdb4e44842b816951b4ca233fe21966997abec662f6c51608ad71cc3b99b878325bc882923ac6246e7db1a681f - languageName: node - linkType: hard - -"@remirror/types@npm:^1.0.1": - version: 1.0.1 - resolution: "@remirror/types@npm:1.0.1" - dependencies: - type-fest: ^2.19.0 - checksum: 59b869d3f189e3d70bb294535e313974eb6d9c38804fa1d9a2f51b06bd8d7495698f247740b3c71a9555a6a939652617088fff638a664f7870f0bb39bada9099 - languageName: node - linkType: hard - -"@rushstack/eslint-patch@npm:^1.3.3": - version: 1.5.1 - resolution: "@rushstack/eslint-patch@npm:1.5.1" - checksum: e4c25322312dbaa29e835a7ab4fbac53c8731dd0da65e46646e38945e296429e7fb91c2ef3da5af5d5938d44b0cde1d5290438ebb3dcb015e02b80b5e2530d24 - languageName: node - linkType: hard - -"@shared/dila-resolver@workspace:^, @shared/dila-resolver@workspace:shared/dila-resolver": - version: 0.0.0-use.local - resolution: "@shared/dila-resolver@workspace:shared/dila-resolver" - dependencies: - "@babel/core": ^7.15.5 - "@babel/plugin-transform-modules-commonjs": ^7.15.4 - "@babel/preset-typescript": ^7.15.0 - "@shared/eslint-config": "workspace:^" - "@shared/types": "workspace:^" - "@socialgouv/dila-api-client": ^1.2.4 - "@tsconfig/node14": ^1.0.1 - "@types/jest": ^27.0.0 - jest: ^27.0.6 - lint-staged: ^12.0.0 - ts-node: ^10.2.1 - typescript: ^4.4.3 - languageName: unknown - linkType: soft - -"@shared/elasticsearch-document-adapter@workspace:^, @shared/elasticsearch-document-adapter@workspace:shared/elasticsearch-document-adapter": - version: 0.0.0-use.local - resolution: "@shared/elasticsearch-document-adapter@workspace:shared/elasticsearch-document-adapter" - dependencies: - "@babel/cli": ^7.15.7 - "@babel/core": ^7.15.5 - "@babel/preset-env": ^7.16.11 - "@babel/preset-typescript": ^7.16.7 - "@elastic/elasticsearch": ^7.14.1 - "@shared/eslint-config": "workspace:^" - "@shared/types": "workspace:^" - "@shared/utils": "workspace:^" - "@socialgouv/cdtn-elasticsearch": "workspace:^" - "@socialgouv/cdtn-logger": "workspace:^" - "@socialgouv/cdtn-slugify": ^4.52.1 - "@socialgouv/cdtn-sources": ^4.52.1 - "@types/jest": ^29.2.3 - "@types/node-fetch": ^2.5.12 - "@vercel/ncc": 0.34.0 - jest: ^27.1.1 - lint-staged: ^12.0.0 - nctx: ^1.2.0 - node-fetch: ^2.6.5 - p-map: ^4.0.0 - p-queue: ^6.6.2 - rehype-raw: ^5.1.0 - rehype-stringify: ^8.0.0 - remark-parse: ^9.0.0 - remark-rehype: ^8.1.0 - remark-stringify: ^9.0.1 - ts-jest: ^29.0.3 - typescript: ^4.9.5 - unified: ^9.2.2 - languageName: unknown - linkType: soft + object.omit: ^3.0.0 + object.pick: ^1.3.0 + throttle-debounce: ^3.0.1 + checksum: 666d7ee9553f3220781ff7e9af4de2c1e90141bdb4e44842b816951b4ca233fe21966997abec662f6c51608ad71cc3b99b878325bc882923ac6246e7db1a681f + languageName: node + linkType: hard + +"@remirror/types@npm:^1.0.1": + version: 1.0.1 + resolution: "@remirror/types@npm:1.0.1" + dependencies: + type-fest: ^2.19.0 + checksum: 59b869d3f189e3d70bb294535e313974eb6d9c38804fa1d9a2f51b06bd8d7495698f247740b3c71a9555a6a939652617088fff638a664f7870f0bb39bada9099 + languageName: node + linkType: hard + +"@rushstack/eslint-patch@npm:^1.3.3": + version: 1.5.1 + resolution: "@rushstack/eslint-patch@npm:1.5.1" + checksum: e4c25322312dbaa29e835a7ab4fbac53c8731dd0da65e46646e38945e296429e7fb91c2ef3da5af5d5938d44b0cde1d5290438ebb3dcb015e02b80b5e2530d24 + languageName: node + linkType: hard "@shared/eslint-config@workspace:^, @shared/eslint-config@workspace:shared/eslint-config": version: 0.0.0-use.local @@ -5043,13 +4261,17 @@ __metadata: "@shared/types": "workspace:^" "@socialgouv/cdtn-sources": ^4.91.1 "@socialgouv/cdtn-utils": ^4.109.0 + "@socialgouv/dila-api-client": ^1.2.4 + "@swc/jest": ^0.2.29 "@types/uuid": ^9.0.5 "@types/xxhashjs": ^0.2.2 "@urql/core": ^2.4.3 graphql: ^16.3.0 isomorphic-unfetch: ^3.1.0 - typescript: ^5.2.2 + jest: ^29.7.0 + typescript: ^5.3.3 uuid: ^9.0.1 + winston: 3.3.3 xxhashjs: ^0.2.2 languageName: unknown linkType: soft @@ -5084,6 +4306,13 @@ __metadata: languageName: node linkType: hard +"@sinclair/typebox@npm:^0.27.8": + version: 0.27.8 + resolution: "@sinclair/typebox@npm:0.27.8" + checksum: 00bd7362a3439021aa1ea51b0e0d0a0e8ca1351a3d54c606b115fdcc49b51b16db6e5f43b4fe7a28c38688523e22a94d49dd31168868b655f0d4d50f032d07a1 + languageName: node + linkType: hard + "@sindresorhus/is@npm:^0.14.0": version: 0.14.0 resolution: "@sindresorhus/is@npm:0.14.0" @@ -5141,7 +4370,7 @@ __metadata: "@babel/core": ^7.15.5 "@babel/plugin-transform-modules-commonjs": ^7.15.4 "@shared/eslint-config": "workspace:^" - "@socialgouv/cdtn-logger": "workspace:^" + "@shared/utils": "workspace:^" got: ^11.8.2 jest: ^27.1.1 lint-staged: ^12.0.0 @@ -5150,25 +4379,6 @@ __metadata: languageName: unknown linkType: soft -"@socialgouv/cdtn-logger@workspace:^, @socialgouv/cdtn-logger@workspace:shared/logger": - version: 0.0.0-use.local - resolution: "@socialgouv/cdtn-logger@workspace:shared/logger" - dependencies: - "@babel/core": ^7.15.5 - "@babel/plugin-transform-modules-commonjs": ^7.15.4 - "@babel/preset-typescript": ^7.15.0 - "@shared/eslint-config": "workspace:^" - "@tsconfig/node14": ^1.0.1 - "@types/std-mocks": ^1.0.1 - babel-plugin-dynamic-import-node: ^2.3.3 - jest: ^27.1.1 - lint-staged: ^12.0.0 - std-mocks: ^1.0.1 - typescript: ^4.9.5 - winston: ^3.3.3 - languageName: unknown - linkType: soft - "@socialgouv/cdtn-slugify@npm:4.52.1": version: 4.52.1 resolution: "@socialgouv/cdtn-slugify@npm:4.52.1" @@ -5747,6 +4957,18 @@ __metadata: languageName: node linkType: hard +"@swc/jest@npm:^0.2.29": + version: 0.2.29 + resolution: "@swc/jest@npm:0.2.29" + dependencies: + "@jest/create-cache-key-function": ^27.4.2 + jsonc-parser: ^3.2.0 + peerDependencies: + "@swc/core": "*" + checksum: 9eaad322310f34e81f67d41411a7d60663341af1bd9fb65456faa914c936d849d6f643fa3b942a187d52e71e62c33097098c639d25c2047fa874f49bf51cec76 + languageName: node + linkType: hard + "@szmarczak/http-timer@npm:^1.1.2": version: 1.1.2 resolution: "@szmarczak/http-timer@npm:1.1.2" @@ -6250,7 +5472,7 @@ __metadata: languageName: node linkType: hard -"@tsconfig/node14@npm:^1.0.0, @tsconfig/node14@npm:^1.0.1": +"@tsconfig/node14@npm:^1.0.0": version: 1.0.3 resolution: "@tsconfig/node14@npm:1.0.3" checksum: 19275fe80c4c8d0ad0abed6a96dbf00642e88b220b090418609c4376e1cef81bf16237bf170ad1b341452feddb8115d8dd2e5acdfdea1b27422071163dc9ba9d @@ -6506,7 +5728,7 @@ __metadata: languageName: node linkType: hard -"@types/jest@npm:*, @types/jest@npm:^29.2.3": +"@types/jest@npm:*": version: 29.5.2 resolution: "@types/jest@npm:29.5.2" dependencies: @@ -6536,7 +5758,7 @@ __metadata: languageName: node linkType: hard -"@types/jest@npm:^27.0.0, @types/jest@npm:^27.0.1, @types/jest@npm:^27.4.0, @types/jest@npm:^27.4.1": +"@types/jest@npm:^27.0.1, @types/jest@npm:^27.4.0, @types/jest@npm:^27.4.1": version: 27.5.2 resolution: "@types/jest@npm:27.5.2" dependencies: @@ -6649,7 +5871,7 @@ __metadata: languageName: node linkType: hard -"@types/node-fetch@npm:^2.5.0, @types/node-fetch@npm:^2.5.12": +"@types/node-fetch@npm:^2.5.0": version: 2.6.4 resolution: "@types/node-fetch@npm:2.6.4" dependencies: @@ -6900,13 +6122,6 @@ __metadata: languageName: node linkType: hard -"@types/std-mocks@npm:^1.0.1": - version: 1.0.1 - resolution: "@types/std-mocks@npm:1.0.1" - checksum: 190350f6089d77ccea23681135ffc5b02aab4ce59ea603b666891240b58571e3921ff5ea2a47fd92c36566270fbff88b507b0a0d57f97a1aa8666f77b66da974 - languageName: node - linkType: hard - "@types/superagent@npm:*": version: 4.1.18 resolution: "@types/superagent@npm:4.1.18" @@ -7484,7 +6699,6 @@ __metadata: version: 0.0.0-use.local resolution: "alert-cli@workspace:targets/alert-cli" dependencies: - "@shared/dila-resolver": "workspace:^" "@shared/eslint-config": "workspace:^" "@shared/types": "workspace:^" "@shared/utils": "workspace:^" @@ -8137,6 +7351,23 @@ __metadata: languageName: node linkType: hard +"babel-jest@npm:^29.7.0": + version: 29.7.0 + resolution: "babel-jest@npm:29.7.0" + dependencies: + "@jest/transform": ^29.7.0 + "@types/babel__core": ^7.1.14 + babel-plugin-istanbul: ^6.1.1 + babel-preset-jest: ^29.6.3 + chalk: ^4.0.0 + graceful-fs: ^4.2.9 + slash: ^3.0.0 + peerDependencies: + "@babel/core": ^7.8.0 + checksum: ee6f8e0495afee07cac5e4ee167be705c711a8cc8a737e05a587a131fdae2b3c8f9aa55dfd4d9c03009ac2d27f2de63d8ba96d3e8460da4d00e8af19ef9a83f7 + languageName: node + linkType: hard + "babel-merge@npm:^3.0.0": version: 3.0.0 resolution: "babel-merge@npm:3.0.0" @@ -8149,15 +7380,6 @@ __metadata: languageName: node linkType: hard -"babel-plugin-dynamic-import-node@npm:^2.3.3": - version: 2.3.3 - resolution: "babel-plugin-dynamic-import-node@npm:2.3.3" - dependencies: - object.assign: ^4.1.0 - checksum: c9d24415bcc608d0db7d4c8540d8002ac2f94e2573d2eadced137a29d9eab7e25d2cbb4bc6b9db65cf6ee7430f7dd011d19c911a9a778f0533b4a05ce8292c9b - languageName: node - linkType: hard - "babel-plugin-emotion@npm:^10.0.27": version: 10.2.2 resolution: "babel-plugin-emotion@npm:10.2.2" @@ -8213,6 +7435,18 @@ __metadata: languageName: node linkType: hard +"babel-plugin-jest-hoist@npm:^29.6.3": + version: 29.6.3 + resolution: "babel-plugin-jest-hoist@npm:29.6.3" + dependencies: + "@babel/template": ^7.3.3 + "@babel/types": ^7.3.3 + "@types/babel__core": ^7.1.14 + "@types/babel__traverse": ^7.0.6 + checksum: 51250f22815a7318f17214a9d44650ba89551e6d4f47a2dc259128428324b52f5a73979d010cefd921fd5a720d8c1d55ad74ff601cd94c7bd44d5f6292fde2d1 + languageName: node + linkType: hard + "babel-plugin-macros@npm:^2.0.0, babel-plugin-macros@npm:^2.6.1": version: 2.8.0 resolution: "babel-plugin-macros@npm:2.8.0" @@ -8235,42 +7469,6 @@ __metadata: languageName: node linkType: hard -"babel-plugin-polyfill-corejs2@npm:^0.4.3": - version: 0.4.3 - resolution: "babel-plugin-polyfill-corejs2@npm:0.4.3" - dependencies: - "@babel/compat-data": ^7.17.7 - "@babel/helper-define-polyfill-provider": ^0.4.0 - semver: ^6.1.1 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 09ba40b9f8ac66a733628b2f12722bb764bdcc4f9600b93d60f1994418a8f84bc4b1ed9ab07c9d288debbf6210413fdff0721a3a43bd89c7f77adf76b0310adc - languageName: node - linkType: hard - -"babel-plugin-polyfill-corejs3@npm:^0.8.1": - version: 0.8.1 - resolution: "babel-plugin-polyfill-corejs3@npm:0.8.1" - dependencies: - "@babel/helper-define-polyfill-provider": ^0.4.0 - core-js-compat: ^3.30.1 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: c23a581973c141a4687126cf964981180ef27e3eb0b34b911161db4f5caf9ba7ff60bee0ebe46d650ba09e03a6a3ac2cd6a6ae5f4f5363a148470e5cd8447df2 - languageName: node - linkType: hard - -"babel-plugin-polyfill-regenerator@npm:^0.5.0": - version: 0.5.0 - resolution: "babel-plugin-polyfill-regenerator@npm:0.5.0" - dependencies: - "@babel/helper-define-polyfill-provider": ^0.4.0 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: ef2bcffc7c9a5e4426fc2dbf89bf3a46999a8415c21cd741c3ab3cb4b5ab804aaa3d71ef733f0eda1bcc0b91d9d80f98d33983a66dab9b8bed166ec38f8f8ad1 - languageName: node - linkType: hard - "babel-plugin-styled-components@npm:>= 1.12.0": version: 2.1.4 resolution: "babel-plugin-styled-components@npm:2.1.4" @@ -8339,6 +7537,18 @@ __metadata: languageName: node linkType: hard +"babel-preset-jest@npm:^29.6.3": + version: 29.6.3 + resolution: "babel-preset-jest@npm:29.6.3" + dependencies: + babel-plugin-jest-hoist: ^29.6.3 + babel-preset-current-node-syntax: ^1.0.0 + peerDependencies: + "@babel/core": ^7.0.0 + checksum: aa4ff2a8a728d9d698ed521e3461a109a1e66202b13d3494e41eea30729a5e7cc03b3a2d56c594423a135429c37bf63a9fa8b0b9ce275298be3095a88c69f6fb + languageName: node + linkType: hard + "bail@npm:^1.0.0": version: 1.0.5 resolution: "bail@npm:1.0.5" @@ -8668,7 +7878,7 @@ __metadata: languageName: node linkType: hard -"browserslist@npm:^4.21.3, browserslist@npm:^4.21.5": +"browserslist@npm:^4.21.3": version: 4.21.9 resolution: "browserslist@npm:4.21.9" dependencies: @@ -9133,7 +8343,7 @@ __metadata: languageName: node linkType: hard -"chokidar@npm:^3.2.2, chokidar@npm:^3.4.0, chokidar@npm:^3.5.2": +"chokidar@npm:^3.2.2, chokidar@npm:^3.5.2": version: 3.5.3 resolution: "chokidar@npm:3.5.3" dependencies: @@ -9556,13 +8766,6 @@ __metadata: languageName: node linkType: hard -"commander@npm:^4.0.1": - version: 4.1.1 - resolution: "commander@npm:4.1.1" - checksum: d7b9913ff92cae20cb577a4ac6fcc121bd6223319e54a40f51a14740a681ad5c574fd29a57da478a5f234a6fa6c52cbf0b7c641353e03c648b1ae85ba670b977 - languageName: node - linkType: hard - "commander@npm:^7.1.0": version: 7.2.0 resolution: "commander@npm:7.2.0" @@ -9833,7 +9036,7 @@ __metadata: languageName: node linkType: hard -"convert-source-map@npm:^1.1.0, convert-source-map@npm:^1.4.0, convert-source-map@npm:^1.5.0, convert-source-map@npm:^1.6.0, convert-source-map@npm:^1.7.0": +"convert-source-map@npm:^1.4.0, convert-source-map@npm:^1.5.0, convert-source-map@npm:^1.6.0, convert-source-map@npm:^1.7.0": version: 1.9.0 resolution: "convert-source-map@npm:1.9.0" checksum: dc55a1f28ddd0e9485ef13565f8f756b342f9a46c4ae18b843fe3c30c675d058d6a4823eff86d472f187b176f0adf51ea7b69ea38be34be4a63cbbf91b0593c8 @@ -9885,15 +9088,6 @@ __metadata: languageName: node linkType: hard -"core-js-compat@npm:^3.30.1, core-js-compat@npm:^3.30.2": - version: 3.31.0 - resolution: "core-js-compat@npm:3.31.0" - dependencies: - browserslist: ^4.21.5 - checksum: 5c76ac5e4ab39480391f93a5aef14a2cfa188cda7bd6a7b8532de1f8bc5d89099a5025b2640d2ef70a2928614792363dcbcf8bd254aa7b2e11b85aeed7ac460f - languageName: node - linkType: hard - "core-js-pure@npm:^3.30.2": version: 3.31.0 resolution: "core-js-pure@npm:3.31.0" @@ -10034,6 +9228,23 @@ __metadata: languageName: node linkType: hard +"create-jest@npm:^29.7.0": + version: 29.7.0 + resolution: "create-jest@npm:29.7.0" + dependencies: + "@jest/types": ^29.6.3 + chalk: ^4.0.0 + exit: ^0.1.2 + graceful-fs: ^4.2.9 + jest-config: ^29.7.0 + jest-util: ^29.7.0 + prompts: ^2.0.1 + bin: + create-jest: bin/create-jest.js + checksum: 1427d49458adcd88547ef6fa39041e1fe9033a661293aa8d2c3aa1b4967cb5bf4f0c00436c7a61816558f28ba2ba81a94d5c962e8022ea9a883978fc8e1f2945 + languageName: node + linkType: hard + "create-require@npm:^1.1.0": version: 1.1.1 resolution: "create-require@npm:1.1.1" @@ -10750,6 +9961,18 @@ __metadata: languageName: node linkType: hard +"dedent@npm:^1.0.0": + version: 1.5.1 + resolution: "dedent@npm:1.5.1" + peerDependencies: + babel-plugin-macros: ^3.1.0 + peerDependenciesMeta: + babel-plugin-macros: + optional: true + checksum: c3c300a14edf1bdf5a873f9e4b22e839d62490bc5c8d6169c1f15858a1a76733d06a9a56930e963d677a2ceeca4b6b0894cc5ea2f501aa382ca5b92af3413c2a + languageName: node + linkType: hard + "deep-equal@npm:^1.0.1": version: 1.1.1 resolution: "deep-equal@npm:1.1.1" @@ -11062,6 +10285,13 @@ __metadata: languageName: node linkType: hard +"diff-sequences@npm:^29.6.3": + version: 29.6.3 + resolution: "diff-sequences@npm:29.6.3" + checksum: f4914158e1f2276343d98ff5b31fc004e7304f5470bf0f1adb2ac6955d85a531a6458d33e87667f98f6ae52ebd3891bb47d420bb48a5bd8b7a27ee25b20e33aa + languageName: node + linkType: hard + "diff@npm:5.0.0": version: 5.0.0 resolution: "diff@npm:5.0.0" @@ -12207,6 +11437,19 @@ __metadata: languageName: node linkType: hard +"expect@npm:^29.7.0": + version: 29.7.0 + resolution: "expect@npm:29.7.0" + dependencies: + "@jest/expect-utils": ^29.7.0 + jest-get-type: ^29.6.3 + jest-matcher-utils: ^29.7.0 + jest-message-util: ^29.7.0 + jest-util: ^29.7.0 + checksum: 9257f10288e149b81254a0fda8ffe8d54a7061cd61d7515779998b012579d2b8c22354b0eb901daf0145f347403da582f75f359f4810c007182ad3fb318b5c0c + languageName: node + linkType: hard + "exponential-backoff@npm:^3.1.1": version: 3.1.1 resolution: "exponential-backoff@npm:3.1.1" @@ -12219,11 +11462,13 @@ __metadata: resolution: "export-elasticsearch@workspace:targets/export-elasticsearch" dependencies: "@azure/storage-blob": ^12.9.0 - "@shared/elasticsearch-document-adapter": "workspace:^" + "@elastic/elasticsearch": ^7.14.1 "@shared/eslint-config": "workspace:^" "@shared/types": "workspace:^" "@shared/utils": "workspace:^" - "@socialgouv/cdtn-logger": "workspace:^" + "@socialgouv/cdtn-elasticsearch": "workspace:^" + "@socialgouv/cdtn-slugify": ^4.52.1 + "@socialgouv/cdtn-sources": ^4.52.1 "@swc/cli": 0.1.55 "@swc/core": 1.2.150 "@swc/jest": 0.2.20 @@ -12239,12 +11484,22 @@ __metadata: inversify: ^6.0.1 inversify-express-utils: ^6.4.3 jest: 27.5.1 + nctx: ^1.2.0 + node-fetch: ^2.6.5 nodemon: 2.0.15 + p-map: ^4.0.0 + p-queue: ^6.6.2 reflect-metadata: ^0.1.13 + rehype-raw: ^5.1.0 + rehype-stringify: ^8.0.0 + remark-parse: ^9.0.0 + remark-rehype: ^8.1.0 + remark-stringify: ^9.0.1 rimraf: 3.0.2 supertest: ^6.2.2 timekeeper: ^2.2.0 typescript: 4.6.2 + unified: ^9.2.2 zod: ^3.14.2 languageName: unknown linkType: soft @@ -12844,13 +12099,6 @@ __metadata: languageName: node linkType: hard -"fs-readdir-recursive@npm:^1.1.0": - version: 1.1.0 - resolution: "fs-readdir-recursive@npm:1.1.0" - checksum: 29d50f3d2128391c7fc9fd051c8b7ea45bcc8aa84daf31ef52b17218e20bfd2bd34d02382742801954cc8d1905832b68227f6b680a666ce525d8b6b75068ad1e - languageName: node - linkType: hard - "fs.realpath@npm:^1.0.0": version: 1.0.0 resolution: "fs.realpath@npm:1.0.0" @@ -13272,7 +12520,7 @@ __metadata: languageName: node linkType: hard -"glob@npm:^7.1.1, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.2.0": +"glob@npm:^7.1.1, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4": version: 7.2.3 resolution: "glob@npm:7.2.3" dependencies: @@ -15165,6 +14413,19 @@ __metadata: languageName: node linkType: hard +"istanbul-lib-instrument@npm:^6.0.0": + version: 6.0.1 + resolution: "istanbul-lib-instrument@npm:6.0.1" + dependencies: + "@babel/core": ^7.12.3 + "@babel/parser": ^7.14.7 + "@istanbuljs/schema": ^0.1.2 + istanbul-lib-coverage: ^3.2.0 + semver: ^7.5.4 + checksum: fb23472e739cfc9b027cefcd7d551d5e7ca7ff2817ae5150fab99fe42786a7f7b56a29a2aa8309c37092e18297b8003f9c274f50ca4360949094d17fbac81472 + languageName: node + linkType: hard + "istanbul-lib-report@npm:^3.0.0": version: 3.0.0 resolution: "istanbul-lib-report@npm:3.0.0" @@ -15258,6 +14519,17 @@ __metadata: languageName: node linkType: hard +"jest-changed-files@npm:^29.7.0": + version: 29.7.0 + resolution: "jest-changed-files@npm:29.7.0" + dependencies: + execa: ^5.0.0 + jest-util: ^29.7.0 + p-limit: ^3.1.0 + checksum: 963e203893c396c5dfc75e00a49426688efea7361b0f0e040035809cecd2d46b3c01c02be2d9e8d38b1138357d2de7719ea5b5be21f66c10f2e9685a5a73bb99 + languageName: node + linkType: hard + "jest-circus@npm:^27.5.1": version: 27.5.1 resolution: "jest-circus@npm:27.5.1" @@ -15313,6 +14585,34 @@ __metadata: languageName: node linkType: hard +"jest-circus@npm:^29.7.0": + version: 29.7.0 + resolution: "jest-circus@npm:29.7.0" + dependencies: + "@jest/environment": ^29.7.0 + "@jest/expect": ^29.7.0 + "@jest/test-result": ^29.7.0 + "@jest/types": ^29.6.3 + "@types/node": "*" + chalk: ^4.0.0 + co: ^4.6.0 + dedent: ^1.0.0 + is-generator-fn: ^2.0.0 + jest-each: ^29.7.0 + jest-matcher-utils: ^29.7.0 + jest-message-util: ^29.7.0 + jest-runtime: ^29.7.0 + jest-snapshot: ^29.7.0 + jest-util: ^29.7.0 + p-limit: ^3.1.0 + pretty-format: ^29.7.0 + pure-rand: ^6.0.0 + slash: ^3.0.0 + stack-utils: ^2.0.3 + checksum: 349437148924a5a109c9b8aad6d393a9591b4dac1918fc97d81b7fc515bc905af9918495055071404af1fab4e48e4b04ac3593477b1d5dcf48c4e71b527c70a7 + languageName: node + linkType: hard + "jest-cli@npm:^27.0.6, jest-cli@npm:^27.5.1": version: 27.5.1 resolution: "jest-cli@npm:27.5.1" @@ -15367,6 +14667,32 @@ __metadata: languageName: node linkType: hard +"jest-cli@npm:^29.7.0": + version: 29.7.0 + resolution: "jest-cli@npm:29.7.0" + dependencies: + "@jest/core": ^29.7.0 + "@jest/test-result": ^29.7.0 + "@jest/types": ^29.6.3 + chalk: ^4.0.0 + create-jest: ^29.7.0 + exit: ^0.1.2 + import-local: ^3.0.2 + jest-config: ^29.7.0 + jest-util: ^29.7.0 + jest-validate: ^29.7.0 + yargs: ^17.3.1 + peerDependencies: + node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 + peerDependenciesMeta: + node-notifier: + optional: true + bin: + jest: bin/jest.js + checksum: 664901277a3f5007ea4870632ed6e7889db9da35b2434e7cb488443e6bf5513889b344b7fddf15112135495b9875892b156faeb2d7391ddb9e2a849dcb7b6c36 + languageName: node + linkType: hard + "jest-config@npm:^27.5.1": version: 27.5.1 resolution: "jest-config@npm:27.5.1" @@ -15442,6 +14768,44 @@ __metadata: languageName: node linkType: hard +"jest-config@npm:^29.7.0": + version: 29.7.0 + resolution: "jest-config@npm:29.7.0" + dependencies: + "@babel/core": ^7.11.6 + "@jest/test-sequencer": ^29.7.0 + "@jest/types": ^29.6.3 + babel-jest: ^29.7.0 + chalk: ^4.0.0 + ci-info: ^3.2.0 + deepmerge: ^4.2.2 + glob: ^7.1.3 + graceful-fs: ^4.2.9 + jest-circus: ^29.7.0 + jest-environment-node: ^29.7.0 + jest-get-type: ^29.6.3 + jest-regex-util: ^29.6.3 + jest-resolve: ^29.7.0 + jest-runner: ^29.7.0 + jest-util: ^29.7.0 + jest-validate: ^29.7.0 + micromatch: ^4.0.4 + parse-json: ^5.2.0 + pretty-format: ^29.7.0 + slash: ^3.0.0 + strip-json-comments: ^3.1.1 + peerDependencies: + "@types/node": "*" + ts-node: ">=9.0.0" + peerDependenciesMeta: + "@types/node": + optional: true + ts-node: + optional: true + checksum: 4cabf8f894c180cac80b7df1038912a3fc88f96f2622de33832f4b3314f83e22b08fb751da570c0ab2b7988f21604bdabade95e3c0c041068ac578c085cf7dff + languageName: node + linkType: hard + "jest-diff@npm:^26.0.0": version: 26.6.2 resolution: "jest-diff@npm:26.6.2" @@ -15478,6 +14842,18 @@ __metadata: languageName: node linkType: hard +"jest-diff@npm:^29.7.0": + version: 29.7.0 + resolution: "jest-diff@npm:29.7.0" + dependencies: + chalk: ^4.0.0 + diff-sequences: ^29.6.3 + jest-get-type: ^29.6.3 + pretty-format: ^29.7.0 + checksum: 08e24a9dd43bfba1ef07a6374e5af138f53137b79ec3d5cc71a2303515335898888fa5409959172e1e05de966c9e714368d15e8994b0af7441f0721ee8e1bb77 + languageName: node + linkType: hard + "jest-docblock@npm:^27.5.1": version: 27.5.1 resolution: "jest-docblock@npm:27.5.1" @@ -15496,6 +14872,15 @@ __metadata: languageName: node linkType: hard +"jest-docblock@npm:^29.7.0": + version: 29.7.0 + resolution: "jest-docblock@npm:29.7.0" + dependencies: + detect-newline: ^3.0.0 + checksum: 66390c3e9451f8d96c5da62f577a1dad701180cfa9b071c5025acab2f94d7a3efc2515cfa1654ebe707213241541ce9c5530232cdc8017c91ed64eea1bd3b192 + languageName: node + linkType: hard + "jest-each@npm:^27.5.1": version: 27.5.1 resolution: "jest-each@npm:27.5.1" @@ -15522,6 +14907,19 @@ __metadata: languageName: node linkType: hard +"jest-each@npm:^29.7.0": + version: 29.7.0 + resolution: "jest-each@npm:29.7.0" + dependencies: + "@jest/types": ^29.6.3 + chalk: ^4.0.0 + jest-get-type: ^29.6.3 + jest-util: ^29.7.0 + pretty-format: ^29.7.0 + checksum: e88f99f0184000fc8813f2a0aa79e29deeb63700a3b9b7928b8a418d7d93cd24933608591dbbdea732b473eb2021c72991b5cc51a17966842841c6e28e6f691c + languageName: node + linkType: hard + "jest-environment-jsdom@npm:^27.5.1": version: 27.5.1 resolution: "jest-environment-jsdom@npm:27.5.1" @@ -15586,6 +14984,20 @@ __metadata: languageName: node linkType: hard +"jest-environment-node@npm:^29.7.0": + version: 29.7.0 + resolution: "jest-environment-node@npm:29.7.0" + dependencies: + "@jest/environment": ^29.7.0 + "@jest/fake-timers": ^29.7.0 + "@jest/types": ^29.6.3 + "@types/node": "*" + jest-mock: ^29.7.0 + jest-util: ^29.7.0 + checksum: 501a9966292cbe0ca3f40057a37587cb6def25e1e0c5e39ac6c650fe78d3c70a2428304341d084ac0cced5041483acef41c477abac47e9a290d5545fd2f15646 + languageName: node + linkType: hard + "jest-get-type@npm:^26.3.0": version: 26.3.0 resolution: "jest-get-type@npm:26.3.0" @@ -15607,6 +15019,13 @@ __metadata: languageName: node linkType: hard +"jest-get-type@npm:^29.6.3": + version: 29.6.3 + resolution: "jest-get-type@npm:29.6.3" + checksum: 88ac9102d4679d768accae29f1e75f592b760b44277df288ad76ce5bf038c3f5ce3719dea8aa0f035dac30e9eb034b848ce716b9183ad7cc222d029f03e92205 + languageName: node + linkType: hard + "jest-haste-map@npm:^27.5.1": version: 27.5.1 resolution: "jest-haste-map@npm:27.5.1" @@ -15650,7 +15069,30 @@ __metadata: dependenciesMeta: fsevents: optional: true - checksum: 3828ff7783f168e34be2c63887f82a01634261f605dcae062d83f979a61c37739e21b9607ecb962256aea3fbe5a530a1acee062d0026fcb47c607c12796cf3b7 + checksum: 3828ff7783f168e34be2c63887f82a01634261f605dcae062d83f979a61c37739e21b9607ecb962256aea3fbe5a530a1acee062d0026fcb47c607c12796cf3b7 + languageName: node + linkType: hard + +"jest-haste-map@npm:^29.7.0": + version: 29.7.0 + resolution: "jest-haste-map@npm:29.7.0" + dependencies: + "@jest/types": ^29.6.3 + "@types/graceful-fs": ^4.1.3 + "@types/node": "*" + anymatch: ^3.0.3 + fb-watchman: ^2.0.0 + fsevents: ^2.3.2 + graceful-fs: ^4.2.9 + jest-regex-util: ^29.6.3 + jest-util: ^29.7.0 + jest-worker: ^29.7.0 + micromatch: ^4.0.4 + walker: ^1.0.8 + dependenciesMeta: + fsevents: + optional: true + checksum: c2c8f2d3e792a963940fbdfa563ce14ef9e14d4d86da645b96d3cd346b8d35c5ce0b992ee08593939b5f718cf0a1f5a90011a056548a1dbf58397d4356786f01 languageName: node linkType: hard @@ -15699,6 +15141,16 @@ __metadata: languageName: node linkType: hard +"jest-leak-detector@npm:^29.7.0": + version: 29.7.0 + resolution: "jest-leak-detector@npm:29.7.0" + dependencies: + jest-get-type: ^29.6.3 + pretty-format: ^29.7.0 + checksum: e3950e3ddd71e1d0c22924c51a300a1c2db6cf69ec1e51f95ccf424bcc070f78664813bef7aed4b16b96dfbdeea53fe358f8aeaaea84346ae15c3735758f1605 + languageName: node + linkType: hard + "jest-matcher-utils@npm:^27.0.0, jest-matcher-utils@npm:^27.5.1": version: 27.5.1 resolution: "jest-matcher-utils@npm:27.5.1" @@ -15723,6 +15175,18 @@ __metadata: languageName: node linkType: hard +"jest-matcher-utils@npm:^29.7.0": + version: 29.7.0 + resolution: "jest-matcher-utils@npm:29.7.0" + dependencies: + chalk: ^4.0.0 + jest-diff: ^29.7.0 + jest-get-type: ^29.6.3 + pretty-format: ^29.7.0 + checksum: d7259e5f995d915e8a37a8fd494cb7d6af24cd2a287b200f831717ba0d015190375f9f5dc35393b8ba2aae9b2ebd60984635269c7f8cff7d85b077543b7744cd + languageName: node + linkType: hard + "jest-message-util@npm:^27.5.1": version: 27.5.1 resolution: "jest-message-util@npm:27.5.1" @@ -15757,6 +15221,23 @@ __metadata: languageName: node linkType: hard +"jest-message-util@npm:^29.7.0": + version: 29.7.0 + resolution: "jest-message-util@npm:29.7.0" + dependencies: + "@babel/code-frame": ^7.12.13 + "@jest/types": ^29.6.3 + "@types/stack-utils": ^2.0.0 + chalk: ^4.0.0 + graceful-fs: ^4.2.9 + micromatch: ^4.0.4 + pretty-format: ^29.7.0 + slash: ^3.0.0 + stack-utils: ^2.0.3 + checksum: a9d025b1c6726a2ff17d54cc694de088b0489456c69106be6b615db7a51b7beb66788bea7a59991a019d924fbf20f67d085a445aedb9a4d6760363f4d7d09930 + languageName: node + linkType: hard + "jest-mock@npm:^27.5.1": version: 27.5.1 resolution: "jest-mock@npm:27.5.1" @@ -15778,6 +15259,17 @@ __metadata: languageName: node linkType: hard +"jest-mock@npm:^29.7.0": + version: 29.7.0 + resolution: "jest-mock@npm:29.7.0" + dependencies: + "@jest/types": ^29.6.3 + "@types/node": "*" + jest-util: ^29.7.0 + checksum: 81ba9b68689a60be1482212878973700347cb72833c5e5af09895882b9eb5c4e02843a1bbdf23f94c52d42708bab53a30c45a3482952c9eec173d1eaac5b86c5 + languageName: node + linkType: hard + "jest-pnp-resolver@npm:^1.2.2": version: 1.2.3 resolution: "jest-pnp-resolver@npm:1.2.3" @@ -15804,6 +15296,13 @@ __metadata: languageName: node linkType: hard +"jest-regex-util@npm:^29.6.3": + version: 29.6.3 + resolution: "jest-regex-util@npm:29.6.3" + checksum: 0518beeb9bf1228261695e54f0feaad3606df26a19764bc19541e0fc6e2a3737191904607fb72f3f2ce85d9c16b28df79b7b1ec9443aa08c3ef0e9efda6f8f2a + languageName: node + linkType: hard + "jest-resolve-dependencies@npm:^27.5.1": version: 27.5.1 resolution: "jest-resolve-dependencies@npm:27.5.1" @@ -15825,6 +15324,16 @@ __metadata: languageName: node linkType: hard +"jest-resolve-dependencies@npm:^29.7.0": + version: 29.7.0 + resolution: "jest-resolve-dependencies@npm:29.7.0" + dependencies: + jest-regex-util: ^29.6.3 + jest-snapshot: ^29.7.0 + checksum: aeb75d8150aaae60ca2bb345a0d198f23496494677cd6aefa26fc005faf354061f073982175daaf32b4b9d86b26ca928586344516e3e6969aa614cb13b883984 + languageName: node + linkType: hard + "jest-resolve@npm:^27.5.1": version: 27.5.1 resolution: "jest-resolve@npm:27.5.1" @@ -15860,6 +15369,23 @@ __metadata: languageName: node linkType: hard +"jest-resolve@npm:^29.7.0": + version: 29.7.0 + resolution: "jest-resolve@npm:29.7.0" + dependencies: + chalk: ^4.0.0 + graceful-fs: ^4.2.9 + jest-haste-map: ^29.7.0 + jest-pnp-resolver: ^1.2.2 + jest-util: ^29.7.0 + jest-validate: ^29.7.0 + resolve: ^1.20.0 + resolve.exports: ^2.0.0 + slash: ^3.0.0 + checksum: 0ca218e10731aa17920526ec39deaec59ab9b966237905ffc4545444481112cd422f01581230eceb7e82d86f44a543d520a71391ec66e1b4ef1a578bd5c73487 + languageName: node + linkType: hard + "jest-runner@npm:^27.5.1": version: 27.5.1 resolution: "jest-runner@npm:27.5.1" @@ -15918,6 +15444,35 @@ __metadata: languageName: node linkType: hard +"jest-runner@npm:^29.7.0": + version: 29.7.0 + resolution: "jest-runner@npm:29.7.0" + dependencies: + "@jest/console": ^29.7.0 + "@jest/environment": ^29.7.0 + "@jest/test-result": ^29.7.0 + "@jest/transform": ^29.7.0 + "@jest/types": ^29.6.3 + "@types/node": "*" + chalk: ^4.0.0 + emittery: ^0.13.1 + graceful-fs: ^4.2.9 + jest-docblock: ^29.7.0 + jest-environment-node: ^29.7.0 + jest-haste-map: ^29.7.0 + jest-leak-detector: ^29.7.0 + jest-message-util: ^29.7.0 + jest-resolve: ^29.7.0 + jest-runtime: ^29.7.0 + jest-util: ^29.7.0 + jest-watcher: ^29.7.0 + jest-worker: ^29.7.0 + p-limit: ^3.1.0 + source-map-support: 0.5.13 + checksum: f0405778ea64812bf9b5c50b598850d94ccf95d7ba21f090c64827b41decd680ee19fcbb494007cdd7f5d0d8906bfc9eceddd8fa583e753e736ecd462d4682fb + languageName: node + linkType: hard + "jest-runtime@npm:^27.5.1": version: 27.5.1 resolution: "jest-runtime@npm:27.5.1" @@ -15978,6 +15533,36 @@ __metadata: languageName: node linkType: hard +"jest-runtime@npm:^29.7.0": + version: 29.7.0 + resolution: "jest-runtime@npm:29.7.0" + dependencies: + "@jest/environment": ^29.7.0 + "@jest/fake-timers": ^29.7.0 + "@jest/globals": ^29.7.0 + "@jest/source-map": ^29.6.3 + "@jest/test-result": ^29.7.0 + "@jest/transform": ^29.7.0 + "@jest/types": ^29.6.3 + "@types/node": "*" + chalk: ^4.0.0 + cjs-module-lexer: ^1.0.0 + collect-v8-coverage: ^1.0.0 + glob: ^7.1.3 + graceful-fs: ^4.2.9 + jest-haste-map: ^29.7.0 + jest-message-util: ^29.7.0 + jest-mock: ^29.7.0 + jest-regex-util: ^29.6.3 + jest-resolve: ^29.7.0 + jest-snapshot: ^29.7.0 + jest-util: ^29.7.0 + slash: ^3.0.0 + strip-bom: ^4.0.0 + checksum: d19f113d013e80691e07047f68e1e3448ef024ff2c6b586ce4f90cd7d4c62a2cd1d460110491019719f3c59bfebe16f0e201ed005ef9f80e2cf798c374eed54e + languageName: node + linkType: hard + "jest-serializer@npm:^27.5.1": version: 27.5.1 resolution: "jest-serializer@npm:27.5.1" @@ -16049,6 +15634,34 @@ __metadata: languageName: node linkType: hard +"jest-snapshot@npm:^29.7.0": + version: 29.7.0 + resolution: "jest-snapshot@npm:29.7.0" + dependencies: + "@babel/core": ^7.11.6 + "@babel/generator": ^7.7.2 + "@babel/plugin-syntax-jsx": ^7.7.2 + "@babel/plugin-syntax-typescript": ^7.7.2 + "@babel/types": ^7.3.3 + "@jest/expect-utils": ^29.7.0 + "@jest/transform": ^29.7.0 + "@jest/types": ^29.6.3 + babel-preset-current-node-syntax: ^1.0.0 + chalk: ^4.0.0 + expect: ^29.7.0 + graceful-fs: ^4.2.9 + jest-diff: ^29.7.0 + jest-get-type: ^29.6.3 + jest-matcher-utils: ^29.7.0 + jest-message-util: ^29.7.0 + jest-util: ^29.7.0 + natural-compare: ^1.4.0 + pretty-format: ^29.7.0 + semver: ^7.5.3 + checksum: 86821c3ad0b6899521ce75ee1ae7b01b17e6dfeff9166f2cf17f012e0c5d8c798f30f9e4f8f7f5bed01ea7b55a6bc159f5eda778311162cbfa48785447c237ad + languageName: node + linkType: hard + "jest-util@npm:^27.0.0, jest-util@npm:^27.5.1": version: 27.5.1 resolution: "jest-util@npm:27.5.1" @@ -16063,7 +15676,7 @@ __metadata: languageName: node linkType: hard -"jest-util@npm:^29.0.0, jest-util@npm:^29.5.0": +"jest-util@npm:^29.5.0": version: 29.5.0 resolution: "jest-util@npm:29.5.0" dependencies: @@ -16077,6 +15690,20 @@ __metadata: languageName: node linkType: hard +"jest-util@npm:^29.7.0": + version: 29.7.0 + resolution: "jest-util@npm:29.7.0" + dependencies: + "@jest/types": ^29.6.3 + "@types/node": "*" + chalk: ^4.0.0 + ci-info: ^3.2.0 + graceful-fs: ^4.2.9 + picomatch: ^2.2.3 + checksum: 042ab4980f4ccd4d50226e01e5c7376a8556b472442ca6091a8f102488c0f22e6e8b89ea874111d2328a2080083bf3225c86f3788c52af0bd0345a00eb57a3ca + languageName: node + linkType: hard + "jest-validate@npm:^27.5.1": version: 27.5.1 resolution: "jest-validate@npm:27.5.1" @@ -16105,6 +15732,20 @@ __metadata: languageName: node linkType: hard +"jest-validate@npm:^29.7.0": + version: 29.7.0 + resolution: "jest-validate@npm:29.7.0" + dependencies: + "@jest/types": ^29.6.3 + camelcase: ^6.2.0 + chalk: ^4.0.0 + jest-get-type: ^29.6.3 + leven: ^3.1.0 + pretty-format: ^29.7.0 + checksum: 191fcdc980f8a0de4dbdd879fa276435d00eb157a48683af7b3b1b98b0f7d9de7ffe12689b617779097ff1ed77601b9f7126b0871bba4f776e222c40f62e9dae + languageName: node + linkType: hard + "jest-watcher@npm:^27.5.1": version: 27.5.1 resolution: "jest-watcher@npm:27.5.1" @@ -16136,6 +15777,22 @@ __metadata: languageName: node linkType: hard +"jest-watcher@npm:^29.7.0": + version: 29.7.0 + resolution: "jest-watcher@npm:29.7.0" + dependencies: + "@jest/test-result": ^29.7.0 + "@jest/types": ^29.6.3 + "@types/node": "*" + ansi-escapes: ^4.2.1 + chalk: ^4.0.0 + emittery: ^0.13.1 + jest-util: ^29.7.0 + string-length: ^4.0.1 + checksum: 67e6e7fe695416deff96b93a14a561a6db69389a0667e9489f24485bb85e5b54e12f3b2ba511ec0b777eca1e727235b073e3ebcdd473d68888650489f88df92f + languageName: node + linkType: hard + "jest-worker@npm:27.0.0-next.5": version: 27.0.0-next.5 resolution: "jest-worker@npm:27.0.0-next.5" @@ -16170,6 +15827,18 @@ __metadata: languageName: node linkType: hard +"jest-worker@npm:^29.7.0": + version: 29.7.0 + resolution: "jest-worker@npm:29.7.0" + dependencies: + "@types/node": "*" + jest-util: ^29.7.0 + merge-stream: ^2.0.0 + supports-color: ^8.0.0 + checksum: 30fff60af49675273644d408b650fc2eb4b5dcafc5a0a455f238322a8f9d8a98d847baca9d51ff197b6747f54c7901daa2287799230b856a0f48287d131f8c13 + languageName: node + linkType: hard + "jest@npm:27.0.6": version: 27.0.6 resolution: "jest@npm:27.0.6" @@ -16188,7 +15857,7 @@ __metadata: languageName: node linkType: hard -"jest@npm:27.5.1, jest@npm:^27.0.6, jest@npm:^27.1.1": +"jest@npm:27.5.1, jest@npm:^27.1.1": version: 27.5.1 resolution: "jest@npm:27.5.1" dependencies: @@ -16225,6 +15894,25 @@ __metadata: languageName: node linkType: hard +"jest@npm:^29.7.0": + version: 29.7.0 + resolution: "jest@npm:29.7.0" + dependencies: + "@jest/core": ^29.7.0 + "@jest/types": ^29.6.3 + import-local: ^3.0.2 + jest-cli: ^29.7.0 + peerDependencies: + node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 + peerDependenciesMeta: + node-notifier: + optional: true + bin: + jest: bin/jest.js + checksum: 17ca8d67504a7dbb1998cf3c3077ec9031ba3eb512da8d71cb91bcabb2b8995c4e4b292b740cb9bf1cbff5ce3e110b3f7c777b0cefb6f41ab05445f248d0ee0b + languageName: node + linkType: hard + "joi@npm:^17.3.0": version: 17.9.2 resolution: "joi@npm:17.9.2" @@ -16363,15 +16051,6 @@ __metadata: languageName: node linkType: hard -"jsesc@npm:~0.5.0": - version: 0.5.0 - resolution: "jsesc@npm:0.5.0" - bin: - jsesc: bin/jsesc - checksum: b8b44cbfc92f198ad972fba706ee6a1dfa7485321ee8c0b25f5cedd538dcb20cde3197de16a7265430fce8277a12db066219369e3d51055038946039f6e20e17 - languageName: node - linkType: hard - "json-buffer@npm:3.0.0": version: 3.0.0 resolution: "json-buffer@npm:3.0.0" @@ -16428,7 +16107,7 @@ __metadata: languageName: node linkType: hard -"json5@npm:2.x, json5@npm:^2.2.2, json5@npm:^2.2.3": +"json5@npm:2.x, json5@npm:^2.2.2": version: 2.2.3 resolution: "json5@npm:2.2.3" bin: @@ -16448,7 +16127,7 @@ __metadata: languageName: node linkType: hard -"jsonc-parser@npm:3.2.0": +"jsonc-parser@npm:3.2.0, jsonc-parser@npm:^3.2.0": version: 3.2.0 resolution: "jsonc-parser@npm:3.2.0" checksum: 946dd9a5f326b745aa326d48a7257e3f4a4b62c5e98ec8e49fa2bdd8d96cef7e6febf1399f5c7016114fd1f68a1c62c6138826d5d90bc650448e3cf0951c53c7 @@ -17033,7 +16712,7 @@ __metadata: languageName: node linkType: hard -"lodash.debounce@npm:4.0.8, lodash.debounce@npm:^4.0.8": +"lodash.debounce@npm:4.0.8": version: 4.0.8 resolution: "lodash.debounce@npm:4.0.8" checksum: a3f527d22c548f43ae31c861ada88b2637eb48ac6aa3eb56e82d44917971b8aa96fbb37aa60efea674dc4ee8c42074f90f7b1f772e9db375435f6c83a19b3bc6 @@ -17152,7 +16831,7 @@ __metadata: languageName: node linkType: hard -"lodash@npm:4.x, lodash@npm:^4.11.1, lodash@npm:^4.17.15, lodash@npm:^4.17.21, lodash@npm:^4.17.4, lodash@npm:^4.5.1, lodash@npm:^4.7.0": +"lodash@npm:4.x, lodash@npm:^4.17.15, lodash@npm:^4.17.21, lodash@npm:^4.17.4, lodash@npm:^4.5.1, lodash@npm:^4.7.0": version: 4.17.21 resolution: "lodash@npm:4.17.21" checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7 @@ -17181,7 +16860,7 @@ __metadata: languageName: node linkType: hard -"logform@npm:^2.2.0, logform@npm:^2.3.2, logform@npm:^2.4.0": +"logform@npm:^2.2.0, logform@npm:^2.3.2": version: 2.5.1 resolution: "logform@npm:2.5.1" dependencies: @@ -18955,7 +18634,7 @@ __metadata: languageName: node linkType: hard -"object.assign@npm:^4.1.0, object.assign@npm:^4.1.3, object.assign@npm:^4.1.4": +"object.assign@npm:^4.1.3, object.assign@npm:^4.1.4": version: 4.1.4 resolution: "object.assign@npm:4.1.4" dependencies: @@ -20171,6 +19850,17 @@ __metadata: languageName: node linkType: hard +"pretty-format@npm:^29.7.0": + version: 29.7.0 + resolution: "pretty-format@npm:29.7.0" + dependencies: + "@jest/schemas": ^29.6.3 + ansi-styles: ^5.0.0 + react-is: ^18.0.0 + checksum: 032c1602383e71e9c0c02a01bbd25d6759d60e9c7cf21937dde8357aa753da348fcec5def5d1002c9678a8524d5fe099ad98861286550ef44de8808cc61e43b6 + languageName: node + linkType: hard + "proc-log@npm:^2.0.0, proc-log@npm:^2.0.1": version: 2.0.1 resolution: "proc-log@npm:2.0.1" @@ -21553,22 +21243,6 @@ __metadata: languageName: node linkType: hard -"regenerate-unicode-properties@npm:^10.1.0": - version: 10.1.0 - resolution: "regenerate-unicode-properties@npm:10.1.0" - dependencies: - regenerate: ^1.4.2 - checksum: b1a8929588433ab8b9dc1a34cf3665b3b472f79f2af6ceae00d905fc496b332b9af09c6718fb28c730918f19a00dc1d7310adbaa9b72a2ec7ad2f435da8ace17 - languageName: node - linkType: hard - -"regenerate@npm:^1.4.2": - version: 1.4.2 - resolution: "regenerate@npm:1.4.2" - checksum: 3317a09b2f802da8db09aa276e469b57a6c0dd818347e05b8862959c6193408242f150db5de83c12c3fa99091ad95fb42a6db2c3329bfaa12a0ea4cbbeb30cb0 - languageName: node - linkType: hard - "regenerator-runtime@npm:^0.13.11, regenerator-runtime@npm:^0.13.4": version: 0.13.11 resolution: "regenerator-runtime@npm:0.13.11" @@ -21583,15 +21257,6 @@ __metadata: languageName: node linkType: hard -"regenerator-transform@npm:^0.15.1": - version: 0.15.1 - resolution: "regenerator-transform@npm:0.15.1" - dependencies: - "@babel/runtime": ^7.8.4 - checksum: 2d15bdeadbbfb1d12c93f5775493d85874dbe1d405bec323da5c61ec6e701bc9eea36167483e1a5e752de9b2df59ab9a2dfff6bf3784f2b28af2279a673d29a4 - languageName: node - linkType: hard - "regexp.prototype.flags@npm:^1.2.0, regexp.prototype.flags@npm:^1.4.3, regexp.prototype.flags@npm:^1.5.0": version: 1.5.0 resolution: "regexp.prototype.flags@npm:1.5.0" @@ -21614,20 +21279,6 @@ __metadata: languageName: node linkType: hard -"regexpu-core@npm:^5.3.1": - version: 5.3.2 - resolution: "regexpu-core@npm:5.3.2" - dependencies: - "@babel/regjsgen": ^0.8.0 - regenerate: ^1.4.2 - regenerate-unicode-properties: ^10.1.0 - regjsparser: ^0.9.1 - unicode-match-property-ecmascript: ^2.0.0 - unicode-match-property-value-ecmascript: ^2.1.0 - checksum: 95bb97088419f5396e07769b7de96f995f58137ad75fac5811fb5fe53737766dfff35d66a0ee66babb1eb55386ef981feaef392f9df6d671f3c124812ba24da2 - languageName: node - linkType: hard - "registry-auth-token@npm:^4.0.0": version: 4.2.2 resolution: "registry-auth-token@npm:4.2.2" @@ -21646,17 +21297,6 @@ __metadata: languageName: node linkType: hard -"regjsparser@npm:^0.9.1": - version: 0.9.1 - resolution: "regjsparser@npm:0.9.1" - dependencies: - jsesc: ~0.5.0 - bin: - regjsparser: bin/parser - checksum: 5e1b76afe8f1d03c3beaf9e0d935dd467589c3625f6d65fb8ffa14f224d783a0fed4bf49c2c1b8211043ef92b6117313419edf055a098ed8342e340586741afc - languageName: node - linkType: hard - "rehype-minify-whitespace@npm:^4.0.3": version: 4.0.5 resolution: "rehype-minify-whitespace@npm:4.0.5" @@ -21907,7 +21547,7 @@ __metadata: languageName: node linkType: hard -"resolve@npm:^1.10.0, resolve@npm:^1.12.0, resolve@npm:^1.14.2, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.1": +"resolve@npm:^1.10.0, resolve@npm:^1.12.0, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.1": version: 1.22.2 resolution: "resolve@npm:1.22.2" dependencies: @@ -21946,7 +21586,7 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@^1.10.0#~builtin, resolve@patch:resolve@^1.12.0#~builtin, resolve@patch:resolve@^1.14.2#~builtin, resolve@patch:resolve@^1.19.0#~builtin, resolve@patch:resolve@^1.20.0#~builtin, resolve@patch:resolve@^1.22.1#~builtin": +"resolve@patch:resolve@^1.10.0#~builtin, resolve@patch:resolve@^1.12.0#~builtin, resolve@patch:resolve@^1.19.0#~builtin, resolve@patch:resolve@^1.20.0#~builtin, resolve@patch:resolve@^1.22.1#~builtin": version: 1.22.2 resolution: "resolve@patch:resolve@npm%3A1.22.2#~builtin::version=1.22.2&hash=c3c19d" dependencies: @@ -22288,7 +21928,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^6.0.0, semver@npm:^6.1.1, semver@npm:^6.1.2, semver@npm:^6.2.0, semver@npm:^6.3.0": +"semver@npm:^6.0.0, semver@npm:^6.2.0, semver@npm:^6.3.0": version: 6.3.0 resolution: "semver@npm:6.3.0" bin: @@ -22306,7 +21946,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.5.4": +"semver@npm:^7.5.3, semver@npm:^7.5.4": version: 7.5.4 resolution: "semver@npm:7.5.4" dependencies: @@ -22590,13 +22230,6 @@ __metadata: languageName: node linkType: hard -"slash@npm:^2.0.0": - version: 2.0.0 - resolution: "slash@npm:2.0.0" - checksum: 512d4350735375bd11647233cb0e2f93beca6f53441015eea241fe784d8068281c3987fbaa93e7ef1c38df68d9c60013045c92837423c69115297d6169aa85e6 - languageName: node - linkType: hard - "slash@npm:^4.0.0": version: 4.0.0 resolution: "slash@npm:4.0.0" @@ -22935,15 +22568,6 @@ __metadata: languageName: node linkType: hard -"std-mocks@npm:^1.0.1": - version: 1.0.1 - resolution: "std-mocks@npm:1.0.1" - dependencies: - lodash: ^4.11.1 - checksum: b7b97a39c77e373ea243443e195030ca0e41e0f7e8ba7908993511c4346dfdee0fb0d6edc0a72d2ed4ad3a26a1a4434d7dbde65629172452f3462745a8c8433a - languageName: node - linkType: hard - "stop-iteration-iterator@npm:^1.0.0": version: 1.0.0 resolution: "stop-iteration-iterator@npm:1.0.0" @@ -24126,39 +23750,6 @@ __metadata: languageName: node linkType: hard -"ts-jest@npm:^29.0.3": - version: 29.1.0 - resolution: "ts-jest@npm:29.1.0" - dependencies: - bs-logger: 0.x - fast-json-stable-stringify: 2.x - jest-util: ^29.0.0 - json5: ^2.2.3 - lodash.memoize: 4.x - make-error: 1.x - semver: 7.x - yargs-parser: ^21.0.1 - peerDependencies: - "@babel/core": ">=7.0.0-beta.0 <8" - "@jest/types": ^29.0.0 - babel-jest: ^29.0.0 - jest: ^29.0.0 - typescript: ">=4.3 <6" - peerDependenciesMeta: - "@babel/core": - optional: true - "@jest/types": - optional: true - babel-jest: - optional: true - esbuild: - optional: true - bin: - ts-jest: cli.js - checksum: 535dc42ad523cbe1e387701fb2e448518419b515c082f09b25411f0b3dd0b854cf3e8141c316d6f4b99883aeb4a4f94159cbb1edfb06d7f77ea6229fadb2e1bf - languageName: node - linkType: hard - "ts-node@npm:10.8.0": version: 10.8.0 resolution: "ts-node@npm:10.8.0" @@ -24197,44 +23788,6 @@ __metadata: languageName: node linkType: hard -"ts-node@npm:^10.2.1": - version: 10.9.1 - resolution: "ts-node@npm:10.9.1" - dependencies: - "@cspotcode/source-map-support": ^0.8.0 - "@tsconfig/node10": ^1.0.7 - "@tsconfig/node12": ^1.0.7 - "@tsconfig/node14": ^1.0.0 - "@tsconfig/node16": ^1.0.2 - acorn: ^8.4.1 - acorn-walk: ^8.1.1 - arg: ^4.1.0 - create-require: ^1.1.0 - diff: ^4.0.1 - make-error: ^1.1.1 - v8-compile-cache-lib: ^3.0.1 - yn: 3.1.1 - peerDependencies: - "@swc/core": ">=1.2.50" - "@swc/wasm": ">=1.2.50" - "@types/node": "*" - typescript: ">=2.7" - peerDependenciesMeta: - "@swc/core": - optional: true - "@swc/wasm": - optional: true - bin: - ts-node: dist/bin.js - ts-node-cwd: dist/bin-cwd.js - ts-node-esm: dist/bin-esm.js - ts-node-script: dist/bin-script.js - ts-node-transpile-only: dist/bin-transpile.js - ts-script: dist/bin-script-deprecated.js - checksum: 090adff1302ab20bd3486e6b4799e90f97726ed39e02b39e566f8ab674fd5bd5f727f43615debbfc580d33c6d9d1c6b1b3ce7d8e3cca3e20530a145ffa232c35 - languageName: node - linkType: hard - "ts-pnp@npm:^1.1.6": version: 1.2.0 resolution: "ts-pnp@npm:1.2.0" @@ -24567,13 +24120,13 @@ __metadata: languageName: node linkType: hard -"typescript@npm:^5.2.2": - version: 5.2.2 - resolution: "typescript@npm:5.2.2" +"typescript@npm:^5.3.3": + version: 5.3.3 + resolution: "typescript@npm:5.3.3" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 7912821dac4d962d315c36800fe387cdc0a6298dba7ec171b350b4a6e988b51d7b8f051317786db1094bd7431d526b648aba7da8236607febb26cf5b871d2d3c + checksum: 2007ccb6e51bbbf6fde0a78099efe04dc1c3dfbdff04ca3b6a8bc717991862b39fd6126c0c3ebf2d2d98ac5e960bcaa873826bb2bb241f14277034148f41f6a2 languageName: node linkType: hard @@ -24607,13 +24160,13 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@^5.2.2#~builtin": - version: 5.2.2 - resolution: "typescript@patch:typescript@npm%3A5.2.2#~builtin::version=5.2.2&hash=f3b441" +"typescript@patch:typescript@^5.3.3#~builtin": + version: 5.3.3 + resolution: "typescript@patch:typescript@npm%3A5.3.3#~builtin::version=5.3.3&hash=f3b441" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 0f4da2f15e6f1245e49db15801dbee52f2bbfb267e1c39225afdab5afee1a72839cd86000e65ee9d7e4dfaff12239d28beaf5ee431357fcced15fb08583d72ca + checksum: f61375590b3162599f0f0d5b8737877ac0a7bc52761dbb585d67e7b8753a3a4c42d9a554c4cc929f591ffcf3a2b0602f65ae3ce74714fd5652623a816862b610 languageName: node linkType: hard @@ -24683,37 +24236,6 @@ __metadata: languageName: node linkType: hard -"unicode-canonical-property-names-ecmascript@npm:^2.0.0": - version: 2.0.0 - resolution: "unicode-canonical-property-names-ecmascript@npm:2.0.0" - checksum: 39be078afd014c14dcd957a7a46a60061bc37c4508ba146517f85f60361acf4c7539552645ece25de840e17e293baa5556268d091ca6762747fdd0c705001a45 - languageName: node - linkType: hard - -"unicode-match-property-ecmascript@npm:^2.0.0": - version: 2.0.0 - resolution: "unicode-match-property-ecmascript@npm:2.0.0" - dependencies: - unicode-canonical-property-names-ecmascript: ^2.0.0 - unicode-property-aliases-ecmascript: ^2.0.0 - checksum: 1f34a7434a23df4885b5890ac36c5b2161a809887000be560f56ad4b11126d433c0c1c39baf1016bdabed4ec54829a6190ee37aa24919aa116dc1a5a8a62965a - languageName: node - linkType: hard - -"unicode-match-property-value-ecmascript@npm:^2.1.0": - version: 2.1.0 - resolution: "unicode-match-property-value-ecmascript@npm:2.1.0" - checksum: 8d6f5f586b9ce1ed0e84a37df6b42fdba1317a05b5df0c249962bd5da89528771e2d149837cad11aa26bcb84c35355cb9f58a10c3d41fa3b899181ece6c85220 - languageName: node - linkType: hard - -"unicode-property-aliases-ecmascript@npm:^2.0.0": - version: 2.1.0 - resolution: "unicode-property-aliases-ecmascript@npm:2.1.0" - checksum: 243524431893649b62cc674d877bd64ef292d6071dd2fd01ab4d5ad26efbc104ffcd064f93f8a06b7e4ec54c172bf03f6417921a0d8c3a9994161fe1f88f815b - languageName: node - linkType: hard - "unified@npm:9.2.0": version: 9.2.0 resolution: "unified@npm:9.2.0" @@ -25863,7 +25385,7 @@ __metadata: languageName: node linkType: hard -"winston-transport@npm:^4.4.0, winston-transport@npm:^4.5.0": +"winston-transport@npm:^4.4.0": version: 4.5.0 resolution: "winston-transport@npm:4.5.0" dependencies: @@ -25891,25 +25413,6 @@ __metadata: languageName: node linkType: hard -"winston@npm:^3.3.3": - version: 3.9.0 - resolution: "winston@npm:3.9.0" - dependencies: - "@colors/colors": 1.5.0 - "@dabh/diagnostics": ^2.0.2 - async: ^3.2.3 - is-stream: ^2.0.0 - logform: ^2.4.0 - one-time: ^1.0.0 - readable-stream: ^3.4.0 - safe-stable-stringify: ^2.3.1 - stack-trace: 0.0.x - triple-beam: ^1.3.0 - winston-transport: ^4.5.0 - checksum: 410f82b7a502106e7d93e62cd21d7e9bcfd37884d0d95921b12526d2fe163e654ec9cd39e18f9884fad5cf6506a45d07bd2519c1dc9c88e82f0f12b2ce9fa510 - languageName: node - linkType: hard - "wonka@npm:>= 4.0.9, wonka@npm:^6.3.2": version: 6.3.2 resolution: "wonka@npm:6.3.2" @@ -26231,7 +25734,7 @@ __metadata: languageName: node linkType: hard -"yargs-parser@npm:21.1.1, yargs-parser@npm:^21.0.1, yargs-parser@npm:^21.1.1": +"yargs-parser@npm:21.1.1, yargs-parser@npm:^21.1.1": version: 21.1.1 resolution: "yargs-parser@npm:21.1.1" checksum: ed2d96a616a9e3e1cc7d204c62ecc61f7aaab633dcbfab2c6df50f7f87b393993fe6640d017759fe112d0cb1e0119f2b4150a87305cc873fd90831c6a58ccf1c