From e8d39ab2f7988e7dac52b61e62830fd1832baf54 Mon Sep 17 00:00:00 2001
From: Ana Gelez <ana+git@gelez.xyz>
Date: Tue, 23 Jun 2026 23:42:49 +0200
Subject: [PATCH 1/6] =?UTF-8?q?Passage=20=C3=A0=20Typescript=206?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 tsconfig.json     | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4ac6ad8e..8b52bf5c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -52,7 +52,7 @@
         "sinon-chai": "^3.7.0",
         "svelte": "^5.0.0",
         "svelte-check": "^4.0.0",
-        "typescript": "^5.5.0"
+        "typescript": "^6.0.3"
       }
     },
     "node_modules/@babel/runtime": {
@@ -7411,9 +7411,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.9.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
-      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz",
+      "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
diff --git a/package.json b/package.json
index e6fd0a65..013e03b4 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
     "sinon-chai": "^3.7.0",
     "svelte": "^5.0.0",
     "svelte-check": "^4.0.0",
-    "typescript": "^5.5.0"
+    "typescript": "^6.0.3"
   },
   "dependencies": {
     "@isomorphic-git/lightning-fs": "^4.6.0",
diff --git a/tsconfig.json b/tsconfig.json
index 1f6e3a8e..b48af06f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -11,7 +11,6 @@
     "moduleResolution": "bundler",
     "target": "esnext",
     "lib": ["ES2022", "dom", "dom.iterable"],
-    "downlevelIteration": true,
     "types": ["node", "mocha"],
     "noUnusedLocals": true,
     "noUnusedParameters": true

From 86173f5c6d45e4b4b94b1b7444466663eea29305 Mon Sep 17 00:00:00 2001
From: Ana Gelez <ana+git@gelez.xyz>
Date: Wed, 24 Jun 2026 10:19:18 +0200
Subject: [PATCH 2/6] =?UTF-8?q?Passage=20=C3=A0=20la=20syntaxe=20TypeScrip?=
 =?UTF-8?q?t?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/scripts/{GitAgent.js => GitAgent.ts}   | 173 ++++--------
 .../actions/{article.js => article.ts}        |  61 ++--
 ...nt-repository.js => current-repository.ts} |  53 ++--
 .../{current-user.js => current-user.ts}      |  47 ++--
 assets/scripts/actions/{file.js => file.ts}   |  58 +---
 assets/scripts/actions/{page.js => page.ts}   |  69 ++---
 assets/scripts/actions/{setup.js => setup.ts} |  52 ++--
 .../{buildStatus.js => buildStatus.ts}        |  43 +--
 assets/scripts/components/Header.svelte       |  70 ++---
 assets/scripts/components/Skeleton.svelte     |  24 +-
 .../scripts/components/screens/Account.svelte |  12 +-
 .../components/screens/AfterOauthLogin.svelte |  13 +-
 .../components/screens/ArticleContenu.svelte  |  27 +-
 .../components/screens/AtelierArticles.svelte |  24 +-
 .../components/screens/AtelierPages.svelte    |  24 +-
 .../components/screens/ChooseAccount.svelte   |   2 +-
 .../components/screens/CreateAccount.svelte   |  12 +-
 .../components/screens/CreateNewSite.svelte   |  10 +-
 .../scripts/components/screens/Login.svelte   |  14 +-
 .../components/screens/PageContenu.svelte     |  29 +-
 .../ResolutionDesynchronisation.svelte        |  26 +-
 .../screens/SelectCurrentSite.svelte          |  21 +-
 .../screens/SelectOrCreateSite.svelte         |   2 +-
 .../components/screens/Settings.svelte        |  32 +--
 .../scripts/components/screens/Welcome.svelte |  17 +-
 .../components/screens/intern/Editeur.svelte  |  43 ++-
 .../screens/intern/ListContenu.svelte         |  42 ++-
 assets/scripts/{config.js => config.ts}       |  11 +-
 .../{github.js => github.ts}                  | 130 ++++-----
 assets/scripts/oauth-services-api/gitlab.js   | 264 ------------------
 assets/scripts/oauth-services-api/gitlab.ts   | 239 ++++++++++++++++
 .../oauth-services-api/{index.js => index.ts} |  38 +--
 .../scripts/routeComponentLifeCycle.svelte.js |  62 ----
 .../scripts/routeComponentLifeCycle.svelte.ts |  52 ++++
 .../scripts/routes/{account.js => account.ts} |  12 +-
 ...er-oauth-login.js => after-oauth-login.ts} |   7 +-
 assets/scripts/routes/atelier-articles.js     | 143 ----------
 assets/scripts/routes/atelier-articles.ts     | 142 ++++++++++
 ...t-articles.js => atelier-list-articles.ts} |  27 +-
 ...er-list-pages.js => atelier-list-pages.ts} |  16 +-
 assets/scripts/routes/atelier-pages.js        | 150 ----------
 assets/scripts/routes/atelier-pages.ts        | 150 ++++++++++
 .../{choose-account.js => choose-account.ts}  |   4 +-
 .../{create-account.js => create-account.ts}  |  12 +-
 ...{create-new-site.js => create-new-site.ts} |   2 +-
 assets/scripts/routes/{login.js => login.ts}  |  28 +-
 assets/scripts/routes/{main.js => main.ts}    |   9 +-
 ...ion.js => resolution-desynchronisation.ts} |  16 +-
 ...reate-site.js => select-or-create-site.ts} |   2 +-
 .../routes/{settings.js => settings.ts}       |  29 +-
 ...ng-site.js => start-from-existing-site.ts} |  10 +-
 assets/scripts/routes/urls.js                 |   7 -
 assets/scripts/routes/urls.ts                 |   8 +
 .../scripts/routes/{welcome.js => welcome.ts} |   6 +-
 assets/scripts/scribouilliGitRepo.js          |  66 -----
 assets/scripts/scribouilliGitRepo.ts          |  63 +++++
 assets/scripts/{scripts.js => scripts.ts}     |   2 -
 assets/scripts/{store.js => store.ts}         | 166 +++++------
 assets/scripts/types/atelier.js               |  37 ---
 assets/scripts/types/atelier.ts               |  33 +++
 assets/scripts/types/git.js                   |  88 ------
 assets/scripts/types/git.ts                   |  95 +++++++
 assets/scripts/{utils.js => utils.ts}         |  80 ++----
 docs/conseils.md                              |  30 ++
 package-lock.json                             |  69 +++++
 package.json                                  |   3 +
 rollup.config.js                              |  52 ----
 rollup.config.ts                              |  54 ++++
 tsconfig.json                                 |   5 +-
 69 files changed, 1529 insertions(+), 1890 deletions(-)
 rename assets/scripts/{GitAgent.js => GitAgent.ts} (76%)
 rename assets/scripts/actions/{article.js => article.ts} (77%)
 rename assets/scripts/actions/{current-repository.js => current-repository.ts} (86%)
 rename assets/scripts/actions/{current-user.js => current-user.ts} (74%)
 rename assets/scripts/actions/{file.js => file.ts} (64%)
 rename assets/scripts/actions/{page.js => page.ts} (74%)
 rename assets/scripts/actions/{setup.js => setup.ts} (80%)
 rename assets/scripts/{buildStatus.js => buildStatus.ts} (84%)
 rename assets/scripts/{config.js => config.ts} (80%)
 rename assets/scripts/oauth-services-api/{github.js => github.ts} (56%)
 delete mode 100644 assets/scripts/oauth-services-api/gitlab.js
 create mode 100644 assets/scripts/oauth-services-api/gitlab.ts
 rename assets/scripts/oauth-services-api/{index.js => index.ts} (59%)
 delete mode 100644 assets/scripts/routeComponentLifeCycle.svelte.js
 create mode 100644 assets/scripts/routeComponentLifeCycle.svelte.ts
 rename assets/scripts/routes/{account.js => account.ts} (75%)
 rename assets/scripts/routes/{after-oauth-login.js => after-oauth-login.ts} (94%)
 delete mode 100644 assets/scripts/routes/atelier-articles.js
 create mode 100644 assets/scripts/routes/atelier-articles.ts
 rename assets/scripts/routes/{atelier-list-articles.js => atelier-list-articles.ts} (69%)
 rename assets/scripts/routes/{atelier-list-pages.js => atelier-list-pages.ts} (75%)
 delete mode 100644 assets/scripts/routes/atelier-pages.js
 create mode 100644 assets/scripts/routes/atelier-pages.ts
 rename assets/scripts/routes/{choose-account.js => choose-account.ts} (74%)
 rename assets/scripts/routes/{create-account.js => create-account.ts} (66%)
 rename assets/scripts/routes/{create-new-site.js => create-new-site.ts} (85%)
 rename assets/scripts/routes/{login.js => login.ts} (83%)
 rename assets/scripts/routes/{main.js => main.ts} (94%)
 rename assets/scripts/routes/{resolution-desynchronisation.js => resolution-desynchronisation.ts} (73%)
 rename assets/scripts/routes/{select-or-create-site.js => select-or-create-site.ts} (77%)
 rename assets/scripts/routes/{settings.js => settings.ts} (83%)
 rename assets/scripts/routes/{start-from-existing-site.js => start-from-existing-site.ts} (81%)
 delete mode 100644 assets/scripts/routes/urls.js
 create mode 100644 assets/scripts/routes/urls.ts
 rename assets/scripts/routes/{welcome.js => welcome.ts} (93%)
 delete mode 100644 assets/scripts/scribouilliGitRepo.js
 create mode 100644 assets/scripts/scribouilliGitRepo.ts
 rename assets/scripts/{scripts.js => scripts.ts} (96%)
 rename assets/scripts/{store.js => store.ts} (51%)
 delete mode 100644 assets/scripts/types/atelier.js
 create mode 100644 assets/scripts/types/atelier.ts
 delete mode 100644 assets/scripts/types/git.js
 create mode 100644 assets/scripts/types/git.ts
 rename assets/scripts/{utils.js => utils.ts} (61%)
 create mode 100644 docs/conseils.md
 delete mode 100644 rollup.config.js
 create mode 100644 rollup.config.ts

diff --git a/assets/scripts/GitAgent.js b/assets/scripts/GitAgent.ts
similarity index 76%
rename from assets/scripts/GitAgent.js
rename to assets/scripts/GitAgent.ts
index 51328d4e..8fd96037 100644
--- a/assets/scripts/GitAgent.js
+++ b/assets/scripts/GitAgent.ts
@@ -1,5 +1,3 @@
-//@ts-check
-
 /**
  * Ce fichier gère les interactions avec git (contenu, commits, branches, remotes, pull/pull, etc.)
  * et aussi le contenu sous-jacent et le filesystem
@@ -17,8 +15,8 @@ import http from 'isomorphic-git/http/web'
 
 const DEFAULT_CORS_PROXY_URL = 'https://cors.isomorphic-git.org'
 
-/** @typedef {import('isomorphic-git')} isomorphicGit */
-/** @typedef {import('isomorphic-git').GitAuth} GitAuth */
+import type { CommitObject, GitAuth } from 'isomorphic-git'
+import { ResolutionOption } from './store'
 
 export default class GitAgent {
   #fs
@@ -33,20 +31,20 @@ export default class GitAgent {
   #hostname
   #repoDirectory
 
-  /**
-   * @param { object } _
-   * @param { string } _.repoId
-   * @param { string } _.remoteURL
-   * @param { string } [_.corsProxyURL]
-   * @param { GitAuth } _.auth
-   * @param {((resolutionOptions: import('./store.js').ResolutionOption[]) => void) | undefined } [_.onMergeConflict]
-   */
   constructor({
     repoId,
     remoteURL,
     corsProxyURL = DEFAULT_CORS_PROXY_URL,
     auth,
     onMergeConflict,
+  }: {
+    repoId: string
+    remoteURL: string
+    corsProxyURL?: string
+    auth: GitAuth
+    onMergeConflict?:
+      | ((resolutionOptions: ResolutionOption[]) => void)
+      | undefined
   }) {
     this.#fs = new FS('scribouilli')
 
@@ -63,31 +61,18 @@ export default class GitAgent {
     this.#repoDirectory = `/${this.#hostname}/${this.#repoId}`
   }
 
-  /**
-   *
-   * @param {string} filename
-   * @returns {string}
-   */
-  #path(filename) {
+  #path(filename: string): string {
     return `${this.#repoDirectory}/${filename}`
   }
 
   /**
    * @summary helper to create ref strings for remotes
-   *
-   * @param {string} remote
-   * @param {string} ref
-   * @returns {string}
    */
-  #createRemoteRef(remote, ref) {
+  #createRemoteRef(remote: string, ref: string): string {
     return `remotes/${remote}/${ref}`
   }
 
-  /**
-   *
-   * @returns {ReturnType<isomorphicGit["clone"]>}
-   */
-  clone() {
+  clone(): ReturnType<typeof git.clone> {
     console.info('clone', this.#remoteURL)
     return git.clone({
       fs: this.#fs,
@@ -101,25 +86,18 @@ export default class GitAgent {
     })
   }
 
-  /**
-   *
-   * @returns {ReturnType<isomorphicGit["currentBranch"]>}
-   */
-  currentBranch() {
+  currentBranch(): ReturnType<typeof git.currentBranch> {
     return git.currentBranch({
       fs: this.#fs,
       dir: this.#repoDirectory,
     })
   }
 
-  /**
-   *
-   * @param {string} branch
-   * @param {boolean} [force]
-   * @param {boolean} [checkout]
-   * @returns {ReturnType<isomorphicGit["branch"]>}
-   */
-  branch(branch, force = false, checkout = true) {
+  branch(
+    branch: string,
+    force: boolean = false,
+    checkout: boolean = true,
+  ): ReturnType<typeof git.branch> {
     return git.branch({
       fs: this.#fs,
       dir: this.#repoDirectory,
@@ -129,23 +107,14 @@ export default class GitAgent {
     })
   }
 
-  /**
-   *
-   * @returns {ReturnType<isomorphicGit["listRemotes"]>}
-   */
-  listRemotes() {
+  listRemotes(): ReturnType<typeof git.listRemotes> {
     return git.listRemotes({
       fs: this.#fs,
       dir: this.#repoDirectory,
     })
   }
 
-  /**
-   *
-   * @param {string} [remote]
-   * @returns {ReturnType<isomorphicGit["listBranches"]>}
-   */
-  listBranches(remote) {
+  listBranches(remote: string): ReturnType<typeof git.listBranches> {
     return git.listBranches({
       fs: this.#fs,
       dir: this.#repoDirectory,
@@ -156,10 +125,8 @@ export default class GitAgent {
   /**
    * @summary This version of git push may fail if the remote repo
    * has unmerged changes
-   *
-   * @returns {ReturnType<isomorphicGit["push"]>}
    */
-  falliblePush() {
+  falliblePush(): ReturnType<typeof git.push> {
     console.info('falliblePush')
     return git.push({
       fs: this.#fs,
@@ -176,10 +143,8 @@ export default class GitAgent {
    * @summary This version of git push tries to push
    * then tries to pull if the push fails
    * and tries again to push if the pull succeeded
-   *
-   * @returns {Promise<any>}
    */
-  safePush() {
+  safePush(): Promise<any> {
     console.info('safePush')
     return this.falliblePush()
       .catch(err => {
@@ -203,10 +168,8 @@ export default class GitAgent {
 
   /**
    * @summary like git push --force
-   *
-   * @returns {ReturnType<isomorphicGit["push"]>}
    */
-  forcePush() {
+  forcePush(): ReturnType<typeof git.push> {
     console.info('forcePush')
     return git.push({
       fs: this.#fs,
@@ -220,11 +183,7 @@ export default class GitAgent {
     })
   }
 
-  /**
-   *
-   * @returns {ReturnType<isomorphicGit["fetch"]>}
-   */
-  async fetch() {
+  async fetch(): ReturnType<typeof git.fetch> {
     return git.fetch({
       fs: this.#fs,
       http,
@@ -235,12 +194,9 @@ export default class GitAgent {
     })
   }
 
-  /**
-   *
-   * @param {string} [ref]
-   * @returns {Promise<import('isomorphic-git').CommitObject & { oid: string }>}
-   */
-  currentCommit(ref = undefined) {
+  currentCommit(
+    ref: string | undefined = undefined,
+  ): Promise<CommitObject & { oid: string }> {
     return git
       .log({
         fs: this.#fs,
@@ -251,12 +207,9 @@ export default class GitAgent {
       .then(commits => ({ oid: commits[0].oid, ...commits[0].commit }))
   }
 
-  /**
-   *
-   * @param {string} [ref]
-   * @returns {ReturnType<isomorphicGit["checkout"]>}
-   */
-  checkout(ref = undefined) {
+  checkout(
+    ref: string | undefined = undefined,
+  ): ReturnType<typeof git.checkout> {
     return git.checkout({
       fs: this.#fs,
       dir: this.#repoDirectory,
@@ -265,13 +218,10 @@ export default class GitAgent {
   }
 
   /**
-   *
    * @summary This function tries to merge
    * If it fails, it forwards the conflict to this.onMergeConflict with resolution propositions
-   *
-   * @returns {Promise<any>}
    */
-  async tryMerging() {
+  async tryMerging(): Promise<any> {
     console.info('tryMerging')
     const [currentBranch, remotes] = await Promise.all([
       this.currentBranch(),
@@ -338,12 +288,8 @@ export default class GitAgent {
 
   /**
    * @summary Create a commit with the given message.
-   *
-   * @param {string} message
-   *
-   * @returns {ReturnType<isomorphicGit["commit"]>} sha of the commit
    */
-  commit(message) {
+  commit(message: string): ReturnType<typeof git.commit> {
     return git.commit({
       fs: this.#fs,
       dir: this.#repoDirectory,
@@ -353,11 +299,8 @@ export default class GitAgent {
 
   /**
    * @summary Remove file from git tree and from the file system
-   *
-   * @param {string} fileName
-   * @returns {ReturnType<isomorphicGit["remove"]>}
    */
-  async removeFile(fileName) {
+  async removeFile(fileName: string): ReturnType<typeof git.remove> {
     const path = this.#path(fileName)
     await this.#fs.promises.unlink(path)
     return await git.remove({
@@ -369,19 +312,13 @@ export default class GitAgent {
 
   /**
    * @summary like a git pull but the merge is better customized
-   *
-   * @returns {Promise<any>}
    */
-  async fetchAndTryMerging() {
+  async fetchAndTryMerging(): Promise<any> {
     await this.fetch()
     await this.tryMerging()
   }
 
-  /**
-   *
-   * @return {Promise<any>}
-   */
-  async pullOrCloneRepo() {
+  async pullOrCloneRepo(): Promise<any> {
     let dirExists = true
     try {
       const stat = await this.#fs.promises.stat(this.#repoDirectory)
@@ -408,12 +345,11 @@ export default class GitAgent {
    * https://isomorphic-git.org/docs/en/setConfig
    *
    * Alors, on doit passer le repoName
-   *
-   * @param {string} login
-   * @param {string} email
-   * @returns {Promise<ReturnType<isomorphicGit["setConfig"]>>}
    */
-  async setAuthor(login, email) {
+  async setAuthor(
+    login: string,
+    email: string,
+  ): Promise<ReturnType<typeof git.setConfig>> {
     if (!login || !email) {
       return
     }
@@ -434,11 +370,8 @@ export default class GitAgent {
 
   /**
    * @summary Get file informations
-   *
-   * @param {string} fileName
-   * @returns {Promise<string>}
    */
-  async getFile(fileName) {
+  async getFile(fileName: string): Promise<string> {
     const content = await this.#fs.promises.readFile(this.#path(fileName), {
       encoding: 'utf8',
     })
@@ -450,13 +383,11 @@ export default class GitAgent {
 
   /**
    * @summary Create or update a file and add it to the git staging area
-   *
-   * @param {string | Uint8Array} content
-   * @param {string} fileName
-   *
-   * @returns {Promise<void>}
    */
-  async writeFile(fileName, content) {
+  async writeFile(
+    fileName: string,
+    content: string | Uint8Array,
+  ): Promise<void> {
     // This condition is here just in case, but it should not happen in practice
     // Having an empty file name will not lead immediately to a crash but will result in
     // some bugs later, see https://github.com/Scribouilli/scribouilli/issues/49#issuecomment-1648226372
@@ -472,21 +403,11 @@ export default class GitAgent {
     })
   }
 
-  /**
-   *
-   * @param {string} dir
-   * @returns
-   */
-  listFiles(dir) {
+  listFiles(dir: string) {
     return this.#fs.promises.readdir(this.#path(dir))
   }
 
-  /**
-   *
-   * @param {string} filename
-   * @returns
-   */
-  async checkFileExistence(filename) {
+  async checkFileExistence(filename: string) {
     const stat = await this.#fs.promises.stat(this.#path(filename))
     return stat.isFile()
   }
diff --git a/assets/scripts/actions/article.js b/assets/scripts/actions/article.ts
similarity index 77%
rename from assets/scripts/actions/article.js
rename to assets/scripts/actions/article.ts
index e5192029..5727bb78 100644
--- a/assets/scripts/actions/article.js
+++ b/assets/scripts/actions/article.ts
@@ -1,18 +1,15 @@
-//@ts-check
-
 import lireFrontMatter from 'front-matter'
 
-import store from './../store.js'
+import store, { type ScribouilliState } from './../store.js'
 import { deleteFileAndPushChanges, writeFileAndPushChanges } from './file.js'
 import { keepMarkdownAndHTMLFiles } from './page.js'
 import { makeArticleFileName, makeArticleFrontMatter } from './../utils.js'
+import { Article } from '../types/atelier.js'
 
 /** Return whether the blog is enabled or not and whether the "Articles" section
  * should be available.
- *
- * @param {import("../store.js").ScribouilliState} state
  */
-export function showArticles(state) {
+export function showArticles(state: ScribouilliState) {
   const index = blogIndex(state)
   return index !== undefined
 }
@@ -22,11 +19,8 @@ export function showArticles(state) {
  *
  * It is true iff there is a file in the root of the project that has `blogIndex: true`
  * in its front-matter.
- *
- * @param {import("../store.js").ScribouilliState} state
- * @returns {string | undefined}
  */
-export function blogIndex(state) {
+export function blogIndex(state: ScribouilliState): string | undefined {
   const pages = state.pages ?? []
   const index = pages.find(p => p.blogIndex ?? false)?.path
   // In previous versions we assumed that the blog index was always
@@ -34,11 +28,7 @@ export function blogIndex(state) {
   return index ?? pages.find(p => p.path === 'blog.md')?.path
 }
 
-/**
- *
- * @returns {Promise<Article[]>}
- */
-export async function getArticlesList() {
+export async function getArticlesList(): Promise<Article[]> {
   const { gitAgent } = store.state
 
   if (!gitAgent) {
@@ -57,7 +47,13 @@ export async function getArticlesList() {
         content.toString(),
       )
       return {
-        title: data?.title,
+        title:
+          typeof data === 'object' &&
+          data !== null &&
+          'title' in data &&
+          typeof data.title === 'string'
+            ? data.title
+            : '',
         path: fullName,
         content: markdownContent,
       }
@@ -65,12 +61,9 @@ export async function getArticlesList() {
   )
 }
 
-/**
- * @param {string} fileName
- *
- * @returns {ReturnType<typeof deleteFileAndPushChanges>}
- */
-export const deleteArticle = fileName => {
+export const deleteArticle = (
+  fileName: string,
+): ReturnType<typeof deleteFileAndPushChanges> => {
   const { state } = store
 
   store.mutations.setArticles(
@@ -85,13 +78,10 @@ export const deleteArticle = fileName => {
   )
 }
 
-/**
- * @param {string} title
- * @param {string} content
- *
- * @returns {ReturnType<typeof writeFileAndPushChanges>}
- */
-export const createArticle = (title, content) => {
+export const createArticle = (
+  title: string,
+  content: string,
+): ReturnType<typeof writeFileAndPushChanges> => {
   const { state } = store
 
   const date = new Date()
@@ -116,14 +106,11 @@ export const createArticle = (title, content) => {
   )
 }
 
-/**
- * @param {string} fileName
- * @param {string} content
- * @param {string} title
- *
- * @returns {ReturnType<typeof writeFileAndPushChanges>}
- */
-export const updateArticle = async (fileName, title, content) => {
+export const updateArticle = async (
+  fileName: string,
+  title: string,
+  content: string,
+): ReturnType<typeof writeFileAndPushChanges> => {
   const { gitAgent } = store.state
 
   if (!gitAgent) {
diff --git a/assets/scripts/actions/current-repository.js b/assets/scripts/actions/current-repository.ts
similarity index 86%
rename from assets/scripts/actions/current-repository.js
rename to assets/scripts/actions/current-repository.ts
index a0decf5f..f9ce8dfb 100644
--- a/assets/scripts/actions/current-repository.js
+++ b/assets/scripts/actions/current-repository.ts
@@ -1,5 +1,3 @@
-//@ts-check
-
 import page from 'page'
 import yaml from 'js-yaml'
 
@@ -34,11 +32,10 @@ export const getCurrentRepoArticles = () => {
  * repository to be functionnal. It sets the current repository in the store,
  * but also the build status and the site repo config. If the user is not
  * logged in, it redirects to the authentication page.
- *
- * @param {string} querystring
- * @returns {Promise<void>}
  */
-export const setCurrentRepositoryFromQuerystring = async querystring => {
+export const setCurrentRepositoryFromQuerystring = async (
+  querystring: string,
+): Promise<void> => {
   const params = new URLSearchParams(querystring)
   const repoName = params.get('repoName')
   const owner = params.get('account')
@@ -101,11 +98,10 @@ export const setCurrentRepositoryFromQuerystring = async querystring => {
   setBuildStatus(scribouilliGitRepo, gitAgent)
 }
 
-/**
- * @param {ScribouilliGitRepo} scribouilliGitRepo
- * @param {GitAgent} gitAgent
- */
-export const setBuildStatus = (scribouilliGitRepo, gitAgent) => {
+export const setBuildStatus = (
+  scribouilliGitRepo: ScribouilliGitRepo,
+  gitAgent: GitAgent,
+) => {
   store.mutations.setBuildStatus(makeBuildStatus(scribouilliGitRepo, gitAgent))
   /*
   Appel sans vérification,
@@ -119,11 +115,10 @@ export const setBuildStatus = (scribouilliGitRepo, gitAgent) => {
  * @description if baseurl param is set, always update the config with it
  * otherwise, wait for currentRepository.publishedWebsiteURL and
  * compute the new config.baseurl from it
- *
- * @param {string} [baseUrl]
- * @returns {Promise<any>}
  */
-export const setBaseUrlInConfigIfNecessary = async baseUrl => {
+export const setBaseUrlInConfigIfNecessary = async (
+  baseUrl?: string,
+): Promise<any> => {
   const currentRepository = store.state.currentRepository
 
   if (!currentRepository) {
@@ -147,7 +142,6 @@ export const setBaseUrlInConfigIfNecessary = async baseUrl => {
   }
 
   const config = await getCurrentRepoConfig()
-  /** @type {string} */
   const currentBaseURL = config.baseurl || ''
 
   if (currentBaseURL === newBaseUrl) {
@@ -172,15 +166,14 @@ export const setBaseUrlInConfigIfNecessary = async baseUrl => {
     )
   }
 }
-
 /**
- * @param {string} plugin
- * @param {string} version
- * @returns {Promise<boolean>} true if the plugin was installed, false if it was already here.
+ * @returns true if the plugin was installed, false if it was already here.
  */
-export async function installPluginIfNecessary(plugin, version) {
-  /** @type {{ plugins: string[] }} */
-  const config = await getCurrentRepoConfig()
+export async function installPluginIfNecessary(
+  plugin: string,
+  version: string,
+): Promise<boolean> {
+  const config: { plugins: string[] } = await getCurrentRepoConfig()
   if (config.plugins.includes(plugin)) {
     return false
   }
@@ -226,10 +219,7 @@ export async function installPluginIfNecessary(plugin, version) {
   return true
 }
 
-/**
- * @returns {Promise<any>}
- */
-const getCurrentRepoConfig = () => {
+const getCurrentRepoConfig = (): Promise<any> => {
   const { currentRepository, gitAgent } = store.state
 
   if (!currentRepository) {
@@ -245,11 +235,10 @@ const getCurrentRepoConfig = () => {
     .catch(handleErrors)
 }
 
-/**
- * @param {string} css
- * @returns {ReturnType<typeof file.writeFileAndPushChanges>}
- */
-export function saveCustomCSS(css, localStore = store) {
+export function saveCustomCSS(
+  css: string,
+  localStore = store,
+): ReturnType<typeof file.writeFileAndPushChanges> {
   localStore.mutations.setTheme(css)
   localStore.state.buildStatus.setBuildingAndCheckStatusLater(10000)
   return file.writeFileAndPushChanges(
diff --git a/assets/scripts/actions/current-user.js b/assets/scripts/actions/current-user.ts
similarity index 74%
rename from assets/scripts/actions/current-user.js
rename to assets/scripts/actions/current-user.ts
index 5d7be9a5..35167882 100644
--- a/assets/scripts/actions/current-user.js
+++ b/assets/scripts/actions/current-user.ts
@@ -1,15 +1,11 @@
-//@ts-check
-
 import page from 'page'
 import { forget } from 'remember'
 
 import { getOAuthServiceAPI } from '../oauth-services-api/index.js'
-import store from '../store.js'
+import store, { ResolutionOption } from '../store.js'
 import { logMessage } from '../utils.js'
 import { OAUTH_PROVIDER_STORAGE_KEY } from '../config.js'
 
-
-
 const logout = () => {
   forget(OAUTH_PROVIDER_STORAGE_KEY)
   store.mutations.logout()
@@ -24,11 +20,14 @@ const logout = () => {
  * It returns the login of the user or the organization. If the user is not
  * logged in, it redirects to the authentication page.
  *
- * @returns {Promise<{login: string, email: string}>} A promise that resolves to the login of the
- * authenticated user or organization.
+ * @returns A promise that resolves to the login of the authenticated user or
+ * organization.
  *
  */
-export const fetchAuthenticatedUserLogin = () => {
+export const fetchAuthenticatedUserLogin = (): Promise<{
+  login: string
+  email: string
+}> => {
   const loginP = getOAuthServiceAPI()
     .getAuthenticatedUser()
     .then(({ login = '' }) => {
@@ -45,8 +44,8 @@ export const fetchAuthenticatedUserLogin = () => {
       switch (errorMessage) {
         case 'INVALIDATE_TOKEN':
         case 'NO_LOGIN': {
-          logout();
-          break;
+          logout()
+          break
         }
 
         default:
@@ -83,19 +82,17 @@ export const fetchAuthenticatedUserLogin = () => {
 }
 
 /**
- * @summary Fetch the list of repositories for the current user
- * and set it in the store.
+ * @summary Fetch the list of repositories for the current user and set it in
+ * the store.
  *
  * @description This function is called on every page that needs the list of
  * repositories for the current user. It returns a promise that resolves to the
  * list of repositories. If the user is not logged in, it redirects to the
  * authentication page.
  *
- * @returns A promise that resolves to the list of
- * repositories for the current user.
- *
+ * @returns A promise that resolves to the list of repositories for the current
+ * user.
  */
-
 export const fetchCurrentUserRepositories = async () => {
   const { login } = await fetchAuthenticatedUserLogin()
   const currentUserRepositoriesP = getOAuthServiceAPI()
@@ -110,16 +107,12 @@ export const fetchCurrentUserRepositories = async () => {
   return currentUserRepositoriesP
 }
 
-/**
- *
- * @param {import('./../store.js').ResolutionOption['resolution']} resolution
- * @returns {import('./../store.js').ResolutionOption['resolution']}
- */
-export function addConflictRemovalAndRedirectToResolution(resolution) {
-  return function (/** @type {any} */ ...args) {
-    return resolution(...args).then(() => {
-      store.mutations.setConflict(undefined)
-      history.back()
-    })
+export function addConflictRemovalAndRedirectToResolution(
+  resolution: ResolutionOption['resolution'],
+): ResolutionOption['resolution'] {
+  return async function (...args: any) {
+    await resolution(...args)
+    store.mutations.setConflict(undefined)
+    history.back()
   }
 }
diff --git a/assets/scripts/actions/file.js b/assets/scripts/actions/file.ts
similarity index 64%
rename from assets/scripts/actions/file.js
rename to assets/scripts/actions/file.ts
index 3ee49ec7..2c348348 100644
--- a/assets/scripts/actions/file.js
+++ b/assets/scripts/actions/file.ts
@@ -1,21 +1,12 @@
-//@ts-check
-
 import GitAgent from '../GitAgent.js'
-import store from './../store.js'
+import store from '../store.js'
 
-/**
- * @param {string} fileName
- * @param {string|Uint8Array} content
- * @param {string} [commitMessage]
- *
- * @returns {Promise<string>}
- */
 export const writeFileAndCommit = async (
-  fileName,
-  content,
-  commitMessage,
+  fileName: string,
+  content: string | Uint8Array,
+  commitMessage: string,
   localStore = store,
-) => {
+): Promise<string> => {
   if (typeof commitMessage !== 'string' || commitMessage === '') {
     commitMessage = `Modification du fichier ${fileName}`
   }
@@ -29,19 +20,12 @@ export const writeFileAndCommit = async (
   return gitAgent.commit(commitMessage)
 }
 
-/**
- * @param {string} fileName
- * @param {string|Uint8Array} content
- * @param {string} [commitMessage]
- *
- * @returns {ReturnType<typeof GitAgent.prototype.safePush>}
- */
 export const writeFileAndPushChanges = async (
-  fileName,
-  content,
-  commitMessage = '',
+  fileName: string,
+  content: string | Uint8Array,
+  commitMessage: string = '',
   localStore = store,
-) => {
+): ReturnType<typeof GitAgent.prototype.safePush> => {
   const { gitAgent } = localStore.state
 
   if (!gitAgent) {
@@ -52,17 +36,11 @@ export const writeFileAndPushChanges = async (
   return gitAgent.safePush()
 }
 
-/**
- * @param {string} fileName
- * @param {string} [commitMessage]
- *
- * @returns {ReturnType<typeof GitAgent.prototype.commit>}
- */
 export const deleteFileAndCommit = async (
-  fileName,
-  commitMessage = '',
+  fileName: string,
+  commitMessage: string = '',
   localStore = store,
-) => {
+): ReturnType<typeof GitAgent.prototype.commit> => {
   const { gitAgent } = localStore.state
 
   if (!gitAgent) {
@@ -77,17 +55,11 @@ export const deleteFileAndCommit = async (
   return gitAgent.commit(commitMessage)
 }
 
-/**
- * @param {string} fileName
- * @param {string} [commitMessage]
- *
- * @returns {ReturnType<typeof GitAgent.prototype.safePush>}
- */
 export const deleteFileAndPushChanges = (
-  fileName,
-  commitMessage,
+  fileName: string,
+  commitMessage: string,
   localStore = store,
-) => {
+): ReturnType<typeof GitAgent.prototype.safePush> => {
   const { gitAgent } = localStore.state
 
   if (!gitAgent) {
diff --git a/assets/scripts/actions/page.js b/assets/scripts/actions/page.ts
similarity index 74%
rename from assets/scripts/actions/page.js
rename to assets/scripts/actions/page.ts
index f0bcce55..69f5b38b 100644
--- a/assets/scripts/actions/page.js
+++ b/assets/scripts/actions/page.ts
@@ -1,25 +1,15 @@
-//@ts-check
-
 import lireFrontMatter from 'front-matter'
 
 import store from './../store.js'
 import { makeFileNameFromTitle, makePageFrontMatter } from './../utils.js'
 import { deleteFileAndPushChanges, writeFileAndPushChanges } from './file.js'
+import { Page } from '../types/atelier.js'
 
-/**
- *
- * @param {string} filename
- * @returns {boolean}
- */
-export function keepMarkdownAndHTMLFiles(filename) {
+export function keepMarkdownAndHTMLFiles(filename: string): boolean {
   return filename.endsWith('.md') || filename.endsWith('.html')
 }
 
-/**
- *
- * @returns {Promise<Page[]>}
- */
-export async function getPagesList() {
+export async function getPagesList(): Promise<Page[]> {
   const { gitAgent } = store.state
 
   if (!gitAgent) {
@@ -31,9 +21,13 @@ export async function getPagesList() {
   return Promise.all(
     allFiles.filter(keepMarkdownAndHTMLFiles).map(async filename => {
       const content = await gitAgent.getFile(filename)
-      const { attributes: data, body: markdownContent } = lireFrontMatter(
-        content.toString(),
-      )
+      // TODO: validate data with zod or equivalent
+      const { attributes: data, body: markdownContent } = lireFrontMatter<{
+        title: string
+        order: number
+        in_menu: boolean | undefined
+        blog_index: boolean | undefined
+      }>(content.toString())
 
       return {
         title: data?.title,
@@ -48,12 +42,9 @@ export async function getPagesList() {
   )
 }
 
-/**
- * @param {string} fileName
- *
- * @returns {ReturnType<typeof deleteFileAndPushChanges>}
- */
-export const deletePage = fileName => {
+export const deletePage = (
+  fileName: string,
+): ReturnType<typeof deleteFileAndPushChanges> => {
   const { state } = store
 
   store.mutations.setPages(
@@ -69,14 +60,11 @@ export const deletePage = fileName => {
   )
 }
 
-/**
- * @param {string} content
- * @param {string} title
- * @param {number} index
- *
- * @returns {ReturnType<typeof writeFileAndPushChanges>}
- */
-export const createPage = (content, title, index) => {
+export const createPage = (
+  content: string,
+  title: string,
+  index: number,
+): ReturnType<typeof writeFileAndPushChanges> => {
   const { state } = store
   const fileName = makeFileNameFromTitle(title)
 
@@ -99,22 +87,13 @@ export const createPage = (content, title, index) => {
   )
 }
 
-/**
- * @param {string} fileName
- * @param {string} content
- * @param {string} title
- * @param {number} index
- * @param {boolean} blogIndex
- *
- * @returns {ReturnType<typeof writeFileAndPushChanges>}
- */
 export const updatePage = async (
-  fileName,
-  title,
-  content,
-  index,
-  blogIndex,
-) => {
+  fileName: string,
+  title: string,
+  content: string,
+  index: number,
+  blogIndex: boolean,
+): ReturnType<typeof writeFileAndPushChanges> => {
   const { gitAgent } = store.state
 
   if (!gitAgent) {
diff --git a/assets/scripts/actions/setup.js b/assets/scripts/actions/setup.ts
similarity index 80%
rename from assets/scripts/actions/setup.js
rename to assets/scripts/actions/setup.ts
index 87d8d06e..52681b29 100644
--- a/assets/scripts/actions/setup.js
+++ b/assets/scripts/actions/setup.ts
@@ -1,8 +1,6 @@
-//@ts-check
-
 import page from 'page'
 
-import store from './../store.js'
+import store, { ResolutionOption } from './../store.js'
 import ScribouilliGitRepo, {
   makePublicRepositoryURL,
   makeRepoId,
@@ -12,14 +10,12 @@ import { makeAtelierListPageURL } from './../routes/urls.js'
 import { logMessage } from './../utils.js'
 import { setBaseUrlInConfigIfNecessary } from './current-repository.js'
 import GitAgent from '../GitAgent.js'
+import git from 'isomorphic-git'
+import type { GitSiteTemplate } from '../types/git.js'
 
-/** @typedef {import('isomorphic-git')} isomorphicGit */
-
-/**
- * @param {ScribouilliGitRepo} scribouilliGitRepo
- * @returns {Promise<void>}
- */
-const waitRepoReady = scribouilliGitRepo => {
+const waitRepoReady = (
+  scribouilliGitRepo: ScribouilliGitRepo,
+): Promise<void> => {
   return new Promise(resolve => {
     const timer = setInterval(() => {
       getOAuthServiceAPI()
@@ -35,10 +31,7 @@ const waitRepoReady = scribouilliGitRepo => {
   })
 }
 
-/**
- * @returns {Promise<void>}
- */
-export const waitOauthProvider = () => {
+export const waitOauthProvider = (): Promise<void> => {
   return new Promise(resolve => {
     if (store.state.oAuthProvider) resolve()
     else {
@@ -52,10 +45,9 @@ export const waitOauthProvider = () => {
   })
 }
 
-/**
- * @returns {Promise<ReturnType<isomorphicGit["setConfig"]>>}
- */
-export const setupLocalRepository = async () => {
+export const setupLocalRepository = async (): Promise<
+  ReturnType<typeof git.setConfig>
+> => {
   const login = await store.state.login
   const { gitAgent, email } = store.state
 
@@ -76,11 +68,12 @@ export const setupLocalRepository = async () => {
 
 /**
  * @summary guess the published URL until a call to OAuthServiceAPI.getPublishedWebsiteURL is made
- *
- * @param {ScribouilliGitRepo} _
- * @returns {string}
  */
-export function guessBaseURL({ owner, repoName, origin }) {
+export function guessBaseURL({
+  owner,
+  repoName,
+  origin,
+}: ScribouilliGitRepo): string {
   if (origin === 'https://github.com') {
     const publishedHostname = `${owner.toLowerCase()}.github.io`
     repoName = repoName.toLowerCase()
@@ -104,16 +97,19 @@ export function guessBaseURL({ owner, repoName, origin }) {
  * and set a GitHub Pages branch. It redirects to the
  * list of pages for the atelier.
  *
- * @param {string} repoName - The name of the repository to create
- * @param {GitSiteTemplate} template - The git site template to use
+ * @param repoName The name of the repository to create
+ * @param template The git site template to use
  *
- * @returns {Promise<void>} A promise that resolves when the repository
+ * @returns A promise that resolves when the repository
  * is created.
  *
- * @throws {string} An error message if the repository cannot be created.
+ * @throws An error message if the repository cannot be created.
  *
  */
-export const createRepositoryForCurrentAccount = async (repoName, template) => {
+export const createRepositoryForCurrentAccount = async (
+  repoName: string,
+  template: GitSiteTemplate,
+): Promise<void> => {
   const owner = await store.state.login
 
   if (!owner) {
@@ -157,7 +153,7 @@ export const createRepositoryForCurrentAccount = async (repoName, template) => {
           repoId: makeRepoId(owner, escapedRepoName),
           remoteURL: remoteURL,
           onMergeConflict: (
-            /** @type {import("./../store.js").ResolutionOption[] | undefined} */ resolutionOptions,
+            resolutionOptions: ResolutionOption[] | undefined,
           ) => {
             store.mutations.setConflict(resolutionOptions)
           },
diff --git a/assets/scripts/buildStatus.js b/assets/scripts/buildStatus.ts
similarity index 84%
rename from assets/scripts/buildStatus.js
rename to assets/scripts/buildStatus.ts
index 0f02a5e2..5bb1a987 100644
--- a/assets/scripts/buildStatus.js
+++ b/assets/scripts/buildStatus.ts
@@ -1,21 +1,16 @@
-//@ts-check
-
 import GitAgent from './GitAgent.js'
 import { getOAuthServiceAPI } from './oauth-services-api/index.js'
+import ScribouilliGitRepo from './scribouilliGitRepo.js'
+import { BuildStatus } from './types/git.js'
 import { isItStillCompiling } from './utils.js'
 
-/**
- *
- * @param {ScribouilliGitRepo} scribouilliGitRepo
- * @param {GitAgent} gitAgent
- */
-export default function (scribouilliGitRepo, gitAgent) {
-  /** @type {BuildStatus} */
-  let repoStatus = 'in_progress'
-  /** @type {(status: BuildStatus) => any} */
-  let reaction
-  /** @type {ReturnType<setTimeout> | undefined} */
-  let timeout
+export default function (
+  scribouilliGitRepo: ScribouilliGitRepo,
+  gitAgent: GitAgent,
+) {
+  let repoStatus: BuildStatus = 'in_progress'
+  let reaction: (status: BuildStatus) => any
+  let timeout: ReturnType<typeof setTimeout> | undefined
 
   function scheduleCheck(delay = 5000) {
     if (!timeout) {
@@ -30,11 +25,7 @@ export default function (scribouilliGitRepo, gitAgent) {
     get status() {
       return repoStatus
     },
-    /**
-     *
-     * @param {(status: BuildStatus) => any} callback
-     */
-    subscribe(callback) {
+    subscribe(callback: (status: BuildStatus) => any) {
       reaction = callback
     },
     checkStatus() {
@@ -76,12 +67,11 @@ export default function (scribouilliGitRepo, gitAgent) {
  * mimoza includes the hash of the latest built commit in a comment in the HTML
  * of each page. We use that to know which version is currently online, and
  * whether the last build succeeded or not.
- *
- * @param {ScribouilliGitRepo} currentRepository
- * @param {GitAgent} gitAgent
- * @returns {Promise<BuildStatus>}
  */
-async function getBuildStatus(currentRepository, gitAgent) {
+async function getBuildStatus(
+  currentRepository: ScribouilliGitRepo,
+  gitAgent: GitAgent,
+): Promise<BuildStatus> {
   const publishedWebsiteURL = await currentRepository.publishedWebsiteURL
   const lastCommit = await gitAgent.currentCommit()
 
@@ -161,10 +151,7 @@ async function getBuildStatus(currentRepository, gitAgent) {
   return 'success'
 }
 
-/**
- * @param {ScribouilliGitRepo} scribouilliGitRepo
- */
-function getViaApi(scribouilliGitRepo) {
+function getViaApi(scribouilliGitRepo: ScribouilliGitRepo) {
   return getOAuthServiceAPI().getPagesWebsiteDeploymentStatus(
     scribouilliGitRepo,
   )
diff --git a/assets/scripts/components/Header.svelte b/assets/scripts/components/Header.svelte
index bc207178..371604ab 100644
--- a/assets/scripts/components/Header.svelte
+++ b/assets/scripts/components/Header.svelte
@@ -1,26 +1,23 @@
-<script>
+<script lang="ts">
   import { run } from 'svelte/legacy';
+  import type { BuildStatus } from '../types/git.js'
+  import type { ScribouilliState } from '../store.js'
+
+  interface Props {
+    buildStatus: { status: BuildStatus} 
+    currentRepository: ScribouilliState["currentRepository"] | undefined
+    showArticles: boolean
+    conflict: ScribouilliState["conflict"]
+  }
 
-  /** @typedef {import("./../store.js").ScribouilliState} ScribouilliState */
-
-  /**
-   * @typedef {Object} Props
-   * @property {{ status: BuildStatus }} buildStatus
-   * @property {ScribouilliState["currentRepository"] | undefined} currentRepository
-   * @property {boolean} showArticles
-   * @property {ScribouilliState["conflict"]} conflict
-   */
-
-  /** @type {Props} */
   let {
     buildStatus,
     currentRepository,
     showArticles,
     conflict
-  } = $props();
+  }: Props = $props();
 
-  /** @type {string} */
-  let status = $state()
+  let status: string | undefined = $state()
 
   run(() => {
     status = buildStatus?.status
@@ -35,47 +32,22 @@
     })
   }
 
-  /** @type {boolean}*/
-  let needsAccountVerification = $derived(status === 'needs_account_verification')
-  
-
+  let needsAccountVerification: boolean = $derived(status === 'needs_account_verification')
   let buildStatusClass = $derived(buildStatus ? `build-${status}` : undefined)
-
-  /** @type {Promise<string> | undefined } */
-  let publishedWebsiteURL = $derived(currentRepository?.publishedWebsiteURL)
-  
-
-  /** @type {string | undefined} */
-  let repositoryURL = $derived(currentRepository?.publicRepositoryURL)
-  
-
-  /** @type {string | undefined} */
-  let repoName = $derived(currentRepository?.repoName)
-  
-
-  /** @type {string | undefined} */
-  let account = $derived(currentRepository?.owner)
-  
-
-  /** @type {string | undefined} */
-  let homeURL =
+  let publishedWebsiteURL: Promise<string> | undefined = $derived(currentRepository?.publishedWebsiteURL)
+  let repositoryURL: string | undefined = $derived(currentRepository?.publicRepositoryURL)
+  let repoName: string | undefined = $derived(currentRepository?.repoName)
+  let account: string | undefined = $derived(currentRepository?.owner)  
+  let homeURL: string | undefined =
     $derived(repoName && account
       ? `/atelier-list-pages?repoName=${repoName}&account=${account}`
       : '/')
-  /**
-   *
-   * @param {string} account
-   * @param {string} repoName
-   * @returns {string}
-   */
-  function makeResolutionDesynchronisationURL(account, repoName) {
+
+      function makeResolutionDesynchronisationURL(account: string, repoName: string): string {
     return `/resolution-desynchronisation?account=${account}&repoName=${repoName}`
   }
 
-  /** @type {string} */
-  let resolutionURL = $derived(makeResolutionDesynchronisationURL(account || '', repoName || ''));
-  
-
+  let resolutionURL: string = $derived(makeResolutionDesynchronisationURL(account || '', repoName || ''));
 </script>
 
 <header>
diff --git a/assets/scripts/components/Skeleton.svelte b/assets/scripts/components/Skeleton.svelte
index 260f7f31..16f915ce 100644
--- a/assets/scripts/components/Skeleton.svelte
+++ b/assets/scripts/components/Skeleton.svelte
@@ -1,26 +1,24 @@
-<script>
+<script lang="ts">
   import Header from "./Header.svelte";
   import Footer from "./Footer.svelte";
+  import type { ScribouilliState } from "../store"
+  import type { Snippet } from "svelte"
 
-  /** @typedef {import("./../store.js").ScribouilliState} ScribouilliState */
+  interface Props {
+    showArticles?: boolean
+    buildStatus?: any
+    currentRepository?: ScribouilliState["currentRepository"] | undefined
+    conflict?: ScribouilliState["conflict"]
+    children?: Snippet
+  }
 
-  /**
-   * @typedef {Object} Props
-   * @property {boolean} [showArticles]
-   * @property {any} [buildStatus]
-   * @property {ScribouilliState["currentRepository"] | undefined} [currentRepository]
-   * @property {ScribouilliState["conflict"]} [conflict]
-   * @property {import('svelte').Snippet} [children]
-   */
-
-  /** @type {Props} */
   let {
     showArticles = false,
     buildStatus = undefined,
     currentRepository = undefined,
     conflict = undefined,
     children
-  } = $props();
+  }: Props = $props();
 </script>
 
 <Header {showArticles} {currentRepository} {buildStatus} {conflict} />
diff --git a/assets/scripts/components/screens/Account.svelte b/assets/scripts/components/screens/Account.svelte
index f3562b63..01277ddd 100644
--- a/assets/scripts/components/screens/Account.svelte
+++ b/assets/scripts/components/screens/Account.svelte
@@ -1,13 +1,11 @@
-<script>
+<script lang="ts">
   import Skeleton from "../Skeleton.svelte";
   
-  /**
-   * @typedef {Object} Props
-   * @property {string} gitProvider
-   */
+  interface Props {
+    gitProvider: string
+  }
 
-  /** @type {Props} */
-  let { gitProvider } = $props();
+  let { gitProvider }: Props = $props();
 </script>
 
 <Skeleton>
diff --git a/assets/scripts/components/screens/AfterOauthLogin.svelte b/assets/scripts/components/screens/AfterOauthLogin.svelte
index 76dcfc59..facb75da 100644
--- a/assets/scripts/components/screens/AfterOauthLogin.svelte
+++ b/assets/scripts/components/screens/AfterOauthLogin.svelte
@@ -1,14 +1,13 @@
-<script>
+<script lang="ts">
   import Skeleton from "./../Skeleton.svelte";
   import SiteCreationLoader from "./../loaders/SiteCreationLoader.svelte";
+  import type { GithubRepository } from "../../types/git";
 
-  /**
-   * @typedef {Object} Props
-   * @property {Promise<GithubRepository[]|Void>} currentUserReposP
-   */
+  interface Props {
+    currentUserReposP: Promise<GithubRepository[] | void>
+  }
 
-  /** @type {Props} */
-  let { currentUserReposP } = $props();
+  let { currentUserReposP }: Props = $props();
   
 </script>
 
diff --git a/assets/scripts/components/screens/ArticleContenu.svelte b/assets/scripts/components/screens/ArticleContenu.svelte
index 38e10c79..117ef033 100644
--- a/assets/scripts/components/screens/ArticleContenu.svelte
+++ b/assets/scripts/components/screens/ArticleContenu.svelte
@@ -1,19 +1,20 @@
-<script>
+<script lang="ts">
   import {makeAtelierListArticlesURL} from '../../routes/atelier-list-articles.js'
+  import type { EditeurFile, FileContenu } from '../../types/atelier.js'
+  import ScribouilliGitRepo from '../../scribouilliGitRepo.js';
 
   import Editeur from "./intern/Editeur.svelte";
-  /**
-   * @typedef {Object} Props
-   * @property {Promise<EditeurFile>} fileP
-   * @property {any} buildStatus
-   * @property {FileContenu[]} contenus
-   * @property {boolean} showArticles
-   * @property {ScribouilliGitRepo} currentRepository
-   * @property {() => void} onDelete
-   * @property {(file: EditeurFile) => void} onSave
-   */
+  
+  interface Props {
+    fileP: Promise<EditeurFile>
+    buildStatus: any
+    contenus: FileContenu[]
+    showArticles: boolean
+    currentRepository: ScribouilliGitRepo
+    onDelete: () => void
+    onSave: (file: EditeurFile) => void
+  }
 
-  /** @type {Props} */
   let {
     fileP,
     buildStatus,
@@ -22,7 +23,7 @@
     currentRepository,
     onDelete,
     onSave,
-  } = $props();
+  }: Props = $props();
 </script>
 
 <Editeur
diff --git a/assets/scripts/components/screens/AtelierArticles.svelte b/assets/scripts/components/screens/AtelierArticles.svelte
index 4d4c8979..d59dfd13 100644
--- a/assets/scripts/components/screens/AtelierArticles.svelte
+++ b/assets/scripts/components/screens/AtelierArticles.svelte
@@ -1,25 +1,23 @@
-<script>
+<script lang="ts">
+  import ScribouilliGitRepo from '../../scribouilliGitRepo'
+  import type { ScribouilliState } from './../../store.js'
   import ListContenu from './intern/ListContenu.svelte'
 
-  /** @typedef {import("./../../store.js").ScribouilliState} ScribouilliState */
-  
-  /**
-   * @typedef {Object} Props
-   * @property {any} buildStatus
-   * @property {any[] | undefined} articles
-   * @property {boolean | undefined} showArticles
-   * @property {ScribouilliGitRepo} currentRepository
-   * @property {ScribouilliState["conflict"]} conflict
-   */
+  interface Props {
+    buildStatus: any
+    articles: any[] | undefined
+    showArticles: boolean | undefined
+    currentRepository: ScribouilliGitRepo
+    conflict: ScribouilliState["conflict"]
+  }
 
-  /** @type {Props} */
   let {
     buildStatus,
     articles,
     showArticles,
     currentRepository,
     conflict
-  } = $props();
+  }: Props = $props();
 </script>
 
 <ListContenu
diff --git a/assets/scripts/components/screens/AtelierPages.svelte b/assets/scripts/components/screens/AtelierPages.svelte
index 71363405..338ead72 100644
--- a/assets/scripts/components/screens/AtelierPages.svelte
+++ b/assets/scripts/components/screens/AtelierPages.svelte
@@ -1,25 +1,23 @@
-<script>
+<script lang="ts">
+  import ScribouilliGitRepo from '../../scribouilliGitRepo'
+  import type { ScribouilliState } from './../../store.js'
   import ListContenu from './intern/ListContenu.svelte'
 
-  /** @typedef {import("./../../store.js").ScribouilliState} ScribouilliState */
-  
-  /**
-   * @typedef {Object} Props
-   * @property {any} buildStatus
-   * @property {any[] | undefined} pages
-   * @property {boolean | undefined} showArticles
-   * @property {ScribouilliGitRepo} currentRepository
-   * @property {ScribouilliState["conflict"]} conflict
-   */
+  interface Props {
+    buildStatus: any
+    pages: any[] | undefined
+    showArticles: boolean | undefined
+    currentRepository: ScribouilliGitRepo
+    conflict: ScribouilliState["conflict"]
+  }
 
-  /** @type {Props} */
   let {
     buildStatus,
     pages,
     showArticles,
     currentRepository,
     conflict
-  } = $props();
+  }: Props = $props();
 </script>
 
 <ListContenu
diff --git a/assets/scripts/components/screens/ChooseAccount.svelte b/assets/scripts/components/screens/ChooseAccount.svelte
index 730b05e5..daabb255 100644
--- a/assets/scripts/components/screens/ChooseAccount.svelte
+++ b/assets/scripts/components/screens/ChooseAccount.svelte
@@ -1,4 +1,4 @@
-<script>
+<script lang="ts">
   import Skeleton from '../Skeleton.svelte'
 </script>
 
diff --git a/assets/scripts/components/screens/CreateAccount.svelte b/assets/scripts/components/screens/CreateAccount.svelte
index bd33d55d..219e6c66 100644
--- a/assets/scripts/components/screens/CreateAccount.svelte
+++ b/assets/scripts/components/screens/CreateAccount.svelte
@@ -1,13 +1,11 @@
-<script>
+<script lang="ts">
   import Skeleton from "../Skeleton.svelte";
 
-  /**
-   * @typedef {Object} Props
-   * @property {string} gitProvider
-   */
+  interface Props {
+    gitProvider: string
+  }
 
-  /** @type {Props} */
-  let { gitProvider } = $props();
+  let { gitProvider }: Props = $props();
 </script>
 
 <Skeleton>
diff --git a/assets/scripts/components/screens/CreateNewSite.svelte b/assets/scripts/components/screens/CreateNewSite.svelte
index 4e40f22d..ca36a553 100644
--- a/assets/scripts/components/screens/CreateNewSite.svelte
+++ b/assets/scripts/components/screens/CreateNewSite.svelte
@@ -1,15 +1,15 @@
-<script>
+<script lang="ts">
   import Skeleton from "./../Skeleton.svelte";
   import SiteCreationLoader from "./../loaders/SiteCreationLoader.svelte";
   import { createRepositoryForCurrentAccount } from "../../actions/setup.js";
-  import { templates } from '../../config.js';
+  import { DEFAULT_TEMPLATE, templates } from '../../config.js';
+  import type { GitSiteTemplate } from '../../types/git'
 
   let name = $state("");
   let loading = $state(false);
   let hasError = $state(false)
 
-  /** @type {GitSiteTemplate} */
-  let selectedTemplate = $state();
+  let selectedTemplate: GitSiteTemplate = $state(DEFAULT_TEMPLATE);
 
   // @ts-ignore
   const onSubmit = (e) => {
@@ -54,7 +54,7 @@
             <label for="template">Je veux créer :</label>
             <select id="template" bind:value={selectedTemplate}>
               {#each templates as template}
-                <option value={template} selected={template === templates.default}>{template.description}</option>
+                <option value={template} selected={template === DEFAULT_TEMPLATE}>{template.description}</option>
               {/each}
             </select>
           </div>
diff --git a/assets/scripts/components/screens/Login.svelte b/assets/scripts/components/screens/Login.svelte
index 63445a3e..24d1fb14 100644
--- a/assets/scripts/components/screens/Login.svelte
+++ b/assets/scripts/components/screens/Login.svelte
@@ -1,14 +1,12 @@
-<script>
+<script lang="ts">
   import Skeleton from "../Skeleton.svelte";
 
-  /**
-   * @typedef {Object} Props
-   * @property {string} href
-   * @property {string} gitProvider
-   */
+  interface Props {
+    href: string
+    gitProvider: string
+  }
 
-  /** @type {Props} */
-  let { href, gitProvider } = $props();
+  let { href, gitProvider }: Props = $props();
 
 </script>
 
diff --git a/assets/scripts/components/screens/PageContenu.svelte b/assets/scripts/components/screens/PageContenu.svelte
index a7e6bc80..35b29366 100644
--- a/assets/scripts/components/screens/PageContenu.svelte
+++ b/assets/scripts/components/screens/PageContenu.svelte
@@ -1,18 +1,19 @@
-<script>
-  import {makeAtelierListPageURL} from '../../routes/urls.js'
+<script lang="ts">
+  import { makeAtelierListPageURL } from '../../routes/urls.js'
+  import ScribouilliGitRepo from '../../scribouilliGitRepo.js'
+  import type { EditeurFile, FileContenu } from '../../types/atelier.js'
   import Editeur from "./intern/Editeur.svelte";
-  /**
-   * @typedef {Object} Props
-   * @property {Promise<EditeurFile>} fileP
-   * @property {any} buildStatus
-   * @property {FileContenu[]} contenus
-   * @property {boolean} showArticles
-   * @property {ScribouilliGitRepo} currentRepository
-   * @property {() => void} onDelete
-   * @property {(file: EditeurFile) => void} onSave
-   */
+  
+  interface Props {
+    fileP: Promise<EditeurFile>
+    buildStatus: any
+    contenus: FileContenu[]
+    showArticles: boolean
+    currentRepository: ScribouilliGitRepo
+    onDelete: () => void
+    onSave: (file: EditeurFile) => void
+  }
 
-  /** @type {Props} */
   let {
     fileP,
     buildStatus,
@@ -21,7 +22,7 @@
     currentRepository,
     onDelete,
     onSave,
-  } = $props();
+  }: Props = $props();
 </script>
 
 <Editeur
diff --git a/assets/scripts/components/screens/ResolutionDesynchronisation.svelte b/assets/scripts/components/screens/ResolutionDesynchronisation.svelte
index 930e813e..11d1ed74 100644
--- a/assets/scripts/components/screens/ResolutionDesynchronisation.svelte
+++ b/assets/scripts/components/screens/ResolutionDesynchronisation.svelte
@@ -1,35 +1,29 @@
-<script>
+<script lang="ts">
     import Skeleton from "../Skeleton.svelte";
     import {addConflictRemovalAndRedirectToResolution} from
     '../../actions/current-user.js'
+  import type { ScribouilliState } from "../../store"
 
-    /** @typedef {import("../../store.js").ScribouilliState} ScribouilliState */
-
-    /**
-     * @typedef {Object} Props
-     * @property {any} buildStatus
-     * @property {boolean | undefined} showArticles
-     * @property {ScribouilliState["currentRepository"]} currentRepository
-     * @property {ScribouilliState["conflict"]} conflict
-     */
+    interface Props {
+        buildStatus: any
+        showArticles: boolean | undefined
+        currentRepository: ScribouilliState["currentRepository"]
+        conflict: ScribouilliState["conflict"]
+    }
 
-    /** @type {Props} */
     let {
         buildStatus,
         showArticles,
         currentRepository,
         conflict
-    } = $props();
+    }: Props = $props();
 
-    /** @type {ScribouilliState["conflict"]} */
-    let newConflictOptions = $derived(conflict && conflict.map(({message, resolution}) => {
+    let newConflictOptions: ScribouilliState["conflict"] = $derived(conflict && conflict.map(({message, resolution}) => {
         return {
             message,
             resolution: addConflictRemovalAndRedirectToResolution(resolution)
         }
     }));
-    
-
 </script>
 
 <!-- Ne pas montrer la bannière d'avertissement de conflit dans le header dans l'écran de résolution de conflit -->
diff --git a/assets/scripts/components/screens/SelectCurrentSite.svelte b/assets/scripts/components/screens/SelectCurrentSite.svelte
index 6b68e670..b6c89bc6 100644
--- a/assets/scripts/components/screens/SelectCurrentSite.svelte
+++ b/assets/scripts/components/screens/SelectCurrentSite.svelte
@@ -1,21 +1,18 @@
-<script>
-  // @ts-check
+<script lang="ts">
   import page from "page";
 
   import Skeleton from "./../Skeleton.svelte";
   import Loader from "./../loaders/Loader.svelte";
+  import type { GithubRepository } from "../../types/git"
 
-  /**
-   * @typedef {Object} Props
-   * @property {string | Promise<string> | undefined} currentAccount
-   * @property {GithubRepository[]} currentAccountRepositories
-   */
+  interface Props {
+    currentAccount: string | Promise<string> | undefined
+    currentAccountRepositories: GithubRepository[]
+  }
 
-  /** @type {Props} */
-  let { currentAccount, currentAccountRepositories } = $props();
+  let { currentAccount, currentAccountRepositories }: Props = $props();
 
-  /** @type {GithubRepository} */
-  let repo = $state()
+  let repo: GithubRepository | undefined = $state()
   let loading = $state(false);
 
   // @ts-ignore
@@ -30,6 +27,8 @@
   // @ts-ignore
   const onSubmit = (e) => {
     e.preventDefault();
+    
+    if (!repo) return
 
     loading = true;
 
diff --git a/assets/scripts/components/screens/SelectOrCreateSite.svelte b/assets/scripts/components/screens/SelectOrCreateSite.svelte
index a2ca96d8..bfe69cf2 100644
--- a/assets/scripts/components/screens/SelectOrCreateSite.svelte
+++ b/assets/scripts/components/screens/SelectOrCreateSite.svelte
@@ -1,4 +1,4 @@
-<script>
+<script lang="ts">
   import Skeleton from "./../Skeleton.svelte";
 </script>
 
diff --git a/assets/scripts/components/screens/Settings.svelte b/assets/scripts/components/screens/Settings.svelte
index 96f45d23..880a935a 100644
--- a/assets/scripts/components/screens/Settings.svelte
+++ b/assets/scripts/components/screens/Settings.svelte
@@ -1,24 +1,18 @@
-<script>
-  // @ts-check
-
+<script lang="ts">
   import Skeleton from '../Skeleton.svelte'
   import { createEventDispatcher } from 'svelte'
 
   const dispatch = createEventDispatcher()
 
-  /** @typedef {import("./../../store.js").ScribouilliState} ScribouilliState */
-
-  /**
-   * @typedef {Object} Props
-   * @property {any} buildStatus
-   * @property {any} theme
-   * @property {any} deleteRepositoryUrl
-   * @property {any} blogEnabled
-   * @property {boolean|undefined} showArticles
-   * @property {any} currentRepository
-   */
+  interface Props {
+    buildStatus: any
+    theme: any
+    deleteRepositoryUrl: any
+    blogEnabled: any
+    showArticles: boolean | undefined
+    currentRepository: any
+  }
 
-  /** @type {Props} */
   let {
     buildStatus,
     theme = $bindable(),
@@ -26,15 +20,11 @@
     blogEnabled = $bindable(),
     showArticles,
     currentRepository
-  } = $props();
+  }: Props = $props();
 
   let notification = $state('')
 
-  /**
-   * @param {string} color
-   * @returns {boolean}
-   */
-  const checkThemeColor = color => {
+  const checkThemeColor = (color: string): boolean => {
     const themeColor = theme.css?.replace(
       /(.*)--couleur-primaire(.*)#(?<color>[a-fA-F0-9]{6});(.*)/gs,
       '#$<color>',
diff --git a/assets/scripts/components/screens/Welcome.svelte b/assets/scripts/components/screens/Welcome.svelte
index 03a02610..309d73b6 100644
--- a/assets/scripts/components/screens/Welcome.svelte
+++ b/assets/scripts/components/screens/Welcome.svelte
@@ -1,17 +1,12 @@
-<script>
+<script lang="ts">
   import Skeleton from "../Skeleton.svelte";
 
-  /** 
-   * @typedef Props
-   * @property {boolean} showWelcome
-   * @property {boolean} isFetchingCurrentUserRepos
-   */
+  interface Props {
+    showWelcome?: boolean;
+    isFetchingCurrentUserRepos?: boolean;
+  }
 
-   /** @type {Props} */
-   const {
-     showWelcome = false,
-     isFetchingCurrentUserRepos = false,
-   } = $props()
+  let { showWelcome = false, isFetchingCurrentUserRepos = false }: Props = $props();
 </script>
 
 <Skeleton>
diff --git a/assets/scripts/components/screens/intern/Editeur.svelte b/assets/scripts/components/screens/intern/Editeur.svelte
index d29c0013..a6e2d14d 100644
--- a/assets/scripts/components/screens/intern/Editeur.svelte
+++ b/assets/scripts/components/screens/intern/Editeur.svelte
@@ -1,5 +1,4 @@
- <script>
-  /** @typedef {import("./../../../store.js").ScribouilliState} ScribouilliState */
+<script lang="ts">
   import {marked} from 'marked'
   import DOMPurify from 'dompurify'
   import Skeleton from '../../Skeleton.svelte'
@@ -7,21 +6,21 @@
   import store from '../../../store'
   import { writeFileAndCommit } from '../../../actions/file'
   import './../../../../styles/editeur-preview/framalibre.css'
-  /**
-   * @typedef {Object} Props
-   * @property {Promise<EditeurFile>} fileP
-   * @property {any} buildStatus
-   * @property {FileContenu[]} [contenus]
-   * @property {string} editionTitle
-   * @property {string} listPrefix
-   * @property {string} deleteTitle
-   * @property {boolean} showArticles
-   * @property {any} currentRepository
-   * @property {() => void} onDelete
-   * @property {(file: EditeurFile) => void} onSave
-   */
-
-  /** @type {Props} */
+  import type { EditeurFile, FileContenu } from "../../../types/atelier"
+  
+  interface Props {
+    fileP: Promise<EditeurFile>
+    buildStatus: any
+    contenus?: FileContenu[]
+    editionTitle: string
+    listPrefix: string
+    deleteTitle: string
+    showArticles: boolean
+    currentRepository: any
+    onDelete: () => void
+    onSave: (file: EditeurFile) => void
+  }
+
   let {
     fileP,
     buildStatus,
@@ -33,10 +32,9 @@
     currentRepository,
     onDelete,
     onSave,
-  } = $props();
+  }: Props = $props();
 
-  /** @type {FileList} */
-  let files = $state()
+  let files: FileList | undefined = $state()
   // single-image selection
   let image = $derived(files && files[0])
   let imageMd = $state('')
@@ -50,8 +48,7 @@
     }
   })
 
-  /** @type {EditeurFile} */
-  let file = $state({
+  let file: EditeurFile = $state({
     fileName: '',
     content: '',
     previousContent: undefined,
@@ -126,6 +123,8 @@
 
   // @ts-ignore
   const imageSelect = async () => {
+    if (!image) return
+
     imageMd = 'Mise en ligne en cours…'
     const buffer = new Uint8Array(await image.arrayBuffer())
     const imageFilePath = `images/${image.name}`
diff --git a/assets/scripts/components/screens/intern/ListContenu.svelte b/assets/scripts/components/screens/intern/ListContenu.svelte
index b47e5094..93383371 100644
--- a/assets/scripts/components/screens/intern/ListContenu.svelte
+++ b/assets/scripts/components/screens/intern/ListContenu.svelte
@@ -1,22 +1,22 @@
-<script>
-  import store from '../../../store.js'
+<script lang="ts">
+  import store, { type ScribouilliState } from '../../../store.js'
   import Skeleton from '../../Skeleton.svelte'
   import { makePageFrontMatter } from '../../../utils.js'
+  import ScribouilliGitRepo from '../../../scribouilliGitRepo.js'
+  import type { FileContenu } from '../../../types/atelier.js';
   
-  /**
-   * @typedef {Object} Props
-   * @property {any} buildStatus
-   * @property {FileContenu[]} [listContenu]
-   * @property {string} title
-   * @property {string} atelierPrefix
-   * @property {string} newContentButtonText
-   * @property {boolean | undefined} showArticles
-   * @property {ScribouilliGitRepo} currentRepository
-   * @property {boolean} allowModification
-   * @property {import('../../../store').ScribouilliState["conflict"]} conflict
-   */
-
-  /** @type {Props} */
+  interface Props {
+    buildStatus: any
+    listContenu?: FileContenu[]
+    title: string
+    atelierPrefix: string
+    newContentButtonText: string
+    showArticles: boolean | undefined
+    currentRepository: ScribouilliGitRepo
+    allowModification: boolean
+    conflict: ScribouilliState["conflict"]
+  }
+
   let {
     buildStatus,
     listContenu = [],
@@ -27,16 +27,10 @@
     currentRepository,
     allowModification,
     conflict
-  } = $props();
+  }: Props = $props();
 
-  /** @type {string} */
   let repoName = $derived(currentRepository.repoName)
-  
-
-  /** @type {string} */
-  let account = $derived(currentRepository.owner)
-  
-
+  let account = $derived(currentRepository.owner) 
   let modification = $state(false)
 
   const gitAgent = store.state.gitAgent
diff --git a/assets/scripts/config.js b/assets/scripts/config.ts
similarity index 80%
rename from assets/scripts/config.js
rename to assets/scripts/config.ts
index da954c60..243a0069 100644
--- a/assets/scripts/config.js
+++ b/assets/scripts/config.ts
@@ -1,3 +1,5 @@
+import type { GitSiteTemplate } from './types/git'
+
 export const OAUTH_PROVIDER_STORAGE_KEY = 'scribouilli_oauth_provider'
 export const TOCTOCTOC_ACCESS_TOKEN_URL_PARAMETER = 'access_token'
 export const TOCTOCTOC_OAUTH_PROVIDER_URL_PARAMETER = 'type'
@@ -7,9 +9,7 @@ export const gitHubApiBaseUrl = 'https://api.github.com'
 
 export const CUSTOM_CSS_PATH = 'assets/css/custom.css'
 
-/** @type {GitSiteTemplate[] & {default: GitSiteTemplate}} */
-// @ts-ignore
-export const templates = [
+export const templates: GitSiteTemplate[] = [
   {
     url: 'https://github.com/Scribouilli/site-template.git',
     description: 'mon site vitrine ou mon blog',
@@ -22,7 +22,6 @@ export const templates = [
   },
 ]
 
-templates.default = templates[0]
+export const DEFAULT_TEMPLATE = templates[0]
 
-/** @type {Element} */
-export const svelteTarget = document.body
+export const svelteTarget: Element = document.body
diff --git a/assets/scripts/oauth-services-api/github.js b/assets/scripts/oauth-services-api/github.ts
similarity index 56%
rename from assets/scripts/oauth-services-api/github.js
rename to assets/scripts/oauth-services-api/github.ts
index 3a716ada..abbdbaba 100644
--- a/assets/scripts/oauth-services-api/github.js
+++ b/assets/scripts/oauth-services-api/github.ts
@@ -1,16 +1,13 @@
 import { gitHubApiBaseUrl } from './../config.js'
+import type { GitSiteTemplate, OAuthServiceAPI } from '../types/git.js'
+import ScribouilliGitRepo from '../scribouilliGitRepo.js'
 
 const GITHUB_JSON_ACCEPT_HEADER = 'application/vnd.github+json'
 
-/**
- * @implements {OAuthServiceAPI}
- */
-export default class GitHubAPI {
-  /**
-   * @param {string} accessToken
-   */
-  constructor(accessToken) {
-    /** @type {string | undefined} */
+export default class GitHubAPI implements OAuthServiceAPI {
+  private accessToken: string | undefined
+
+  constructor(accessToken: string) {
     this.accessToken = accessToken
   }
 
@@ -31,14 +28,12 @@ export default class GitHubAPI {
     })
   }
 
-  /** @type {OAuthServiceAPI["getUserEmails"]} */
   getUserEmails() {
     return this.callAPI(`${gitHubApiBaseUrl}/user/emails`).then(response => {
       return response.json()
     })
   }
 
-  /** @type {OAuthServiceAPI["getCurrentUserRepositories"]} */
   getCurrentUserRepositories() {
     return this.callAPI(
       `${gitHubApiBaseUrl}/user/repos?sort=updated&visibility=public`,
@@ -47,10 +42,12 @@ export default class GitHubAPI {
     })
   }
 
-  /** @type {OAuthServiceAPI["createDefaultRepository"]} */
-  createDefaultRepository({ owner, repoName, publishedWebsiteURL }, template) {
+  async createDefaultRepository(
+    { owner, repoName, publishedWebsiteURL }: ScribouilliGitRepo,
+    template: GitSiteTemplate,
+  ) {
     // Generate a new repository from the theme repository
-    return this.callAPI(
+    const r = await this.callAPI(
       `${gitHubApiBaseUrl}/repos/${template.githubRepoId}/generate`,
       {
         headers: {
@@ -65,58 +62,48 @@ export default class GitHubAPI {
         }),
       },
     )
-      .then(r => r.json())
-      .then(({ url: newRepoAPIURL, clone_url }) => {
-        // Activate GitHub Pages
-        return this.callAPI(`${newRepoAPIURL}/pages`, {
-          method: 'POST',
-          headers: {
-            Authorization: 'token ' + this.accessToken,
-            Accept: GITHUB_JSON_ACCEPT_HEADER,
-          },
-          body: JSON.stringify({
-            build_type: 'workflow',
-          }),
-        })
-          .then(async () => {
-            console.info('Setup repository settings')
-            // Setup repository settings
-            return this.callAPI(newRepoAPIURL, {
-              method: 'POST',
-              headers: {
-                Authorization: 'token ' + this.accessToken,
-                Accept: GITHUB_JSON_ACCEPT_HEADER,
-              },
-              body: JSON.stringify({
-                homepage: (await publishedWebsiteURL) || '',
-                has_issues: false,
-                has_projects: false,
-                has_wiki: false,
-              }),
-            })
-          })
-          .then(() => {
-            console.info('Apply topic to the new repository')
-            // Apply topic to the new repository
-            return this.callAPI(`${newRepoAPIURL}/topics`, {
-              headers: {
-                Authorization: 'token ' + this.accessToken,
-                Accept: GITHUB_JSON_ACCEPT_HEADER,
-              },
-              method: 'PUT',
-              body: JSON.stringify({
-                owner,
-                repo: repoName,
-                names: ['site-scribouilli'],
-              }),
-            })
-          })
-          .then(() => ({ remoteURL: clone_url }))
-      })
+    const { url: newRepoAPIURL, clone_url } = await r.json()
+    await this.callAPI(`${newRepoAPIURL}/pages`, {
+      method: 'POST',
+      headers: {
+        Authorization: 'token ' + this.accessToken,
+        Accept: GITHUB_JSON_ACCEPT_HEADER,
+      },
+      body: JSON.stringify({
+        build_type: 'workflow',
+      }),
+    })
+    console.info('Setup repository settings')
+    await this.callAPI(newRepoAPIURL, {
+      method: 'POST',
+      headers: {
+        Authorization: 'token ' + this.accessToken,
+        Accept: GITHUB_JSON_ACCEPT_HEADER,
+      },
+      body: JSON.stringify({
+        homepage: (await publishedWebsiteURL) || '',
+        has_issues: false,
+        has_projects: false,
+        has_wiki: false,
+      }),
+    })
+    console.info('Apply topic to the new repository')
+    await this.callAPI(`${newRepoAPIURL}/topics`, {
+      headers: {
+        Authorization: 'token ' + this.accessToken,
+        Accept: GITHUB_JSON_ACCEPT_HEADER,
+      },
+      method: 'PUT',
+      body: JSON.stringify({
+        owner,
+        repo: repoName,
+        names: ['site-scribouilli'],
+      }),
+    })
+    return { remoteURL: clone_url }
   }
 
-  /** @type {OAuthServiceAPI["deploy"]} */
-  deploy({ repoId }) {
+  deploy({ repoId }: ScribouilliGitRepo) {
     return this.callAPI(`${gitHubApiBaseUrl}/repos/${repoId}/dispatches`, {
       method: 'POST',
       headers: {
@@ -129,8 +116,7 @@ export default class GitHubAPI {
     })
   }
 
-  /** @type {OAuthServiceAPI["getPagesWebsiteDeploymentStatus"]} */
-  getPagesWebsiteDeploymentStatus({ repoId }) {
+  getPagesWebsiteDeploymentStatus({ repoId }: ScribouilliGitRepo) {
     // TODO: We need to add the `sha` parameter to avoid the GitHub API to return
     // cached data.
     return this.callAPI(
@@ -148,8 +134,7 @@ export default class GitHubAPI {
       })
   }
 
-  /** @type {OAuthServiceAPI["isPagesWebsiteBuilt"]} */
-  isPagesWebsiteBuilt(scribouilliGitRepo) {
+  isPagesWebsiteBuilt(scribouilliGitRepo: ScribouilliGitRepo) {
     return this.getPagesWebsiteDeploymentStatus(scribouilliGitRepo)
       .then(response => {
         return response === 'success'
@@ -159,8 +144,7 @@ export default class GitHubAPI {
       })
   }
 
-  /** @type {OAuthServiceAPI["isRepositoryReady"]} */
-  isRepositoryReady({ repoId }) {
+  isRepositoryReady({ repoId }: ScribouilliGitRepo) {
     return this.callAPI(
       `${gitHubApiBaseUrl}/repos/${repoId}/contents/_config.yml`,
     )
@@ -172,8 +156,7 @@ export default class GitHubAPI {
       })
   }
 
-  /** @type {OAuthServiceAPI["getPublishedWebsiteURL"]} */
-  getPublishedWebsiteURL({ repoId }) {
+  getPublishedWebsiteURL({ repoId }: ScribouilliGitRepo) {
     return this.callAPI(`${gitHubApiBaseUrl}/repos/${repoId}/pages`, {
       headers: {
         Authorization: 'token ' + this.accessToken,
@@ -184,8 +167,7 @@ export default class GitHubAPI {
       .then(({ html_url }) => (html_url ? html_url : undefined))
   }
 
-  /** @type {OAuthServiceAPI["callAPI"]} */
-  callAPI(url, requestParams) {
+  callAPI(url: string, requestParams?: RequestInit) {
     if (requestParams && requestParams.headers === undefined) {
       requestParams.headers = {
         Authorization: 'token ' + this.accessToken,
diff --git a/assets/scripts/oauth-services-api/gitlab.js b/assets/scripts/oauth-services-api/gitlab.js
deleted file mode 100644
index efbd47df..00000000
--- a/assets/scripts/oauth-services-api/gitlab.js
+++ /dev/null
@@ -1,264 +0,0 @@
-//@ts-check
-
-import GitAgent from '../GitAgent.js'
-
-/**
- * @implements {OAuthServiceAPI}
- */
-export default class GitLabAPI {
-  #gitAgentGetter
-  /**
-   * @param {string} accessToken
-   * @param {string} origin
-   * @param {() => GitAgent} gitAgent
-   */
-  constructor(accessToken, origin, gitAgent) {
-    /** @type {string | undefined} */
-    this.accessToken = accessToken
-    this.origin = origin
-    this.authenticatedUser = undefined
-    this.#gitAgentGetter = gitAgent
-  }
-
-  get gitAgent() {
-    return this.#gitAgentGetter()
-  }
-
-  get apiBaseUrl() {
-    return `${this.origin}/api/v4`
-  }
-
-  /** @type {OAuthServiceAPI["getOauthUsernameAndPassword"]} */
-  getOauthUsernameAndPassword() {
-    if (!this.accessToken) {
-      throw new TypeError('Missing accessToken')
-    }
-
-    // cf. https://isomorphic-git.org/docs/en/authentication
-    return {
-      username: 'oauth2',
-      password: this.accessToken,
-    }
-  }
-
-  /** @type {OAuthServiceAPI["getAuthenticatedUser"]} */
-  getAuthenticatedUser() {
-    if (this.authenticatedUser) {
-      return Promise.resolve(this.authenticatedUser)
-    }
-
-    return this.callAPI(`${this.apiBaseUrl}/user`)
-      .then(response => response.json())
-      .then(json => {
-        const user = {
-          id: json.id,
-          login: json.username,
-          email: json.email,
-        }
-
-        this.authenticatedUser = user
-
-        return Promise.resolve(user)
-      })
-  }
-
-  /** @type {OAuthServiceAPI["getUserEmails"]} */
-  getUserEmails() {
-    return this.getAuthenticatedUser().then(({ email }) => {
-      return Promise.resolve([
-        {
-          email,
-          primary: true,
-        },
-      ])
-    })
-  }
-
-  /** @type {OAuthServiceAPI["getCurrentUserRepositories"]} */
-  getCurrentUserRepositories() {
-    return this.getAuthenticatedUser()
-      .then(({ login }) => {
-        return this.callAPI(
-          `${this.apiBaseUrl}/users/${login}/projects?order_by=updated_at&sort=desc&per_page=30&visibility=public`,
-        )
-      })
-      .then(response => response.json())
-      .then(json => {
-        // @ts-ignore
-        const repositories = json.map(repo => {
-          return {
-            id: repo.id,
-            name: repo.name,
-            owner: {
-              login: repo.owner.username,
-            },
-          }
-        })
-
-        return Promise.resolve(repositories)
-      })
-  }
-
-  /** @type {OAuthServiceAPI["createDefaultRepository"]} */
-  createDefaultRepository(scribouilliGitRepo, { url: gitRepoUrl }) {
-    const { repoName } = scribouilliGitRepo
-
-    return this.callAPI(`${this.apiBaseUrl}/projects`, {
-      method: 'POST',
-      headers: {
-        Authorization: 'Bearer ' + this.accessToken,
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
-        import_url: gitRepoUrl,
-        name: repoName,
-        description: 'Mon site Scribouilli',
-        topics: ['site-scribouilli'],
-        visibility: 'public',
-        pages_access_level: 'public',
-      }),
-    })
-      .then(response => response.json())
-      .then(({ http_url_to_repo }) => ({ remoteURL: http_url_to_repo }))
-  }
-
-  /** @type {OAuthServiceAPI["deploy"]} */
-  deploy(scribouilliGitRepo) {
-    console.log('gitlab.deploy', scribouilliGitRepo)
-    return this.gitAgent.currentBranch().then(branch => {
-      console.log('branch', branch)
-      return this.callAPI(
-        `${this.apiBaseUrl}/projects/${encodeURIComponent(
-          scribouilliGitRepo.repoId,
-        )}/pipeline`,
-        {
-          method: 'POST',
-          headers: {
-            Authorization: 'Bearer ' + this.accessToken,
-            'Content-Type': 'application/json',
-          },
-          body: JSON.stringify({
-            ref: branch,
-          }),
-        },
-      ).then(response => {
-        console.log('response', response)
-      })
-    })
-  }
-
-  /** @type {OAuthServiceAPI["getPagesWebsiteDeploymentStatus"]} */
-  getPagesWebsiteDeploymentStatus({ owner, repoName }) {
-    const urlEncodedRepoPath = encodeURIComponent(`${owner}/${repoName}`)
-
-    return this.callAPI(
-      `${this.apiBaseUrl}/projects/${urlEncodedRepoPath}/deployments?per_page=1&order_by=updated_at&sort=desc`,
-    )
-      .then(response => response.json())
-      .then(json => {
-        const status = json[0].status
-        const matchingStatus = {
-          running: 'in_progress',
-          success: 'success',
-          failed: 'error',
-          created: 'in_progress',
-          canceled: 'error',
-          blocked: 'error',
-        }
-
-        console.debug('Deployment status: ', status)
-
-        // @ts-ignore
-        return Promise.resolve(matchingStatus[status])
-      })
-  }
-
-  /** @type {OAuthServiceAPI["isPagesWebsiteBuilt"]} */
-  isPagesWebsiteBuilt(scribouilliGitRepo) {
-    return this.getPagesWebsiteDeploymentStatus(scribouilliGitRepo)
-      .then(response => {
-        return response === 'success'
-      })
-      .catch(() => {
-        return false
-      })
-  }
-
-  /** @type {OAuthServiceAPI["isRepositoryReady"]} */
-  isRepositoryReady({ owner, repoName }) {
-    const urlEncodedRepoPath = encodeURIComponent(`${owner}/${repoName}`)
-
-    // This call is used only at the creation of the repository.
-    // We assume that the git ref is `main`.
-    return this.callAPI(
-      `${this.apiBaseUrl}/projects/${urlEncodedRepoPath}/repository/files/_config.yml?ref=main`,
-    )
-      .then(response => {
-        return response.ok
-      })
-      .catch(() => {
-        return false
-      })
-  }
-
-  /** @type {OAuthServiceAPI["getPublishedWebsiteURL"]} */
-  getPublishedWebsiteURL({ repoName, owner, origin }) {
-    if (origin === 'https://gitlab.com') {
-      return Promise.resolve(`https://${owner}.gitlab.io/${repoName}/`)
-    }
-
-    if (origin === 'https://git.scribouilli.org') {
-      return Promise.resolve(`https://${owner}.monpetitsite.org/${repoName}/`)
-    }
-
-    return Promise.reject('Unknown origin')
-
-    // console.log('gitlab.getPublishedWebsiteURL', repoId)
-    // return this.callAPI(
-    // `${this.apiBaseUrl}/projects/${encodeURIComponent(
-    // repoId,
-    // )}/environments?per_page=1&order_by=updated_at&sort=desc`,
-    // )
-    // .then(response => response.json())
-    // .then(environments => {
-    // console.log('environments', environments)
-    // return environments[0].external_url
-    // })
-    // .catch(error => {
-    // console.log('error', error)
-    // return undefined
-    // })
-  }
-
-  /**
-   * @type {OAuthServiceAPI["callAPI"]}
-   */
-  callAPI(url, requestParams) {
-    if (requestParams && requestParams.headers === undefined) {
-      requestParams.headers = {
-        Authorization: 'Bearer ' + this.accessToken,
-      }
-    }
-
-    if (requestParams === undefined) {
-      requestParams = {
-        headers: {
-          Authorization: 'Bearer ' + this.accessToken,
-        },
-      }
-    }
-
-    return fetch(url, requestParams).then(httpResp => {
-      if (httpResp.status === 404) {
-        throw 'NOT_FOUND'
-      }
-
-      if (httpResp.status === 401) {
-        this.accessToken = undefined
-        console.debug('this accessToken : ', this.accessToken)
-        throw 'INVALIDATE_TOKEN'
-      }
-      return httpResp
-    })
-  }
-}
diff --git a/assets/scripts/oauth-services-api/gitlab.ts b/assets/scripts/oauth-services-api/gitlab.ts
new file mode 100644
index 00000000..0576b08c
--- /dev/null
+++ b/assets/scripts/oauth-services-api/gitlab.ts
@@ -0,0 +1,239 @@
+import GitAgent from '../GitAgent.js'
+import ScribouilliGitRepo from '../scribouilliGitRepo.js'
+import type {
+  BuildStatus,
+  GitSiteTemplate,
+  OAuthServiceAPI,
+} from '../types/git.js'
+
+export default class GitLabAPI implements OAuthServiceAPI {
+  #gitAgentGetter
+
+  public accessToken: string | undefined
+  private origin
+  private authenticatedUser:
+    | undefined
+    | { id: string; login: string; email: string }
+
+  constructor(accessToken: string, origin: string, gitAgent: () => GitAgent) {
+    this.accessToken = accessToken
+    this.origin = origin
+    this.authenticatedUser = undefined
+    this.#gitAgentGetter = gitAgent
+  }
+
+  get gitAgent() {
+    return this.#gitAgentGetter()
+  }
+
+  get apiBaseUrl() {
+    return `${this.origin}/api/v4`
+  }
+
+  getOauthUsernameAndPassword() {
+    if (!this.accessToken) {
+      throw new TypeError('Missing accessToken')
+    }
+
+    // cf. https://isomorphic-git.org/docs/en/authentication
+    return {
+      username: 'oauth2',
+      password: this.accessToken,
+    }
+  }
+
+  async getAuthenticatedUser() {
+    if (this.authenticatedUser) {
+      return Promise.resolve(this.authenticatedUser)
+    }
+
+    const response = await this.callAPI(`${this.apiBaseUrl}/user`)
+    const json = await response.json()
+    const user = {
+      id: json.id,
+      login: json.username,
+      email: json.email,
+    }
+    this.authenticatedUser = user
+    return await Promise.resolve(user)
+  }
+
+  async getUserEmails() {
+    const { email } = await this.getAuthenticatedUser()
+    return await Promise.resolve([
+      {
+        email,
+        primary: true,
+      },
+    ])
+  }
+
+  async getCurrentUserRepositories() {
+    const { login } = await this.getAuthenticatedUser()
+    const response = await this.callAPI(
+      `${this.apiBaseUrl}/users/${login}/projects?order_by=updated_at&sort=desc&per_page=30&visibility=public`,
+    )
+    const json = await response.json()
+    // @ts-ignore
+    const repositories = json.map(repo => {
+      return {
+        id: repo.id,
+        name: repo.name,
+        owner: {
+          login: repo.owner.username,
+        },
+      }
+    })
+    return await Promise.resolve(repositories)
+  }
+
+  async createDefaultRepository(
+    scribouilliGitRepo: ScribouilliGitRepo,
+    { url: gitRepoUrl }: GitSiteTemplate,
+  ) {
+    const { repoName } = scribouilliGitRepo
+
+    const response = await this.callAPI(`${this.apiBaseUrl}/projects`, {
+      method: 'POST',
+      headers: {
+        Authorization: 'Bearer ' + this.accessToken,
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
+        import_url: gitRepoUrl,
+        name: repoName,
+        description: 'Mon site Scribouilli',
+        topics: ['site-scribouilli'],
+        visibility: 'public',
+        pages_access_level: 'public',
+      }),
+    })
+    const { http_url_to_repo } = await response.json()
+    return { remoteURL: http_url_to_repo }
+  }
+
+  async deploy(scribouilliGitRepo: ScribouilliGitRepo) {
+    console.log('gitlab.deploy', scribouilliGitRepo)
+    const branch = await this.gitAgent.currentBranch()
+    console.log('branch', branch)
+    const response = await this.callAPI(
+      `${this.apiBaseUrl}/projects/${encodeURIComponent(
+        scribouilliGitRepo.repoId,
+      )}/pipeline`,
+      {
+        method: 'POST',
+        headers: {
+          Authorization: 'Bearer ' + this.accessToken,
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+          ref: branch,
+        }),
+      },
+    )
+    console.log('response', response)
+  }
+
+  async getPagesWebsiteDeploymentStatus({
+    owner,
+    repoName,
+  }: ScribouilliGitRepo) {
+    const urlEncodedRepoPath = encodeURIComponent(`${owner}/${repoName}`)
+
+    const response = await this.callAPI(
+      `${this.apiBaseUrl}/projects/${urlEncodedRepoPath}/deployments?per_page=1&order_by=updated_at&sort=desc`,
+    )
+    const json = await response.json()
+    const status = json[0].status as string
+    const matchingStatus = {
+      running: 'in_progress',
+      success: 'success',
+      failed: 'error',
+      created: 'in_progress',
+      canceled: 'error',
+      blocked: 'error',
+    } as Record<string, BuildStatus>
+    console.debug('Deployment status: ', status)
+    return await Promise.resolve(matchingStatus[status])
+  }
+
+  async isPagesWebsiteBuilt(scribouilliGitRepo: ScribouilliGitRepo) {
+    try {
+      const response =
+        await this.getPagesWebsiteDeploymentStatus(scribouilliGitRepo)
+      return response === 'success'
+    } catch {
+      return false
+    }
+  }
+
+  async isRepositoryReady({ owner, repoName }: ScribouilliGitRepo) {
+    const urlEncodedRepoPath = encodeURIComponent(`${owner}/${repoName}`)
+
+    // This call is used only at the creation of the repository.
+    // We assume that the git ref is `main`.
+    try {
+      const response = await this.callAPI(
+        `${this.apiBaseUrl}/projects/${urlEncodedRepoPath}/repository/files/_config.yml?ref=main`,
+      )
+      return response.ok
+    } catch {
+      return false
+    }
+  }
+
+  getPublishedWebsiteURL({ repoName, owner, origin }: ScribouilliGitRepo) {
+    if (origin === 'https://gitlab.com') {
+      return Promise.resolve(`https://${owner}.gitlab.io/${repoName}/`)
+    }
+
+    if (origin === 'https://git.scribouilli.org') {
+      return Promise.resolve(`https://${owner}.monpetitsite.org/${repoName}/`)
+    }
+
+    return Promise.reject('Unknown origin')
+
+    // console.log('gitlab.getPublishedWebsiteURL', repoId)
+    // return this.callAPI(
+    // `${this.apiBaseUrl}/projects/${encodeURIComponent(
+    // repoId,
+    // )}/environments?per_page=1&order_by=updated_at&sort=desc`,
+    // )
+    // .then(response => response.json())
+    // .then(environments => {
+    // console.log('environments', environments)
+    // return environments[0].external_url
+    // })
+    // .catch(error => {
+    // console.log('error', error)
+    // return undefined
+    // })
+  }
+
+  async callAPI(url: string, requestParams?: RequestInit) {
+    if (requestParams && requestParams.headers === undefined) {
+      requestParams.headers = {
+        Authorization: 'Bearer ' + this.accessToken,
+      }
+    }
+
+    if (requestParams === undefined) {
+      requestParams = {
+        headers: {
+          Authorization: 'Bearer ' + this.accessToken,
+        },
+      }
+    }
+
+    const httpResp = await fetch(url, requestParams)
+    if (httpResp.status === 404) {
+      throw 'NOT_FOUND'
+    }
+    if (httpResp.status === 401) {
+      this.accessToken = undefined
+      console.debug('this accessToken : ', this.accessToken)
+      throw 'INVALIDATE_TOKEN'
+    }
+    return httpResp
+  }
+}
diff --git a/assets/scripts/oauth-services-api/index.js b/assets/scripts/oauth-services-api/index.ts
similarity index 59%
rename from assets/scripts/oauth-services-api/index.js
rename to assets/scripts/oauth-services-api/index.ts
index eb27ca84..242a514c 100644
--- a/assets/scripts/oauth-services-api/index.js
+++ b/assets/scripts/oauth-services-api/index.ts
@@ -1,30 +1,13 @@
 import page from 'page'
-import store from '../store.js'
+import store, { OAuthProvider } from '../store.js'
 import GitHubAPI from './github.js'
 import GitlabAPI from './gitlab.js'
+import { OAuthServiceAPI } from '../types/git.js'
 
-/**
- * @overlaod
- * @param {'github'} type
- * @param {GithubOptions} options
- *
- * @returns {OAuthServiceAPI}
- */
-
-/**
- * @overlaod
- * @param {'gitlab'} type
- * @param {GitlabOptions} options
- *
- * @returns {OAuthServiceAPI}
- */
-
-/**
- * @param {import('./../store.js').OAuthProvider} _
- *
- * @returns {OAuthServiceAPI}
- */
-const makeOAuthServiceAPI = ({ accessToken, origin }) => {
+const makeOAuthServiceAPI = ({
+  accessToken,
+  origin,
+}: OAuthProvider): OAuthServiceAPI => {
   const hostname = new URL(origin).hostname
 
   if (hostname === 'github.com') return new GitHubAPI(accessToken)
@@ -39,14 +22,9 @@ const makeOAuthServiceAPI = ({ accessToken, origin }) => {
   }
 }
 
-/** @type {OAuthServiceAPI} */
-let oAuthServiceAPI
+let oAuthServiceAPI: OAuthServiceAPI
 
-/**
- * @returns {OAuthServiceAPI}
- */
-export const getOAuthServiceAPI = () => {
-  // @ts-ignore
+export const getOAuthServiceAPI = (): OAuthServiceAPI => {
   if (oAuthServiceAPI) {
     return oAuthServiceAPI
   }
diff --git a/assets/scripts/routeComponentLifeCycle.svelte.js b/assets/scripts/routeComponentLifeCycle.svelte.js
deleted file mode 100644
index b2f041af..00000000
--- a/assets/scripts/routeComponentLifeCycle.svelte.js
+++ /dev/null
@@ -1,62 +0,0 @@
-//@ts-check
-
-import { mount, unmount } from "svelte";
-import store from "./store.js";
-import {svelteTarget} from "./config.js";
-
-/** @import {Component, ComponentProps} from 'svelte' */
-
-/** @typedef {import("./store.js").ScribouilliState} ScribouilliState */
-/** @typedef {(state: ScribouilliState) => any} MapStateToPropsFunction */
-
-/** @type {Component} */
-let currentComponent;
-/** @type {ComponentProps<typeof currentComponent>} */
-let currentProps;
-/** @type {MapStateToPropsFunction} */
-let currentMapStateToProps = (_) => {};
-
-/**
- * 
- * @param {Component} newComponent 
- * @param {MapStateToPropsFunction} newMapStateToProps 
- */
-export function replaceComponent(newComponent, newMapStateToProps) {
-  console.log('replaceComponent newMapStateToProps', newMapStateToProps)
-
-  if (!newMapStateToProps) {
-    throw new Error("Missing _mapStateToProps in replaceComponent");
-  }
-
-  if (currentComponent) unmount(currentComponent)
-  currentMapStateToProps = newMapStateToProps;
-  
-  const props = $state(currentMapStateToProps(store.state))
-  currentProps = props;
-
-  currentComponent = mount(newComponent, {
-    target: svelteTarget,
-    props: currentProps
-  });
-
-  document.documentElement.scrollTo(0, 0)
-}
-
-/**
- * 
- * @param {ScribouilliState} state 
- */
-function render(state) {
-  const props = currentMapStateToProps(state);
-  
-  if (props) {
-    for(const key of Object.keys(currentProps)){
-      delete currentProps[key]
-    }
-
-    Object.assign(currentProps, props)
-  }
-
-}
-
-store.subscribe(render);
\ No newline at end of file
diff --git a/assets/scripts/routeComponentLifeCycle.svelte.ts b/assets/scripts/routeComponentLifeCycle.svelte.ts
new file mode 100644
index 00000000..122347c8
--- /dev/null
+++ b/assets/scripts/routeComponentLifeCycle.svelte.ts
@@ -0,0 +1,52 @@
+import { mount, unmount } from 'svelte'
+import store, { type ScribouilliState } from './store.js'
+import { svelteTarget } from './config.js'
+
+import { Component } from 'svelte'
+
+type MapStateToPropsFunction = (state: ScribouilliState) => Record<string, any>
+
+let currentComponent: Record<string, any>
+let currentProps: Record<string, any>
+let currentMapStateToProps: MapStateToPropsFunction = _ => ({})
+
+export function replaceComponent(
+  newComponent: Component,
+  newMapStateToProps: MapStateToPropsFunction,
+) {
+  console.log('replaceComponent newMapStateToProps', newMapStateToProps)
+
+  if (!newMapStateToProps) {
+    throw new Error('Missing _mapStateToProps in replaceComponent')
+  }
+
+  if (currentComponent) unmount(currentComponent)
+  currentMapStateToProps = newMapStateToProps
+
+  const props = $state(currentMapStateToProps(store.state))
+  currentProps = props
+
+  currentComponent = mount<Record<string, any>, Record<string, any>>(
+    newComponent,
+    {
+      target: svelteTarget,
+      props: currentProps,
+    },
+  )
+
+  document.documentElement.scrollTo(0, 0)
+}
+
+function render(state: ScribouilliState) {
+  const props = currentMapStateToProps(state)
+
+  if (props) {
+    for (const key of Object.keys(currentProps)) {
+      delete currentProps[key]
+    }
+
+    Object.assign(currentProps, props)
+  }
+}
+
+store.subscribe(render)
diff --git a/assets/scripts/routes/account.js b/assets/scripts/routes/account.ts
similarity index 75%
rename from assets/scripts/routes/account.js
rename to assets/scripts/routes/account.ts
index d005b490..2f203fb1 100644
--- a/assets/scripts/routes/account.js
+++ b/assets/scripts/routes/account.ts
@@ -1,12 +1,8 @@
-// @ts-check
-
+import { Context } from 'page'
 import Account from '../components/screens/Account.svelte'
 import { replaceComponent } from '../routeComponentLifeCycle.svelte.js'
 
-/**
- * @param {import('page').Context} _
- */
-export default ({ querystring }) => {
+export default ({ querystring }: Context) => {
   const params = new URLSearchParams(querystring)
   const gitProvider = params.get('provider')
 
@@ -18,5 +14,7 @@ export default ({ querystring }) => {
 
   // TODO: vérifier que c'est ok d'avoir des props qui viennent pas du state,
   // mais du monde extérieur (ici l'URL de la page)
-  replaceComponent(Account, () => { return { gitProvider } })
+  replaceComponent(Account, () => {
+    return { gitProvider }
+  })
 }
diff --git a/assets/scripts/routes/after-oauth-login.js b/assets/scripts/routes/after-oauth-login.ts
similarity index 94%
rename from assets/scripts/routes/after-oauth-login.js
rename to assets/scripts/routes/after-oauth-login.ts
index ad75da5e..b2b54299 100644
--- a/assets/scripts/routes/after-oauth-login.js
+++ b/assets/scripts/routes/after-oauth-login.ts
@@ -1,5 +1,3 @@
-// @ts-check
-
 import page from 'page'
 import remember from 'remember'
 
@@ -38,7 +36,6 @@ const storeOAuthProviderAccess = () => {
   }
 
   if (accessToken && providerName) {
-    /** @type {import('../store').OAuthProvider} */
     const oAuthProvider = {
       name: providerName,
       accessToken,
@@ -86,5 +83,7 @@ export default () => {
   }
 
   // TODO: pareil que dans account.js ici
-  replaceComponent(AfterOauthLogin, () => { return { currentUserReposP } })
+  replaceComponent(AfterOauthLogin, () => {
+    return { currentUserReposP }
+  })
 }
diff --git a/assets/scripts/routes/atelier-articles.js b/assets/scripts/routes/atelier-articles.js
deleted file mode 100644
index 871c212d..00000000
--- a/assets/scripts/routes/atelier-articles.js
+++ /dev/null
@@ -1,143 +0,0 @@
-// @ts-check
-
-import lireFrontMatter from 'front-matter'
-import page from 'page'
-
-import store from '../store'
-import { handleErrors } from '../utils'
-
-import { replaceComponent } from '../routeComponentLifeCycle.svelte'
-import ArticleContenu from '../components/screens/ArticleContenu.svelte'
-import { setCurrentRepositoryFromQuerystring } from '../actions/current-repository.js'
-import {
-  deleteArticle,
-  createArticle,
-  updateArticle,
-  showArticles,
-} from '../actions/article'
-import { makeAtelierListArticlesURL } from './atelier-list-articles.js'
-
-/**
- *
- * @param {string} fileName
- * @returns {(state: import('../store').ScribouilliState) => any}
- */
-const makeMapStateToProps = fileName => state => {
-  /** @type {(file: EditeurFile) => Promise<void> | void} */
-    const onSave = ({
-      fileName, content, previousContent, title, previousTitle,
-    }) => {
-      if (!state.currentRepository) return
-
-      const hasContentChanged = content !== previousContent
-      const hasTitleChanged = title !== previousTitle
-      const articlePageUrl = makeAtelierListArticlesURL(state.currentRepository)
-
-      // If no content changed, just redirect
-      if (!hasTitleChanged && !hasContentChanged) {
-        return page(articlePageUrl)
-      }
-
-      // If the file name is empty, it means that we are creating a new article.
-      if (fileName === '') {
-        return createArticle(title, content)
-          .then(() => {
-            state.buildStatus.setBuildingAndCheckStatusLater()
-            page(articlePageUrl)
-          })
-          .catch(msg => handleErrors(msg))
-      }
-
-      updateArticle(fileName, title, content)
-        .then(() => {
-          state.buildStatus.setBuildingAndCheckStatusLater()
-          page(articlePageUrl)
-        })
-        .catch(msg => handleErrors(msg))
-    }
-
-  if (fileName) {
-    const { gitAgent } = store.state
-
-    if (!gitAgent) {
-      throw new TypeError('gitAgent is undefined')
-    }
-
-    const onDelete = () => {
-      deleteArticle(fileName)
-        .then(() => {
-          if (!state.currentRepository) return
-
-          state.buildStatus.setBuildingAndCheckStatusLater()
-          page(makeAtelierListArticlesURL(state.currentRepository))
-        })
-        .catch(msg => handleErrors(msg))
-    }
-
-    // Display existing file
-    const fileP = gitAgent
-      .getFile(fileName)
-      .then(contenu => {
-        const { attributes: data, body: markdownContent } =
-          lireFrontMatter(contenu)
-
-        return {
-          fileName: fileName,
-          content: markdownContent,
-          previousContent: markdownContent,
-          title: data?.title,
-          previousTitle: data?.title,
-          onDelete,
-          onSave,
-        }
-      })
-      .catch(msg => handleErrors(msg))
-    return {
-      fileP,
-      contenus: state.articles,
-      buildStatus: state.buildStatus,
-      showArticles: showArticles(state),
-      currentRepository: state.currentRepository,
-      onDelete,
-      onSave,
-    }
-  } else {
-    // Create a new file
-    return {
-      fileP: Promise.resolve({
-        fileName: '',
-        content: '',
-        previousContent: undefined,
-        title: '',
-        previousTitle: undefined,
-        blogIndex: false,
-      }),
-      contenus: state.articles,
-      buildStatus: state.buildStatus,
-      showArticles: showArticles(state),
-      currentRepository: state.currentRepository,
-      onDelete: () => {return},
-      onSave,
-    }
-  }
-}
-
-/**
- * @param {import('page').Context} _
- */
-export default async ({ querystring }) => {
-  await setCurrentRepositoryFromQuerystring(querystring)
-
-  const currentRepository = store.state.currentRepository
-
-  if (!currentRepository) {
-    throw new TypeError('currentRepository is undefined')
-  }
-
-  const fileName = decodeURIComponent(
-    new URLSearchParams(querystring).get('path') ?? '',
-  )
-  const mapStateToProps = makeMapStateToProps(fileName)
-
-  replaceComponent(ArticleContenu, mapStateToProps)
-}
diff --git a/assets/scripts/routes/atelier-articles.ts b/assets/scripts/routes/atelier-articles.ts
new file mode 100644
index 00000000..f69f58c4
--- /dev/null
+++ b/assets/scripts/routes/atelier-articles.ts
@@ -0,0 +1,142 @@
+import lireFrontMatter from 'front-matter'
+import page, { Context } from 'page'
+
+import store, { type ScribouilliState } from '../store'
+import { handleErrors } from '../utils'
+
+import { replaceComponent } from '../routeComponentLifeCycle.svelte'
+import ArticleContenu from '../components/screens/ArticleContenu.svelte'
+import { setCurrentRepositoryFromQuerystring } from '../actions/current-repository.js'
+import {
+  deleteArticle,
+  createArticle,
+  updateArticle,
+  showArticles,
+} from '../actions/article'
+import { makeAtelierListArticlesURL } from './atelier-list-articles.js'
+import { EditeurFile } from '../types/atelier.js'
+
+const makeMapStateToProps =
+  (fileName: string): ((state: ScribouilliState) => any) =>
+  state => {
+    const onSave: (file: EditeurFile) => Promise<void> | void = ({
+      fileName,
+      content,
+      previousContent,
+      title,
+      previousTitle,
+    }): Promise<void> | void => {
+      if (!state.currentRepository) return
+
+      const hasContentChanged = content !== previousContent
+      const hasTitleChanged = title !== previousTitle
+      const articlePageUrl = makeAtelierListArticlesURL(state.currentRepository)
+
+      // If no content changed, just redirect
+      if (!hasTitleChanged && !hasContentChanged) {
+        return page(articlePageUrl)
+      }
+
+      // If the file name is empty, it means that we are creating a new article.
+      if (fileName === '') {
+        return createArticle(title, content)
+          .then(() => {
+            state.buildStatus.setBuildingAndCheckStatusLater()
+            page(articlePageUrl)
+          })
+          .catch(msg => handleErrors(msg))
+      }
+
+      updateArticle(fileName, title, content)
+        .then(() => {
+          state.buildStatus.setBuildingAndCheckStatusLater()
+          page(articlePageUrl)
+        })
+        .catch(msg => handleErrors(msg))
+    }
+
+    if (fileName) {
+      const { gitAgent } = store.state
+
+      if (!gitAgent) {
+        throw new TypeError('gitAgent is undefined')
+      }
+
+      const onDelete = () => {
+        deleteArticle(fileName)
+          .then(() => {
+            if (!state.currentRepository) return
+
+            state.buildStatus.setBuildingAndCheckStatusLater()
+            page(makeAtelierListArticlesURL(state.currentRepository))
+          })
+          .catch(msg => handleErrors(msg))
+      }
+
+      // Display existing file
+      const fileP = gitAgent
+        .getFile(fileName)
+        .then(contenu => {
+          const { attributes: data, body: markdownContent } = lireFrontMatter<{
+            title: string
+          }>(contenu)
+
+          return {
+            fileName: fileName,
+            content: markdownContent,
+            previousContent: markdownContent,
+            title: data?.title,
+            previousTitle: data?.title,
+            onDelete,
+            onSave,
+          }
+        })
+        .catch(msg => handleErrors(msg))
+      return {
+        fileP,
+        contenus: state.articles,
+        buildStatus: state.buildStatus,
+        showArticles: showArticles(state),
+        currentRepository: state.currentRepository,
+        onDelete,
+        onSave,
+      }
+    } else {
+      // Create a new file
+      return {
+        fileP: Promise.resolve({
+          fileName: '',
+          content: '',
+          previousContent: undefined,
+          title: '',
+          previousTitle: undefined,
+          blogIndex: false,
+        }),
+        contenus: state.articles,
+        buildStatus: state.buildStatus,
+        showArticles: showArticles(state),
+        currentRepository: state.currentRepository,
+        onDelete: () => {
+          return
+        },
+        onSave,
+      }
+    }
+  }
+
+export default async ({ querystring }: Context) => {
+  await setCurrentRepositoryFromQuerystring(querystring)
+
+  const currentRepository = store.state.currentRepository
+
+  if (!currentRepository) {
+    throw new TypeError('currentRepository is undefined')
+  }
+
+  const fileName = decodeURIComponent(
+    new URLSearchParams(querystring).get('path') ?? '',
+  )
+  const mapStateToProps = makeMapStateToProps(fileName)
+
+  replaceComponent(ArticleContenu, mapStateToProps)
+}
diff --git a/assets/scripts/routes/atelier-list-articles.js b/assets/scripts/routes/atelier-list-articles.ts
similarity index 69%
rename from assets/scripts/routes/atelier-list-articles.js
rename to assets/scripts/routes/atelier-list-articles.ts
index 337795be..7b31150c 100644
--- a/assets/scripts/routes/atelier-list-articles.js
+++ b/assets/scripts/routes/atelier-list-articles.ts
@@ -1,5 +1,3 @@
-// @ts-check
-
 import AtelierArticles from '../components/screens/AtelierArticles.svelte'
 import { replaceComponent } from '../routeComponentLifeCycle.svelte'
 import {
@@ -7,13 +5,11 @@ import {
   setCurrentRepositoryFromQuerystring,
 } from '../actions/current-repository.js'
 import { showArticles } from '../actions/article'
+import type { ScribouilliState } from '../store.js'
+import ScribouilliGitRepo from '../scribouilliGitRepo.js'
+import { Context } from 'page'
 
-/**
- *
- * @param {import('../store').ScribouilliState} state
- * @returns
- */
-function mapStateToProps(state) {
+function mapStateToProps(state: ScribouilliState) {
   if (!state.currentRepository) {
     throw new TypeError('currentRepository is undefined')
   }
@@ -27,10 +23,7 @@ function mapStateToProps(state) {
   }
 }
 
-/**
- * @param {import('page').Context} _
- */
-export default async ({ querystring }) => {
+export default async ({ querystring }: Context) => {
   await setCurrentRepositoryFromQuerystring(querystring)
 
   getCurrentRepoArticles()
@@ -38,11 +31,9 @@ export default async ({ querystring }) => {
   replaceComponent(AtelierArticles, mapStateToProps)
 }
 
-/**
- *
- * @param {ScribouilliGitRepo} scribouilliGitRepo
- * @returns {string}
- */
-export function makeAtelierListArticlesURL({ owner, repoName }) {
+export function makeAtelierListArticlesURL({
+  owner,
+  repoName,
+}: ScribouilliGitRepo): string {
   return `/atelier-list-articles?account=${owner}&repoName=${repoName}`
 }
diff --git a/assets/scripts/routes/atelier-list-pages.js b/assets/scripts/routes/atelier-list-pages.ts
similarity index 75%
rename from assets/scripts/routes/atelier-list-pages.js
rename to assets/scripts/routes/atelier-list-pages.ts
index 09b4146a..c4dcb39b 100644
--- a/assets/scripts/routes/atelier-list-pages.js
+++ b/assets/scripts/routes/atelier-list-pages.ts
@@ -1,16 +1,11 @@
-// @ts-check
-
 import { replaceComponent } from '../routeComponentLifeCycle.svelte'
 import { setCurrentRepositoryFromQuerystring } from '../actions/current-repository.js'
 import AtelierPages from '../components/screens/AtelierPages.svelte'
 import { showArticles } from '../actions/article'
+import { Context } from 'page'
+import type { ScribouilliState } from '../store.js'
 
-/**
- *
- * @param {import("../store").ScribouilliState} state
- * @returns
- */
-const mapStateToProps = state => {
+const mapStateToProps = (state: ScribouilliState) => {
   if (!state.currentRepository) {
     throw new TypeError('currentRepository is undefined')
   }
@@ -24,10 +19,7 @@ const mapStateToProps = state => {
   }
 }
 
-/**
- * @param {import('page').Context} _
- */
-export default async ({ querystring }) => {
+export default async ({ querystring }: Context) => {
   await setCurrentRepositoryFromQuerystring(querystring)
 
   replaceComponent(AtelierPages, mapStateToProps)
diff --git a/assets/scripts/routes/atelier-pages.js b/assets/scripts/routes/atelier-pages.js
deleted file mode 100644
index 5a1fc107..00000000
--- a/assets/scripts/routes/atelier-pages.js
+++ /dev/null
@@ -1,150 +0,0 @@
-// @ts-check
-
-import lireFrontMatter from 'front-matter'
-import page from 'page'
-
-import { replaceComponent } from '../routeComponentLifeCycle.svelte'
-import store from '../store'
-import { handleErrors, logMessage, makeFileNameFromTitle } from '../utils'
-import { setCurrentRepositoryFromQuerystring } from '../actions/current-repository.js'
-import PageContenu from '../components/screens/PageContenu.svelte'
-import { deletePage, createPage, updatePage } from './../actions/page'
-import { makeAtelierListPageURL } from './urls.js'
-import { showArticles } from '../actions/article'
-
-/**
- *
- * @param {string} fileName
- * @returns {(state: import('../store').ScribouilliState) => any}
- */
-const makeMapStateToProps = fileName => state => {
-  /** @type {(file: EditeurFile) => Promise<void> | void} */
-  const onSave = ({
-    fileName,
-    title,
-    content,
-    previousTitle,
-    previousContent,
-    index,
-    blogIndex,
-  }) => {
-    const currentRepository = state.currentRepository
-    if (!currentRepository) return
-
-    const hasContentChanged = content !== previousContent
-    const hasTitleChanged = title !== previousTitle
-
-    // If no content changed, just redirect
-    if (!hasTitleChanged && !hasContentChanged) {
-      page(makeAtelierListPageURL(currentRepository))
-      return
-    }
-    //
-    // If the file name is empty, it means that we are creating a new page.
-    if (fileName === '') {
-      return createPage(content, title, index)
-        .then(() => {
-          state.buildStatus.setBuildingAndCheckStatusLater()
-          page(makeAtelierListPageURL(currentRepository))
-        })
-        .catch(msg => handleErrors(msg))
-    }
-
-    updatePage(fileName, title, content, index, blogIndex)
-      .then(() => {
-        state.buildStatus.setBuildingAndCheckStatusLater()
-        page(makeAtelierListPageURL(currentRepository))
-      })
-      .catch(msg => handleErrors(msg))
-  }
-
-  // Display existing file
-  if (fileName) {
-    const { gitAgent } = store.state
-
-    if (!gitAgent) {
-      throw new TypeError('gitAgent is undefined')
-    }
-
-    const onDelete = () => {
-      deletePage(fileName)
-        .then(() => {
-          if (!state.currentRepository) return
-          state.buildStatus.setBuildingAndCheckStatusLater()
-          page(makeAtelierListPageURL(state.currentRepository))
-        })
-        .catch(msg => handleErrors(msg))
-    }
-
-    /** @type {() => Promise<EditeurFile | undefined>} */
-    const fileP = async function () {
-      try {
-        const content = await gitAgent.getFile(fileName)
-        const { attributes: data, body: markdownContent } =
-          lireFrontMatter(content)
-        return {
-          fileName,
-          content: markdownContent,
-          previousContent: markdownContent,
-          title: data?.title,
-          index: data?.order,
-          previousTitle: data?.title,
-          blogIndex: data?.blog_index,
-        }
-      } catch (errorMessage) {
-        //@ts-ignore
-        logMessage(errorMessage, 'routes/atelier-pages.js:makeMapStateToProps')
-      }
-    }
-
-    return {
-      fileP: fileP(),
-      contenus: state.articles,
-      buildStatus: state.buildStatus,
-      showArticles: showArticles(state),
-      currentRepository: state.currentRepository,
-      onDelete,
-      onSave,
-    }
-  } else {
-    return {
-      fileP: Promise.resolve({
-        fileName: '',
-        title: '',
-        index: state.pages && state.pages.length + 1,
-        content: '',
-        previousTitle: undefined,
-        previousContent: undefined,
-        inMenu: true,
-        blogIndex: false,
-      }),
-      makeFileNameFromTitle: makeFileNameFromTitle,
-      contenus: state.pages,
-      buildStatus: state.buildStatus,
-      showArticles: showArticles(state),
-      currentRepository: state.currentRepository,
-      onDelete: () => {},
-      onSave,
-    }
-  }
-}
-
-/**
- * @param {import('page').Context} _
- */
-export default async ({ querystring }) => {
-  await setCurrentRepositoryFromQuerystring(querystring)
-
-  const fileName = decodeURIComponent(
-    new URLSearchParams(querystring).get('path') ?? '',
-  )
-  const mapStateToProps = makeMapStateToProps(fileName)
-
-  const currentRepository = store.state.currentRepository
-
-  if (!currentRepository) {
-    throw new TypeError('currentRepository is undefined')
-  }
-
-  replaceComponent(PageContenu, mapStateToProps)
-}
diff --git a/assets/scripts/routes/atelier-pages.ts b/assets/scripts/routes/atelier-pages.ts
new file mode 100644
index 00000000..3c4881f9
--- /dev/null
+++ b/assets/scripts/routes/atelier-pages.ts
@@ -0,0 +1,150 @@
+import lireFrontMatter from 'front-matter'
+import page, { Context } from 'page'
+
+import { replaceComponent } from '../routeComponentLifeCycle.svelte'
+import store, { type ScribouilliState } from '../store'
+import { handleErrors, logMessage, makeFileNameFromTitle } from '../utils'
+import { setCurrentRepositoryFromQuerystring } from '../actions/current-repository.js'
+import PageContenu from '../components/screens/PageContenu.svelte'
+import { deletePage, createPage, updatePage } from './../actions/page'
+import { makeAtelierListPageURL } from './urls.js'
+import { showArticles } from '../actions/article'
+import { EditeurFile } from '../types/atelier.js'
+
+const makeMapStateToProps =
+  (fileName: string): ((state: ScribouilliState) => any) =>
+  state => {
+    const onSave: (file: EditeurFile) => Promise<void> | void = ({
+      fileName,
+      title,
+      content,
+      previousTitle,
+      previousContent,
+      index,
+      blogIndex,
+    }): Promise<void> | void => {
+      const currentRepository = state.currentRepository
+      if (!currentRepository) return
+
+      const hasContentChanged = content !== previousContent
+      const hasTitleChanged = title !== previousTitle
+
+      // If no content changed, just redirect
+      if (!hasTitleChanged && !hasContentChanged) {
+        page(makeAtelierListPageURL(currentRepository))
+        return
+      }
+      //
+      // If the file name is empty, it means that we are creating a new page.
+      if (fileName === '') {
+        return createPage(content, title, index)
+          .then(() => {
+            state.buildStatus.setBuildingAndCheckStatusLater()
+            page(makeAtelierListPageURL(currentRepository))
+          })
+          .catch(msg => handleErrors(msg))
+      }
+
+      updatePage(fileName, title, content, index, blogIndex)
+        .then(() => {
+          state.buildStatus.setBuildingAndCheckStatusLater()
+          page(makeAtelierListPageURL(currentRepository))
+        })
+        .catch(msg => handleErrors(msg))
+    }
+
+    // Display existing file
+    if (fileName) {
+      const { gitAgent } = store.state
+
+      if (!gitAgent) {
+        throw new TypeError('gitAgent is undefined')
+      }
+
+      const onDelete = () => {
+        deletePage(fileName)
+          .then(() => {
+            if (!state.currentRepository) return
+            state.buildStatus.setBuildingAndCheckStatusLater()
+            page(makeAtelierListPageURL(state.currentRepository))
+          })
+          .catch(msg => handleErrors(msg))
+      }
+
+      const fileP: () => Promise<EditeurFile | undefined> =
+        async function (): Promise<EditeurFile | undefined> {
+          try {
+            const content = await gitAgent.getFile(fileName)
+            const { attributes: data, body: markdownContent } =
+              lireFrontMatter<{
+                title: string
+                order: number
+                blog_index: boolean
+              }>(content)
+            return {
+              fileName,
+              content: markdownContent,
+              previousContent: markdownContent,
+              title: data?.title,
+              index: data?.order,
+              previousTitle: data?.title,
+              blogIndex: data?.blog_index,
+            }
+          } catch (errorMessage) {
+            if (typeof errorMessage === 'string') {
+              logMessage(
+                errorMessage,
+                'routes/atelier-pages.js:makeMapStateToProps',
+              )
+            }
+          }
+        }
+
+      return {
+        fileP: fileP(),
+        contenus: state.articles,
+        buildStatus: state.buildStatus,
+        showArticles: showArticles(state),
+        currentRepository: state.currentRepository,
+        onDelete,
+        onSave,
+      }
+    } else {
+      return {
+        fileP: Promise.resolve({
+          fileName: '',
+          title: '',
+          index: state.pages && state.pages.length + 1,
+          content: '',
+          previousTitle: undefined,
+          previousContent: undefined,
+          inMenu: true,
+          blogIndex: false,
+        }),
+        makeFileNameFromTitle: makeFileNameFromTitle,
+        contenus: state.pages,
+        buildStatus: state.buildStatus,
+        showArticles: showArticles(state),
+        currentRepository: state.currentRepository,
+        onDelete: () => {},
+        onSave,
+      }
+    }
+  }
+
+export default async ({ querystring }: Context) => {
+  await setCurrentRepositoryFromQuerystring(querystring)
+
+  const fileName = decodeURIComponent(
+    new URLSearchParams(querystring).get('path') ?? '',
+  )
+  const mapStateToProps = makeMapStateToProps(fileName)
+
+  const currentRepository = store.state.currentRepository
+
+  if (!currentRepository) {
+    throw new TypeError('currentRepository is undefined')
+  }
+
+  replaceComponent(PageContenu, mapStateToProps)
+}
diff --git a/assets/scripts/routes/choose-account.js b/assets/scripts/routes/choose-account.ts
similarity index 74%
rename from assets/scripts/routes/choose-account.js
rename to assets/scripts/routes/choose-account.ts
index 6c4b87cb..ed761bdf 100644
--- a/assets/scripts/routes/choose-account.js
+++ b/assets/scripts/routes/choose-account.ts
@@ -1,8 +1,6 @@
-// @ts-check
-
 import ChooseAccount from '../components/screens/ChooseAccount.svelte'
 import { replaceComponent } from '../routeComponentLifeCycle.svelte.js'
 
 export default () => {
-  replaceComponent(ChooseAccount, () => {})
+  replaceComponent(ChooseAccount, () => ({}))
 }
diff --git a/assets/scripts/routes/create-account.js b/assets/scripts/routes/create-account.ts
similarity index 66%
rename from assets/scripts/routes/create-account.js
rename to assets/scripts/routes/create-account.ts
index 7d5380b9..eec3646b 100644
--- a/assets/scripts/routes/create-account.js
+++ b/assets/scripts/routes/create-account.ts
@@ -1,12 +1,8 @@
-// @ts-check
-
+import { Context } from 'page'
 import CreateAccount from '../components/screens/CreateAccount.svelte'
 import { replaceComponent } from '../routeComponentLifeCycle.svelte'
 
-/**
- * @param {import('page').Context} _
- */
-export default ({ querystring }) => {
+export default ({ querystring }: Context) => {
   const params = new URLSearchParams(querystring)
   const gitProvider = params.get('provider')
 
@@ -14,5 +10,7 @@ export default ({ querystring }) => {
     throw new TypeError(`Missing 'provider' parameter`)
   }
 
-  replaceComponent(CreateAccount, () => { return { gitProvider } })
+  replaceComponent(CreateAccount, () => {
+    return { gitProvider }
+  })
 }
diff --git a/assets/scripts/routes/create-new-site.js b/assets/scripts/routes/create-new-site.ts
similarity index 85%
rename from assets/scripts/routes/create-new-site.js
rename to assets/scripts/routes/create-new-site.ts
index cd4a2d2a..fa48e18f 100644
--- a/assets/scripts/routes/create-new-site.js
+++ b/assets/scripts/routes/create-new-site.ts
@@ -4,5 +4,5 @@ import { fetchAuthenticatedUserLogin } from '../actions/current-user.js'
 
 export default () => {
   fetchAuthenticatedUserLogin()
-  replaceComponent(CreateNewSite, () => {})
+  replaceComponent(CreateNewSite, () => ({}))
 }
diff --git a/assets/scripts/routes/login.js b/assets/scripts/routes/login.ts
similarity index 83%
rename from assets/scripts/routes/login.js
rename to assets/scripts/routes/login.ts
index 9250c535..11c056c4 100644
--- a/assets/scripts/routes/login.js
+++ b/assets/scripts/routes/login.ts
@@ -1,12 +1,10 @@
-// @ts-check
-
 import { replaceComponent } from '../routeComponentLifeCycle.svelte'
 import store from '../store'
 import Login from '../components/screens/Login.svelte'
+import { Context } from 'page'
 
 const TOCTOCTOC_ORIGIN = `https://toctoctoc.lechappeebelle.team`
 
-
 const oAuthAppByProvider = new Map([
   [
     'github.com',
@@ -33,11 +31,7 @@ const oAuthAppByProvider = new Map([
   ],
 ])
 
-/**
- * @param {string} gitProvider
- * @param {string} destination
- */
-function redirectURLByProvider(gitProvider, destination) {
+function redirectURLByProvider(gitProvider: string, destination: string) {
   if (gitProvider === 'github.com') {
     return `${TOCTOCTOC_ORIGIN}/github-callback?destination=${destination}`
   } else {
@@ -46,14 +40,11 @@ function redirectURLByProvider(gitProvider, destination) {
   }
 }
 
-/**
- *
- * @param {string} gitProvider
- * @param {string} client_id
- * @param {string} redirect_url
- * @returns
- */
-function makeLoginHref(gitProvider, client_id, redirect_url) {
+function makeLoginHref(
+  gitProvider: string,
+  client_id: string,
+  redirect_url: string,
+) {
   if (gitProvider === 'github.com') {
     return `https://github.com/login/oauth/authorize?client_id=${client_id}&scope=public_repo,user:email&redirect_uri=${redirect_url}`
   } else {
@@ -62,10 +53,7 @@ function makeLoginHref(gitProvider, client_id, redirect_url) {
   }
 }
 
-/**
- * @param {import('page').Context} _
- */
-export default ({ querystring }) => {
+export default ({ querystring }: Context) => {
   const params = new URLSearchParams(querystring)
   const gitProvider = params.get('provider')
 
diff --git a/assets/scripts/routes/main.js b/assets/scripts/routes/main.ts
similarity index 94%
rename from assets/scripts/routes/main.js
rename to assets/scripts/routes/main.ts
index a3fda80a..24c0b3d9 100644
--- a/assets/scripts/routes/main.js
+++ b/assets/scripts/routes/main.ts
@@ -1,5 +1,3 @@
-//@ts-check
-
 import page from 'page'
 
 import store from '../store.js'
@@ -21,12 +19,7 @@ import startFromExistingSite from './start-from-existing-site.js'
 import settings from './settings.js'
 import resolutionDesynchronisation from './resolution-desynchronisation.js'
 
-/**
- *
- * @param {any} _
- * @param {any} next
- */
-function waitOauthProviderMiddleware(_, next) {
+function waitOauthProviderMiddleware(_: any, next: any) {
   waitOauthProvider().then(next)
 }
 
diff --git a/assets/scripts/routes/resolution-desynchronisation.js b/assets/scripts/routes/resolution-desynchronisation.ts
similarity index 73%
rename from assets/scripts/routes/resolution-desynchronisation.js
rename to assets/scripts/routes/resolution-desynchronisation.ts
index 5fd5680f..48c29db7 100644
--- a/assets/scripts/routes/resolution-desynchronisation.js
+++ b/assets/scripts/routes/resolution-desynchronisation.ts
@@ -1,16 +1,11 @@
-// @ts-check
-
 import ResolutionDesynchronisation from '../components/screens/ResolutionDesynchronisation.svelte'
 import { replaceComponent } from '../routeComponentLifeCycle.svelte.js'
 import { setCurrentRepositoryFromQuerystring } from '../actions/current-repository.js'
 import { showArticles } from '../actions/article.js'
+import type { ScribouilliState } from '../store.js'
+import { Context } from 'page'
 
-/**
- *
- * @param {import('../store.js').ScribouilliState} state
- * @returns
- */
-const mapStateToProps = state => {
+const mapStateToProps = (state: ScribouilliState) => {
   const { conflict, currentRepository, buildStatus } = state
 
   return {
@@ -21,10 +16,7 @@ const mapStateToProps = state => {
   }
 }
 
-/**
- * @param {import('page').Context} _
- */
-export default async ({ querystring }) => {
+export default async ({ querystring }: Context) => {
   await setCurrentRepositoryFromQuerystring(querystring)
 
   replaceComponent(ResolutionDesynchronisation, mapStateToProps)
diff --git a/assets/scripts/routes/select-or-create-site.js b/assets/scripts/routes/select-or-create-site.ts
similarity index 77%
rename from assets/scripts/routes/select-or-create-site.js
rename to assets/scripts/routes/select-or-create-site.ts
index 1c95b114..94ec9f31 100644
--- a/assets/scripts/routes/select-or-create-site.js
+++ b/assets/scripts/routes/select-or-create-site.ts
@@ -2,5 +2,5 @@ import { replaceComponent } from '../routeComponentLifeCycle.svelte'
 import SelectOrCreateSite from '../components/screens/SelectOrCreateSite.svelte'
 
 export default () => {
-  replaceComponent(SelectOrCreateSite, () => {})
+  replaceComponent(SelectOrCreateSite, () => ({}))
 }
diff --git a/assets/scripts/routes/settings.js b/assets/scripts/routes/settings.ts
similarity index 83%
rename from assets/scripts/routes/settings.js
rename to assets/scripts/routes/settings.ts
index bac2a6da..77983aec 100644
--- a/assets/scripts/routes/settings.js
+++ b/assets/scripts/routes/settings.ts
@@ -1,8 +1,6 @@
-// @ts-check
-
 import { CUSTOM_CSS_PATH } from '../config'
 import { replaceComponent } from '../routeComponentLifeCycle.svelte'
-import store from '../store'
+import store, { type ScribouilliState } from '../store'
 import {
   getCurrentRepoPages,
   getCurrentRepoArticles,
@@ -13,6 +11,7 @@ import { handleErrors } from '../utils'
 import Settings from '../components/screens/Settings.svelte'
 import { writeFileAndCommit, deleteFileAndCommit } from '../actions/file'
 import { blogIndex, showArticles } from '../actions/article'
+import { Context } from 'page'
 
 const blogMdContent = `---
 layout: page
@@ -37,12 +36,7 @@ blog_index: true
 {% endfor %}
 `
 
-/**
- *
- * @param {import('../store').ScribouilliState} state
- * @returns
- */
-function mapStateToProps(state) {
+function mapStateToProps(state: ScribouilliState) {
   const blogFile = blogIndex(state)
   // TODO: this should probably be `state` not `store.state`
   const { currentRepository, gitAgent } = store.state
@@ -62,15 +56,17 @@ function mapStateToProps(state) {
     blogEnabled: blogFile !== undefined,
     showArticles: showArticles(state),
     currentRepository: state.currentRepository,
-    /** @type {(theme: { css: string}) => void} */
-    onUpdateTheme: (theme) => {
+    onUpdateTheme: (theme: { css: string }): void => {
       saveCustomCSS(theme.css).catch(handleErrors)
     },
-    /** @type {(activated: boolean) => Promise<void>} */
-    onToggleBlog: async (activated) => {
+    onToggleBlog: async (activated: boolean): Promise<void> => {
       try {
         if (activated) {
-          await writeFileAndCommit('blog.md', blogMdContent, 'Activation du blog')
+          await writeFileAndCommit(
+            'blog.md',
+            blogMdContent,
+            'Activation du blog',
+          )
         } else {
           await deleteFileAndCommit('blog.md', 'Désactivation du blog')
         }
@@ -86,10 +82,7 @@ function mapStateToProps(state) {
   }
 }
 
-/**
- * @param {import('page').Context} _
- */
-export default async ({ querystring }) => {
+export default async ({ querystring }: Context) => {
   await setCurrentRepositoryFromQuerystring(querystring)
 
   const { gitAgent } = store.state
diff --git a/assets/scripts/routes/start-from-existing-site.js b/assets/scripts/routes/start-from-existing-site.ts
similarity index 81%
rename from assets/scripts/routes/start-from-existing-site.js
rename to assets/scripts/routes/start-from-existing-site.ts
index e25d6ede..029d1b3d 100644
--- a/assets/scripts/routes/start-from-existing-site.js
+++ b/assets/scripts/routes/start-from-existing-site.ts
@@ -1,18 +1,12 @@
-//@ts-check
-
 import {
   fetchCurrentUserRepositories,
   fetchAuthenticatedUserLogin,
 } from '../actions/current-user.js'
 import { replaceComponent } from '../routeComponentLifeCycle.svelte.js'
 import SelectCurrentSite from '../components/screens/SelectCurrentSite.svelte'
+import type { ScribouilliState } from '../store.js'
 
-/**
- *
- * @param {import('../store').ScribouilliState} state
- * @returns
- */
-const mapStateToProps = state => {
+const mapStateToProps = (state: ScribouilliState) => {
   const { login, reposByAccount } = state
 
   return {
diff --git a/assets/scripts/routes/urls.js b/assets/scripts/routes/urls.js
deleted file mode 100644
index e1a83bfe..00000000
--- a/assets/scripts/routes/urls.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * @param {ScribouilliGitRepo} scribouilliGitRepo
- * @returns {string}
- */
-export function makeAtelierListPageURL({ owner, repoName }) {
-  return `/atelier-list-pages?account=${owner}&repoName=${repoName}`
-}
diff --git a/assets/scripts/routes/urls.ts b/assets/scripts/routes/urls.ts
new file mode 100644
index 00000000..937a91c9
--- /dev/null
+++ b/assets/scripts/routes/urls.ts
@@ -0,0 +1,8 @@
+import ScribouilliGitRepo from '../scribouilliGitRepo'
+
+export function makeAtelierListPageURL({
+  owner,
+  repoName,
+}: ScribouilliGitRepo): string {
+  return `/atelier-list-pages?account=${owner}&repoName=${repoName}`
+}
diff --git a/assets/scripts/routes/welcome.js b/assets/scripts/routes/welcome.ts
similarity index 93%
rename from assets/scripts/routes/welcome.js
rename to assets/scripts/routes/welcome.ts
index e878c631..6cf0e696 100644
--- a/assets/scripts/routes/welcome.js
+++ b/assets/scripts/routes/welcome.ts
@@ -1,5 +1,3 @@
-//@ts-check
-
 import page from 'page'
 
 import store from '../store.js'
@@ -38,5 +36,7 @@ export default () => {
     }
   }
 
-  replaceComponent(Welcome, () => { return props })
+  replaceComponent(Welcome, () => {
+    return props
+  })
 }
diff --git a/assets/scripts/scribouilliGitRepo.js b/assets/scripts/scribouilliGitRepo.js
deleted file mode 100644
index 5d27b390..00000000
--- a/assets/scripts/scribouilliGitRepo.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * @type {ScribouilliGitRepo}
- */
-export default class {
-  /**
-   *
-   * @param { object } _
-   * @param { string } [_.repoId]
-   * @param { string } _.origin
-   * @param { string } _.publicRepositoryURL
-   * @param { string } _.owner
-   * @param { string } _.repoName
-   * @param { OAuthServiceAPI } _.gitServiceProvider
-   */
-  constructor({
-    repoId,
-    origin,
-    publicRepositoryURL,
-    owner,
-    repoName,
-    gitServiceProvider
-  }) {
-    this.origin = origin
-    this.publicRepositoryURL = publicRepositoryURL
-    this.owner = owner
-    this.repoName = repoName
-
-    this.repoId = repoId ? repoId : makeRepoId(owner, repoName)
-
-    this.publishedWebsiteURL = new Promise(resolve => {
-      const interval = setInterval(() => {
-        gitServiceProvider.getPublishedWebsiteURL(this)
-        .then(url => { 
-          if(url){
-            clearInterval(interval)
-            resolve(url) 
-          }
-        })
-      }, 1000)
-    })
-  }
-
-}
-
-/**
- *
- * @param {string} owner // may be an individual Github user or an organisation
- * @param {string} repoName
- * @returns {string}
- */
-export function makeRepoId(owner, repoName) {
-  return `${owner}/${repoName}`
-}
-
-/**
- *
- * @param {string} owner // may be an individual Github user or an organisation
- * @param {string} repoName
- * @param {string} origin
- * @returns {string}
- */
-export function makePublicRepositoryURL(owner, repoName, origin) {
-  return `${origin}/${owner}/${repoName}`
-}
-
-
diff --git a/assets/scripts/scribouilliGitRepo.ts b/assets/scripts/scribouilliGitRepo.ts
new file mode 100644
index 00000000..15d10b27
--- /dev/null
+++ b/assets/scripts/scribouilliGitRepo.ts
@@ -0,0 +1,63 @@
+import { OAuthServiceAPI } from './types/git'
+
+export default class ScribouilliGitRepo {
+  // TODO: better typing of these fields
+  public origin
+  public publicRepositoryURL
+  public owner
+  public repoName
+  public repoId
+  public publishedWebsiteURL: Promise<string>
+
+  constructor({
+    repoId,
+    origin,
+    publicRepositoryURL,
+    owner,
+    repoName,
+    gitServiceProvider,
+  }: {
+    repoId?: string
+    origin: string
+    publicRepositoryURL: string
+    owner: string
+    repoName: string
+    gitServiceProvider: OAuthServiceAPI
+  }) {
+    this.origin = origin
+    this.publicRepositoryURL = publicRepositoryURL
+    this.owner = owner
+    this.repoName = repoName
+
+    this.repoId = repoId ? repoId : makeRepoId(owner, repoName)
+
+    this.publishedWebsiteURL = new Promise(resolve => {
+      const interval = setInterval(() => {
+        gitServiceProvider.getPublishedWebsiteURL(this).then(url => {
+          if (url) {
+            clearInterval(interval)
+            resolve(url)
+          }
+        })
+      }, 1000)
+    })
+  }
+}
+
+/**
+ * @param owner may be an individual Github user or an organisation
+ */
+export function makeRepoId(owner: string, repoName: string): string {
+  return `${owner}/${repoName}`
+}
+
+/**
+ * @param owner may be an individual Github user or an organisation
+ */
+export function makePublicRepositoryURL(
+  owner: string,
+  repoName: string,
+  origin: string,
+): string {
+  return `${origin}/${owner}/${repoName}`
+}
diff --git a/assets/scripts/scripts.js b/assets/scripts/scripts.ts
similarity index 96%
rename from assets/scripts/scripts.js
rename to assets/scripts/scripts.ts
index 18ab20be..c1b0bacd 100644
--- a/assets/scripts/scripts.js
+++ b/assets/scripts/scripts.ts
@@ -1,5 +1,3 @@
-//@ts-check
-
 import remember from 'remember'
 
 import { OAUTH_PROVIDER_STORAGE_KEY } from './config.js'
diff --git a/assets/scripts/store.js b/assets/scripts/store.ts
similarity index 51%
rename from assets/scripts/store.js
rename to assets/scripts/store.ts
index cc8b4e1d..05e7786b 100644
--- a/assets/scripts/store.js
+++ b/assets/scripts/store.ts
@@ -1,6 +1,7 @@
-//@ts-check
-
-import Store from 'baredux'
+import Store, { BareduxStore } from 'baredux'
+import GitAgent from './GitAgent'
+import ScribouilliGitRepo from './scribouilliGitRepo'
+import { Page, Article } from './types/atelier'
 /**
  * Un store baredux a pour vocation de refléter notamment le modèle mental de la
  * personne face à Scribouilli. Le store stocke donc principalement des données (et parfois des singletons)
@@ -14,36 +15,33 @@ import Store from 'baredux'
 // DO NOT import x from 'remember' // do it in an action instead
 // DO NOT import x from './actions/*.js' // you're making an action, so add an action instead
 
-import GitAgent from './GitAgent.js'
-
-/** @typedef { {message: string, resolution: (...args: any[]) => Promise<any>} } ResolutionOption */
+export interface ResolutionOption {
+  message: string
+  resolution: (...args: any[]) => Promise<any>
+}
 
-/**
- * @typedef {Object} OAuthProvider
- * @property {string} name
- * @property {string} accessToken
- * @property {string} origin
- */
+export interface OAuthProvider {
+  name: string
+  accessToken: string
+  origin: string
+}
 
-/**
- * @typedef {Object} ScribouilliState
- * @property {OAuthProvider} [oAuthProvider]
- * @property {Promise<string> | string} [login]
- * @property {string} [email]
- * @property {ScribouilliGitRepo | undefined} currentRepository
- * @property {GitAgent | undefined} gitAgent
- * @property {ResolutionOption[] | undefined} conflict
- * @property {any} reposByAccount
- * @property {Page[]} [pages]
- * @property {Article[]} [articles]
- * @property {any} buildStatus
- * @property {string} basePath
- * @property {{css?: string}} theme
- */
+export interface ScribouilliState {
+  oAuthProvider?: OAuthProvider
+  login?: Promise<string> | string
+  email?: string
+  currentRepository: ScribouilliGitRepo | undefined
+  gitAgent: GitAgent | undefined
+  conflict: ResolutionOption[] | undefined
+  reposByAccount: any
+  pages?: Page[]
+  articles?: Article[]
+  buildStatus: any
+  basePath: string
+  theme: { css?: string }
+}
 
-/** @type {ScribouilliState} */
-const state = {
-  // @ts-ignore
+const state: ScribouilliState = {
   oAuthProvider: undefined,
   login: undefined,
   email: undefined,
@@ -64,51 +62,33 @@ const state = {
 }
 
 const mutations = {
-  /**
-   * @param {ScribouilliState} state
-   * @param {ScribouilliState['oAuthProvider']} oAuthProvider
-   */
-  setOAuthProvider(state, oAuthProvider) {
+  setOAuthProvider(
+    state: ScribouilliState,
+    oAuthProvider: ScribouilliState['oAuthProvider'],
+  ) {
     state.oAuthProvider = oAuthProvider
   },
-  /**
-   *
-   * @param {ScribouilliState} state
-   * @param {ScribouilliState['login']} login
-   */
-  setLogin(state, login) {
+
+  setLogin(state: ScribouilliState, login: ScribouilliState['login']) {
     state.login = login
   },
-  /**
-   *
-   * @param {ScribouilliState} state
-   * @param {ScribouilliState['email']} email
-   */
-  setEmail(state, email) {
+
+  setEmail(state: ScribouilliState, email: ScribouilliState['email']) {
     state.email = email
   },
-  /**
-   *
-   * @param {ScribouilliState} state
-   * @param {ScribouilliState['currentRepository']} repository
-   */
-  setCurrentRepository(state, repository) {
+
+  setCurrentRepository(
+    state: ScribouilliState,
+    repository: ScribouilliState['currentRepository'],
+  ) {
     state.currentRepository = repository
   },
-  /**
-   *
-   * @param {ScribouilliState} state
-   * @param {ScribouilliState['gitAgent']} gitAgent
-   */
-  setGitAgent(state, gitAgent) {
+
+  setGitAgent(state: ScribouilliState, gitAgent: ScribouilliState['gitAgent']) {
     state.gitAgent = gitAgent
   },
-  /**
-   *
-   * @param {ScribouilliState} state
-   * @param {ScribouilliState['pages']} pages
-   */
-  setPages(state, pages) {
+
+  setPages(state: ScribouilliState, pages: ScribouilliState['pages']) {
     state.pages = pages?.sort((pageA, pageB) => {
       const diffIndex = pageA.index - pageB.index
       if (diffIndex === 0) {
@@ -125,20 +105,12 @@ const mutations = {
       return diffIndex
     })
   },
-  /**
-   *
-   * @param {ScribouilliState} state
-   * @param {ScribouilliState['conflict']} conflict
-   */
-  setConflict(state, conflict) {
+
+  setConflict(state: ScribouilliState, conflict: ScribouilliState['conflict']) {
     state.conflict = conflict
   },
-  /**
-   *
-   * @param {ScribouilliState} state
-   * @param {ScribouilliState['articles']} articles
-   */
-  setArticles(state, articles) {
+
+  setArticles(state: ScribouilliState, articles: ScribouilliState['articles']) {
     state.articles = articles?.sort((pageA, pageB) => {
       if (pageA.path < pageB.path) {
         return 1
@@ -151,19 +123,15 @@ const mutations = {
       return 0
     })
   },
-  /**
-   *
-   * @param {ScribouilliState} state
-   * @param {any} buildStatus
-   */
-  setBuildStatus(state, buildStatus) {
+
+  setBuildStatus(state: ScribouilliState, buildStatus: any) {
     state.buildStatus = buildStatus
   },
-  /**
-   * @param {ScribouilliState} state
-   * @param {{ login: string, repos: any[] }} params
-   */
-  setReposForAccount(state, { login, repos }) {
+
+  setReposForAccount(
+    state: ScribouilliState,
+    { login, repos }: { login: string; repos: any[] },
+  ) {
     state.reposByAccount[login] = repos
       // on place ses propres dépôts avant les dépôts des autres
       .sort((a, b) => {
@@ -180,20 +148,12 @@ const mutations = {
         return 0
       })
   },
-  /**
-   *
-   * @param {ScribouilliState} state
-   * @param {ScribouilliState['theme']['css']} css
-   */
-  setTheme(state, css) {
+
+  setTheme(state: ScribouilliState, css: ScribouilliState['theme']['css']) {
     state.theme.css = css
   },
 
-  /**
-   *
-   * @param {ScribouilliState} state
-   */
-  logout(state) {
+  logout(state: ScribouilliState) {
     // account-related
     state.oAuthProvider = undefined
     state.login = undefined
@@ -209,9 +169,11 @@ const mutations = {
   },
 }
 
-/** @typedef { typeof mutations } ScribouilliMutations */
+type ScribouilliMutations = typeof mutations
 
-/** @type { import('baredux').BareduxStore<ScribouilliState, ScribouilliMutations> } */
-const store = Store({ state, mutations })
+const store: BareduxStore<ScribouilliState, ScribouilliMutations> = Store({
+  state,
+  mutations,
+})
 
 export default store
diff --git a/assets/scripts/types/atelier.js b/assets/scripts/types/atelier.js
deleted file mode 100644
index c3930eb3..00000000
--- a/assets/scripts/types/atelier.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * @typedef {Object} Page
- * @property {string} path
- * @property {string} title
- * @property {string} [content]
- * @property {boolean} [inMenu]
- * @property {boolean} [blogIndex] Is this page the index of the blog section? Defaults to false.
- * @property {number} index
- */
-
-/**
- * @typedef {Object} Article
- * @property {string} path
- * @property {string} title
- * @property {string} [content]
- */
-
-/**
- * @typedef {Object} EditeurFile
- * @property {string} fileName
- * @property {string} content
- * @property {string | undefined} previousContent
- * @property {string} title
- * @property {number} index
- * @property {string | undefined} previousTitle
- * @property {boolean} blogIndex
- */
-
-/**
- * @typedef {Object} FileContenu
- * @property {string} path
- * @property {string} title
- * @property {string} content
- * @property {number} index
- * @property {boolean} inMenu
- * @property {boolean} blogIndex
- */
diff --git a/assets/scripts/types/atelier.ts b/assets/scripts/types/atelier.ts
new file mode 100644
index 00000000..69daccee
--- /dev/null
+++ b/assets/scripts/types/atelier.ts
@@ -0,0 +1,33 @@
+export interface Page {
+  path: string
+  title: string
+  content?: string
+  inMenu?: boolean
+  blogIndex?: boolean
+  index: number
+}
+
+export interface Article {
+  path: string
+  title: string
+  content?: string
+}
+
+export interface EditeurFile {
+  fileName: string
+  content: string
+  previousContent: string | undefined
+  title: string
+  index: number
+  previousTitle: string | undefined
+  blogIndex: boolean
+}
+
+export interface FileContenu {
+  path: string
+  title: string
+  content: string
+  index: number
+  inMenu: boolean
+  blogIndex: boolean
+}
diff --git a/assets/scripts/types/git.js b/assets/scripts/types/git.js
deleted file mode 100644
index ac4d1d96..00000000
--- a/assets/scripts/types/git.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * @typedef {Object} ScribouilliGitRepo
- * @property {string} repoId
- * @property {string} owner
- * @property {string} repoName
- * @property {string} origin
- * @property {Promise<string>} publishedWebsiteURL
- * @property {string} publicRepositoryURL
- */
-
-/**
- * @typedef {Object} GitSiteTemplate
- * @property {string} url
- * @property {string} description
- * @property {string} githubRepoId
- */
-
-/**
- * @typedef {"in_progress" | "success" | "error" | "needs_account_verification" } BuildStatus
- */
-
-/**
- * @typedef {Object} OAuthServiceAPI
- * @property {(url: string, requestParams?: RequestInit) => Promise<Response>} callAPI
- * // https://isomorphic-git.org/docs/en/onAuth#oauth2-tokens
- * @property {() => {username: string, password: string}} getOauthUsernameAndPassword
- * @property {() => Promise<any>} getAuthenticatedUser
- * @property {() => Promise<AuthenticatedUserEmails[]>} getUserEmails
- * @property {(scribouilliGitRepo: ScribouilliGitRepo, template: GitSiteTemplate) => Promise<{remoteURL: string}>} createDefaultRepository
- * @property {(scribouilliGitRepo: ScribouilliGitRepo) => Promise<boolean>} isRepositoryReady
- * @property {() => Promise<GithubRepository[]>} getCurrentUserRepositories
- * @property {(scribouilliGitRepo: ScribouilliGitRepo) => Promise<any>} deploy
- * @property {(scribouilliGitRepo: ScribouilliGitRepo) => Promise<BuildStatus>} getPagesWebsiteDeploymentStatus
- * @property {(scribouilliGitRepo: ScribouilliGitRepo) => Promise<boolean>} isPagesWebsiteBuilt
- * @property {(scribouilliGitRepo: ScribouilliGitRepo) => Promise<string | undefined>} getPublishedWebsiteURL
- */
-
-/**
- * @typedef {Object} GithubOptions
- * @property {string} accessToken
- */
-
-/**
- * @typedef {Object} GitlabOptions
- * @property {string} accessToken
- * @property {string} origin
- * @property {string} refreshToken
- * @property {string} expiredIn
- * @property {string} state
- */
-
-/**
- * @typedef {Object} AuthenticatedUserEmails
- * @property {string} email
- * @property {boolean} primary
- */
-
-/**
- * @typedef {Object} GithubDeployment
- * @property {string} statuses_url
- */
-
-/**
- * @typedef {Object} GithubRepository
- * @property {string} name
- * @property {Object} owner
- * @property {string} owner.login
- */
-
-/**
- * A git commit object.
- *
- * @typedef {Object} CommitObject
- * @property {string} message Commit message
- * @property {string} tree SHA-1 object id of corresponding file tree
- * @property {string[]} parent an array of zero or more SHA-1 object ids
- * @property {Object} author
- * @property {string} author.name The author's name
- * @property {string} author.email The author's email
- * @property {number} author.timestamp UTC Unix timestamp in seconds
- * @property {number} author.timezoneOffset Timezone difference from UTC in minutes
- * @property {Object} committer
- * @property {string} committer.name The committer's name
- * @property {string} committer.email The committer's email
- * @property {number} committer.timestamp UTC Unix timestamp in seconds
- * @property {number} committer.timezoneOffset Timezone difference from UTC in minutes
- * @property {string} [gpgsig] PGP signature (if present)
- */
diff --git a/assets/scripts/types/git.ts b/assets/scripts/types/git.ts
new file mode 100644
index 00000000..ee521b60
--- /dev/null
+++ b/assets/scripts/types/git.ts
@@ -0,0 +1,95 @@
+interface ScribouilliGitRepo {
+  repoId: string
+  owner: string
+  repoName: string
+  origin: string
+  publishedWebsiteURL: Promise<string>
+  publicRepositoryURL: string
+}
+
+export interface GitSiteTemplate {
+  url: string
+  description: string
+  githubRepoId: string
+}
+
+export type BuildStatus =
+  | 'in_progress'
+  | 'success'
+  | 'error'
+  | 'needs_account_verification'
+
+export interface OAuthServiceAPI {
+  callAPI: (url: string, requestParams?: RequestInit) => Promise<Response>
+  getOauthUsernameAndPassword: () => { username: string; password: string }
+  getAuthenticatedUser: () => Promise<any>
+  getUserEmails: () => Promise<AuthenticatedUserEmails[]>
+  createDefaultRepository: (
+    scribouilliGitRepo: ScribouilliGitRepo,
+    template: GitSiteTemplate,
+  ) => Promise<{ remoteURL: string }>
+  isRepositoryReady: (
+    scribouilliGitRepo: ScribouilliGitRepo,
+  ) => Promise<boolean>
+  getCurrentUserRepositories: () => Promise<GithubRepository[]>
+  deploy: (scribouilliGitRepo: ScribouilliGitRepo) => Promise<any>
+  getPagesWebsiteDeploymentStatus: (
+    scribouilliGitRepo: ScribouilliGitRepo,
+  ) => Promise<BuildStatus>
+  isPagesWebsiteBuilt: (
+    scribouilliGitRepo: ScribouilliGitRepo,
+  ) => Promise<boolean>
+  getPublishedWebsiteURL: (
+    scribouilliGitRepo: ScribouilliGitRepo,
+  ) => Promise<string | undefined>
+}
+
+interface GithubOptions {
+  accessToken: string
+}
+
+interface GitlabOptions {
+  accessToken: string
+  origin: string
+  refreshToken: string
+  expiredIn: string
+  state: string
+}
+
+interface AuthenticatedUserEmails {
+  email: string
+  primary: boolean
+}
+
+interface GithubDeployment {
+  statuses_url: string
+}
+
+export interface GithubRepository {
+  name: string
+  owner: {
+    login: string
+  }
+}
+
+/**
+ * A git commit object.
+ */
+interface CommitObject {
+  message: string
+  tree: string
+  parent: string[]
+  author: {
+    name: string
+    email: string
+    timestamp: number
+    timezoneOffset: number
+  }
+  committer: {
+    name: string
+    email: string
+    timestamp: number
+    timezoneOffset: number
+  }
+  gpgsig?: string
+}
diff --git a/assets/scripts/utils.js b/assets/scripts/utils.ts
similarity index 61%
rename from assets/scripts/utils.js
rename to assets/scripts/utils.ts
index 35deca97..077d82c1 100644
--- a/assets/scripts/utils.js
+++ b/assets/scripts/utils.ts
@@ -1,15 +1,13 @@
-//@ts-check
-
 import page from 'page'
 import { format } from 'date-fns'
 
 import store from './store.js'
+import { CommitObject } from 'isomorphic-git'
 
 /**
  * @summary Handle errors catched by Promises
- * @param {string} errorMessage
  */
-export const handleErrors = errorMessage => {
+export const handleErrors = (errorMessage: string) => {
   switch (errorMessage) {
     case 'INVALIDATE_TOKEN': {
       store.mutations.logout()
@@ -38,12 +36,7 @@ export const handleErrors = errorMessage => {
   }
 }
 
-/**
- *
- * @param {string} string
- * @returns {string}
- */
-function makeFilenameCompatibleString(string) {
+function makeFilenameCompatibleString(string: string): string {
   return string
     .replace(/\/|#|\?|:|&|\(|\)|\+/g, '-') // replace url confusing characters
     .normalize('NFD')
@@ -53,41 +46,22 @@ function makeFilenameCompatibleString(string) {
     .toLowerCase()
 }
 
-/**
- *
- * @param {string} title
- * @returns {string}
- */
-export function makeFileNameFromTitle(title) {
+export function makeFileNameFromTitle(title: string): string {
   return makeFilenameCompatibleString(title) + '.md'
 }
 
-/**
- *
- * @param {string} title
- * @param {Date} date
- * @returns {string}
- */
-export function makeArticleFileName(title, date) {
+export function makeArticleFileName(title: string, date: Date): string {
   return `_posts/${format(date, 'yyyy-MM-dd')}-${makeFilenameCompatibleString(
     title,
   )}.md`
 }
 
-/**
- *
- * @param {string} title
- * @param {number?} index
- * @param {boolean} inMenu
- * @param {boolean} [blogIndex]
- * @returns {string}
- */
 export function makePageFrontMatter(
-  title,
-  index = 1,
-  inMenu = true,
-  blogIndex = undefined,
-) {
+  title: string,
+  index: number | null = 1,
+  inMenu: boolean = true,
+  blogIndex?: boolean,
+): string {
   return [
     '---',
     'title: ' + '"' + title.replace(/"/g, '\\"') + '"',
@@ -99,12 +73,7 @@ export function makePageFrontMatter(
     .join('\n')
 }
 
-/**
- *
- * @param {string} title
- * @returns {string}
- */
-export function makeArticleFrontMatter(title) {
+export function makeArticleFrontMatter(title: string): string {
   return [
     '---',
     'title: ' + '"' + title.replace(/"/g, '\\"') + '"',
@@ -112,29 +81,18 @@ export function makeArticleFrontMatter(title) {
   ].join('\n')
 }
 
-/**
- *
- * @param {string} errorMessage
- * @param {string} caller
- * @param {'log' | 'warn' | 'error'} level
- */
-export const logMessage = (errorMessage, caller = 'unknown', level = 'log') => {
+export const logMessage = (
+  errorMessage: string,
+  caller: string = 'unknown',
+  level: 'log' | 'warn' | 'error' = 'log',
+) => {
   console[level](`[${level}] [caller: ${caller}] ${errorMessage}`)
 }
 
-/**
- *
- * @param {number} ms
- * @returns {Promise<void>}
- */
-export const delay = ms => new Promise(resolve => setTimeout(resolve, ms))
+export const delay = (ms: number): Promise<void> =>
+  new Promise(resolve => setTimeout(resolve, ms))
 
-/**
- *
- * @param {CommitObject} lastCommit
- * @returns {boolean}
- */
-export const isItStillCompiling = lastCommit => {
+export const isItStillCompiling = (lastCommit: CommitObject): boolean => {
   // Delay (in seconds) after which a non-updated website is assumed to have failed to build.
   const ERROR_DELAY = 60 * 1000
   const currentTime = new Date().getTime() / 1000
diff --git a/docs/conseils.md b/docs/conseils.md
new file mode 100644
index 00000000..36bc0586
--- /dev/null
+++ b/docs/conseils.md
@@ -0,0 +1,30 @@
+# Conseils et erreurs communes
+
+## Erreur: `TYPE is not exported by FICHIER`
+
+Si on a cette erreur quand on compile, c'est qu'on importe un type comme si
+c'était une valeur. Il faut changer:
+
+```ts
+import { TYPE } from "FICHIER"
+```
+
+en
+
+```ts
+import type { TYPE } from "FICHIER"
+```
+
+ou en
+
+```ts
+import { type TYPE } from "FICHIER"
+```
+
+Le préfixe `type` permet d'importer juste la définition de type et est ignorée
+par Svelte, tout en permettant à TypeScript de comprendre les types.
+
+La différence entre les deux se voit si on importe plusieurs choses depuis ce
+fichier : dans le premier cas, on ne peut lister que des types dans les
+accolades, dans le second cas on doit mettre le préfixe `type` devant chaque
+type mais on peut aussi importer des valeurs.
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 8b52bf5c..4ce00845 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,12 +25,14 @@
         "@rollup/plugin-commonjs": "^29.0.3",
         "@rollup/plugin-node-resolve": "^16.0.3",
         "@rollup/plugin-terser": "^0.4.4",
+        "@rollup/plugin-typescript": "^12.3.0",
         "@types/chai": "^4.3.10",
         "@types/dompurify": "^3.0.4",
         "@types/js-yaml": "^4.0.9",
         "@types/jsdom": "^21.1.5",
         "@types/mocha": "^10.0.4",
         "@types/page": "^1.11.8",
+        "@types/rollup-plugin-css-only": "^3.1.3",
         "@types/sinon": "^17.0.1",
         "@types/sinon-chai": "^3.2.12",
         "chai": "^4.3.10",
@@ -52,6 +54,7 @@
         "sinon-chai": "^3.7.0",
         "svelte": "^5.0.0",
         "svelte-check": "^4.0.0",
+        "tslib": "^2.8.1",
         "typescript": "^6.0.3"
       }
     },
@@ -776,6 +779,33 @@
         }
       }
     },
+    "node_modules/@rollup/plugin-typescript": {
+      "version": "12.3.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-12.3.0.tgz",
+      "integrity": "sha512-7DP0/p7y3t67+NabT9f8oTBFE6gGkto4SA6Np2oudYmZE/m1dt8RB0SjL1msMxFpLo631qjRCcBlAbq1ml/Big==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@rollup/pluginutils": "^5.1.0",
+        "resolve": "^1.22.1"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^2.14.0||^3.0.0||^4.0.0",
+        "tslib": "*",
+        "typescript": ">=3.7.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        },
+        "tslib": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@rollup/pluginutils": {
       "version": "5.4.0",
       "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.4.0.tgz",
@@ -1341,6 +1371,38 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/rollup-plugin-css-only": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/@types/rollup-plugin-css-only/-/rollup-plugin-css-only-3.1.3.tgz",
+      "integrity": "sha512-Yomg5XvEYfZ9RWAO/5yKhc1QAUXmyI2VOFeMJpAmwhE73EZMsjtuZ+w2Y7gC2c2XHdb+YtymNQrFKqBqyokjfw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "rollup": "^0.63.4"
+      }
+    },
+    "node_modules/@types/rollup-plugin-css-only/node_modules/@types/estree": {
+      "version": "0.0.39",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
+      "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/rollup-plugin-css-only/node_modules/rollup": {
+      "version": "0.63.5",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.63.5.tgz",
+      "integrity": "sha512-dFf8LpUNzIj3oE0vCvobX6rqOzHzLBoblyFp+3znPbjiSmSvOoK2kMKx+Fv9jYduG1rvcCfCveSgEaQHjWRF6g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "0.0.39",
+        "@types/node": "*"
+      },
+      "bin": {
+        "rollup": "bin/rollup"
+      }
+    },
     "node_modules/@types/sinon": {
       "version": "17.0.4",
       "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-17.0.4.tgz",
@@ -7297,6 +7359,13 @@
         "node": ">=14"
       }
     },
+    "node_modules/tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "dev": true,
+      "license": "0BSD"
+    },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
diff --git a/package.json b/package.json
index 013e03b4..edcbc1b8 100644
--- a/package.json
+++ b/package.json
@@ -31,12 +31,14 @@
     "@rollup/plugin-commonjs": "^29.0.3",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-terser": "^0.4.4",
+    "@rollup/plugin-typescript": "^12.3.0",
     "@types/chai": "^4.3.10",
     "@types/dompurify": "^3.0.4",
     "@types/js-yaml": "^4.0.9",
     "@types/jsdom": "^21.1.5",
     "@types/mocha": "^10.0.4",
     "@types/page": "^1.11.8",
+    "@types/rollup-plugin-css-only": "^3.1.3",
     "@types/sinon": "^17.0.1",
     "@types/sinon-chai": "^3.2.12",
     "chai": "^4.3.10",
@@ -58,6 +60,7 @@
     "sinon-chai": "^3.7.0",
     "svelte": "^5.0.0",
     "svelte-check": "^4.0.0",
+    "tslib": "^2.8.1",
     "typescript": "^6.0.3"
   },
   "dependencies": {
diff --git a/rollup.config.js b/rollup.config.js
deleted file mode 100644
index bb8d1fa1..00000000
--- a/rollup.config.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import svelte from 'rollup-plugin-svelte';
-import resolve from '@rollup/plugin-node-resolve';
-import commonjs from '@rollup/plugin-commonjs';
-import terser from '@rollup/plugin-terser';
-import css from 'rollup-plugin-css-only';
-
-
-// disable minification for prod for the moment
-// PPP : re-enable when we feel confident about not having to debug in production
-const production = false;		
-//const production = !process.env.ROLLUP_WATCH;
-
-export default {
-	input: 'assets/scripts/scripts.js',
-	output: {
-		sourcemap: true,
-		format: 'iife',
-		name: 'app',
-		file: 'build/bundle.js',
-		globals: {
-			buffer: 'buffer',
-		}
-	},
-	plugins: [
-		svelte({
-			compilerOptions: {
-				// enable run-time checks when not in production
-				dev: !production,
-			},
-		}),
-
-		css({ output: 'bundle.css' }),
-
-		// If you have external dependencies installed from
-		// npm, you'll most likely need these plugins. In
-		// some cases you'll need additional configuration -
-		// consult the documentation for details:
-		// https://github.com/rollup/plugins/tree/master/packages/commonjs
-		resolve({
-			browser: true,
-			dedupe: ['svelte']
-		}),
-		commonjs(),
-
-		// If we're building for production (npm run build
-		// instead of npm run dev), minify
-		production && terser()
-	],
-	watch: {
-		clearScreen: false
-	}
-};
diff --git a/rollup.config.ts b/rollup.config.ts
new file mode 100644
index 00000000..4141b164
--- /dev/null
+++ b/rollup.config.ts
@@ -0,0 +1,54 @@
+import svelte from 'rollup-plugin-svelte'
+import resolve from '@rollup/plugin-node-resolve'
+import commonjs from '@rollup/plugin-commonjs'
+import terser from '@rollup/plugin-terser'
+import css from 'rollup-plugin-css-only'
+import typescript from '@rollup/plugin-typescript'
+
+// disable minification for prod for the moment
+// PPP : re-enable when we feel confident about not having to debug in production
+const production = false
+//const production = !process.env.ROLLUP_WATCH;
+
+export default {
+  input: 'assets/scripts/scripts.ts',
+  output: {
+    sourcemap: true,
+    format: 'iife',
+    name: 'app',
+    file: 'build/bundle.js',
+    globals: {
+      buffer: 'buffer',
+    },
+  },
+  plugins: [
+    typescript(),
+
+    svelte({
+      compilerOptions: {
+        // enable run-time checks when not in production
+        dev: !production,
+      },
+    }),
+
+    css({ output: 'bundle.css' }),
+
+    // If you have external dependencies installed from
+    // npm, you'll most likely need these plugins. In
+    // some cases you'll need additional configuration -
+    // consult the documentation for details:
+    // https://github.com/rollup/plugins/tree/master/packages/commonjs
+    resolve({
+      browser: true,
+      dedupe: ['svelte'],
+    }),
+    commonjs(),
+
+    // If we're building for production (npm run build
+    // instead of npm run dev), minify
+    production && terser(),
+  ],
+  watch: {
+    clearScreen: false,
+  },
+}
diff --git a/tsconfig.json b/tsconfig.json
index b48af06f..5af59f21 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "include": ["declarations.d.ts", "assets/scripts/**/*.js"],
+  "include": ["declarations.d.ts", "assets/scripts/**/*.ts"],
   "exclude": ["node_modules", "tests/**/*.js"],
   "compilerOptions": {
     "allowJs": true,
@@ -13,6 +13,7 @@
     "lib": ["ES2022", "dom", "dom.iterable"],
     "types": ["node", "mocha"],
     "noUnusedLocals": true,
-    "noUnusedParameters": true
+    "noUnusedParameters": true,
+    "outDir": "build",
   }
 }

From 7ee91841f1f49dd87a48612c3d971bc8a6e0a72f Mon Sep 17 00:00:00 2001
From: Ana Gelez <ana+git@gelez.xyz>
Date: Wed, 24 Jun 2026 13:02:52 +0200
Subject: [PATCH 3/6] =?UTF-8?q?Supprime=20des=20interfaces=20qui=20ne=20so?=
 =?UTF-8?q?nt=20plus=20utilis=C3=A9es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/scripts/types/git.ts | 38 -------------------------------------
 1 file changed, 38 deletions(-)

diff --git a/assets/scripts/types/git.ts b/assets/scripts/types/git.ts
index ee521b60..aae18fdc 100644
--- a/assets/scripts/types/git.ts
+++ b/assets/scripts/types/git.ts
@@ -44,52 +44,14 @@ export interface OAuthServiceAPI {
   ) => Promise<string | undefined>
 }
 
-interface GithubOptions {
-  accessToken: string
-}
-
-interface GitlabOptions {
-  accessToken: string
-  origin: string
-  refreshToken: string
-  expiredIn: string
-  state: string
-}
-
 interface AuthenticatedUserEmails {
   email: string
   primary: boolean
 }
 
-interface GithubDeployment {
-  statuses_url: string
-}
-
 export interface GithubRepository {
   name: string
   owner: {
     login: string
   }
 }
-
-/**
- * A git commit object.
- */
-interface CommitObject {
-  message: string
-  tree: string
-  parent: string[]
-  author: {
-    name: string
-    email: string
-    timestamp: number
-    timezoneOffset: number
-  }
-  committer: {
-    name: string
-    email: string
-    timestamp: number
-    timezoneOffset: number
-  }
-  gpgsig?: string
-}

From a3c1e6b9ea3dc17a7ed2f59eb2cac6c7889537f7 Mon Sep 17 00:00:00 2001
From: Ana Gelez <ana+git@gelez.xyz>
Date: Wed, 24 Jun 2026 13:02:52 +0200
Subject: [PATCH 4/6] =?UTF-8?q?Change=20le=20buildStatus=20pour=20que=20?=
 =?UTF-8?q?=C3=A7a=20soit=20moins=20compliqu=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/scripts/actions/current-repository.ts | 44 ++++++++----
 assets/scripts/buildStatus.ts                | 74 ++++++--------------
 assets/scripts/components/Header.svelte      | 22 +-----
 assets/scripts/components/Skeleton.svelte    |  5 +-
 assets/scripts/routes/atelier-articles.ts    | 45 +++++++-----
 assets/scripts/routes/atelier-pages.ts       | 49 +++++++------
 assets/scripts/store.ts                      |  7 +-
 7 files changed, 122 insertions(+), 124 deletions(-)

diff --git a/assets/scripts/actions/current-repository.ts b/assets/scripts/actions/current-repository.ts
index f9ce8dfb..f50a30fe 100644
--- a/assets/scripts/actions/current-repository.ts
+++ b/assets/scripts/actions/current-repository.ts
@@ -9,12 +9,16 @@ import ScribouilliGitRepo, {
 import GitAgent from '../GitAgent.js'
 import { handleErrors, logMessage } from './../utils.js'
 import { fetchAuthenticatedUserLogin } from './current-user.js'
-import makeBuildStatus from './../buildStatus.js'
+import {
+  scheduleCheck,
+  setBuildingAndCheckStatusLater,
+} from './../buildStatus.js'
 import { file } from './file.js'
 import { getPagesList } from './page.js'
 import { getArticlesList } from './article.js'
 import { getOAuthServiceAPI } from '../oauth-services-api/index.js'
 import { CUSTOM_CSS_PATH } from '../config.js'
+import { BuildStatus } from '../types/git.js'
 
 export const getCurrentRepoPages = () => {
   return getPagesList().then(store.mutations.setPages).catch(handleErrors)
@@ -102,13 +106,22 @@ export const setBuildStatus = (
   scribouilliGitRepo: ScribouilliGitRepo,
   gitAgent: GitAgent,
 ) => {
-  store.mutations.setBuildStatus(makeBuildStatus(scribouilliGitRepo, gitAgent))
-  /*
-  Appel sans vérification,
-  On suppose qu'au chargement initial,
-  on peut faire confiance à ce que renvoit l'API
-  */
-  store.state.buildStatus.checkStatus()
+  store.mutations.setBuildStatus('in_progress')
+  let lastBuildStatus: BuildStatus | undefined = undefined
+  store.subscribe(state => {
+    if (state.buildStatus !== lastBuildStatus) {
+      lastBuildStatus = state.buildStatus
+
+      if (
+        state.buildStatus === 'in_progress' ||
+        state.buildStatus === 'needs_account_verification'
+      ) {
+        scheduleCheck(scribouilliGitRepo, gitAgent)
+      }
+    }
+  })
+
+  scheduleCheck(scribouilliGitRepo, gitAgent)
 }
 
 /**
@@ -237,10 +250,17 @@ const getCurrentRepoConfig = (): Promise<any> => {
 
 export function saveCustomCSS(
   css: string,
-  localStore = store,
-): ReturnType<typeof file.writeFileAndPushChanges> {
-  localStore.mutations.setTheme(css)
-  localStore.state.buildStatus.setBuildingAndCheckStatusLater(10000)
+): ReturnType<typeof file.writeFileAndPushChanges> | Promise<void> {
+  if (!store.state.currentRepository || !store.state.gitAgent) {
+    return Promise.resolve()
+  }
+
+  store.mutations.setTheme(css)
+  setBuildingAndCheckStatusLater(
+    store.state.currentRepository,
+    store.state.gitAgent,
+    10000,
+  )
   return file.writeFileAndPushChanges(
     CUSTOM_CSS_PATH,
     css,
diff --git a/assets/scripts/buildStatus.ts b/assets/scripts/buildStatus.ts
index 5bb1a987..1f175681 100644
--- a/assets/scripts/buildStatus.ts
+++ b/assets/scripts/buildStatus.ts
@@ -1,66 +1,38 @@
 import GitAgent from './GitAgent.js'
 import { getOAuthServiceAPI } from './oauth-services-api/index.js'
 import ScribouilliGitRepo from './scribouilliGitRepo.js'
+import store from './store.js'
 import { BuildStatus } from './types/git.js'
 import { isItStillCompiling } from './utils.js'
 
-export default function (
+let timeout: ReturnType<typeof setTimeout> | undefined
+
+export function scheduleCheck(
   scribouilliGitRepo: ScribouilliGitRepo,
   gitAgent: GitAgent,
+  delay = 5000,
 ) {
-  let repoStatus: BuildStatus = 'in_progress'
-  let reaction: (status: BuildStatus) => any
-  let timeout: ReturnType<typeof setTimeout> | undefined
-
-  function scheduleCheck(delay = 5000) {
-    if (!timeout) {
-      timeout = setTimeout(() => {
-        buildStatusObject.checkStatus()
-        timeout = undefined
-      }, delay)
-    }
-  }
-
-  const buildStatusObject = {
-    get status() {
-      return repoStatus
-    },
-    subscribe(callback: (status: BuildStatus) => any) {
-      reaction = callback
-    },
-    checkStatus() {
-      return getBuildStatus(scribouilliGitRepo, gitAgent)
-        .then(status => {
-          repoStatus = status
-          if (reaction) {
-            reaction(repoStatus)
-          }
-
-          if (
-            repoStatus === 'in_progress' ||
-            repoStatus === 'needs_account_verification'
-          ) {
-            scheduleCheck()
-          }
-        })
-        .catch(() => {
-          repoStatus = 'error'
-          if (reaction) {
-            reaction(repoStatus)
-          }
-        })
-    },
-    setBuildingAndCheckStatusLater(t = 30000) {
-      repoStatus = 'in_progress'
-      // @ts-ignore
-      clearTimeout(timeout)
+  if (!timeout) {
+    timeout = setTimeout(async () => {
+      const status = await getBuildStatus(scribouilliGitRepo, gitAgent).catch(
+        () => 'error' as const,
+      )
+      store.mutations.setBuildStatus(status)
       timeout = undefined
-      scheduleCheck(t)
-    },
+    }, delay)
   }
+}
 
-  buildStatusObject.checkStatus()
-  return buildStatusObject
+export function setBuildingAndCheckStatusLater(
+  scribouilliGitRepo: ScribouilliGitRepo,
+  gitAgent: GitAgent,
+  t = 30000,
+) {
+  store.mutations.setBuildStatus('in_progress')
+  // @ts-ignore
+  clearTimeout(timeout)
+  timeout = undefined
+  scheduleCheck(scribouilliGitRepo, gitAgent, t)
 }
 
 /**
diff --git a/assets/scripts/components/Header.svelte b/assets/scripts/components/Header.svelte
index 371604ab..52f3d5fd 100644
--- a/assets/scripts/components/Header.svelte
+++ b/assets/scripts/components/Header.svelte
@@ -1,10 +1,9 @@
 <script lang="ts">
-  import { run } from 'svelte/legacy';
   import type { BuildStatus } from '../types/git.js'
   import type { ScribouilliState } from '../store.js'
 
   interface Props {
-    buildStatus: { status: BuildStatus} 
+    buildStatus: BuildStatus
     currentRepository: ScribouilliState["currentRepository"] | undefined
     showArticles: boolean
     conflict: ScribouilliState["conflict"]
@@ -17,23 +16,8 @@
     conflict
   }: Props = $props();
 
-  let status: string | undefined = $state()
-
-  run(() => {
-    status = buildStatus?.status
-  });
-
-  if (buildStatus) {
-    // @ts-ignore
-    buildStatus.subscribe(s => {
-      if (s) { 
-        status = s
-      }
-    })
-  }
-
-  let needsAccountVerification: boolean = $derived(status === 'needs_account_verification')
-  let buildStatusClass = $derived(buildStatus ? `build-${status}` : undefined)
+  let needsAccountVerification: boolean = $derived(buildStatus === 'needs_account_verification')
+  let buildStatusClass = $derived(buildStatus ? `build-${buildStatus}` : undefined)
   let publishedWebsiteURL: Promise<string> | undefined = $derived(currentRepository?.publishedWebsiteURL)
   let repositoryURL: string | undefined = $derived(currentRepository?.publicRepositoryURL)
   let repoName: string | undefined = $derived(currentRepository?.repoName)
diff --git a/assets/scripts/components/Skeleton.svelte b/assets/scripts/components/Skeleton.svelte
index 16f915ce..a98e2cc7 100644
--- a/assets/scripts/components/Skeleton.svelte
+++ b/assets/scripts/components/Skeleton.svelte
@@ -3,10 +3,11 @@
   import Footer from "./Footer.svelte";
   import type { ScribouilliState } from "../store"
   import type { Snippet } from "svelte"
+  import type { BuildStatus } from "../types/git"
 
   interface Props {
     showArticles?: boolean
-    buildStatus?: any
+    buildStatus: BuildStatus
     currentRepository?: ScribouilliState["currentRepository"] | undefined
     conflict?: ScribouilliState["conflict"]
     children?: Snippet
@@ -14,7 +15,7 @@
 
   let {
     showArticles = false,
-    buildStatus = undefined,
+    buildStatus = "in_progress" as const,
     currentRepository = undefined,
     conflict = undefined,
     children
diff --git a/assets/scripts/routes/atelier-articles.ts b/assets/scripts/routes/atelier-articles.ts
index f69f58c4..35483c85 100644
--- a/assets/scripts/routes/atelier-articles.ts
+++ b/assets/scripts/routes/atelier-articles.ts
@@ -15,18 +15,19 @@ import {
 } from '../actions/article'
 import { makeAtelierListArticlesURL } from './atelier-list-articles.js'
 import { EditeurFile } from '../types/atelier.js'
+import { setBuildingAndCheckStatusLater } from '../buildStatus'
 
 const makeMapStateToProps =
   (fileName: string): ((state: ScribouilliState) => any) =>
   state => {
-    const onSave: (file: EditeurFile) => Promise<void> | void = ({
+    const onSave: (file: EditeurFile) => Promise<void> = async ({
       fileName,
       content,
       previousContent,
       title,
       previousTitle,
-    }): Promise<void> | void => {
-      if (!state.currentRepository) return
+    }): Promise<void> => {
+      if (!state.currentRepository || !state.gitAgent) return
 
       const hasContentChanged = content !== previousContent
       const hasTitleChanged = title !== previousTitle
@@ -39,20 +40,27 @@ const makeMapStateToProps =
 
       // If the file name is empty, it means that we are creating a new article.
       if (fileName === '') {
-        return createArticle(title, content)
-          .then(() => {
-            state.buildStatus.setBuildingAndCheckStatusLater()
-            page(articlePageUrl)
-          })
-          .catch(msg => handleErrors(msg))
+        try {
+          await createArticle(title, content)
+          setBuildingAndCheckStatusLater(
+            state.currentRepository,
+            state.gitAgent,
+          )
+          page(articlePageUrl)
+          return
+        } catch (msg: any) {
+          handleErrors(msg)
+        }
       }
 
-      updateArticle(fileName, title, content)
-        .then(() => {
-          state.buildStatus.setBuildingAndCheckStatusLater()
-          page(articlePageUrl)
-        })
-        .catch(msg => handleErrors(msg))
+      try {
+        await updateArticle(fileName, title, content)
+        setBuildingAndCheckStatusLater(state.currentRepository, state.gitAgent)
+        page(articlePageUrl)
+        return
+      } catch (msg: any) {
+        handleErrors(msg)
+      }
     }
 
     if (fileName) {
@@ -65,9 +73,12 @@ const makeMapStateToProps =
       const onDelete = () => {
         deleteArticle(fileName)
           .then(() => {
-            if (!state.currentRepository) return
+            if (!state.currentRepository || !state.gitAgent) return
 
-            state.buildStatus.setBuildingAndCheckStatusLater()
+            setBuildingAndCheckStatusLater(
+              state.currentRepository,
+              state.gitAgent,
+            )
             page(makeAtelierListArticlesURL(state.currentRepository))
           })
           .catch(msg => handleErrors(msg))
diff --git a/assets/scripts/routes/atelier-pages.ts b/assets/scripts/routes/atelier-pages.ts
index 3c4881f9..18831906 100644
--- a/assets/scripts/routes/atelier-pages.ts
+++ b/assets/scripts/routes/atelier-pages.ts
@@ -10,11 +10,12 @@ import { deletePage, createPage, updatePage } from './../actions/page'
 import { makeAtelierListPageURL } from './urls.js'
 import { showArticles } from '../actions/article'
 import { EditeurFile } from '../types/atelier.js'
+import { setBuildingAndCheckStatusLater } from '../buildStatus'
 
 const makeMapStateToProps =
   (fileName: string): ((state: ScribouilliState) => any) =>
   state => {
-    const onSave: (file: EditeurFile) => Promise<void> | void = ({
+    const onSave: (file: EditeurFile) => Promise<void> = async ({
       fileName,
       title,
       content,
@@ -22,35 +23,40 @@ const makeMapStateToProps =
       previousContent,
       index,
       blogIndex,
-    }): Promise<void> | void => {
-      const currentRepository = state.currentRepository
-      if (!currentRepository) return
+    }): Promise<void> => {
+      if (!state.currentRepository || !state.gitAgent) return
 
       const hasContentChanged = content !== previousContent
       const hasTitleChanged = title !== previousTitle
 
       // If no content changed, just redirect
       if (!hasTitleChanged && !hasContentChanged) {
-        page(makeAtelierListPageURL(currentRepository))
+        page(makeAtelierListPageURL(state.currentRepository))
         return
       }
-      //
+
       // If the file name is empty, it means that we are creating a new page.
       if (fileName === '') {
-        return createPage(content, title, index)
-          .then(() => {
-            state.buildStatus.setBuildingAndCheckStatusLater()
-            page(makeAtelierListPageURL(currentRepository))
-          })
-          .catch(msg => handleErrors(msg))
+        try {
+          await createPage(content, title, index)
+          setBuildingAndCheckStatusLater(
+            state.currentRepository,
+            state.gitAgent,
+          )
+          page(makeAtelierListPageURL(state.currentRepository))
+          return
+        } catch (msg: any) {
+          handleErrors(msg)
+        }
       }
 
-      updatePage(fileName, title, content, index, blogIndex)
-        .then(() => {
-          state.buildStatus.setBuildingAndCheckStatusLater()
-          page(makeAtelierListPageURL(currentRepository))
-        })
-        .catch(msg => handleErrors(msg))
+      try {
+        await updatePage(fileName, title, content, index, blogIndex)
+        setBuildingAndCheckStatusLater(state.currentRepository, state.gitAgent)
+        page(makeAtelierListPageURL(state.currentRepository))
+      } catch (msg: any) {
+        handleErrors(msg)
+      }
     }
 
     // Display existing file
@@ -64,8 +70,11 @@ const makeMapStateToProps =
       const onDelete = () => {
         deletePage(fileName)
           .then(() => {
-            if (!state.currentRepository) return
-            state.buildStatus.setBuildingAndCheckStatusLater()
+            if (!state.currentRepository || !state.gitAgent) return
+            setBuildingAndCheckStatusLater(
+              state.currentRepository,
+              state.gitAgent,
+            )
             page(makeAtelierListPageURL(state.currentRepository))
           })
           .catch(msg => handleErrors(msg))
diff --git a/assets/scripts/store.ts b/assets/scripts/store.ts
index 05e7786b..3b467998 100644
--- a/assets/scripts/store.ts
+++ b/assets/scripts/store.ts
@@ -2,6 +2,7 @@ import Store, { BareduxStore } from 'baredux'
 import GitAgent from './GitAgent'
 import ScribouilliGitRepo from './scribouilliGitRepo'
 import { Page, Article } from './types/atelier'
+import { BuildStatus } from './types/git'
 /**
  * Un store baredux a pour vocation de refléter notamment le modèle mental de la
  * personne face à Scribouilli. Le store stocke donc principalement des données (et parfois des singletons)
@@ -36,7 +37,7 @@ export interface ScribouilliState {
   reposByAccount: any
   pages?: Page[]
   articles?: Article[]
-  buildStatus: any
+  buildStatus: BuildStatus
   basePath: string
   theme: { css?: string }
 }
@@ -54,7 +55,7 @@ const state: ScribouilliState = {
   },
   pages: [],
   articles: undefined,
-  buildStatus: undefined,
+  buildStatus: 'in_progress',
   basePath: location.hostname.endsWith('.github.io') ? '/scribouilli' : '',
   theme: {
     css: undefined,
@@ -124,7 +125,7 @@ const mutations = {
     })
   },
 
-  setBuildStatus(state: ScribouilliState, buildStatus: any) {
+  setBuildStatus(state: ScribouilliState, buildStatus: BuildStatus) {
     state.buildStatus = buildStatus
   },
 

From 99bd44d96aec997625a175c78bd7cb4cd119426d Mon Sep 17 00:00:00 2001
From: Ana Gelez <ana+git@gelez.xyz>
Date: Wed, 24 Jun 2026 14:38:01 +0200
Subject: [PATCH 5/6] Meilleur typage pour le cycle de vie des composants

---
 assets/scripts/routeComponentLifeCycle.svelte.ts | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/assets/scripts/routeComponentLifeCycle.svelte.ts b/assets/scripts/routeComponentLifeCycle.svelte.ts
index 122347c8..eb7a4ce4 100644
--- a/assets/scripts/routeComponentLifeCycle.svelte.ts
+++ b/assets/scripts/routeComponentLifeCycle.svelte.ts
@@ -10,8 +10,8 @@ let currentComponent: Record<string, any>
 let currentProps: Record<string, any>
 let currentMapStateToProps: MapStateToPropsFunction = _ => ({})
 
-export function replaceComponent(
-  newComponent: Component,
+export function replaceComponent<P extends Record<string, any>>(
+  newComponent: Component<P>,
   newMapStateToProps: MapStateToPropsFunction,
 ) {
   console.log('replaceComponent newMapStateToProps', newMapStateToProps)
@@ -27,7 +27,14 @@ export function replaceComponent(
   currentProps = props
 
   currentComponent = mount<Record<string, any>, Record<string, any>>(
-    newComponent,
+    // Astuce pour faire la conversion de Component<P> vers
+    // Component<Record<string, any>>: On fait oublier le type à TypeScript en
+    // faisant une première conversion vers unknown, puis on le passe dans le
+    // type qu'on veut vraiment.
+    //
+    // Sans ça, il râle parce que rien ne garanti que P soit strictement égal à
+    // Record<string, any>.
+    newComponent as unknown as Component<Record<string, any>>,
     {
       target: svelteTarget,
       props: currentProps,

From e16bbb426366cfc9c36d577dbecaf32a18f432fb Mon Sep 17 00:00:00 2001
From: Ana Gelez <ana+git@gelez.xyz>
Date: Wed, 24 Jun 2026 23:21:31 +0200
Subject: [PATCH 6/6] Passe les tests en TypeScript

---
 assets/scripts/GitAgent.ts                    |  2 +-
 assets/scripts/actions/article.ts             | 10 ++--
 assets/scripts/actions/current-repository.ts  | 29 ++++++-----
 assets/scripts/actions/current-user.ts        |  8 ++--
 assets/scripts/actions/file.ts                |  8 ++--
 assets/scripts/actions/page.ts                |  8 ++--
 assets/scripts/actions/setup.ts               | 16 +++----
 assets/scripts/buildStatus.ts                 | 12 ++---
 assets/scripts/components/Header.svelte       |  4 +-
 .../components/screens/ArticleContenu.svelte  |  6 +--
 .../components/screens/AtelierArticles.svelte |  2 +-
 .../components/screens/AtelierPages.svelte    |  2 +-
 .../components/screens/CreateNewSite.svelte   |  8 ++--
 .../components/screens/PageContenu.svelte     |  6 +--
 .../ResolutionDesynchronisation.svelte        |  2 +-
 .../screens/intern/ListContenu.svelte         |  8 ++--
 assets/scripts/oauth-services-api/github.ts   |  6 +--
 assets/scripts/oauth-services-api/gitlab.ts   |  6 +--
 assets/scripts/oauth-services-api/index.ts    |  8 ++--
 .../scripts/routeComponentLifeCycle.svelte.ts |  4 +-
 assets/scripts/routes/account.ts              |  2 +-
 assets/scripts/routes/after-oauth-login.ts    |  6 +--
 assets/scripts/routes/atelier-articles.ts     |  6 +--
 .../scripts/routes/atelier-list-articles.ts   |  6 +--
 assets/scripts/routes/atelier-list-pages.ts   |  4 +-
 assets/scripts/routes/atelier-pages.ts        |  6 +--
 assets/scripts/routes/choose-account.ts       |  2 +-
 assets/scripts/routes/create-new-site.ts      |  2 +-
 assets/scripts/routes/main.ts                 | 34 ++++++-------
 .../routes/resolution-desynchronisation.ts    |  8 ++--
 assets/scripts/routes/settings.ts             |  2 +-
 .../routes/start-from-existing-site.ts        |  6 +--
 assets/scripts/routes/welcome.ts              |  6 +--
 assets/scripts/scribouilliGitRepo.ts          |  2 +-
 assets/scripts/scripts.ts                     |  6 +--
 assets/scripts/store.ts                       | 24 +++++++---
 assets/scripts/utils.ts                       |  4 +-
 package.json                                  |  2 +-
 tests/actions/current-repository.test.js      | 33 -------------
 tests/actions/current-repository.test.ts      | 48 +++++++++++++++++++
 tests/actions/{file.test.js => file.test.ts}  | 31 ++++++------
 tests/{fixtures.js => fixtures.ts}            |  9 ++--
 tests/{setup.js => setup.ts}                  |  0
 tests/{utils.test.js => utils.test.ts}        |  4 +-
 tsconfig.json                                 |  1 +
 45 files changed, 222 insertions(+), 187 deletions(-)
 delete mode 100644 tests/actions/current-repository.test.js
 create mode 100644 tests/actions/current-repository.test.ts
 rename tests/actions/{file.test.js => file.test.ts} (79%)
 rename tests/{fixtures.js => fixtures.ts} (85%)
 rename tests/{setup.js => setup.ts} (100%)
 rename tests/{utils.test.js => utils.test.ts} (92%)

diff --git a/assets/scripts/GitAgent.ts b/assets/scripts/GitAgent.ts
index 8fd96037..0d4e8f16 100644
--- a/assets/scripts/GitAgent.ts
+++ b/assets/scripts/GitAgent.ts
@@ -16,7 +16,7 @@ import http from 'isomorphic-git/http/web'
 const DEFAULT_CORS_PROXY_URL = 'https://cors.isomorphic-git.org'
 
 import type { CommitObject, GitAuth } from 'isomorphic-git'
-import { ResolutionOption } from './store'
+import type { ResolutionOption } from './store.ts'
 
 export default class GitAgent {
   #fs
diff --git a/assets/scripts/actions/article.ts b/assets/scripts/actions/article.ts
index 5727bb78..e51c1c77 100644
--- a/assets/scripts/actions/article.ts
+++ b/assets/scripts/actions/article.ts
@@ -1,10 +1,10 @@
 import lireFrontMatter from 'front-matter'
 
-import store, { type ScribouilliState } from './../store.js'
-import { deleteFileAndPushChanges, writeFileAndPushChanges } from './file.js'
-import { keepMarkdownAndHTMLFiles } from './page.js'
-import { makeArticleFileName, makeArticleFrontMatter } from './../utils.js'
-import { Article } from '../types/atelier.js'
+import store, { type ScribouilliState } from './../store.ts'
+import { deleteFileAndPushChanges, writeFileAndPushChanges } from './file.ts'
+import { keepMarkdownAndHTMLFiles } from './page.ts'
+import { makeArticleFileName, makeArticleFrontMatter } from './../utils.ts'
+import type { Article } from '../types/atelier.ts'
 
 /** Return whether the blog is enabled or not and whether the "Articles" section
  * should be available.
diff --git a/assets/scripts/actions/current-repository.ts b/assets/scripts/actions/current-repository.ts
index f50a30fe..1075b45e 100644
--- a/assets/scripts/actions/current-repository.ts
+++ b/assets/scripts/actions/current-repository.ts
@@ -1,24 +1,24 @@
 import page from 'page'
 import yaml from 'js-yaml'
 
-import store from './../store.js'
+import store, { type PartialStore } from './../store.ts'
 import ScribouilliGitRepo, {
   makeRepoId,
   makePublicRepositoryURL,
-} from './../scribouilliGitRepo.js'
-import GitAgent from '../GitAgent.js'
-import { handleErrors, logMessage } from './../utils.js'
-import { fetchAuthenticatedUserLogin } from './current-user.js'
+} from './../scribouilliGitRepo.ts'
+import GitAgent from '../GitAgent.ts'
+import { handleErrors, logMessage } from './../utils.ts'
+import { fetchAuthenticatedUserLogin } from './current-user.ts'
 import {
   scheduleCheck,
   setBuildingAndCheckStatusLater,
-} from './../buildStatus.js'
-import { file } from './file.js'
-import { getPagesList } from './page.js'
-import { getArticlesList } from './article.js'
-import { getOAuthServiceAPI } from '../oauth-services-api/index.js'
-import { CUSTOM_CSS_PATH } from '../config.js'
-import { BuildStatus } from '../types/git.js'
+} from './../buildStatus.ts'
+import { file } from './file.ts'
+import { getPagesList } from './page.ts'
+import { getArticlesList } from './article.ts'
+import { getOAuthServiceAPI } from '../oauth-services-api/index.ts'
+import { CUSTOM_CSS_PATH } from '../config.ts'
+import type { BuildStatus } from '../types/git.ts'
 
 export const getCurrentRepoPages = () => {
   return getPagesList().then(store.mutations.setPages).catch(handleErrors)
@@ -248,8 +248,13 @@ const getCurrentRepoConfig = (): Promise<any> => {
     .catch(handleErrors)
 }
 
+const defaultStore = store
 export function saveCustomCSS(
   css: string,
+  store: PartialStore<
+    'currentRepository' | 'gitAgent',
+    'setTheme'
+  > = defaultStore,
 ): ReturnType<typeof file.writeFileAndPushChanges> | Promise<void> {
   if (!store.state.currentRepository || !store.state.gitAgent) {
     return Promise.resolve()
diff --git a/assets/scripts/actions/current-user.ts b/assets/scripts/actions/current-user.ts
index 35167882..a353e767 100644
--- a/assets/scripts/actions/current-user.ts
+++ b/assets/scripts/actions/current-user.ts
@@ -1,10 +1,10 @@
 import page from 'page'
 import { forget } from 'remember'
 
-import { getOAuthServiceAPI } from '../oauth-services-api/index.js'
-import store, { ResolutionOption } from '../store.js'
-import { logMessage } from '../utils.js'
-import { OAUTH_PROVIDER_STORAGE_KEY } from '../config.js'
+import { getOAuthServiceAPI } from '../oauth-services-api/index.ts'
+import store, { type ResolutionOption } from '../store.ts'
+import { logMessage } from '../utils.ts'
+import { OAUTH_PROVIDER_STORAGE_KEY } from '../config.ts'
 
 const logout = () => {
   forget(OAUTH_PROVIDER_STORAGE_KEY)
diff --git a/assets/scripts/actions/file.ts b/assets/scripts/actions/file.ts
index 2c348348..6aefe96d 100644
--- a/assets/scripts/actions/file.ts
+++ b/assets/scripts/actions/file.ts
@@ -1,11 +1,11 @@
-import GitAgent from '../GitAgent.js'
-import store from '../store.js'
+import GitAgent from '../GitAgent.ts'
+import store, { type PartialStore } from '../store.ts'
 
 export const writeFileAndCommit = async (
   fileName: string,
   content: string | Uint8Array,
-  commitMessage: string,
-  localStore = store,
+  commitMessage?: string,
+  localStore: PartialStore<'gitAgent', never> = store,
 ): Promise<string> => {
   if (typeof commitMessage !== 'string' || commitMessage === '') {
     commitMessage = `Modification du fichier ${fileName}`
diff --git a/assets/scripts/actions/page.ts b/assets/scripts/actions/page.ts
index 69f5b38b..06e6159c 100644
--- a/assets/scripts/actions/page.ts
+++ b/assets/scripts/actions/page.ts
@@ -1,9 +1,9 @@
 import lireFrontMatter from 'front-matter'
 
-import store from './../store.js'
-import { makeFileNameFromTitle, makePageFrontMatter } from './../utils.js'
-import { deleteFileAndPushChanges, writeFileAndPushChanges } from './file.js'
-import { Page } from '../types/atelier.js'
+import store from './../store.ts'
+import { makeFileNameFromTitle, makePageFrontMatter } from './../utils.ts'
+import { deleteFileAndPushChanges, writeFileAndPushChanges } from './file.ts'
+import type { Page } from '../types/atelier.ts'
 
 export function keepMarkdownAndHTMLFiles(filename: string): boolean {
   return filename.endsWith('.md') || filename.endsWith('.html')
diff --git a/assets/scripts/actions/setup.ts b/assets/scripts/actions/setup.ts
index 52681b29..73726ec2 100644
--- a/assets/scripts/actions/setup.ts
+++ b/assets/scripts/actions/setup.ts
@@ -1,17 +1,17 @@
 import page from 'page'
 
-import store, { ResolutionOption } from './../store.js'
+import store, { ResolutionOption } from './../store.ts'
 import ScribouilliGitRepo, {
   makePublicRepositoryURL,
   makeRepoId,
-} from './../scribouilliGitRepo.js'
-import { getOAuthServiceAPI } from './../oauth-services-api/index.js'
-import { makeAtelierListPageURL } from './../routes/urls.js'
-import { logMessage } from './../utils.js'
-import { setBaseUrlInConfigIfNecessary } from './current-repository.js'
-import GitAgent from '../GitAgent.js'
+} from './../scribouilliGitRepo.ts'
+import { getOAuthServiceAPI } from './../oauth-services-api/index.ts'
+import { makeAtelierListPageURL } from './../routes/urls.ts'
+import { logMessage } from './../utils.ts'
+import { setBaseUrlInConfigIfNecessary } from './current-repository.ts'
+import GitAgent from '../GitAgent.ts'
 import git from 'isomorphic-git'
-import type { GitSiteTemplate } from '../types/git.js'
+import type { GitSiteTemplate } from '../types/git.ts'
 
 const waitRepoReady = (
   scribouilliGitRepo: ScribouilliGitRepo,
diff --git a/assets/scripts/buildStatus.ts b/assets/scripts/buildStatus.ts
index 1f175681..ef22c46c 100644
--- a/assets/scripts/buildStatus.ts
+++ b/assets/scripts/buildStatus.ts
@@ -1,9 +1,9 @@
-import GitAgent from './GitAgent.js'
-import { getOAuthServiceAPI } from './oauth-services-api/index.js'
-import ScribouilliGitRepo from './scribouilliGitRepo.js'
-import store from './store.js'
-import { BuildStatus } from './types/git.js'
-import { isItStillCompiling } from './utils.js'
+import GitAgent from './GitAgent.ts'
+import { getOAuthServiceAPI } from './oauth-services-api/index.ts'
+import ScribouilliGitRepo from './scribouilliGitRepo.ts'
+import store from './store.ts'
+import type { BuildStatus } from './types/git.ts'
+import { isItStillCompiling } from './utils.ts'
 
 let timeout: ReturnType<typeof setTimeout> | undefined
 
diff --git a/assets/scripts/components/Header.svelte b/assets/scripts/components/Header.svelte
index 52f3d5fd..2eae015a 100644
--- a/assets/scripts/components/Header.svelte
+++ b/assets/scripts/components/Header.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import type { BuildStatus } from '../types/git.js'
-  import type { ScribouilliState } from '../store.js'
+  import type { BuildStatus } from '../types/git.ts'
+  import type { ScribouilliState } from '../store.ts'
 
   interface Props {
     buildStatus: BuildStatus
diff --git a/assets/scripts/components/screens/ArticleContenu.svelte b/assets/scripts/components/screens/ArticleContenu.svelte
index 117ef033..f1eb29b8 100644
--- a/assets/scripts/components/screens/ArticleContenu.svelte
+++ b/assets/scripts/components/screens/ArticleContenu.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-  import {makeAtelierListArticlesURL} from '../../routes/atelier-list-articles.js'
-  import type { EditeurFile, FileContenu } from '../../types/atelier.js'
-  import ScribouilliGitRepo from '../../scribouilliGitRepo.js';
+  import {makeAtelierListArticlesURL} from '../../routes/atelier-list-articles.ts'
+  import type { EditeurFile, FileContenu } from '../../types/atelier.ts'
+  import ScribouilliGitRepo from '../../scribouilliGitRepo.ts';
 
   import Editeur from "./intern/Editeur.svelte";
   
diff --git a/assets/scripts/components/screens/AtelierArticles.svelte b/assets/scripts/components/screens/AtelierArticles.svelte
index d59dfd13..a4676074 100644
--- a/assets/scripts/components/screens/AtelierArticles.svelte
+++ b/assets/scripts/components/screens/AtelierArticles.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import ScribouilliGitRepo from '../../scribouilliGitRepo'
-  import type { ScribouilliState } from './../../store.js'
+  import type { ScribouilliState } from './../../store.ts'
   import ListContenu from './intern/ListContenu.svelte'
 
   interface Props {
diff --git a/assets/scripts/components/screens/AtelierPages.svelte b/assets/scripts/components/screens/AtelierPages.svelte
index 338ead72..2dcc0233 100644
--- a/assets/scripts/components/screens/AtelierPages.svelte
+++ b/assets/scripts/components/screens/AtelierPages.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import ScribouilliGitRepo from '../../scribouilliGitRepo'
-  import type { ScribouilliState } from './../../store.js'
+  import type { ScribouilliState } from './../../store.ts'
   import ListContenu from './intern/ListContenu.svelte'
 
   interface Props {
diff --git a/assets/scripts/components/screens/CreateNewSite.svelte b/assets/scripts/components/screens/CreateNewSite.svelte
index ca36a553..d09a380b 100644
--- a/assets/scripts/components/screens/CreateNewSite.svelte
+++ b/assets/scripts/components/screens/CreateNewSite.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-  import Skeleton from "./../Skeleton.svelte";
-  import SiteCreationLoader from "./../loaders/SiteCreationLoader.svelte";
-  import { createRepositoryForCurrentAccount } from "../../actions/setup.js";
-  import { DEFAULT_TEMPLATE, templates } from '../../config.js';
+  import Skeleton from './../Skeleton.svelte';
+  import SiteCreationLoader from './../loaders/SiteCreationLoader.svelte';
+  import { createRepositoryForCurrentAccount } from '../../actions/setup.ts';
+  import { DEFAULT_TEMPLATE, templates } from '../../config.ts';
   import type { GitSiteTemplate } from '../../types/git'
 
   let name = $state("");
diff --git a/assets/scripts/components/screens/PageContenu.svelte b/assets/scripts/components/screens/PageContenu.svelte
index 35b29366..ba93b64d 100644
--- a/assets/scripts/components/screens/PageContenu.svelte
+++ b/assets/scripts/components/screens/PageContenu.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-  import { makeAtelierListPageURL } from '../../routes/urls.js'
-  import ScribouilliGitRepo from '../../scribouilliGitRepo.js'
-  import type { EditeurFile, FileContenu } from '../../types/atelier.js'
+  import { makeAtelierListPageURL } from '../../routes/urls.ts'
+  import ScribouilliGitRepo from '../../scribouilliGitRepo.ts'
+  import type { EditeurFile, FileContenu } from '../../types/atelier.ts'
   import Editeur from "./intern/Editeur.svelte";
   
   interface Props {
diff --git a/assets/scripts/components/screens/ResolutionDesynchronisation.svelte b/assets/scripts/components/screens/ResolutionDesynchronisation.svelte
index 11d1ed74..f406b7ab 100644
--- a/assets/scripts/components/screens/ResolutionDesynchronisation.svelte
+++ b/assets/scripts/components/screens/ResolutionDesynchronisation.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import Skeleton from "../Skeleton.svelte";
     import {addConflictRemovalAndRedirectToResolution} from
-    '../../actions/current-user.js'
+    '../../actions/current-user.ts'
   import type { ScribouilliState } from "../../store"
 
     interface Props {
diff --git a/assets/scripts/components/screens/intern/ListContenu.svelte b/assets/scripts/components/screens/intern/ListContenu.svelte
index 93383371..0f0914db 100644
--- a/assets/scripts/components/screens/intern/ListContenu.svelte
+++ b/assets/scripts/components/screens/intern/ListContenu.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-  import store, { type ScribouilliState } from '../../../store.js'
+  import store, { type ScribouilliState } from '../../../store.ts'
   import Skeleton from '../../Skeleton.svelte'
-  import { makePageFrontMatter } from '../../../utils.js'
-  import ScribouilliGitRepo from '../../../scribouilliGitRepo.js'
-  import type { FileContenu } from '../../../types/atelier.js';
+  import { makePageFrontMatter } from '../../../utils.ts'
+  import ScribouilliGitRepo from '../../../scribouilliGitRepo.ts'
+  import type { FileContenu } from '../../../types/atelier.ts';
   
   interface Props {
     buildStatus: any
diff --git a/assets/scripts/oauth-services-api/github.ts b/assets/scripts/oauth-services-api/github.ts
index abbdbaba..69222e14 100644
--- a/assets/scripts/oauth-services-api/github.ts
+++ b/assets/scripts/oauth-services-api/github.ts
@@ -1,6 +1,6 @@
-import { gitHubApiBaseUrl } from './../config.js'
-import type { GitSiteTemplate, OAuthServiceAPI } from '../types/git.js'
-import ScribouilliGitRepo from '../scribouilliGitRepo.js'
+import { gitHubApiBaseUrl } from './../config.ts'
+import type { GitSiteTemplate, OAuthServiceAPI } from '../types/git.ts'
+import ScribouilliGitRepo from '../scribouilliGitRepo.ts'
 
 const GITHUB_JSON_ACCEPT_HEADER = 'application/vnd.github+json'
 
diff --git a/assets/scripts/oauth-services-api/gitlab.ts b/assets/scripts/oauth-services-api/gitlab.ts
index 0576b08c..01e62473 100644
--- a/assets/scripts/oauth-services-api/gitlab.ts
+++ b/assets/scripts/oauth-services-api/gitlab.ts
@@ -1,10 +1,10 @@
-import GitAgent from '../GitAgent.js'
-import ScribouilliGitRepo from '../scribouilliGitRepo.js'
+import GitAgent from '../GitAgent.ts'
+import ScribouilliGitRepo from '../scribouilliGitRepo.ts'
 import type {
   BuildStatus,
   GitSiteTemplate,
   OAuthServiceAPI,
-} from '../types/git.js'
+} from '../types/git.ts'
 
 export default class GitLabAPI implements OAuthServiceAPI {
   #gitAgentGetter
diff --git a/assets/scripts/oauth-services-api/index.ts b/assets/scripts/oauth-services-api/index.ts
index 242a514c..c6a31a0d 100644
--- a/assets/scripts/oauth-services-api/index.ts
+++ b/assets/scripts/oauth-services-api/index.ts
@@ -1,8 +1,8 @@
 import page from 'page'
-import store, { OAuthProvider } from '../store.js'
-import GitHubAPI from './github.js'
-import GitlabAPI from './gitlab.js'
-import { OAuthServiceAPI } from '../types/git.js'
+import store, { type OAuthProvider } from '../store.ts'
+import GitHubAPI from './github.ts'
+import GitlabAPI from './gitlab.ts'
+import type { OAuthServiceAPI } from '../types/git.ts'
 
 const makeOAuthServiceAPI = ({
   accessToken,
diff --git a/assets/scripts/routeComponentLifeCycle.svelte.ts b/assets/scripts/routeComponentLifeCycle.svelte.ts
index eb7a4ce4..66fa1689 100644
--- a/assets/scripts/routeComponentLifeCycle.svelte.ts
+++ b/assets/scripts/routeComponentLifeCycle.svelte.ts
@@ -1,6 +1,6 @@
 import { mount, unmount } from 'svelte'
-import store, { type ScribouilliState } from './store.js'
-import { svelteTarget } from './config.js'
+import store, { type ScribouilliState } from './store.ts'
+import { svelteTarget } from './config.ts'
 
 import { Component } from 'svelte'
 
diff --git a/assets/scripts/routes/account.ts b/assets/scripts/routes/account.ts
index 2f203fb1..4993eaf7 100644
--- a/assets/scripts/routes/account.ts
+++ b/assets/scripts/routes/account.ts
@@ -1,6 +1,6 @@
 import { Context } from 'page'
 import Account from '../components/screens/Account.svelte'
-import { replaceComponent } from '../routeComponentLifeCycle.svelte.js'
+import { replaceComponent } from '../routeComponentLifeCycle.svelte.ts'
 
 export default ({ querystring }: Context) => {
   const params = new URLSearchParams(querystring)
diff --git a/assets/scripts/routes/after-oauth-login.ts b/assets/scripts/routes/after-oauth-login.ts
index b2b54299..82a4297c 100644
--- a/assets/scripts/routes/after-oauth-login.ts
+++ b/assets/scripts/routes/after-oauth-login.ts
@@ -6,11 +6,11 @@ import {
   TOCTOCTOC_ACCESS_TOKEN_URL_PARAMETER,
   TOCTOCTOC_OAUTH_PROVIDER_URL_PARAMETER,
   TOCTOCTOC_OAUTH_PROVIDER_ORIGIN_PARAMETER,
-} from '../config.js'
-import { replaceComponent } from '../routeComponentLifeCycle.svelte.js'
+} from '../config.ts'
+import { replaceComponent } from '../routeComponentLifeCycle.svelte.ts'
 import store from '../store'
 import AfterOauthLogin from '../components/screens/AfterOauthLogin.svelte'
-import { fetchCurrentUserRepositories } from '../actions/current-user.js'
+import { fetchCurrentUserRepositories } from '../actions/current-user.ts'
 
 const storeOAuthProviderAccess = () => {
   const url = new URL(location.href)
diff --git a/assets/scripts/routes/atelier-articles.ts b/assets/scripts/routes/atelier-articles.ts
index 35483c85..87b05547 100644
--- a/assets/scripts/routes/atelier-articles.ts
+++ b/assets/scripts/routes/atelier-articles.ts
@@ -6,15 +6,15 @@ import { handleErrors } from '../utils'
 
 import { replaceComponent } from '../routeComponentLifeCycle.svelte'
 import ArticleContenu from '../components/screens/ArticleContenu.svelte'
-import { setCurrentRepositoryFromQuerystring } from '../actions/current-repository.js'
+import { setCurrentRepositoryFromQuerystring } from '../actions/current-repository.ts'
 import {
   deleteArticle,
   createArticle,
   updateArticle,
   showArticles,
 } from '../actions/article'
-import { makeAtelierListArticlesURL } from './atelier-list-articles.js'
-import { EditeurFile } from '../types/atelier.js'
+import { makeAtelierListArticlesURL } from './atelier-list-articles.ts'
+import type { EditeurFile } from '../types/atelier.ts'
 import { setBuildingAndCheckStatusLater } from '../buildStatus'
 
 const makeMapStateToProps =
diff --git a/assets/scripts/routes/atelier-list-articles.ts b/assets/scripts/routes/atelier-list-articles.ts
index 7b31150c..4c594912 100644
--- a/assets/scripts/routes/atelier-list-articles.ts
+++ b/assets/scripts/routes/atelier-list-articles.ts
@@ -3,10 +3,10 @@ import { replaceComponent } from '../routeComponentLifeCycle.svelte'
 import {
   getCurrentRepoArticles,
   setCurrentRepositoryFromQuerystring,
-} from '../actions/current-repository.js'
+} from '../actions/current-repository.ts'
 import { showArticles } from '../actions/article'
-import type { ScribouilliState } from '../store.js'
-import ScribouilliGitRepo from '../scribouilliGitRepo.js'
+import type { ScribouilliState } from '../store.ts'
+import ScribouilliGitRepo from '../scribouilliGitRepo.ts'
 import { Context } from 'page'
 
 function mapStateToProps(state: ScribouilliState) {
diff --git a/assets/scripts/routes/atelier-list-pages.ts b/assets/scripts/routes/atelier-list-pages.ts
index c4dcb39b..476a659c 100644
--- a/assets/scripts/routes/atelier-list-pages.ts
+++ b/assets/scripts/routes/atelier-list-pages.ts
@@ -1,9 +1,9 @@
 import { replaceComponent } from '../routeComponentLifeCycle.svelte'
-import { setCurrentRepositoryFromQuerystring } from '../actions/current-repository.js'
+import { setCurrentRepositoryFromQuerystring } from '../actions/current-repository.ts'
 import AtelierPages from '../components/screens/AtelierPages.svelte'
 import { showArticles } from '../actions/article'
 import { Context } from 'page'
-import type { ScribouilliState } from '../store.js'
+import type { ScribouilliState } from '../store.ts'
 
 const mapStateToProps = (state: ScribouilliState) => {
   if (!state.currentRepository) {
diff --git a/assets/scripts/routes/atelier-pages.ts b/assets/scripts/routes/atelier-pages.ts
index 18831906..ae21b4a5 100644
--- a/assets/scripts/routes/atelier-pages.ts
+++ b/assets/scripts/routes/atelier-pages.ts
@@ -4,12 +4,12 @@ import page, { Context } from 'page'
 import { replaceComponent } from '../routeComponentLifeCycle.svelte'
 import store, { type ScribouilliState } from '../store'
 import { handleErrors, logMessage, makeFileNameFromTitle } from '../utils'
-import { setCurrentRepositoryFromQuerystring } from '../actions/current-repository.js'
+import { setCurrentRepositoryFromQuerystring } from '../actions/current-repository.ts'
 import PageContenu from '../components/screens/PageContenu.svelte'
 import { deletePage, createPage, updatePage } from './../actions/page'
-import { makeAtelierListPageURL } from './urls.js'
+import { makeAtelierListPageURL } from './urls.ts'
 import { showArticles } from '../actions/article'
-import { EditeurFile } from '../types/atelier.js'
+import type { EditeurFile } from '../types/atelier.ts'
 import { setBuildingAndCheckStatusLater } from '../buildStatus'
 
 const makeMapStateToProps =
diff --git a/assets/scripts/routes/choose-account.ts b/assets/scripts/routes/choose-account.ts
index ed761bdf..a115095d 100644
--- a/assets/scripts/routes/choose-account.ts
+++ b/assets/scripts/routes/choose-account.ts
@@ -1,5 +1,5 @@
 import ChooseAccount from '../components/screens/ChooseAccount.svelte'
-import { replaceComponent } from '../routeComponentLifeCycle.svelte.js'
+import { replaceComponent } from '../routeComponentLifeCycle.svelte.ts'
 
 export default () => {
   replaceComponent(ChooseAccount, () => ({}))
diff --git a/assets/scripts/routes/create-new-site.ts b/assets/scripts/routes/create-new-site.ts
index fa48e18f..1c2a10c4 100644
--- a/assets/scripts/routes/create-new-site.ts
+++ b/assets/scripts/routes/create-new-site.ts
@@ -1,6 +1,6 @@
 import { replaceComponent } from '../routeComponentLifeCycle.svelte'
 import CreateNewSite from '../components/screens/CreateNewSite.svelte'
-import { fetchAuthenticatedUserLogin } from '../actions/current-user.js'
+import { fetchAuthenticatedUserLogin } from '../actions/current-user.ts'
 
 export default () => {
   fetchAuthenticatedUserLogin()
diff --git a/assets/scripts/routes/main.ts b/assets/scripts/routes/main.ts
index 24c0b3d9..4a9a4140 100644
--- a/assets/scripts/routes/main.ts
+++ b/assets/scripts/routes/main.ts
@@ -1,23 +1,23 @@
 import page from 'page'
 
-import store from '../store.js'
-import { waitOauthProvider } from '../actions/setup.js'
+import store from '../store.ts'
+import { waitOauthProvider } from '../actions/setup.ts'
 
-import welcome from './welcome.js'
-import chooseAccount from './choose-account.js'
-import account from './account.js'
-import login from './login.js'
-import afterOauthLogin from './after-oauth-login.js'
-import atelierListArticles from './atelier-list-articles.js'
-import atelierListPages from './atelier-list-pages.js'
-import atelierPages from './atelier-pages.js'
-import atelierArticles from './atelier-articles.js'
-import createAccount from './create-account.js'
-import selectOrCreateSite from './select-or-create-site.js'
-import createNewSite from './create-new-site.js'
-import startFromExistingSite from './start-from-existing-site.js'
-import settings from './settings.js'
-import resolutionDesynchronisation from './resolution-desynchronisation.js'
+import welcome from './welcome.ts'
+import chooseAccount from './choose-account.ts'
+import account from './account.ts'
+import login from './login.ts'
+import afterOauthLogin from './after-oauth-login.ts'
+import atelierListArticles from './atelier-list-articles.ts'
+import atelierListPages from './atelier-list-pages.ts'
+import atelierPages from './atelier-pages.ts'
+import atelierArticles from './atelier-articles.ts'
+import createAccount from './create-account.ts'
+import selectOrCreateSite from './select-or-create-site.ts'
+import createNewSite from './create-new-site.ts'
+import startFromExistingSite from './start-from-existing-site.ts'
+import settings from './settings.ts'
+import resolutionDesynchronisation from './resolution-desynchronisation.ts'
 
 function waitOauthProviderMiddleware(_: any, next: any) {
   waitOauthProvider().then(next)
diff --git a/assets/scripts/routes/resolution-desynchronisation.ts b/assets/scripts/routes/resolution-desynchronisation.ts
index 48c29db7..5ce977d2 100644
--- a/assets/scripts/routes/resolution-desynchronisation.ts
+++ b/assets/scripts/routes/resolution-desynchronisation.ts
@@ -1,8 +1,8 @@
 import ResolutionDesynchronisation from '../components/screens/ResolutionDesynchronisation.svelte'
-import { replaceComponent } from '../routeComponentLifeCycle.svelte.js'
-import { setCurrentRepositoryFromQuerystring } from '../actions/current-repository.js'
-import { showArticles } from '../actions/article.js'
-import type { ScribouilliState } from '../store.js'
+import { replaceComponent } from '../routeComponentLifeCycle.svelte.ts'
+import { setCurrentRepositoryFromQuerystring } from '../actions/current-repository.ts'
+import { showArticles } from '../actions/article.ts'
+import type { ScribouilliState } from '../store.ts'
 import { Context } from 'page'
 
 const mapStateToProps = (state: ScribouilliState) => {
diff --git a/assets/scripts/routes/settings.ts b/assets/scripts/routes/settings.ts
index 77983aec..8a190f81 100644
--- a/assets/scripts/routes/settings.ts
+++ b/assets/scripts/routes/settings.ts
@@ -6,7 +6,7 @@ import {
   getCurrentRepoArticles,
   setCurrentRepositoryFromQuerystring,
   saveCustomCSS,
-} from '../actions/current-repository.js'
+} from '../actions/current-repository.ts'
 import { handleErrors } from '../utils'
 import Settings from '../components/screens/Settings.svelte'
 import { writeFileAndCommit, deleteFileAndCommit } from '../actions/file'
diff --git a/assets/scripts/routes/start-from-existing-site.ts b/assets/scripts/routes/start-from-existing-site.ts
index 029d1b3d..29be872f 100644
--- a/assets/scripts/routes/start-from-existing-site.ts
+++ b/assets/scripts/routes/start-from-existing-site.ts
@@ -1,10 +1,10 @@
 import {
   fetchCurrentUserRepositories,
   fetchAuthenticatedUserLogin,
-} from '../actions/current-user.js'
-import { replaceComponent } from '../routeComponentLifeCycle.svelte.js'
+} from '../actions/current-user.ts'
+import { replaceComponent } from '../routeComponentLifeCycle.svelte.ts'
 import SelectCurrentSite from '../components/screens/SelectCurrentSite.svelte'
-import type { ScribouilliState } from '../store.js'
+import type { ScribouilliState } from '../store.ts'
 
 const mapStateToProps = (state: ScribouilliState) => {
   const { login, reposByAccount } = state
diff --git a/assets/scripts/routes/welcome.ts b/assets/scripts/routes/welcome.ts
index 6cf0e696..f31683c6 100644
--- a/assets/scripts/routes/welcome.ts
+++ b/assets/scripts/routes/welcome.ts
@@ -1,8 +1,8 @@
 import page from 'page'
 
-import store from '../store.js'
-import { fetchCurrentUserRepositories } from '../actions/current-user.js'
-import { replaceComponent } from '../routeComponentLifeCycle.svelte.js'
+import store from '../store.ts'
+import { fetchCurrentUserRepositories } from '../actions/current-user.ts'
+import { replaceComponent } from '../routeComponentLifeCycle.svelte.ts'
 
 import Welcome from '../components/screens/Welcome.svelte'
 
diff --git a/assets/scripts/scribouilliGitRepo.ts b/assets/scripts/scribouilliGitRepo.ts
index 15d10b27..493c6b54 100644
--- a/assets/scripts/scribouilliGitRepo.ts
+++ b/assets/scripts/scribouilliGitRepo.ts
@@ -1,4 +1,4 @@
-import { OAuthServiceAPI } from './types/git'
+import type { OAuthServiceAPI } from './types/git.ts'
 
 export default class ScribouilliGitRepo {
   // TODO: better typing of these fields
diff --git a/assets/scripts/scripts.ts b/assets/scripts/scripts.ts
index c1b0bacd..41a52a48 100644
--- a/assets/scripts/scripts.ts
+++ b/assets/scripts/scripts.ts
@@ -1,9 +1,9 @@
 import remember from 'remember'
 
-import { OAUTH_PROVIDER_STORAGE_KEY } from './config.js'
-import './routes/main.js'
+import { OAUTH_PROVIDER_STORAGE_KEY } from './config.ts'
+import './routes/main.ts'
 
-import store from './store.js'
+import store from './store.ts'
 
 // @ts-ignore
 window.Buffer = buffer.Buffer
diff --git a/assets/scripts/store.ts b/assets/scripts/store.ts
index 3b467998..90875ab5 100644
--- a/assets/scripts/store.ts
+++ b/assets/scripts/store.ts
@@ -1,8 +1,8 @@
-import Store, { BareduxStore } from 'baredux'
-import GitAgent from './GitAgent'
-import ScribouilliGitRepo from './scribouilliGitRepo'
-import { Page, Article } from './types/atelier'
-import { BuildStatus } from './types/git'
+import Store, { type BareduxStore } from 'baredux'
+import GitAgent from './GitAgent.ts'
+import ScribouilliGitRepo from './scribouilliGitRepo.ts'
+import type { Page, Article } from './types/atelier.ts'
+import type { BuildStatus } from './types/git.ts'
 /**
  * Un store baredux a pour vocation de refléter notamment le modèle mental de la
  * personne face à Scribouilli. Le store stocke donc principalement des données (et parfois des singletons)
@@ -14,7 +14,7 @@ import { BuildStatus } from './types/git'
  *
  */
 // DO NOT import x from 'remember' // do it in an action instead
-// DO NOT import x from './actions/*.js' // you're making an action, so add an action instead
+// DO NOT import x from './actions/*.ts' // you're making an action, so add an action instead
 
 export interface ResolutionOption {
   message: string
@@ -177,4 +177,16 @@ const store: BareduxStore<ScribouilliState, ScribouilliMutations> = Store({
   mutations,
 })
 
+type PartialMutations<State, Mutations extends keyof ScribouilliMutations> = {
+  [mutation in Mutations]: (state: State, ...others: any[]) => void | State
+}
+
+export type PartialStore<
+  S extends keyof ScribouilliState = keyof ScribouilliState,
+  M extends keyof ScribouilliMutations = keyof ScribouilliMutations,
+> = BareduxStore<
+  Pick<ScribouilliState, S>,
+  PartialMutations<Pick<ScribouilliState, S>, M>
+>
+
 export default store
diff --git a/assets/scripts/utils.ts b/assets/scripts/utils.ts
index 077d82c1..0000e07d 100644
--- a/assets/scripts/utils.ts
+++ b/assets/scripts/utils.ts
@@ -1,8 +1,8 @@
 import page from 'page'
 import { format } from 'date-fns'
 
-import store from './store.js'
-import { CommitObject } from 'isomorphic-git'
+import store from './store.ts'
+import type { CommitObject } from 'isomorphic-git'
 
 /**
  * @summary Handle errors catched by Promises
diff --git a/package.json b/package.json
index edcbc1b8..36e3371f 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "ts": "tsc && echo 'Tout va bien 🎉'",
     "dev": "rollup -c -w",
     "build": "rollup -c",
-    "test": "mocha --recursive tests",
+    "test": "mocha --recursive tests --extension ts",
     "prepare": "husky install",
     "svelte-check": "svelte-check --tsconfig tsconfig.json"
   },
diff --git a/tests/actions/current-repository.test.js b/tests/actions/current-repository.test.js
deleted file mode 100644
index 9e6d4bf6..00000000
--- a/tests/actions/current-repository.test.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import '../setup.js'
-import { file } from '../../assets/scripts/actions/file.js'
-import { saveCustomCSS } from '../../assets/scripts/actions/current-repository.js'
-import { CUSTOM_CSS_PATH } from '../../assets/scripts/config.js'
-
-describe('actions/current-repository.js', () => {
-  describe('saveCustomCSS', () => {
-    it('calls writeFile, commit and safePush', done => {
-      const fakeStore = {
-        mutations: {
-          setTheme: sinon.stub(),
-        },
-        state: {
-          buildStatus: {
-            setBuildingAndCheckStatusLater: sinon.stub(),
-          },
-        },
-      }
-      sinon.stub(file, 'writeFileAndPushChanges')
-      const css = 'body{ background: pink; }'
-
-      saveCustomCSS(css, fakeStore)
-
-      expect(file.writeFileAndPushChanges).to.have.been.calledWithExactly(
-        CUSTOM_CSS_PATH,
-        css,
-        'mise à jour du fichier de styles custom',
-      )
-
-      done()
-    })
-  })
-})
diff --git a/tests/actions/current-repository.test.ts b/tests/actions/current-repository.test.ts
new file mode 100644
index 00000000..4f433773
--- /dev/null
+++ b/tests/actions/current-repository.test.ts
@@ -0,0 +1,48 @@
+import '../setup.ts'
+import { file } from '../../assets/scripts/actions/file.ts'
+import { saveCustomCSS } from '../../assets/scripts/actions/current-repository.ts'
+import { CUSTOM_CSS_PATH } from '../../assets/scripts/config.ts'
+import { describe } from 'mocha'
+import sinon from 'sinon'
+import { expect } from 'chai'
+import GitAgent from '../../assets/scripts/GitAgent.ts'
+
+describe('actions/current-repository.ts', () => {
+  describe('saveCustomCSS', () => {
+    it('calls writeFile, commit and safePush', done => {
+      const fakeStore = {
+        mutations: {
+          setTheme: sinon.stub(),
+        },
+        state: {
+          currentRepository: {
+            origin: 'github.com',
+            publicRepositoryURL: 'https://github.com/test/site',
+            owner: 'test',
+            repoName: 'site',
+            repoId: 'test-site',
+            publishedWebsiteURL: Promise.resolve('https://test.github.io/site'),
+          },
+          gitAgent: new GitAgent({
+            auth: {},
+            remoteURL: 'https://github.com',
+            repoId: 'test-site',
+          }),
+        },
+        subscribe: sinon.stub(),
+      }
+      sinon.stub(file, 'writeFileAndPushChanges')
+      const css = 'body { background: pink; }'
+
+      saveCustomCSS(css, fakeStore)
+
+      expect(file.writeFileAndPushChanges).to.have.been.calledWithExactly(
+        CUSTOM_CSS_PATH,
+        css,
+        'mise à jour du fichier de styles custom',
+      )
+
+      done()
+    })
+  })
+})
diff --git a/tests/actions/file.test.js b/tests/actions/file.test.ts
similarity index 79%
rename from tests/actions/file.test.js
rename to tests/actions/file.test.ts
index 649cf7d6..13b927d4 100644
--- a/tests/actions/file.test.js
+++ b/tests/actions/file.test.ts
@@ -1,18 +1,20 @@
-import './../setup.js'
-import { fakeStateWithOneSite } from './../fixtures.js'
+import './../setup.ts'
+import { fakeStateWithOneSite } from './../fixtures.ts'
 import {
   writeFileAndCommit,
   writeFileAndPushChanges,
   deleteFileAndCommit,
   deleteFileAndPushChanges,
-} from './../../assets/scripts/actions/file.js'
-import gitAgent from './../../assets/scripts/GitAgent.js'
-import store from './../../assets/scripts/store.js'
+} from './../../assets/scripts/actions/file.ts'
+import gitAgent from './../../assets/scripts/GitAgent.ts'
+import store from './../../assets/scripts/store.ts'
+import sinon from 'sinon'
+import { expect } from 'chai'
 
 // Use a common sandbox for all tests so we can easily restore it after each test.
 const sandbox = sinon.createSandbox()
 
-describe('actions/file.js', () => {
+describe('actions/file.ts', () => {
   beforeEach(() => {
     sandbox.stub(store, 'state').value(fakeStateWithOneSite)
   })
@@ -30,9 +32,10 @@ describe('actions/file.js', () => {
             commit: sinon.stub(),
           },
         },
+        mutations: {},
       }
       writeFileAndCommit(
-        'test.js',
+        'test.ts',
         'Curiouser and curiouser!',
         undefined,
         fakeStore,
@@ -40,12 +43,12 @@ describe('actions/file.js', () => {
       done()
       expect(fakeStore.state.gitAgent.writeFile).to.have.been.calledWith(
         'bla',
-        'test.js',
+        'test.ts',
         'Curiouser and curiouser!',
       )
-      expect(faceStore.state.gitAgent.commit).to.have.been.calledWith(
+      expect(fakeStore.state.gitAgent.commit).to.have.been.calledWith(
         'fanne',
-        'Modification du fichier test.js',
+        'Modification du fichier test.ts',
       )
     })
   })
@@ -61,7 +64,7 @@ describe('actions/file.js', () => {
         },
       }
       writeFileAndPushChanges(
-        'test.js',
+        'test.ts',
         'Curiouser and curiouser!',
         undefined,
         fakeStore,
@@ -69,7 +72,7 @@ describe('actions/file.js', () => {
       done()
       expect(gitAgent.writeFile).to.have.been.calledWith(
         store.state.currentRepository,
-        'test.js',
+        'test.ts',
         'Curiouser and curiouser!',
       )
       expect(gitAgent.commit).to.have.been.calledWith(
@@ -93,7 +96,7 @@ describe('actions/file.js', () => {
         },
       }
 
-      deleteFileAndCommit('test.js', undefined, fakeStore)
+      deleteFileAndCommit('test.ts', undefined, fakeStore)
       done()
       expect(fakeStore.state.gitAgent.removeFile).to.have.been.calledOnce
       expect(fakeStore.state.gitAgent.commit).to.have.been.calledOnce
@@ -111,7 +114,7 @@ describe('actions/file.js', () => {
           },
         },
       }
-      deleteFileAndPushChanges('test.js', undefined, fakeStore)
+      deleteFileAndPushChanges('test.ts', undefined, fakeStore)
       expect(fakeStore.state.gitAgent.safePush).to.have.been.calledOnce
       done()
     })
diff --git a/tests/fixtures.js b/tests/fixtures.ts
similarity index 85%
rename from tests/fixtures.js
rename to tests/fixtures.ts
index 77bb780c..cb69c5c8 100644
--- a/tests/fixtures.js
+++ b/tests/fixtures.ts
@@ -1,8 +1,7 @@
-
-import GitAgent from '../assets/scripts/GitAgent.js'
+import GitAgent from '../assets/scripts/GitAgent.ts'
 
 //@ts-ignore
-export const fakeStateWithOneSite = (sandbox) => ({
+export const fakeStateWithOneSite = sandbox => ({
   oAuthProvider: {
     origin: 'https://github.com',
     accessToken: '1234567890',
@@ -34,6 +33,6 @@ export const fakeStateWithOneSite = (sandbox) => ({
     ],
   },
   buildStatus: {
-    setBuildingAndCheckStatusLater(){}
-  }
+    setBuildingAndCheckStatusLater() {},
+  },
 })
diff --git a/tests/setup.js b/tests/setup.ts
similarity index 100%
rename from tests/setup.js
rename to tests/setup.ts
diff --git a/tests/utils.test.js b/tests/utils.test.ts
similarity index 92%
rename from tests/utils.test.js
rename to tests/utils.test.ts
index 9d589f80..1459b1e5 100644
--- a/tests/utils.test.js
+++ b/tests/utils.test.ts
@@ -1,5 +1,5 @@
-import './setup.js'
-import { isItStillCompiling } from '../assets/scripts/utils.js'
+import './setup.ts'
+import { isItStillCompiling } from '../assets/scripts/utils.ts'
 
 describe('Utils function', () => {
   let now, clock
diff --git a/tsconfig.json b/tsconfig.json
index 5af59f21..ea9f9211 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,6 +9,7 @@
     "strict": true,
     "skipLibCheck": true,
     "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
     "target": "esnext",
     "lib": ["ES2022", "dom", "dom.iterable"],
     "types": ["node", "mocha"],