Merge branch 'master' into multilingue-correction-trad

.github/workflows/deploy-tag.yml

@@ -26,7 +26,7 @@ jobs:
         ref: ${{ format('v{0}', inputs.release-version) }}
 
     - name: Set up Python 3.10 (w/ cache)
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.10'
         cache: 'pip'

.github/workflows/deploy.yml

@@ -24,7 +24,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set up Python 3.10 (w/ cache)
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.10'
         cache: 'pip'

.github/workflows/docs.yml

@@ -56,9 +56,9 @@ jobs:
           node-version: "18"
           cache: ${{ steps.detect-package-manager.outputs.manager }}
       - name: Setup Pages
-        uses: actions/configure-pages@v3
+        uses: actions/configure-pages@v5
       - name: Restore cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ./docs/.eleventy/cache
@@ -74,7 +74,7 @@ jobs:
         run: ${{ steps.detect-package-manager.outputs.manager }} run build
         working-directory: ./docs
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v2
+        uses: actions/upload-pages-artifact@v3
         with:
           path: ./docs/_site
 
@@ -88,4 +88,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v4

.github/workflows/node.yml

@@ -35,6 +35,24 @@ jobs:
       working-directory: ${{ matrix.app }}
       run: npm clean-install-test --no-audit --no-fund
 
+    - name: Coveralls
+      uses: coverallsapp/github-action@v2
+      with:
+        base-path: ${{ matrix.app }}
+        parallel: true
+        flag-name: run-${{ join(matrix.*, ' - ') }}
+
     - name: Build (if necessary)
       working-directory: ${{ matrix.app }}
       run: npm run build --if-present
+
+  finish:
+    needs: build
+    if: ${{ always() }}
+    runs-on: ubuntu-latest
+    steps:
+    - name: Coveralls Finished
+      uses: coverallsapp/github-action@v2
+      with:
+        parallel-finished: true
+        carryforward: "run-front,run-graphql,run-export"

.gitignore

@@ -7,3 +7,5 @@ sails/.tmp
 nodemon.dev.json
 /.idea/
 /.run/
+
+coverage/

JOURNAL.md

@@ -1,5 +1,20 @@
 # Journal de développement
 
+## Lundi 30 septembre 2024
+
+### Ce que j'ai aimé/appris
+
+- reprendre l'écriture de ce journal 😄
+- remettre les mains dans le code en retrouvant Roch et Nicolas à Paris 8
+- supprimer du code en redirigeant une fonctionnalité vers le module `stylo-export`
+- supprimer la dépendance au _submodule_ git
+- l'équilibre papote / code
+
+### Ce que j'ai trouvé difficile
+
+- revenir dans un contexte qui a bougé pendant un an, ne pas être au fait des tenants et aboutissants de certaines réflexions (métadonnées)
+- constater qu'un bug empêche l'affichage des articles en local pour des raisons qui m'échappent encore (sentiment de fragilité applicative)
+
 ## Mercredi 9 mars 2022
 
 ### Ce que j'ai aimé/appris

README.md

@@ -1,4 +1,4 @@
-# Stylo
+# Stylo [![Coverage Status](https://coveralls.io/repos/github/EcrituresNumeriques/stylo/badge.svg?branch=master)](https://coveralls.io/github/EcrituresNumeriques/stylo?branch=master) [![tests](https://github.com/EcrituresNumeriques/stylo/actions/workflows/node.yml/badge.svg)](https://github.com/EcrituresNumeriques/stylo/actions/workflows/node.yml)
 
 Stylo est un éditeur de textes pour articles scientifiques en sciences humaines et sociales.
 
@@ -87,3 +87,8 @@ Pour installer une instance Stylo en tant que service à disposition d'utilisate
 ---
 
 [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
+[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FEcrituresNumeriques%2Fstylo.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2FEcrituresNumeriques%2Fstylo?ref=badge_shield)
+
+
+## License
+[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FEcrituresNumeriques%2Fstylo.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2FEcrituresNumeriques%2Fstylo?ref=badge_large)

docs/src/en/firststeps.md

@@ -199,7 +199,7 @@ The bibliography lists the bibliographic references that you have added. The bib
 
 You can directly [structure your references in BibTex](/en/bibtexsyntax/), or export your references in BibTex with your bibliography management tool:
 
-- See tutorials : <a class="btn btn-info" href="http://sens-public.org/IMG/pdf/Utiliser_Zotero.pdf" role="button">Zotero</a> <a class="btn btn-info" href="https://libguides.usask.ca/c.php?g=218034&p=1446316" role="button">Mendeley</a>
+- See tutorials : <a class="btn btn-info" href="https://research.library.gsu.edu/c.php?g=115275" role="button">Zotero</a> <a class="btn btn-info" href="https://libguides.usask.ca/c.php?g=218034&p=1446316" role="button">Mendeley</a>
 
 To add a reference to the article, you just need to click on the reference, then paste (Ctrl+V) the reference in the desired place of the text. This way, a click is the same as "copying" the reference key to the clipboard. Then, you just need to paste it into the body text.
 

docs/src/fr/bibliographie.md

@@ -19,7 +19,7 @@ La bibliographie liste les références bibliographiques que vous avez ajoutées
 
 Vous pouvez directement [structurer vos références en BibTeX](http://www.andy-roberts.net/writing/latex/bibliographies) ou exporter vos références en BibTeX grâce à votre outil de gestion de bibliographie :
 
-- voir tutoriels : <a class="btn btn-info" href="http://archive.sens-public.org/IMG/pdf/Utiliser_Zotero.pdf" role="button">Zotero</a> <a class="btn btn-info" href="https://libguides.usask.ca/c.php?g=218034&p=1446316" role="button">Mendeley</a>
+- voir tutoriels : <a class="btn btn-info" href="https://bib.umontreal.ca/en/citer/logiciels-bibliographiques/zotero/installer" role="button">Zotero</a> <a class="btn btn-info" href="https://libguides.usask.ca/c.php?g=218034&p=1446316" role="button">Mendeley</a>
 
 ## Synchroniser une collection Zotero
 

export/package.json

@@ -9,7 +9,7 @@
     "npm": ">=8"
   },
   "scripts": {
-    "test": "jest",
+    "test": "jest --collectCoverage --coverageReporters html --coverageReporters text-summary --coverageReporters lcovonly --detectOpenHandles",
     "start": "node src/app.js",
     "dev": "npx dotenv -e ../stylo.env npm run start",
     "prod": "NODE_ENV=production node --heapsnapshot-signal=SIGUSR2 src/app.js"

export/src/export.test.js

@@ -51,13 +51,13 @@ test('should create a book export context', () => {
       article: {
         title: 'Chapter 2: The Pool of Tears',
         versions: [
-          {
-            bib: 'Bibliography of chapter 2, first version',
-            md: 'Content of chapter 2, first version',
-          },
           {
             bib: 'Bibliography of chapter 2, second version',
             md: 'Content of chapter 2, second version',
+          },
+          {
+            bib: 'Bibliography of chapter 2, first version',
+            md: 'Content of chapter 2, first version',
           }
         ],
         workingVersion: {

front/.eslintrc.cjs

@@ -3,7 +3,6 @@ module.exports = {
   env: {
     browser: true,
     es2021: true,
-    'jest/globals': true,
   },
   extends: [
     'eslint:recommended',
@@ -23,7 +22,7 @@ module.exports = {
       parser: "jsonc-eslint-parser",
     },
   ],
-  plugins: ['react', 'jest'],
+  plugins: ['react', 'vitest'],
   settings: {
     react: {
       version: '16.13',

front/dockerfile

@@ -16,12 +16,14 @@ COPY ./ /modules/
 RUN set -ex \
     && apk update \
     && apk add linux-headers openssl-dev pcre-dev zlib-dev openssl abuild \
-               musl-dev libxslt libxml2-utils make mercurial gcc unzip git \
+               musl-dev libxslt libxml2-utils make gcc unzip git \
                xz g++ \
     # allow abuild as a root user \
     && printf "#!/bin/sh\\n/usr/bin/abuild -F \"\$@\"\\n" > /usr/local/bin/abuild \
     && chmod +x /usr/local/bin/abuild \
-    && hg clone -r ${NGINX_VERSION}-${PKG_RELEASE} https://hg.nginx.org/pkg-oss/ \
+    && curl -f -sSLO https://github.com/nginx/pkg-oss/archive/${NGINX_VERSION}-${PKG_RELEASE}.tar.gz \
+    && mkdir pkg-oss \
+    && tar xzvf ${NGINX_VERSION}-${PKG_RELEASE}.tar.gz -C pkg-oss --strip-components 1 \
     && cd pkg-oss \
     && mkdir /tmp/packages \
     && for module in "$ENABLED_MODULES"; do \

front/index.html

@@ -3,7 +3,6 @@
   <head>
     <meta charset="utf-8">
     <link rel="icon" href="./favicon.ico">
-    <link rel="preconnect" href="https://polyfill.io">
     <link rel="preconnect" href="https://analyseweb.huma-num.fr">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
@@ -19,7 +18,6 @@
     <meta name="twitter:title" content="Stylo">
     <meta name="twitter:description" content="Stylo, online text editor for scholars">
     <meta name="twitter:image" content="/favicon.ico">
-    <script src="https://polyfill.io/v3/polyfill.min.js"></script>
     {{#if SNOWPACK_MATOMO}}
     <!-- Matomo -->
     <script>