From 065a9b55b1a214258a2e8fdd7be278a99b44ef0b Mon Sep 17 00:00:00 2001
From: Sylvain Zimmer <sylvain@sylvainzimmer.com>
Date: Thu, 23 Jun 2022 10:45:03 +0200
Subject: [PATCH 01/42] Complete licensing info

---
 README.md                        | 2 +-
 packages/dictionaries/LICENSE.md | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index e3a878de..c2caa1ac 100644
--- a/README.md
+++ b/README.md
@@ -99,4 +99,4 @@ To clean all packages and return to a fresh state run `yarn workspaces clean`.
 
 ## License
 
-[Apache License, Version 2.0](https://choosealicense.com/licenses/apache-2.0/)
+All code and dictionaries are published under [Apache License, Version 2.0](https://choosealicense.com/licenses/apache-2.0/), except for the French dictionary which is published under [Creative Commons BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/).
diff --git a/packages/dictionaries/LICENSE.md b/packages/dictionaries/LICENSE.md
index 387cac31..202a07b2 100644
--- a/packages/dictionaries/LICENSE.md
+++ b/packages/dictionaries/LICENSE.md
@@ -1,10 +1,12 @@
-Source code is released under [Apache-2.0](/LICENSE) LICENSE
+Source code is released under the [Apache-2.0](/LICENSE) license.
 
 French dictionary files:
 
 - [fr.json](./src/fr/fr.json)
 - [lexique-infra.brut](./scripts/data/lexique-infra.brut)
 
-are released under [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/) LICENSE
+are released under the [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/) license.
 
-See [LICENSES.md](./scripts/data/LICENSES.md) for more details
+Other dictionaries are released under the [Apache-2.0](/LICENSE) license.
+
+See [LICENSES.md](./scripts/data/LICENSES.md) for more details.

From 4f61b00297509654fe6867c4cf6e5ff1233eddcc Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Tue, 14 Jun 2022 10:25:49 +0200
Subject: [PATCH 02/42] feat(chrome-extension): first run experience

---
 apps/chrome-extension/src/i18n/en.json       |  3 +-
 apps/chrome-extension/src/i18n/fr.json       |  3 +-
 apps/chrome-extension/src/views/MainMenu.vue | 32 +++++++++++++++-----
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/apps/chrome-extension/src/i18n/en.json b/apps/chrome-extension/src/i18n/en.json
index d0a9d9ee..6850126c 100644
--- a/apps/chrome-extension/src/i18n/en.json
+++ b/apps/chrome-extension/src/i18n/en.json
@@ -13,7 +13,8 @@
     "I_HAVE_PROFILE_CODE": "I have profile code",
     "MENU_LANGUAGE": "Menu language:",
     "CONTACT_US": "Contact us!",
-    "TELL_US_ABOUT_YOU": "Tell us about you"
+    "TELL_US_ABOUT_YOU": "Tell us about you",
+    "FIRST_RUN": "To get started please select one of the two options below:"
   },
   "QUICK_ACTIVATE": {
     "QUICK_ACTIVATE": "Quick activate",
diff --git a/apps/chrome-extension/src/i18n/fr.json b/apps/chrome-extension/src/i18n/fr.json
index 49cb567a..ce911482 100644
--- a/apps/chrome-extension/src/i18n/fr.json
+++ b/apps/chrome-extension/src/i18n/fr.json
@@ -13,7 +13,8 @@
     "I_HAVE_PROFILE_CODE": "J'ai un code de profil",
     "MENU_LANGUAGE": "Langue du menu :",
     "CONTACT_US": "Contactez-nous !",
-    "TELL_US_ABOUT_YOU": "Dites nous en plus sur vous"
+    "TELL_US_ABOUT_YOU": "Dites nous en plus sur vous",
+    "FIRST_RUN": "Pour configurer votre profil, veuillez choisir une des options suivantes :"
   },
   "QUICK_ACTIVATE": {
     "QUICK_ACTIVATE": "Activation rapide",
diff --git a/apps/chrome-extension/src/views/MainMenu.vue b/apps/chrome-extension/src/views/MainMenu.vue
index f1d92636..5994ee45 100644
--- a/apps/chrome-extension/src/views/MainMenu.vue
+++ b/apps/chrome-extension/src/views/MainMenu.vue
@@ -1,9 +1,14 @@
 <script lang="ts">
-import { defineComponent, ref, watchEffect } from '@vue/composition-api'
+import { computed, defineComponent, ref, watchEffect } from '@vue/composition-api'
 import { BButton, BFormCheckbox, BImg } from 'bootstrap-vue'
+import isEqual from 'lodash/isEqual'
 
 import utils from '@/chrome'
 import i18n from '@/i18n'
+import store from '@/store'
+import { buildDefaultProfiles } from '@/constants/defaultProfiles'
+import { Profiles } from '@/interfaces'
+
 import QuickActivate from '@/components/QuickActivate.vue'
 
 const MainMenu = defineComponent({
@@ -22,6 +27,15 @@ const MainMenu = defineComponent({
 
     const { openSettings, sendMessageToCurrentTab, newSettings, openTemplates, broadcastMessage, getEnabled, saveEnabled } = utils
 
+    const settings = computed(() => store.getters.getSettings)
+    const defaultProfiles = buildDefaultProfiles()
+
+    const isDefaultSettings = computed(() => {
+      const lang = settings.value.language as keyof Profiles
+      const defaultSettings = defaultProfiles[lang]
+      return isEqual(settings.value, defaultSettings)
+    })
+
     watchEffect(async () => (readaptEnabled.value = await getEnabled()))
 
     const switchEnabled = async () => {
@@ -52,7 +66,8 @@ const MainMenu = defineComponent({
       adapt,
       reset,
       selectTemplate,
-      changeLocale
+      changeLocale,
+      isDefaultSettings
     }
   }
 })
@@ -66,7 +81,7 @@ export default MainMenu
         <!--<b-button class="mr-2" size="sm" variant="primary" @click="adapt()" :disabled="!readaptEnabled">-->
         <!--  {{ $t('MAIN_MENU.ADAPT_PAGE') }}-->
         <!--</b-button>-->
-        <b-button size="sm" variant="outline-primary" @click="reset()" :disabled="!readaptEnabled">
+        <b-button v-if="!isDefaultSettings" size="sm" variant="outline-primary" @click="reset()" :disabled="!readaptEnabled">
           {{ $t('MAIN_MENU.RESET') }}
         </b-button>
       </div>
@@ -83,12 +98,12 @@ export default MainMenu
       </div>
     </div>
 
-    <div class="d-flex justify-content-start align-items-center mt-2">
+    <div class="d-flex justify-content-start align-items-center mt-2" v-if="!isDefaultSettings">
       <label class="form-check-label mr-2">{{ $t('MAIN_MENU.READAPT_ACTIVE') }}</label>
       <b-form-checkbox switch :checked="readaptEnabled" @change="switchEnabled" />
     </div>
 
-    <div class="mt-3">
+    <div class="mt-3" v-if="!isDefaultSettings">
       <h5>{{ $t('MAIN_MENU.ADAPT_TEXT_BY') }}</h5>
       <ul class="help">
         <!-- <li>-->
@@ -99,13 +114,14 @@ export default MainMenu
         <li>{{ $t('MAIN_MENU.HOLD_CMD_AND_CLICK_TARGET') }}</li>
       </ul>
     </div>
+    <div v-else class="text-center my-3">{{ $t('MAIN_MENU.FIRST_RUN') }}</div>
 
-    <div class="my-3 d-flex justify-content-between align-items-center">
-      <b-button size="sm" variant="primary" @click="openSettings" style="max-width: 150px">
+    <div class="my-3 d-flex align-items-center" :class="isDefaultSettings ? 'justify-content-center' : 'justify-content-between'">
+      <b-button v-if="!isDefaultSettings" size="sm" variant="primary" @click="openSettings" style="max-width: 150px">
         {{ $t('MAIN_MENU.SEE_MODIFY_CURRENT_PROFILE') }}
       </b-button>
 
-      <b-button size="sm" variant="primary" @click="newSettings" style="max-width: 150px">
+      <b-button size="sm" variant="primary" :class="{ 'mr-4': isDefaultSettings }" @click="newSettings" style="max-width: 150px">
         {{ $t('MAIN_MENU.CREATE_BRAND_NEW_PROFILE') }}
       </b-button>
 

From ddc46870a6bf1bf0a4b99c7cd3494f3e180948a1 Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Fri, 17 Jun 2022 15:23:18 +0200
Subject: [PATCH 03/42] feat(chrome-extension): optimize ui for 600x600

---
 .../chrome-extension/src/components/QuickActivate.vue | 11 +++++------
 apps/chrome-extension/src/views/MainMenu.vue          |  6 +++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/apps/chrome-extension/src/components/QuickActivate.vue b/apps/chrome-extension/src/components/QuickActivate.vue
index 24bc3443..bb90ae8e 100644
--- a/apps/chrome-extension/src/components/QuickActivate.vue
+++ b/apps/chrome-extension/src/components/QuickActivate.vue
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { defineComponent, ref, watchEffect } from '@vue/composition-api'
-import { BCard, BTableSimple, BTbody, BTd, BTh, BTr } from 'bootstrap-vue'
+import { BTableSimple, BTbody, BTd, BTh, BTr } from 'bootstrap-vue'
 import { opacityOptions } from '@readapt/settings'
 
 import { thicknessOptions } from '@/constants/ticknessOptions'
@@ -11,7 +11,6 @@ import { RangeBar } from '@readapt/shared-components'
 
 const QuickActivate = defineComponent({
   components: {
-    BCard,
     BTableSimple,
     BTbody,
     BTr,
@@ -51,9 +50,9 @@ const QuickActivate = defineComponent({
 export default QuickActivate
 </script>
 <template>
-  <b-card>
-    <h6 class="text-uppercase pl-1">{{ $t('QUICK_ACTIVATE.QUICK_ACTIVATE') }}</h6>
-    <b-table-simple striped small responsive class="mt-3" style="max-height: 33vh">
+  <div class="border rounded">
+    <div class="text-uppercase pl-1 my-3">{{ $t('QUICK_ACTIVATE.QUICK_ACTIVATE') }}</div>
+    <b-table-simple striped small responsive style="max-height: 35vh">
       <b-tbody>
         <!-- FONT
         <b-tr>
@@ -142,5 +141,5 @@ export default QuickActivate
         </b-tr>
       </b-tbody>
     </b-table-simple>
-  </b-card>
+  </div>
 </template>
diff --git a/apps/chrome-extension/src/views/MainMenu.vue b/apps/chrome-extension/src/views/MainMenu.vue
index 5994ee45..db57089a 100644
--- a/apps/chrome-extension/src/views/MainMenu.vue
+++ b/apps/chrome-extension/src/views/MainMenu.vue
@@ -75,7 +75,7 @@ export default MainMenu
 </script>
 
 <template>
-  <div class="container-fluid" style="max-width: 600px">
+  <div class="container-fluid d-flex flex-column justify-content-between" style="min-width: 600px; min-height: 600px">
     <div class="mt-2 d-flex justify-content-between align-items-center">
       <div>
         <!--<b-button class="mr-2" size="sm" variant="primary" @click="adapt()" :disabled="!readaptEnabled">-->
@@ -116,7 +116,7 @@ export default MainMenu
     </div>
     <div v-else class="text-center my-3">{{ $t('MAIN_MENU.FIRST_RUN') }}</div>
 
-    <div class="my-3 d-flex align-items-center" :class="isDefaultSettings ? 'justify-content-center' : 'justify-content-between'">
+    <div class="mt-3 mb-auto d-flex align-items-center" :class="isDefaultSettings ? 'justify-content-center' : 'justify-content-between'">
       <b-button v-if="!isDefaultSettings" size="sm" variant="primary" @click="openSettings" style="max-width: 150px">
         {{ $t('MAIN_MENU.SEE_MODIFY_CURRENT_PROFILE') }}
       </b-button>
@@ -134,7 +134,7 @@ export default MainMenu
       <!--            </b-button>-->
     </div>
 
-    <QuickActivate />
+    <QuickActivate class="mb-auto" />
     <div class="my-2 d-flex justify-content-end align-items-center">
       <a href="https://forms.gle/ciWCnYnkFjutwEHWA" target="_blank" class="mr-2">
         <b-button size="sm" variant="primary">{{ $t('MAIN_MENU.TELL_US_ABOUT_YOU') }}</b-button>

From 31889980e4fa4d21414c53f4012ad9f4afa6c3bd Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Thu, 16 Jun 2022 17:12:49 +0200
Subject: [PATCH 04/42] feat(chrome-extension): collects adapt event metrics

---
 .gitignore                                      |  2 ++
 apps/chrome-extension/.env-template             |  1 +
 apps/chrome-extension/README.md                 |  8 ++++++--
 apps/chrome-extension/package.json              |  4 +++-
 apps/chrome-extension/scripts/init-env          | 17 +++++++++++++++++
 .../src-extension/background.ts                 | 14 ++++++++++++++
 apps/chrome-extension/src-extension/readapt.ts  |  1 +
 .../src-extension/rollup.config.js              |  4 +++-
 package.json                                    |  1 +
 yarn.lock                                       | 13 +++++++++++++
 10 files changed, 61 insertions(+), 4 deletions(-)
 create mode 100644 apps/chrome-extension/.env-template
 create mode 100755 apps/chrome-extension/scripts/init-env

diff --git a/.gitignore b/.gitignore
index ed4ea5da..188e5e37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,8 @@ coverage/
 .idea
 dist/
 .vscode/lauch.js
+.env*
+!.env-template
 
 .parcel-cache
 *.tsbuildinfo
diff --git a/apps/chrome-extension/.env-template b/apps/chrome-extension/.env-template
new file mode 100644
index 00000000..debd5d65
--- /dev/null
+++ b/apps/chrome-extension/.env-template
@@ -0,0 +1 @@
+MATOMO_URL=
diff --git a/apps/chrome-extension/README.md b/apps/chrome-extension/README.md
index 2ebe4028..586e15c8 100644
--- a/apps/chrome-extension/README.md
+++ b/apps/chrome-extension/README.md
@@ -2,9 +2,9 @@
 
 ## Introduction
 
-Created by [Contentsquare Foundation](https://contentsquare-foundation.org/), Readapt is a software platform that aims to help those with reading challenges like dyslexia to more easily read digital text. The [Chrome extension](https://chrome.google.com/webstore/detail/readapt/emgfmfgandmhbgleikkoaebngboghfpe) version of Readapt allows users to set their reading preferences and adapt text on websites. It also provides reading tools like a screen mask and reading ruler. 
+Created by [Contentsquare Foundation](https://contentsquare-foundation.org/), Readapt is a software platform that aims to help those with reading challenges like dyslexia to more easily read digital text. The [Chrome extension](https://chrome.google.com/webstore/detail/readapt/emgfmfgandmhbgleikkoaebngboghfpe) version of Readapt allows users to set their reading preferences and adapt text on websites. It also provides reading tools like a screen mask and reading ruler.
 
-This Chrome extension is compatible with many Chromium-based browsers like Google Chrome and Microsoft Edge (web view 2). It is available in English and French. 
+This Chrome extension is compatible with many Chromium-based browsers like Google Chrome and Microsoft Edge (web view 2). It is available in English and French.
 
 ## How the Readapt Chrome extension works
 After installing the extension, you can click on the extension to either create your profile from scratch or select from one of our reading templates. After saving your preferences, you can start to adapt text on websites by holding the control (Windows) or command ⌘ key (Mac) and left-clicking on your target text. To remove the text adaptation, you can either click on the extension and click on "Reset text on page", or right-click on the webpage and select "Readapt > Reset all text".
@@ -17,6 +17,10 @@ The reading tools (screen mask and reading ruler) can be activated on a webpage
 yarn install
 ```
 
+### Setup env var
+
+After install an `.env` file will be generated, please fill missing values
+
 ### Compiles and hot-reloads for development
 ```
 yarn serve
diff --git a/apps/chrome-extension/package.json b/apps/chrome-extension/package.json
index 935f39f5..f87ef121 100644
--- a/apps/chrome-extension/package.json
+++ b/apps/chrome-extension/package.json
@@ -9,7 +9,8 @@
     "clean": "shx rm -rf dist",
     "test:unit": "vue-cli-service test:unit",
     "lint": "vue-cli-service lint",
-    "package": "scripts/package-release"
+    "package": "scripts/package-release",
+    "postinstall": "scripts/init-env"
   },
   "dependencies": {
     "@readapt/settings": "^1.0.0",
@@ -20,6 +21,7 @@
     "bootstrap": "~4.6.1",
     "bootstrap-vue": "~2.22.0",
     "core-js": "^3.8.3",
+    "dotenv": "^16.0.1",
     "lodash": "^4.17.21",
     "popper.js": "^1.16.1",
     "vue": "~2.6.14",
diff --git a/apps/chrome-extension/scripts/init-env b/apps/chrome-extension/scripts/init-env
new file mode 100755
index 00000000..0987ccfd
--- /dev/null
+++ b/apps/chrome-extension/scripts/init-env
@@ -0,0 +1,17 @@
+#!/usr/bin/env node
+/*
+ This script check env file or create it from template with default values.
+*/
+const fs = require('fs');
+const path = require('path')
+
+const ENV_FILE_PATH = path.join(__dirname, '../.env');
+
+
+if (!fs.existsSync(ENV_FILE_PATH)) {
+  const ENV_TEMPLATE_PATH = path.join(__dirname, '../.env-template');
+  fs.copyFileSync(ENV_TEMPLATE_PATH, ENV_FILE_PATH)
+  console.log('.env file created with default values, please setup missing values')
+} else {
+  console.log('Check .env file OK')
+}
diff --git a/apps/chrome-extension/src-extension/background.ts b/apps/chrome-extension/src-extension/background.ts
index 85a1c999..66c0a004 100644
--- a/apps/chrome-extension/src-extension/background.ts
+++ b/apps/chrome-extension/src-extension/background.ts
@@ -93,6 +93,11 @@ chrome.storage.onChanged.addListener(async (changes) => {
   if (hasSettingsChanged(changes)) {
     await broadcastMessage('REFRESH')
   }
+
+  const matomoURL = '__MATOMO_URL'
+  if (matomoURL && hasEventChanged(changes)) {
+    await fetch(`${matomoURL}/matomo.php?idsite=1&action_name=adapt&rec=1`)
+  }
 })
 
 const hasEnabledChanged = (changes: { [p: string]: chrome.storage.StorageChange }): boolean => {
@@ -104,6 +109,15 @@ const hasEnabledChanged = (changes: { [p: string]: chrome.storage.StorageChange
   return false
 }
 
+const hasEventChanged = (changes: { [p: string]: chrome.storage.StorageChange }): boolean => {
+  for (const [key] of Object.entries(changes)) {
+    if (key === 'event') {
+      return true
+    }
+  }
+  return false
+}
+
 const switchEnabledContextMenu = (enabled: boolean): void => {
   // chrome.contextMenus.update('readaptMenuAdaptAction', { visible: enabled })
   chrome.contextMenus.update('readaptMenuResetAction', { visible: enabled })
diff --git a/apps/chrome-extension/src-extension/readapt.ts b/apps/chrome-extension/src-extension/readapt.ts
index 80092490..4ac537ef 100644
--- a/apps/chrome-extension/src-extension/readapt.ts
+++ b/apps/chrome-extension/src-extension/readapt.ts
@@ -196,6 +196,7 @@ const adaptHtmlElement = async (element: HTMLElement): Promise<void> => {
     console.error('Something went wrong when adapting element', element)
     console.error(error)
   }
+  chrome.storage.local.set({ event: `adapt:${new Date().toISOString()}` }).catch(console.error)
 
   document.body.classList.remove('readapt-loading')
 }
diff --git a/apps/chrome-extension/src-extension/rollup.config.js b/apps/chrome-extension/src-extension/rollup.config.js
index 9a8eea33..08ec6c4e 100644
--- a/apps/chrome-extension/src-extension/rollup.config.js
+++ b/apps/chrome-extension/src-extension/rollup.config.js
@@ -3,12 +3,14 @@ import resolve from '@rollup/plugin-node-resolve'
 import commonjs from '@rollup/plugin-commonjs'
 import { terser } from 'rollup-plugin-terser'
 import path from 'path'
+import replace from '@rollup/plugin-replace'
 
+require('dotenv').config()
 export default [
   {
     input: path.join(__dirname, './background.ts'),
     output: [{ file: './dist/scripts/background.js', format: 'iife' }],
-    plugins: [ts(), resolve(), commonjs(), terser({ compress: true })]
+    plugins: [replace({ __MATOMO_URL: process.env.MATOMO_URL }), ts(), resolve(), commonjs(), terser({ compress: true })]
   },
   {
     input: path.join(__dirname, './readapt.ts'),
diff --git a/package.json b/package.json
index 6efef80b..9b8190da 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "@parcel/transformer-typescript-types": "^2.3.1",
     "@rollup/plugin-commonjs": "^21.0.1",
     "@rollup/plugin-node-resolve": "^13.1.3",
+    "@rollup/plugin-replace": "^4.0.0",
     "@types/jest": "^27.0.1",
     "@types/node": "^16.11.22",
     "@typescript-eslint/eslint-plugin": "^5.4.0",
diff --git a/yarn.lock b/yarn.lock
index 90bf844f..60d6060d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2819,6 +2819,14 @@
     is-module "^1.0.0"
     resolve "^1.19.0"
 
+"@rollup/plugin-replace@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-4.0.0.tgz#e34c457d6a285f0213359740b43f39d969b38a67"
+  integrity sha512-+rumQFiaNac9y64OHtkHGmdjm7us9bo1PlbgQfdihQtuNxzjpaB064HbRnewUOggLQxVCCyINfStkgmBeQpv1g==
+  dependencies:
+    "@rollup/pluginutils" "^3.1.0"
+    magic-string "^0.25.7"
+
 "@rollup/pluginutils@^3.1.0":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b"
@@ -5842,6 +5850,11 @@ dotenv@^10.0.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"
   integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==
 
+dotenv@^16.0.1:
+  version "16.0.1"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.1.tgz#8f8f9d94876c35dac989876a5d3a82a267fdce1d"
+  integrity sha512-1K6hR6wtk2FviQ4kEiSjFiH5rpzEVi8WW0x96aztHVMhEspNpc4DVOUTEHtEva5VThQ8IaBX1Pe4gSzpVVUsKQ==
+
 dotenv@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-7.0.0.tgz#a2be3cd52736673206e8a85fb5210eea29628e7c"

From 10db077ac9882f0cde6679f756da7114f28e527a Mon Sep 17 00:00:00 2001
From: Taze_Young <92599554+TazeYoung@users.noreply.github.com>
Date: Fri, 17 Jun 2022 14:19:57 +0200
Subject: [PATCH 05/42] Create CODE_OF_CONDUCT.md

---
 CODE_OF_CONDUCT.md | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 CODE_OF_CONDUCT.md

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 00000000..0cdfd923
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,10 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of the Readapt project, we pledge to respect everyone who contributes by posting issues, updating documentation, submitting pull requests, providing feedback in comments, and any other activities.
+Communication through any of Readapt’s channels (GitHub, YouTube, email etc.) must be constructive and never resort to personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+
+We promise to extend courtesy and respect to everyone involved in this project regardless of gender, gender identity, sexual orientation, visible or invisible disability, age, race, ethnicity, religion, or level of experience. We expect anyone contributing to the Readapt project to do the same.
+
+If any member of the community violates this code of conduct, the maintainers of the Readapt project may take action, removing issues, comments, and PRs or blocking accounts as deemed appropriate.
+
+If you are subject to or witness unacceptable behavior, or have any other concerns, please email us at readapt@contentsquare.com.

From 71a240f4aa5383a68b046e9c32b58a00eea1abf1 Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Mon, 20 Jun 2022 17:00:24 +0200
Subject: [PATCH 06/42] feat(ms-word-addin): collects apdapt event metrics

---
 apps/ms-word-addin/.env-template           |  1 +
 apps/ms-word-addin/package.json            |  3 ++-
 apps/ms-word-addin/scripts/init-env        | 17 +++++++++++++++++
 apps/ms-word-addin/src/constants/config.ts |  3 +++
 apps/ms-word-addin/src/services/stats.ts   |  7 +++++++
 apps/ms-word-addin/src/views/MainMenu.vue  |  2 ++
 6 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 apps/ms-word-addin/.env-template
 create mode 100755 apps/ms-word-addin/scripts/init-env
 create mode 100644 apps/ms-word-addin/src/constants/config.ts
 create mode 100644 apps/ms-word-addin/src/services/stats.ts

diff --git a/apps/ms-word-addin/.env-template b/apps/ms-word-addin/.env-template
new file mode 100644
index 00000000..e14b2ddf
--- /dev/null
+++ b/apps/ms-word-addin/.env-template
@@ -0,0 +1 @@
+VUE_APP_MATOMO_URL=
diff --git a/apps/ms-word-addin/package.json b/apps/ms-word-addin/package.json
index b495805e..98692735 100644
--- a/apps/ms-word-addin/package.json
+++ b/apps/ms-word-addin/package.json
@@ -14,7 +14,8 @@
     "stop": "office-addin-debugging stop manifest.xml",
     "validate": "office-addin-manifest validate manifest.xml",
     "cert:install": "node ./node_modules/.bin/office-addin-dev-certs install",
-    "cert:uninstall": "node ./node_modules/.bin/office-addin-dev-certs uninstall"
+    "cert:uninstall": "node ./node_modules/.bin/office-addin-dev-certs uninstall",
+    "postinstall": "scripts/init-env"
   },
   "dependencies": {
     "@readapt/settings": "^1.0.0",
diff --git a/apps/ms-word-addin/scripts/init-env b/apps/ms-word-addin/scripts/init-env
new file mode 100755
index 00000000..0987ccfd
--- /dev/null
+++ b/apps/ms-word-addin/scripts/init-env
@@ -0,0 +1,17 @@
+#!/usr/bin/env node
+/*
+ This script check env file or create it from template with default values.
+*/
+const fs = require('fs');
+const path = require('path')
+
+const ENV_FILE_PATH = path.join(__dirname, '../.env');
+
+
+if (!fs.existsSync(ENV_FILE_PATH)) {
+  const ENV_TEMPLATE_PATH = path.join(__dirname, '../.env-template');
+  fs.copyFileSync(ENV_TEMPLATE_PATH, ENV_FILE_PATH)
+  console.log('.env file created with default values, please setup missing values')
+} else {
+  console.log('Check .env file OK')
+}
diff --git a/apps/ms-word-addin/src/constants/config.ts b/apps/ms-word-addin/src/constants/config.ts
new file mode 100644
index 00000000..925b326a
--- /dev/null
+++ b/apps/ms-word-addin/src/constants/config.ts
@@ -0,0 +1,3 @@
+export const config = {
+  matomoURL: process.env.VUE_APP_MATOMO_URL
+}
diff --git a/apps/ms-word-addin/src/services/stats.ts b/apps/ms-word-addin/src/services/stats.ts
new file mode 100644
index 00000000..877d3e6c
--- /dev/null
+++ b/apps/ms-word-addin/src/services/stats.ts
@@ -0,0 +1,7 @@
+import { config } from '@/constants/config'
+
+const trackAdaptEvent = () => {
+  fetch(`${config.matomoURL}/matomo.php?idsite=2&action_name=adapt&rec=1`).catch(console.error)
+}
+
+export { trackAdaptEvent }
diff --git a/apps/ms-word-addin/src/views/MainMenu.vue b/apps/ms-word-addin/src/views/MainMenu.vue
index 0550c7a5..3b2cfa0f 100644
--- a/apps/ms-word-addin/src/views/MainMenu.vue
+++ b/apps/ms-word-addin/src/views/MainMenu.vue
@@ -7,6 +7,7 @@ import { BButton, BImg } from 'bootstrap-vue'
 import i18n from '@/i18n'
 import { buildDefaultProfiles } from '@/constants/defaultProfiles'
 import { Profiles } from '@/interfaces'
+import { trackAdaptEvent } from '@/services/stats'
 
 export interface OfficeCustomImageData {
   htmlImage: HTMLImageElement
@@ -138,6 +139,7 @@ const MainMenu = defineComponent({
     }
 
     const openDialogBox = () => {
+      trackAdaptEvent()
       Office.context.ui.displayDialogAsync(
         `${window.location.origin}/#/dialog-box`,
         { height: 90, width: 90 },

From da2a4f77bf011a2d15d3662a7fa6dbe83a01bbe2 Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Tue, 21 Jun 2022 15:20:28 +0200
Subject: [PATCH 07/42] test(visual-engine): fix tests after dict update

---
 .../{src/text-engine => tests}/text-engine.spec.ts        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename packages/text-engine/{src/text-engine => tests}/text-engine.spec.ts (97%)

diff --git a/packages/text-engine/src/text-engine/text-engine.spec.ts b/packages/text-engine/tests/text-engine.spec.ts
similarity index 97%
rename from packages/text-engine/src/text-engine/text-engine.spec.ts
rename to packages/text-engine/tests/text-engine.spec.ts
index 2514cf30..18d3a5d5 100644
--- a/packages/text-engine/src/text-engine/text-engine.spec.ts
+++ b/packages/text-engine/tests/text-engine.spec.ts
@@ -1,5 +1,5 @@
-import * as textEngine from './text-engine'
-import { Phoneme } from './models'
+import * as textEngine from '../src/text-engine/text-engine'
+import { Phoneme } from '../src'
 
 describe('English TextEngine', () => {
   const enPhonemes = textEngine.getPhonemes('en')
@@ -51,7 +51,7 @@ describe('English TextEngine', () => {
     const lang = 'en'
     const expectedPhonemes = 'jh.aa._.n._.ih.z._.l.ih.s._.ah.n.ih.ng.ng._.t.uw._.k._.r.ih.s._.m.ah.s._.w._.ih.s._.l.ih.ng.ng'
     // prettier-ignore
-    const expectedSyllablesValue = [[0, 3], [5, 5], [6, 6], [8, 10], [11, 12], [13, 16], [18, 19], [21, 26], [27, 29], [31, 34], [35, 39]]
+    const expectedSyllablesValue = [[0, 3], [5, 6], [8, 10], [11, 12], [13, 16], [18, 19], [21, 26], [27, 29], [31, 34], [35, 39]]
     const expectedSilentLettersValue = [2, 11, 22, 26, 32, 35]
 
     const { phonemes, syllables, silentLetters } = textEngine.analyse(text, lang)
@@ -82,7 +82,7 @@ describe('English TextEngine', () => {
     const expectedPhonemes =
       'dh.dh.ih.s._.ih.z._.ae.n._._.ih.g|z.ae.m.p.ah|l._._._.s.eh.n.t.ah.n.s._._._.w._.ah.t._.ae.n._._.ao.ao._.s.ah.m._._.w.er.er.d._.ih.t._.ih.z._._.ih.t._.s._.f.ae.n.t.ae.s.t.ih.k._.ah.m.ey.z.ih.ng.ng._._._.b._.y.uw.t.ah.f.ah.l._._._._._._._.ih.n.k.r.eh.d.ah.b.ah|l._._._.dh.dh.ah._.s.k.ay._.ih.z._.b.l.uw._._.ih.sh.sh'
     // prettier-ignore
-    const expectedSyllablesValue = [[0, 3], [5, 5], [6, 6], [8, 9], [12, 13], [14, 15], [16, 18], [21, 23], [24, 28], [31, 34], [36, 37], [40, 42], [43, 46], [48, 51], [53, 54], [56, 56], [57, 57], [60, 63], [65, 67], [68, 70], [71, 73], [75, 75], [76, 78], [79, 81], [85, 88], [89, 90], [91, 93], [101, 102], [103, 106], [107, 107], [108, 110], [113, 115], [117, 119], [121, 121], [122, 122], [124, 127], [129, 131]]
+    const expectedSyllablesValue = [[0, 3], [5, 6], [8, 9], [12, 13], [14, 15], [16, 18], [21, 23], [24, 28], [31, 34], [36, 37], [40, 42], [43, 46], [48, 51], [53, 54], [56, 57], [60, 63], [65, 67], [68, 70], [71, 73], [75, 75], [76, 78], [79, 81], [85, 88], [89, 90], [91, 93], [101, 102], [103, 106], [107, 107], [108, 110], [113, 115], [117, 119], [121, 122], [124, 127], [129, 131]]
     const expectedSilentLettersValue = [32]
 
     const { phonemes, syllables, silentLetters } = textEngine.analyse(text, lang)

From 896da9f3738d4ff4b0fddfba8c5f5c06c2725aa2 Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Tue, 21 Jun 2022 15:22:29 +0200
Subject: [PATCH 08/42] test: add run tests script to main package.json

---
 apps/chrome-extension/package.json                  |  1 +
 apps/chrome-extension/tests/unit/example.spec.ts    | 13 +++----------
 apps/ms-word-addin/package.json                     |  1 +
 apps/ms-word-addin/tests/unit/example.spec.ts       | 13 +++----------
 packages/dictionaries/package.json                  |  1 +
 packages/settings/package.json                      |  2 +-
 packages/shared-components/package.json             |  1 +
 .../{test => tests}/adaptHtmlElement.spec.ts        |  0
 8 files changed, 11 insertions(+), 21 deletions(-)
 rename packages/visual-engine/{test => tests}/adaptHtmlElement.spec.ts (100%)

diff --git a/apps/chrome-extension/package.json b/apps/chrome-extension/package.json
index f87ef121..1a76d4d2 100644
--- a/apps/chrome-extension/package.json
+++ b/apps/chrome-extension/package.json
@@ -7,6 +7,7 @@
     "build": "vue-cli-service build && yarn build-extension",
     "build-extension": "rollup -c src-extension/rollup.config.js",
     "clean": "shx rm -rf dist",
+    "test": "yarn test:unit",
     "test:unit": "vue-cli-service test:unit",
     "lint": "vue-cli-service lint",
     "package": "scripts/package-release",
diff --git a/apps/chrome-extension/tests/unit/example.spec.ts b/apps/chrome-extension/tests/unit/example.spec.ts
index f84fb39d..1de8bff3 100644
--- a/apps/chrome-extension/tests/unit/example.spec.ts
+++ b/apps/chrome-extension/tests/unit/example.spec.ts
@@ -1,12 +1,5 @@
-import { shallowMount } from '@vue/test-utils'
-import HelloWorld from '@/components/HelloWorld.vue'
-
-describe('HelloWorld.vue', () => {
-  it('renders props.msg when passed', () => {
-    const msg = 'new message'
-    const wrapper = shallowMount(HelloWorld, {
-      propsData: { msg }
-    })
-    expect(wrapper.text()).toMatch(msg)
+describe('dummy test', () => {
+  it('no tests yet', () => {
+    expect(true).toBeTruthy()
   })
 })
diff --git a/apps/ms-word-addin/package.json b/apps/ms-word-addin/package.json
index 98692735..27aa970e 100644
--- a/apps/ms-word-addin/package.json
+++ b/apps/ms-word-addin/package.json
@@ -5,6 +5,7 @@
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
+    "test": "yarn test:unit",
     "test:unit": "vue-cli-service test:unit",
     "lint": "vue-cli-service lint",
     "clean": "shx rm -rf dist",
diff --git a/apps/ms-word-addin/tests/unit/example.spec.ts b/apps/ms-word-addin/tests/unit/example.spec.ts
index f84fb39d..1de8bff3 100644
--- a/apps/ms-word-addin/tests/unit/example.spec.ts
+++ b/apps/ms-word-addin/tests/unit/example.spec.ts
@@ -1,12 +1,5 @@
-import { shallowMount } from '@vue/test-utils'
-import HelloWorld from '@/components/HelloWorld.vue'
-
-describe('HelloWorld.vue', () => {
-  it('renders props.msg when passed', () => {
-    const msg = 'new message'
-    const wrapper = shallowMount(HelloWorld, {
-      propsData: { msg }
-    })
-    expect(wrapper.text()).toMatch(msg)
+describe('dummy test', () => {
+  it('no tests yet', () => {
+    expect(true).toBeTruthy()
   })
 })
diff --git a/packages/dictionaries/package.json b/packages/dictionaries/package.json
index a87c0da9..1de654cd 100644
--- a/packages/dictionaries/package.json
+++ b/packages/dictionaries/package.json
@@ -22,6 +22,7 @@
   "scripts": {
     "clean": "shx rm -rf dist",
     "build": "parcel build && npm run types",
+    "test": "echo 'no test yet'",
     "types": "tsc --emitDeclarationOnly",
     "generate-fr-dict": "ts-node scripts/generateFrenchDictionary.ts",
     "generate-en-dict": "ts-node scripts/generateEnglishDictionary.ts"
diff --git a/packages/settings/package.json b/packages/settings/package.json
index ce9b30b5..ecdb9380 100644
--- a/packages/settings/package.json
+++ b/packages/settings/package.json
@@ -6,7 +6,7 @@
   "types": "dist/types.d.ts",
   "scripts": {
     "clean": "shx rm -rf dist",
-    "test": "jest",
+    "test": "echo 'no test yet'",
     "build": "rollup -c rollup.config.js"
   },
   "publishConfig": {
diff --git a/packages/shared-components/package.json b/packages/shared-components/package.json
index 17b545e7..6ae95aca 100644
--- a/packages/shared-components/package.json
+++ b/packages/shared-components/package.json
@@ -12,6 +12,7 @@
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build --target lib --name readapt-shared-components src/index.ts && yarn types",
     "clean": "shx rm -rf dist",
+    "test": "yarn test:unit",
     "test:unit": "vue-cli-service test:unit",
     "lint": "vue-cli-service lint",
     "types": "rollup -c rollup.config.js"
diff --git a/packages/visual-engine/test/adaptHtmlElement.spec.ts b/packages/visual-engine/tests/adaptHtmlElement.spec.ts
similarity index 100%
rename from packages/visual-engine/test/adaptHtmlElement.spec.ts
rename to packages/visual-engine/tests/adaptHtmlElement.spec.ts

From f2b1ce93a2388bae567029e4ed86564f93181341 Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Tue, 21 Jun 2022 15:24:05 +0200
Subject: [PATCH 09/42] style: fix lint errors

---
 packages/visual-engine/src/adaptTextContent.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/visual-engine/src/adaptTextContent.ts b/packages/visual-engine/src/adaptTextContent.ts
index 3962e1ae..c358820d 100644
--- a/packages/visual-engine/src/adaptTextContent.ts
+++ b/packages/visual-engine/src/adaptTextContent.ts
@@ -1,4 +1,4 @@
-import { AnaliseTextFn, Liaison, Phoneme, Syllable } from '@readapt/text-engine'
+import { AnaliseTextFn, Liaison, Syllable } from '@readapt/text-engine'
 import { ColoredItem, Settings } from '@readapt/settings'
 import xor from 'lodash/xor'
 

From 57961a9a922809c34cc9b0bc057944798b28e6b7 Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Tue, 21 Jun 2022 15:44:50 +0200
Subject: [PATCH 10/42] ci: add github action to continuous integration

---
 .github/workflows/main.yaml | 28 ++++++++++++++++++++++++++++
 package.json                |  1 +
 2 files changed, 29 insertions(+)
 create mode 100644 .github/workflows/main.yaml

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
new file mode 100644
index 00000000..25b90468
--- /dev/null
+++ b/.github/workflows/main.yaml
@@ -0,0 +1,28 @@
+name: readapt ci
+
+on:
+  pull_request:
+    branches: [ "master", "develop", "release/ms-word-addin"]
+  push:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
+      - run: npm i -g --force yarn
+      - run: yarn install --frozen-lockfile
+      - run: yarn audit --groups dependencies
+      - run: yarn lint
+      - run: yarn build-deps
+      - run: yarn test --ci
+      - run: yarn workspace chrome-extension build
+      - run: yarn workspace ms-word-addin build
+
+
+
diff --git a/package.json b/package.json
index 9b8190da..e187fafc 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
   "scripts": {
     "build-ms-word-addin": "yarn build-deps && yarn workspace ms-word-addin build",
     "build-chrome-extension": "yarn build-deps && yarn workspace chrome-extension build",
+    "test": "yarn workspaces run test",
     "build-deps": "lerna run build --stream --include-dependencies --scope=@readapt/* ",
     "lint": "eslint --ext .ts,.vue packages/* apps/*"
   },

From 46aaea1b45cbb99b880d57641a51bd235c715d9c Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Tue, 21 Jun 2022 16:49:24 +0200
Subject: [PATCH 11/42] build(chrome-extension): update description in
 manifest.json

---
 apps/chrome-extension/manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/chrome-extension/manifest.json b/apps/chrome-extension/manifest.json
index 38d74d1f..259e914d 100644
--- a/apps/chrome-extension/manifest.json
+++ b/apps/chrome-extension/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Readapt",
-  "description": "Readapt by Contentsquare",
+  "description": "Readapt by Contentsquare Foundation",
   "version": "0.0.0",
   "manifest_version": 3,
   "action": {

From e2d4cf4e4dce1bf82bd3e671fe0f2e8423463b86 Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Tue, 21 Jun 2022 17:28:36 +0200
Subject: [PATCH 12/42] feat(chrome-extension): improve ui in main menu

---
 apps/chrome-extension/src/views/MainMenu.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/chrome-extension/src/views/MainMenu.vue b/apps/chrome-extension/src/views/MainMenu.vue
index db57089a..90a0daa6 100644
--- a/apps/chrome-extension/src/views/MainMenu.vue
+++ b/apps/chrome-extension/src/views/MainMenu.vue
@@ -75,7 +75,7 @@ export default MainMenu
 </script>
 
 <template>
-  <div class="container-fluid d-flex flex-column justify-content-between" style="min-width: 600px; min-height: 600px">
+  <div class="container-fluid d-flex flex-column justify-content-between" style="min-width: 600px; min-height: 600px; max-width: 600px">
     <div class="mt-2 d-flex justify-content-between align-items-center">
       <div>
         <!--<b-button class="mr-2" size="sm" variant="primary" @click="adapt()" :disabled="!readaptEnabled">-->

From e5b45bcadb32430c036215c5473afd01dd1c3edb Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Tue, 28 Jun 2022 09:26:45 +0200
Subject: [PATCH 13/42] build(ms-word-addin): do not generate .env file when
 build in CI

---
 apps/ms-word-addin/scripts/init-env | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/ms-word-addin/scripts/init-env b/apps/ms-word-addin/scripts/init-env
index 0987ccfd..0f261b9e 100755
--- a/apps/ms-word-addin/scripts/init-env
+++ b/apps/ms-word-addin/scripts/init-env
@@ -5,6 +5,12 @@
 const fs = require('fs');
 const path = require('path')
 
+// do not check env file in CI
+if (process.env.RENDER) {
+  console.log('Env vars must be configured in the CI dashboard')
+  return
+}
+
 const ENV_FILE_PATH = path.join(__dirname, '../.env');
 
 

From add8fe476731883c49c728368d81b112de314e2e Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Tue, 28 Jun 2022 10:31:39 +0200
Subject: [PATCH 14/42] build(ms-word-addin): set env vars in CI

---
 apps/ms-word-addin/scripts/init-env        | 15 ++++++++-------
 apps/ms-word-addin/scripts/set-env         |  2 ++
 apps/ms-word-addin/src/constants/config.ts |  1 +
 3 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100755 apps/ms-word-addin/scripts/set-env

diff --git a/apps/ms-word-addin/scripts/init-env b/apps/ms-word-addin/scripts/init-env
index 0f261b9e..5550336b 100755
--- a/apps/ms-word-addin/scripts/init-env
+++ b/apps/ms-word-addin/scripts/init-env
@@ -4,16 +4,10 @@
 */
 const fs = require('fs');
 const path = require('path')
-
-// do not check env file in CI
-if (process.env.RENDER) {
-  console.log('Env vars must be configured in the CI dashboard')
-  return
-}
+const { execSync } = require("child_process");
 
 const ENV_FILE_PATH = path.join(__dirname, '../.env');
 
-
 if (!fs.existsSync(ENV_FILE_PATH)) {
   const ENV_TEMPLATE_PATH = path.join(__dirname, '../.env-template');
   fs.copyFileSync(ENV_TEMPLATE_PATH, ENV_FILE_PATH)
@@ -21,3 +15,10 @@ if (!fs.existsSync(ENV_FILE_PATH)) {
 } else {
   console.log('Check .env file OK')
 }
+
+// setup env file in CI
+if (process.env.RENDER) {
+  console.log('Env vars must be configured in the CI dashboard')
+  execSync(`${__dirname}/set-env > ${ENV_FILE_PATH}`)
+  return
+}
diff --git a/apps/ms-word-addin/scripts/set-env b/apps/ms-word-addin/scripts/set-env
new file mode 100755
index 00000000..7435c1ea
--- /dev/null
+++ b/apps/ms-word-addin/scripts/set-env
@@ -0,0 +1,2 @@
+#! /bin/bash
+echo VUE_APP_MATOMO_URL=$VUE_APP_MATOMO_URL
diff --git a/apps/ms-word-addin/src/constants/config.ts b/apps/ms-word-addin/src/constants/config.ts
index 925b326a..2e519859 100644
--- a/apps/ms-word-addin/src/constants/config.ts
+++ b/apps/ms-word-addin/src/constants/config.ts
@@ -1,3 +1,4 @@
 export const config = {
+  ...process.env,
   matomoURL: process.env.VUE_APP_MATOMO_URL
 }

From 8a4b7e7760922eb83c538bb62425f3bd1ede15ac Mon Sep 17 00:00:00 2001
From: Ahmed Radjdi <ahmed.radjdi@contentsquare.com>
Date: Fri, 17 Jun 2022 16:57:24 +0200
Subject: [PATCH 15/42] feat: add dynamic ext preview

---
 .../src/components/AdaptContainer.vue         | 64 ++++++++++++------
 .../src/components/PreviewContainer.vue       | 53 +++++++++++++++
 .../src/components/TemplateSelectorOption.vue | 31 ++-------
 .../src/views/SettingsMenu.vue                | 34 +++-------
 .../src/components/AdaptContainer.vue         | 65 +++++++++++++------
 .../src/components/PreviewContainer.vue       | 53 +++++++++++++++
 apps/ms-word-addin/src/views/DialogBox.vue    | 15 +----
 apps/ms-word-addin/src/views/SettingsMenu.vue | 37 ++---------
 .../settings/src/langConfig/langConfigEn.ts   |  2 +-
 .../settings/src/langConfig/langConfigFr.ts   |  2 +-
 10 files changed, 216 insertions(+), 140 deletions(-)
 create mode 100644 apps/chrome-extension/src/components/PreviewContainer.vue
 create mode 100644 apps/ms-word-addin/src/components/PreviewContainer.vue

diff --git a/apps/chrome-extension/src/components/AdaptContainer.vue b/apps/chrome-extension/src/components/AdaptContainer.vue
index 39cf0918..4fe0f451 100644
--- a/apps/chrome-extension/src/components/AdaptContainer.vue
+++ b/apps/chrome-extension/src/components/AdaptContainer.vue
@@ -2,40 +2,62 @@
 import { adaptHtmlElementAsync } from '@/visualEngine/adaptHtmlElementAsync'
 import { removeStyleElement } from '@readapt/visual-engine'
 import { Settings } from '@readapt/settings'
-import { defineComponent, PropType, ref, watch, watchEffect, onUnmounted } from '@vue/composition-api'
+import { defineComponent, PropType, ref, watchEffect, onMounted, onUnmounted } from '@vue/composition-api'
+import { BSpinner } from 'bootstrap-vue'
 
-const AdaptContainer = defineComponent({
+const PreviewContainer = defineComponent({
+  components: { BSpinner },
   props: {
     contentToAdapt: { type: String, required: true },
     settings: { type: Object as PropType<Settings>, required: true },
     scope: { type: String, default: 'preview' }
   },
   setup(props, { emit }) {
-    const containerElement = ref<HTMLParagraphElement>()
+    const isLoading = ref(true)
+    const containerElement = ref<HTMLDivElement>()
+    const contentElement = ref<HTMLParagraphElement>()
 
-    const ready = ref(false)
+    const adaptContent = async () => {
+      if (containerElement.value && contentElement.value && props.contentToAdapt) {
+        contentElement.value.innerHTML = props.contentToAdapt
+        await adaptHtmlElementAsync(containerElement.value, props.settings, props.scope)
+        isLoading.value = false
+      }
+    }
+
+    watchEffect(() => adaptContent(), { flush: 'post' })
+
+    onMounted(() => adaptContent())
 
     onUnmounted(() => removeStyleElement(props.scope))
 
-    watch(ready, (isReadyNow) => isReadyNow && emit('ready'))
-
-    watchEffect(
-      async () => {
-        if (containerElement.value && props.contentToAdapt) {
-          containerElement.value.innerHTML = props.contentToAdapt
-          await adaptHtmlElementAsync(containerElement.value, props.settings, props.scope)
-          // ready after first adaptation
-          ready.value = true
-        }
-      },
-      { flush: 'post' }
-    )
-
-    return { containerElement }
+    const onClick = () => emit('edit')
+
+    return { isLoading, containerElement, contentElement, onClick }
   }
 })
-export default AdaptContainer
+export default PreviewContainer
 </script>
 <template>
-  <div ref="containerElement" />
+  <div class="adapt-container">
+    <template v-if="isLoading">
+      <div class="d-flex h-100 align-items-center justify-content-center flex-column">
+        <b-spinner label="Loading..." variant="primary"></b-spinner>
+        <div>{{ $t('LOADING') }}...</div>
+      </div>
+    </template>
+
+    <div :class="{ loading: isLoading }">
+      <div ref="containerElement" @click="onClick">
+        <p ref="contentElement" />
+      </div>
+    </div>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.loading {
+  opacity: 0.5;
+  background-color: var(--light);
+}
+</style>
diff --git a/apps/chrome-extension/src/components/PreviewContainer.vue b/apps/chrome-extension/src/components/PreviewContainer.vue
new file mode 100644
index 00000000..13df7e84
--- /dev/null
+++ b/apps/chrome-extension/src/components/PreviewContainer.vue
@@ -0,0 +1,53 @@
+<script lang="ts">
+import { Settings } from '@readapt/settings'
+import { defineComponent, PropType, ref, watch } from '@vue/composition-api'
+import AdaptContainer from './AdaptContainer.vue'
+
+const PreviewContainer = defineComponent({
+  components: { AdaptContainer },
+  props: {
+    contentToAdapt: { type: String, required: true },
+    settings: { type: Object as PropType<Settings>, required: true },
+    scope: { type: String, default: 'preview' }
+  },
+  setup(props) {
+    const textToAdaptElement = ref<HTMLTextAreaElement>()
+    const isReading = ref(true)
+
+    const onRead = () => {
+      isReading.value = true
+    }
+
+    const onEdit = () => {
+      isReading.value = false
+      setTimeout(() => textToAdaptElement.value?.focus())
+    }
+
+    const textToAdapt = ref(props.contentToAdapt)
+    watch([textToAdapt, isReading], () => {
+      if (isReading.value && !textToAdapt.value) {
+        textToAdapt.value = props.contentToAdapt
+      }
+    })
+
+    return { textToAdapt, textToAdaptElement, isReading, onRead, onEdit }
+  }
+})
+export default PreviewContainer
+</script>
+<template>
+  <div class="mb-auto">
+    <textarea class="form-control" ref="textToAdaptElement" v-model="textToAdapt" @blur="onRead" :hidden="isReading" />
+
+    <template v-if="isReading">
+      <AdaptContainer class="adapt-container" :content-to-adapt="textToAdapt" :settings="settings" :scope="scope" @edit="onEdit" />
+    </template>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.adapt-container {
+  max-height: 67vh;
+  overflow-y: scroll;
+}
+</style>
diff --git a/apps/chrome-extension/src/components/TemplateSelectorOption.vue b/apps/chrome-extension/src/components/TemplateSelectorOption.vue
index 36853d64..64f961b1 100644
--- a/apps/chrome-extension/src/components/TemplateSelectorOption.vue
+++ b/apps/chrome-extension/src/components/TemplateSelectorOption.vue
@@ -1,11 +1,11 @@
 <script lang="ts">
 import { defineComponent, PropType, ref } from '@vue/composition-api'
-import { BButton, BCard, BCardText, BFormRadio, BSpinner } from 'bootstrap-vue'
+import { BButton, BCard, BCardText, BFormRadio } from 'bootstrap-vue'
 import AdaptContainer from '@/components/AdaptContainer.vue'
 import { SettingsTemplate } from '@/interfaces/settingsTemplate'
 
 const TemplateSelectorOption = defineComponent({
-  components: { BButton, BCard, BCardText, BSpinner, BFormRadio, AdaptContainer },
+  components: { BButton, BCard, BCardText, BFormRadio, AdaptContainer },
   props: {
     name: { type: String, required: true },
     value: { type: Object as PropType<SettingsTemplate>, required: true },
@@ -13,7 +13,6 @@ const TemplateSelectorOption = defineComponent({
   },
   setup(props, { emit }) {
     const valueModel = ref(props.value)
-    const isLoading = ref(true)
 
     const isSelected = () => props.value.value === props.template.value
 
@@ -26,9 +25,7 @@ const TemplateSelectorOption = defineComponent({
 
     const onModify = () => emit('modify', props.template.settings)
 
-    const onReady = () => (isLoading.value = false)
-
-    return { valueModel, isLoading, isSelected, onSelect, onChange, onModify, onReady }
+    return { valueModel, isSelected, onSelect, onChange, onModify }
   }
 })
 export default TemplateSelectorOption
@@ -52,22 +49,7 @@ export default TemplateSelectorOption
       </ul>
     </b-card-text>
 
-    <div v-if="isLoading">
-      <div class="d-flex h-100 align-items-center justify-content-center flex-column">
-        <b-spinner label="Loading..." variant="primary"></b-spinner>
-        <div>{{ $t('LOADING') }}...</div>
-      </div>
-    </div>
-
-    <div :class="{ loading: isLoading }">
-      <AdaptContainer
-        class="template-preview"
-        :content-to-adapt="template.content"
-        :settings="template.settings"
-        :scope="template.value"
-        @ready="onReady"
-      />
-    </div>
+    <AdaptContainer class="template-preview" :content-to-adapt="template.content" :settings="template.settings" :scope="template.value" />
   </b-card>
 </template>
 
@@ -80,9 +62,4 @@ export default TemplateSelectorOption
 .template-preview {
   width: 320px;
 }
-
-.loading {
-  opacity: 0.5;
-  background-color: var(--light);
-}
 </style>
diff --git a/apps/chrome-extension/src/views/SettingsMenu.vue b/apps/chrome-extension/src/views/SettingsMenu.vue
index d0d59bfb..c5dead4b 100644
--- a/apps/chrome-extension/src/views/SettingsMenu.vue
+++ b/apps/chrome-extension/src/views/SettingsMenu.vue
@@ -1,26 +1,22 @@
 <script lang="ts">
 import { computed, defineComponent, ref } from '@vue/composition-api'
-import { BRow, BCol, BSpinner } from 'bootstrap-vue'
+import { BRow, BCol } from 'bootstrap-vue'
 import isEqual from 'lodash/isEqual'
 import store, { loadStoredSettings } from '@/store'
 import utils from '@/chrome'
 
-import AdaptContainer from '@/components/AdaptContainer.vue'
+import PreviewContainer from '@/components/PreviewContainer.vue'
 import { Settings } from '@readapt/settings'
 import { CloseSettings, SaveSettings } from '@readapt/shared-components'
+undefined
 
 const { closeCurrentTab } = utils
 
 const SettingsMenu = defineComponent({
-  components: { BRow, BCol, BSpinner, AdaptContainer, SaveSettings, CloseSettings },
+  components: { BRow, BCol, PreviewContainer, SaveSettings, CloseSettings },
   setup() {
     const settings = computed(() => store.getters.getSettings)
     const contentToAdapt = computed(() => store.getters.getTextPreview)
-    const isLoading = ref(true)
-
-    const onReady = () => {
-      isLoading.value = false
-    }
 
     const settingsFile = computed(() => {
       const settingsFile = encodeURIComponent(JSON.stringify(settings.value, null, 2))
@@ -38,15 +34,16 @@ const SettingsMenu = defineComponent({
       closeCurrentTab()
     }
 
+    const textToAdapt = ref(store.getters.getTextPreview)
+
     return {
-      onReady,
       settings,
       settingsFile,
       contentToAdapt,
       isSettingsDirty,
-      isLoading,
       saveSettings,
-      closeSettings
+      closeSettings,
+      textToAdapt
     }
   }
 })
@@ -72,16 +69,7 @@ export default SettingsMenu
       <b-col lg="4">
         <div class="d-flex flex-column align-content-between h-100">
           <h3>{{ $t('SETTINGS.TEXT_PREVIEW') }}</h3>
-          <div v-if="isLoading">
-            <div class="d-flex align-items-center justify-content-center flex-column">
-              <b-spinner label="Loading..." variant="primary"></b-spinner>
-              <div>{{ $t('LOADING') }}...</div>
-            </div>
-          </div>
-
-          <div :class="{ loading: isLoading }" class="mb-auto">
-            <AdaptContainer style="max-height: 67vh; overflow-y: scroll" :settings="settings" :content-to-adapt="contentToAdapt" @ready="onReady" />
-          </div>
+          <PreviewContainer :settings="settings" :content-to-adapt="contentToAdapt" />
 
           <div class="mt-3 d-flex justify-content-between">
             <SaveSettings @save-settings="saveSettings" />
@@ -110,8 +98,4 @@ export default SettingsMenu
     text-decoration-line: none;
   }
 }
-.loading {
-  opacity: 0.5;
-  background-color: var(--light);
-}
 </style>
diff --git a/apps/ms-word-addin/src/components/AdaptContainer.vue b/apps/ms-word-addin/src/components/AdaptContainer.vue
index 39cf0918..e247004c 100644
--- a/apps/ms-word-addin/src/components/AdaptContainer.vue
+++ b/apps/ms-word-addin/src/components/AdaptContainer.vue
@@ -2,40 +2,63 @@
 import { adaptHtmlElementAsync } from '@/visualEngine/adaptHtmlElementAsync'
 import { removeStyleElement } from '@readapt/visual-engine'
 import { Settings } from '@readapt/settings'
-import { defineComponent, PropType, ref, watch, watchEffect, onUnmounted } from '@vue/composition-api'
+import { defineComponent, PropType, ref, watchEffect, onMounted, onUnmounted } from '@vue/composition-api'
+import { BSpinner } from 'bootstrap-vue'
 
-const AdaptContainer = defineComponent({
+const PreviewContainer = defineComponent({
+  components: { BSpinner },
   props: {
     contentToAdapt: { type: String, required: true },
     settings: { type: Object as PropType<Settings>, required: true },
     scope: { type: String, default: 'preview' }
   },
   setup(props, { emit }) {
-    const containerElement = ref<HTMLParagraphElement>()
+    const isLoading = ref(true)
+    const containerElement = ref<HTMLDivElement>()
+    const contentElement = ref<HTMLParagraphElement>()
 
-    const ready = ref(false)
+    const adaptContent = async () => {
+      if (containerElement.value && contentElement.value && props.contentToAdapt) {
+        contentElement.value.innerHTML = props.contentToAdapt
+        await adaptHtmlElementAsync(containerElement.value, props.settings, props.scope)
+        isLoading.value = false
+        emit('ready') // Only for ms-word addin
+      }
+    }
+
+    watchEffect(() => adaptContent(), { flush: 'post' })
+
+    onMounted(() => adaptContent())
 
     onUnmounted(() => removeStyleElement(props.scope))
 
-    watch(ready, (isReadyNow) => isReadyNow && emit('ready'))
-
-    watchEffect(
-      async () => {
-        if (containerElement.value && props.contentToAdapt) {
-          containerElement.value.innerHTML = props.contentToAdapt
-          await adaptHtmlElementAsync(containerElement.value, props.settings, props.scope)
-          // ready after first adaptation
-          ready.value = true
-        }
-      },
-      { flush: 'post' }
-    )
-
-    return { containerElement }
+    const onClick = () => emit('edit')
+
+    return { isLoading, containerElement, contentElement, onClick }
   }
 })
-export default AdaptContainer
+export default PreviewContainer
 </script>
 <template>
-  <div ref="containerElement" />
+  <div class="adapt-container">
+    <template v-if="isLoading">
+      <div class="d-flex h-100 align-items-center justify-content-center flex-column">
+        <b-spinner label="Loading..." variant="primary"></b-spinner>
+        <div>{{ $t('LOADING') }}...</div>
+      </div>
+    </template>
+
+    <div :class="{ loading: isLoading }">
+      <div ref="containerElement" @click="onClick">
+        <p ref="contentElement" />
+      </div>
+    </div>
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.loading {
+  opacity: 0.5;
+  background-color: var(--light);
+}
+</style>
diff --git a/apps/ms-word-addin/src/components/PreviewContainer.vue b/apps/ms-word-addin/src/components/PreviewContainer.vue
new file mode 100644
index 00000000..13df7e84
--- /dev/null
+++ b/apps/ms-word-addin/src/components/PreviewContainer.vue
@@ -0,0 +1,53 @@
+<script lang="ts">
+import { Settings } from '@readapt/settings'
+import { defineComponent, PropType, ref, watch } from '@vue/composition-api'
+import AdaptContainer from './AdaptContainer.vue'
+
+const PreviewContainer = defineComponent({
+  components: { AdaptContainer },
+  props: {
+    contentToAdapt: { type: String, required: true },
+    settings: { type: Object as PropType<Settings>, required: true },
+    scope: { type: String, default: 'preview' }
+  },
+  setup(props) {
+    const textToAdaptElement = ref<HTMLTextAreaElement>()
+    const isReading = ref(true)
+
+    const onRead = () => {
+      isReading.value = true
+    }
+
+    const onEdit = () => {
+      isReading.value = false
+      setTimeout(() => textToAdaptElement.value?.focus())
+    }
+
+    const textToAdapt = ref(props.contentToAdapt)
+    watch([textToAdapt, isReading], () => {
+      if (isReading.value && !textToAdapt.value) {
+        textToAdapt.value = props.contentToAdapt
+      }
+    })
+
+    return { textToAdapt, textToAdaptElement, isReading, onRead, onEdit }
+  }
+})
+export default PreviewContainer
+</script>
+<template>
+  <div class="mb-auto">
+    <textarea class="form-control" ref="textToAdaptElement" v-model="textToAdapt" @blur="onRead" :hidden="isReading" />
+
+    <template v-if="isReading">
+      <AdaptContainer class="adapt-container" :content-to-adapt="textToAdapt" :settings="settings" :scope="scope" @edit="onEdit" />
+    </template>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.adapt-container {
+  max-height: 67vh;
+  overflow-y: scroll;
+}
+</style>
diff --git a/apps/ms-word-addin/src/views/DialogBox.vue b/apps/ms-word-addin/src/views/DialogBox.vue
index 6a7b2b62..f6a34f32 100644
--- a/apps/ms-word-addin/src/views/DialogBox.vue
+++ b/apps/ms-word-addin/src/views/DialogBox.vue
@@ -29,7 +29,6 @@ const DialogBox = defineComponent({
     BTd,
     BTh,
     BIconList,
-    BSpinner,
     BSidebar,
     BFormCheckbox,
     BFormSelect,
@@ -40,7 +39,6 @@ const DialogBox = defineComponent({
   setup() {
     const error = ref<string>('')
     const userPlatform = ref<Office.PlatformType>()
-    const isLoading = ref(true)
     const rulerActivated = ref(false)
     const maskActivated = ref(false)
 
@@ -86,7 +84,6 @@ const DialogBox = defineComponent({
     const docHtml = ref<string>('')
 
     const onReady = () => {
-      isLoading.value = false
       // Setting the default height of the Mask
       const maskReadingZone = document.getElementById('mask-readingzone') as HTMLElement
       maskReadingZone.style.height = `${heightMask}px`
@@ -201,7 +198,6 @@ const DialogBox = defineComponent({
       docHtml,
       print,
       userPlatform,
-      isLoading,
       onReady,
       toggleRuler,
       toggleMask,
@@ -385,15 +381,8 @@ export default DialogBox
           </b-sidebar>
         </div>
       </div>
-      <div v-if="isLoading">
-        <div class="d-flex h-100 align-items-center justify-content-center flex-column">
-          <b-spinner label="Loading..." variant="primary"></b-spinner>
-          <div>{{ $t('LOADING') }}...</div>
-        </div>
-      </div>
-      <div :class="{ loading: isLoading }">
-        <AdaptContainer :settings="settings" :content-to-adapt="docHtml" @ready="onReady" />
-      </div>
+
+      <AdaptContainer :settings="settings" :content-to-adapt="docHtml" @ready="onReady" />
     </div>
     <div id="ruler"></div>
     <div id="mask">
diff --git a/apps/ms-word-addin/src/views/SettingsMenu.vue b/apps/ms-word-addin/src/views/SettingsMenu.vue
index 5d3bb174..9526649b 100644
--- a/apps/ms-word-addin/src/views/SettingsMenu.vue
+++ b/apps/ms-word-addin/src/views/SettingsMenu.vue
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { computed, defineComponent, ref } from '@vue/composition-api'
-import { BRow, BCol, BSpinner } from 'bootstrap-vue'
+import { BRow, BCol } from 'bootstrap-vue'
 import isEqual from 'lodash/isEqual'
 
 import { Settings } from '@readapt/settings'
@@ -8,25 +8,19 @@ import { CloseSettings, SaveSettings } from '@readapt/shared-components'
 
 import routes from '../router'
 import store, { loadStoredSettings } from '@/store'
-import AdaptContainer from '@/components/AdaptContainer.vue'
+import PreviewContainer from '@/components/PreviewContainer.vue'
 
 const SettingsMenu = defineComponent({
   components: {
     BRow,
     BCol,
-    BSpinner,
-    AdaptContainer,
+    PreviewContainer,
     SaveSettings,
     CloseSettings
   },
   setup() {
     const settings = computed(() => store.getters.getSettings)
     const contentToAdapt = computed(() => store.getters.getTextPreview)
-    const isLoading = ref(true)
-
-    const onReady = () => {
-      isLoading.value = false
-    }
 
     const storedSettings = ref(loadStoredSettings())
     const isSettingsDirty = computed(() => !isEqual(storedSettings.value, settings.value))
@@ -39,15 +33,7 @@ const SettingsMenu = defineComponent({
       routes.push({ path: '/' })
     }
 
-    return {
-      onReady,
-      settings,
-      contentToAdapt,
-      isLoading,
-      saveSettings,
-      isSettingsDirty,
-      closeSettings
-    }
+    return { settings, contentToAdapt, saveSettings, isSettingsDirty, closeSettings }
   }
 })
 export default SettingsMenu
@@ -66,15 +52,8 @@ export default SettingsMenu
         <router-view />
       </b-col>
       <b-col lg="3" class="m-1" style="max-height: 32vh">
-        <div v-if="isLoading">
-          <div class="d-flex h-100 align-items-center justify-content-center flex-column">
-            <b-spinner label="Loading..." variant="primary"></b-spinner>
-            <div>{{ $t('LOADING') }}...</div>
-          </div>
-        </div>
-        <div class="text-preview" :class="{ loading: isLoading }">
-          <AdaptContainer :settings="settings" :content-to-adapt="contentToAdapt" @ready="onReady" />
-        </div>
+        <PreviewContainer :settings="settings" :content-to-adapt="contentToAdapt" />
+
         <div style="max-height: 8vh">
           <div class="mt-3 d-flex justify-content-between">
             <SaveSettings @save-settings="saveSettings" />
@@ -110,8 +89,4 @@ export default SettingsMenu
     overflow-y: scroll;
   }
 }
-.loading {
-  opacity: 0.5;
-  background-color: var(--light);
-}
 </style>
diff --git a/packages/settings/src/langConfig/langConfigEn.ts b/packages/settings/src/langConfig/langConfigEn.ts
index 1961e394..7a980461 100644
--- a/packages/settings/src/langConfig/langConfigEn.ts
+++ b/packages/settings/src/langConfig/langConfigEn.ts
@@ -72,7 +72,7 @@ export const lettersEn: ColoredOption[] = [
 ]
 
 export const textPreviewEn =
-  '<p>The hungry purple dinosaur ate the kind, zingy fox, the jabbering crab, and the mad whale and started vending and quacking. The quick brown fox jumps over the lazy dog.</p>'
+  'The hungry purple dinosaur ate the kind, zingy fox, the jabbering crab, and the mad whale and started vending and quacking. The quick brown fox jumps over the lazy dog.'
 
 export const langConfigEn: LangConfig = {
   phonemeOptions: phonemesEn,
diff --git a/packages/settings/src/langConfig/langConfigFr.ts b/packages/settings/src/langConfig/langConfigFr.ts
index b166a628..6a1de8d0 100644
--- a/packages/settings/src/langConfig/langConfigFr.ts
+++ b/packages/settings/src/langConfig/langConfigFr.ts
@@ -77,7 +77,7 @@ const lettersFr: ColoredOption[] = [
 ]
 
 const textPreviewFr =
-  "<p>Voici un texte de démonstration. En effet il montrera l'effet des options sélectionnées. Il y a trois onglets de configuration. Prenez le temps de chercher la configuration qui vous aidera le mieux.</p>"
+  "Voici un texte de démonstration. En effet il montrera l'effet des options sélectionnées. Il y a trois onglets de configuration. Prenez le temps de chercher la configuration qui vous aidera le mieux."
 
 export const langConfigFr: LangConfig = {
   phonemeOptions: phonemesFr,

From e722f83298aa49368b71903cc9ec9efd69de771e Mon Sep 17 00:00:00 2001
From: Ahmed Radjdi <ahmed.radjdi@contentsquare.com>
Date: Fri, 17 Jun 2022 18:07:45 +0200
Subject: [PATCH 16/42] fix: sanitize html + add style

---
 apps/chrome-extension/package.json            |  1 +
 .../src/components/PreviewContainer.vue       |  9 ++++-
 apps/chrome-extension/src/main.ts             |  2 +
 apps/chrome-extension/src/shims-vue.d.ts      |  2 +
 apps/ms-word-addin/package.json               |  1 +
 .../src/components/PreviewContainer.vue       |  9 ++++-
 apps/ms-word-addin/src/main.ts                |  2 +
 apps/ms-word-addin/src/shims-vue.d.ts         |  2 +
 yarn.lock                                     | 40 ++++++++++++++++++-
 9 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/apps/chrome-extension/package.json b/apps/chrome-extension/package.json
index 1a76d4d2..887c2ef6 100644
--- a/apps/chrome-extension/package.json
+++ b/apps/chrome-extension/package.json
@@ -28,6 +28,7 @@
     "vue": "~2.6.14",
     "vue-i18n": "~8.27.0",
     "vue-router": "~3.5.1",
+    "vue-sanitize": "^0.2.2",
     "vuex": "~3.6.2"
   },
   "devDependencies": {
diff --git a/apps/chrome-extension/src/components/PreviewContainer.vue b/apps/chrome-extension/src/components/PreviewContainer.vue
index 13df7e84..b123972d 100644
--- a/apps/chrome-extension/src/components/PreviewContainer.vue
+++ b/apps/chrome-extension/src/components/PreviewContainer.vue
@@ -37,10 +37,10 @@ export default PreviewContainer
 </script>
 <template>
   <div class="mb-auto">
-    <textarea class="form-control" ref="textToAdaptElement" v-model="textToAdapt" @blur="onRead" :hidden="isReading" />
+    <textarea class="textarea-container form-control" rows="5" ref="textToAdaptElement" v-model="textToAdapt" @blur="onRead" :hidden="isReading" />
 
     <template v-if="isReading">
-      <AdaptContainer class="adapt-container" :content-to-adapt="textToAdapt" :settings="settings" :scope="scope" @edit="onEdit" />
+      <AdaptContainer class="adapt-container" :content-to-adapt="$sanitize(textToAdapt)" :settings="settings" :scope="scope" @edit="onEdit" />
     </template>
   </div>
 </template>
@@ -49,5 +49,10 @@ export default PreviewContainer
 .adapt-container {
   max-height: 67vh;
   overflow-y: scroll;
+  cursor: pointer;
+
+  &:hover {
+    outline: 1px solid #dee2e6;
+  }
 }
 </style>
diff --git a/apps/chrome-extension/src/main.ts b/apps/chrome-extension/src/main.ts
index 78296d2c..2b2c0d8b 100644
--- a/apps/chrome-extension/src/main.ts
+++ b/apps/chrome-extension/src/main.ts
@@ -1,5 +1,6 @@
 import Vue from 'vue'
 import CompositionApi from '@vue/composition-api'
+import VueSanitize from 'vue-sanitize'
 
 import App from './App.vue'
 import i18n from './i18n'
@@ -11,6 +12,7 @@ import './theme.scss'
 Vue.config.productionTip = false
 
 Vue.use(CompositionApi)
+Vue.use(VueSanitize)
 
 new Vue({
   i18n,
diff --git a/apps/chrome-extension/src/shims-vue.d.ts b/apps/chrome-extension/src/shims-vue.d.ts
index d9f24faa..5b725b03 100644
--- a/apps/chrome-extension/src/shims-vue.d.ts
+++ b/apps/chrome-extension/src/shims-vue.d.ts
@@ -2,3 +2,5 @@ declare module '*.vue' {
   import Vue from 'vue'
   export default Vue
 }
+
+declare module 'vue-sanitize'
diff --git a/apps/ms-word-addin/package.json b/apps/ms-word-addin/package.json
index 27aa970e..995e56f9 100644
--- a/apps/ms-word-addin/package.json
+++ b/apps/ms-word-addin/package.json
@@ -32,6 +32,7 @@
     "vue": "~2.6.14",
     "vue-i18n": "~8.27.0",
     "vue-router": "~3.5.1",
+    "vue-sanitize": "^0.2.2",
     "vuex": "~3.6.2"
   },
   "devDependencies": {
diff --git a/apps/ms-word-addin/src/components/PreviewContainer.vue b/apps/ms-word-addin/src/components/PreviewContainer.vue
index 13df7e84..b123972d 100644
--- a/apps/ms-word-addin/src/components/PreviewContainer.vue
+++ b/apps/ms-word-addin/src/components/PreviewContainer.vue
@@ -37,10 +37,10 @@ export default PreviewContainer
 </script>
 <template>
   <div class="mb-auto">
-    <textarea class="form-control" ref="textToAdaptElement" v-model="textToAdapt" @blur="onRead" :hidden="isReading" />
+    <textarea class="textarea-container form-control" rows="5" ref="textToAdaptElement" v-model="textToAdapt" @blur="onRead" :hidden="isReading" />
 
     <template v-if="isReading">
-      <AdaptContainer class="adapt-container" :content-to-adapt="textToAdapt" :settings="settings" :scope="scope" @edit="onEdit" />
+      <AdaptContainer class="adapt-container" :content-to-adapt="$sanitize(textToAdapt)" :settings="settings" :scope="scope" @edit="onEdit" />
     </template>
   </div>
 </template>
@@ -49,5 +49,10 @@ export default PreviewContainer
 .adapt-container {
   max-height: 67vh;
   overflow-y: scroll;
+  cursor: pointer;
+
+  &:hover {
+    outline: 1px solid #dee2e6;
+  }
 }
 </style>
diff --git a/apps/ms-word-addin/src/main.ts b/apps/ms-word-addin/src/main.ts
index 8377ca72..96c6fc4f 100644
--- a/apps/ms-word-addin/src/main.ts
+++ b/apps/ms-word-addin/src/main.ts
@@ -1,3 +1,4 @@
+import VueSanitize from 'vue-sanitize'
 import CompositionApi from '@vue/composition-api'
 import { ToastPlugin, SidebarPlugin } from 'bootstrap-vue'
 import Vue from 'vue'
@@ -12,6 +13,7 @@ import './theme.scss'
 Vue.config.productionTip = false
 
 Vue.use(CompositionApi)
+Vue.use(VueSanitize)
 Vue.use(ToastPlugin)
 Vue.use(SidebarPlugin)
 
diff --git a/apps/ms-word-addin/src/shims-vue.d.ts b/apps/ms-word-addin/src/shims-vue.d.ts
index d9f24faa..5b725b03 100644
--- a/apps/ms-word-addin/src/shims-vue.d.ts
+++ b/apps/ms-word-addin/src/shims-vue.d.ts
@@ -2,3 +2,5 @@ declare module '*.vue' {
   import Vue from 'vue'
   export default Vue
 }
+
+declare module 'vue-sanitize'
diff --git a/yarn.lock b/yarn.lock
index 60d6060d..5d124a40 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7157,7 +7157,7 @@ htmlnano@^2.0.0:
     posthtml "^0.16.5"
     timsort "^0.3.0"
 
-htmlparser2@^6.1.0:
+htmlparser2@^6.0.0, htmlparser2@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"
   integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==
@@ -9270,6 +9270,11 @@ nanoid@^3.3.1:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25"
   integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==
 
+nanoid@^3.3.4:
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
+  integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -10094,6 +10099,11 @@ parse-path@^4.0.0:
     qs "^6.9.4"
     query-string "^6.13.8"
 
+parse-srcset@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/parse-srcset/-/parse-srcset-1.0.2.tgz#f2bd221f6cc970a938d88556abc589caaaa2bde1"
+  integrity sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q==
+
 parse-url@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-6.0.0.tgz#f5dd262a7de9ec00914939220410b66cff09107d"
@@ -10528,6 +10538,15 @@ postcss@^8.2.6, postcss@^8.3.5, postcss@^8.4.7:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
+postcss@^8.3.11:
+  version "8.4.14"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.14.tgz#ee9274d5622b4858c1007a74d76e42e56fd21caf"
+  integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==
+  dependencies:
+    nanoid "^3.3.4"
+    picocolors "^1.0.0"
+    source-map-js "^1.0.2"
+
 posthtml-parser@^0.10.1:
   version "0.10.2"
   resolved "https://registry.yarnpkg.com/posthtml-parser/-/posthtml-parser-0.10.2.tgz#df364d7b179f2a6bf0466b56be7b98fd4e97c573"
@@ -11239,6 +11258,18 @@ safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0,
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
+sanitize-html@^2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.7.0.tgz#e106205b468aca932e2f9baf241f24660d34e279"
+  integrity sha512-jfQelabOn5voO7FAfnQF7v+jsA6z9zC/O4ec0z3E35XPEtHYJT/OdUziVWlKW4irCr2kXaQAyXTXDHWAibg1tA==
+  dependencies:
+    deepmerge "^4.2.2"
+    escape-string-regexp "^4.0.0"
+    htmlparser2 "^6.0.0"
+    is-plain-object "^5.0.0"
+    parse-srcset "^1.0.2"
+    postcss "^8.3.11"
+
 sass-loader@^12.0.0:
   version "12.6.0"
   resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-12.6.0.tgz#5148362c8e2cdd4b950f3c63ac5d16dbfed37bcb"
@@ -12694,6 +12725,13 @@ vue-router@~3.5.1:
   resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.5.3.tgz#041048053e336829d05dafacf6a8fb669a2e7999"
   integrity sha512-FUlILrW3DGitS2h+Xaw8aRNvGTwtuaxrRkNSHWTizOfLUie7wuYwezeZ50iflRn8YPV5kxmU2LQuu3nM/b3Zsg==
 
+vue-sanitize@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/vue-sanitize/-/vue-sanitize-0.2.2.tgz#a33bb3c1af7f10bc0966eb85d1290d0c47247819"
+  integrity sha512-dj4bgP2C1QoNvzRKniOXEpk3fezEGE4bG7AXhnsB351B+iCOw845RWr2qRFjpF+Rs9v7Itn3vU4GIihIjzangg==
+  dependencies:
+    sanitize-html "^2.7.0"
+
 vue-style-loader@^4.1.0, vue-style-loader@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz#6d55863a51fa757ab24e89d9371465072aa7bc35"

From 26791f56c9246b76ef19edaec961ab023b7012ef Mon Sep 17 00:00:00 2001
From: Ahmed Radjdi <ahmed.radjdi@contentsquare.com>
Date: Mon, 27 Jun 2022 08:28:18 +0200
Subject: [PATCH 17/42] fix: update text on setting langage change + misc fixes

---
 .../src/components/AdaptContainer.vue         | 19 ++++++++++++++-----
 .../src/components/PreviewContainer.vue       |  4 ++++
 .../src/views/SettingsMenu.vue                |  6 +-----
 .../src/components/AdaptContainer.vue         | 18 +++++++++++++-----
 .../src/components/PreviewContainer.vue       |  4 ++++
 5 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/apps/chrome-extension/src/components/AdaptContainer.vue b/apps/chrome-extension/src/components/AdaptContainer.vue
index 4fe0f451..413531d9 100644
--- a/apps/chrome-extension/src/components/AdaptContainer.vue
+++ b/apps/chrome-extension/src/components/AdaptContainer.vue
@@ -2,10 +2,10 @@
 import { adaptHtmlElementAsync } from '@/visualEngine/adaptHtmlElementAsync'
 import { removeStyleElement } from '@readapt/visual-engine'
 import { Settings } from '@readapt/settings'
-import { defineComponent, PropType, ref, watchEffect, onMounted, onUnmounted } from '@vue/composition-api'
+import { defineComponent, PropType, ref, onMounted, onUnmounted, watch } from '@vue/composition-api'
 import { BSpinner } from 'bootstrap-vue'
 
-const PreviewContainer = defineComponent({
+const AdaptContainer = defineComponent({
   components: { BSpinner },
   props: {
     contentToAdapt: { type: String, required: true },
@@ -22,10 +22,19 @@ const PreviewContainer = defineComponent({
         contentElement.value.innerHTML = props.contentToAdapt
         await adaptHtmlElementAsync(containerElement.value, props.settings, props.scope)
         isLoading.value = false
+        emit('ready') // Only for ms-word addin
       }
     }
 
-    watchEffect(() => adaptContent(), { flush: 'post' })
+    watch(
+      () => ({
+        ...props,
+        containerElement: containerElement.value,
+        contentElement: contentElement.value
+      }),
+      () => adaptContent(),
+      { deep: true, flush: 'post' }
+    )
 
     onMounted(() => adaptContent())
 
@@ -36,10 +45,10 @@ const PreviewContainer = defineComponent({
     return { isLoading, containerElement, contentElement, onClick }
   }
 })
-export default PreviewContainer
+export default AdaptContainer
 </script>
 <template>
-  <div class="adapt-container">
+  <div>
     <template v-if="isLoading">
       <div class="d-flex h-100 align-items-center justify-content-center flex-column">
         <b-spinner label="Loading..." variant="primary"></b-spinner>
diff --git a/apps/chrome-extension/src/components/PreviewContainer.vue b/apps/chrome-extension/src/components/PreviewContainer.vue
index b123972d..5f39ee46 100644
--- a/apps/chrome-extension/src/components/PreviewContainer.vue
+++ b/apps/chrome-extension/src/components/PreviewContainer.vue
@@ -29,6 +29,10 @@ const PreviewContainer = defineComponent({
         textToAdapt.value = props.contentToAdapt
       }
     })
+    watch(
+      () => props.contentToAdapt,
+      () => (textToAdapt.value = props.contentToAdapt)
+    )
 
     return { textToAdapt, textToAdaptElement, isReading, onRead, onEdit }
   }
diff --git a/apps/chrome-extension/src/views/SettingsMenu.vue b/apps/chrome-extension/src/views/SettingsMenu.vue
index c5dead4b..ee6afd26 100644
--- a/apps/chrome-extension/src/views/SettingsMenu.vue
+++ b/apps/chrome-extension/src/views/SettingsMenu.vue
@@ -8,7 +8,6 @@ import utils from '@/chrome'
 import PreviewContainer from '@/components/PreviewContainer.vue'
 import { Settings } from '@readapt/settings'
 import { CloseSettings, SaveSettings } from '@readapt/shared-components'
-undefined
 
 const { closeCurrentTab } = utils
 
@@ -34,16 +33,13 @@ const SettingsMenu = defineComponent({
       closeCurrentTab()
     }
 
-    const textToAdapt = ref(store.getters.getTextPreview)
-
     return {
       settings,
       settingsFile,
       contentToAdapt,
       isSettingsDirty,
       saveSettings,
-      closeSettings,
-      textToAdapt
+      closeSettings
     }
   }
 })
diff --git a/apps/ms-word-addin/src/components/AdaptContainer.vue b/apps/ms-word-addin/src/components/AdaptContainer.vue
index e247004c..413531d9 100644
--- a/apps/ms-word-addin/src/components/AdaptContainer.vue
+++ b/apps/ms-word-addin/src/components/AdaptContainer.vue
@@ -2,10 +2,10 @@
 import { adaptHtmlElementAsync } from '@/visualEngine/adaptHtmlElementAsync'
 import { removeStyleElement } from '@readapt/visual-engine'
 import { Settings } from '@readapt/settings'
-import { defineComponent, PropType, ref, watchEffect, onMounted, onUnmounted } from '@vue/composition-api'
+import { defineComponent, PropType, ref, onMounted, onUnmounted, watch } from '@vue/composition-api'
 import { BSpinner } from 'bootstrap-vue'
 
-const PreviewContainer = defineComponent({
+const AdaptContainer = defineComponent({
   components: { BSpinner },
   props: {
     contentToAdapt: { type: String, required: true },
@@ -26,7 +26,15 @@ const PreviewContainer = defineComponent({
       }
     }
 
-    watchEffect(() => adaptContent(), { flush: 'post' })
+    watch(
+      () => ({
+        ...props,
+        containerElement: containerElement.value,
+        contentElement: contentElement.value
+      }),
+      () => adaptContent(),
+      { deep: true, flush: 'post' }
+    )
 
     onMounted(() => adaptContent())
 
@@ -37,10 +45,10 @@ const PreviewContainer = defineComponent({
     return { isLoading, containerElement, contentElement, onClick }
   }
 })
-export default PreviewContainer
+export default AdaptContainer
 </script>
 <template>
-  <div class="adapt-container">
+  <div>
     <template v-if="isLoading">
       <div class="d-flex h-100 align-items-center justify-content-center flex-column">
         <b-spinner label="Loading..." variant="primary"></b-spinner>
diff --git a/apps/ms-word-addin/src/components/PreviewContainer.vue b/apps/ms-word-addin/src/components/PreviewContainer.vue
index b123972d..5f39ee46 100644
--- a/apps/ms-word-addin/src/components/PreviewContainer.vue
+++ b/apps/ms-word-addin/src/components/PreviewContainer.vue
@@ -29,6 +29,10 @@ const PreviewContainer = defineComponent({
         textToAdapt.value = props.contentToAdapt
       }
     })
+    watch(
+      () => props.contentToAdapt,
+      () => (textToAdapt.value = props.contentToAdapt)
+    )
 
     return { textToAdapt, textToAdaptElement, isReading, onRead, onEdit }
   }

From ef7294d37f934b1b1177d4ebf7282c28e3bdd995 Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Tue, 28 Jun 2022 09:09:58 +0200
Subject: [PATCH 18/42] style(ms-word-addin): remove unused import

---
 apps/ms-word-addin/src/views/DialogBox.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/ms-word-addin/src/views/DialogBox.vue b/apps/ms-word-addin/src/views/DialogBox.vue
index f6a34f32..79dd7b81 100644
--- a/apps/ms-word-addin/src/views/DialogBox.vue
+++ b/apps/ms-word-addin/src/views/DialogBox.vue
@@ -1,7 +1,7 @@
 <script lang="ts">
 /* global Office */
 import { computed, defineComponent, onMounted, ref } from '@vue/composition-api'
-import { BButton, BFormCheckbox, BFormSelect, BTableSimple, BTbody, BTr, BTd, BTh, BIconList, BSpinner, BSidebar } from 'bootstrap-vue'
+import { BButton, BFormCheckbox, BFormSelect, BTableSimple, BTbody, BTr, BTd, BTh, BIconList, BSidebar } from 'bootstrap-vue'
 
 import {
   Settings,

From 780443edaa860aa309444b6824fffae332ed899a Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Tue, 28 Jun 2022 13:10:33 +0200
Subject: [PATCH 19/42] fix: restore default text preview when empty

---
 apps/chrome-extension/src/components/PreviewContainer.vue | 2 +-
 apps/ms-word-addin/src/components/PreviewContainer.vue    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/chrome-extension/src/components/PreviewContainer.vue b/apps/chrome-extension/src/components/PreviewContainer.vue
index 5f39ee46..fb5abb1c 100644
--- a/apps/chrome-extension/src/components/PreviewContainer.vue
+++ b/apps/chrome-extension/src/components/PreviewContainer.vue
@@ -25,7 +25,7 @@ const PreviewContainer = defineComponent({
 
     const textToAdapt = ref(props.contentToAdapt)
     watch([textToAdapt, isReading], () => {
-      if (isReading.value && !textToAdapt.value) {
+      if (isReading.value && !/\S/.test(textToAdapt.value)) {
         textToAdapt.value = props.contentToAdapt
       }
     })
diff --git a/apps/ms-word-addin/src/components/PreviewContainer.vue b/apps/ms-word-addin/src/components/PreviewContainer.vue
index 5f39ee46..fb5abb1c 100644
--- a/apps/ms-word-addin/src/components/PreviewContainer.vue
+++ b/apps/ms-word-addin/src/components/PreviewContainer.vue
@@ -25,7 +25,7 @@ const PreviewContainer = defineComponent({
 
     const textToAdapt = ref(props.contentToAdapt)
     watch([textToAdapt, isReading], () => {
-      if (isReading.value && !textToAdapt.value) {
+      if (isReading.value && !/\S/.test(textToAdapt.value)) {
         textToAdapt.value = props.contentToAdapt
       }
     })

From 48ecc5a17a4745616e2fdf406c5b44a4658699ee Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Tue, 28 Jun 2022 13:45:05 +0200
Subject: [PATCH 20/42] v1.1.0

---
 apps/chrome-extension/package.json      | 10 +++++-----
 apps/ms-word-addin/package.json         | 10 +++++-----
 lerna.json                              |  2 +-
 packages/dictionaries/package.json      |  2 +-
 packages/settings/package.json          |  2 +-
 packages/shared-components/package.json |  4 ++--
 packages/text-engine/package.json       |  4 ++--
 packages/visual-engine/package.json     |  6 +++---
 8 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/apps/chrome-extension/package.json b/apps/chrome-extension/package.json
index 887c2ef6..d3ce71ed 100644
--- a/apps/chrome-extension/package.json
+++ b/apps/chrome-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chrome-extension",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -14,10 +14,10 @@
     "postinstall": "scripts/init-env"
   },
   "dependencies": {
-    "@readapt/settings": "^1.0.0",
-    "@readapt/shared-components": "^1.0.0",
-    "@readapt/text-engine": "^1.0.0",
-    "@readapt/visual-engine": "^1.0.0",
+    "@readapt/settings": "^1.1.0",
+    "@readapt/shared-components": "^1.1.0",
+    "@readapt/text-engine": "^1.1.0",
+    "@readapt/visual-engine": "^1.1.0",
     "@vue/composition-api": "~1.4.5",
     "bootstrap": "~4.6.1",
     "bootstrap-vue": "~2.22.0",
diff --git a/apps/ms-word-addin/package.json b/apps/ms-word-addin/package.json
index 995e56f9..e2755155 100644
--- a/apps/ms-word-addin/package.json
+++ b/apps/ms-word-addin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ms-word-addin",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -19,10 +19,10 @@
     "postinstall": "scripts/init-env"
   },
   "dependencies": {
-    "@readapt/settings": "^1.0.0",
-    "@readapt/shared-components": "^1.0.0",
-    "@readapt/text-engine": "^1.0.0",
-    "@readapt/visual-engine": "^1.0.0",
+    "@readapt/settings": "^1.1.0",
+    "@readapt/shared-components": "^1.1.0",
+    "@readapt/text-engine": "^1.1.0",
+    "@readapt/visual-engine": "^1.1.0",
     "@vue/composition-api": "~1.4.5",
     "bootstrap": "~4.6.1",
     "bootstrap-vue": "~2.22.0",
diff --git a/lerna.json b/lerna.json
index cbf807a5..7150bee8 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0",
+  "version": "1.1.0",
   "npmClient": "yarn",
   "useWorkspaces": true
 }
diff --git a/packages/dictionaries/package.json b/packages/dictionaries/package.json
index 1de654cd..53902847 100644
--- a/packages/dictionaries/package.json
+++ b/packages/dictionaries/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@readapt/dictionaries",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "types": "dist/index.d.ts",
   "main": "",
   "targets": {
diff --git a/packages/settings/package.json b/packages/settings/package.json
index ecdb9380..91d18c91 100644
--- a/packages/settings/package.json
+++ b/packages/settings/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@readapt/settings",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "main": "dist/readapt-settings.js",
   "module": "dist/readapt-settings.esm.js",
   "types": "dist/types.d.ts",
diff --git a/packages/shared-components/package.json b/packages/shared-components/package.json
index 6ae95aca..6bce4b27 100644
--- a/packages/shared-components/package.json
+++ b/packages/shared-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@readapt/shared-components",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "main": "dist/readapt-shared-components.common.js",
   "module": "dist/readapt-shared-components.common.js",
   "types": "dist/types.d.ts",
@@ -26,7 +26,7 @@
     "url": "git+https://github.com/ContentSquare/readapt.git"
   },
   "dependencies": {
-    "@readapt/settings": "^1.0.0",
+    "@readapt/settings": "^1.1.0",
     "bootstrap": "~4.6.1",
     "bootstrap-vue": "~2.22.0",
     "core-js": "^3.8.3"
diff --git a/packages/text-engine/package.json b/packages/text-engine/package.json
index fc120ab8..a5707c9d 100644
--- a/packages/text-engine/package.json
+++ b/packages/text-engine/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@readapt/text-engine",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "main": "dist/readapt-text-engine.js",
   "module": "dist/readapt-text-engine.esm.js",
   "types": "dist/types.d.ts",
@@ -25,6 +25,6 @@
     "src/*"
   ],
   "dependencies": {
-    "@readapt/dictionaries": "^1.0.0"
+    "@readapt/dictionaries": "^1.1.0"
   }
 }
diff --git a/packages/visual-engine/package.json b/packages/visual-engine/package.json
index f3b09af3..5af1aba0 100644
--- a/packages/visual-engine/package.json
+++ b/packages/visual-engine/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@readapt/visual-engine",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "main": "dist/readapt-visual-engine.js",
   "module": "dist/readapt-visual-engine.esm.js",
   "types": "dist/types.d.ts",
@@ -22,8 +22,8 @@
     "src/*"
   ],
   "dependencies": {
-    "@readapt/settings": "^1.0.0",
-    "@readapt/text-engine": "^1.0.0",
+    "@readapt/settings": "^1.1.0",
+    "@readapt/text-engine": "^1.1.0",
     "lodash": "^4.17.21"
   },
   "devDependencies": {

From 9fbb4d453686ef5e4a8e099a4a8e7ab0190e86ca Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Tue, 28 Jun 2022 15:12:17 +0200
Subject: [PATCH 21/42] fix: double adaptation in AdaptContainer

---
 apps/chrome-extension/src/components/AdaptContainer.vue | 4 +---
 apps/ms-word-addin/src/components/AdaptContainer.vue    | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/apps/chrome-extension/src/components/AdaptContainer.vue b/apps/chrome-extension/src/components/AdaptContainer.vue
index 413531d9..e761f692 100644
--- a/apps/chrome-extension/src/components/AdaptContainer.vue
+++ b/apps/chrome-extension/src/components/AdaptContainer.vue
@@ -2,7 +2,7 @@
 import { adaptHtmlElementAsync } from '@/visualEngine/adaptHtmlElementAsync'
 import { removeStyleElement } from '@readapt/visual-engine'
 import { Settings } from '@readapt/settings'
-import { defineComponent, PropType, ref, onMounted, onUnmounted, watch } from '@vue/composition-api'
+import { defineComponent, PropType, ref, onUnmounted, watch } from '@vue/composition-api'
 import { BSpinner } from 'bootstrap-vue'
 
 const AdaptContainer = defineComponent({
@@ -36,8 +36,6 @@ const AdaptContainer = defineComponent({
       { deep: true, flush: 'post' }
     )
 
-    onMounted(() => adaptContent())
-
     onUnmounted(() => removeStyleElement(props.scope))
 
     const onClick = () => emit('edit')
diff --git a/apps/ms-word-addin/src/components/AdaptContainer.vue b/apps/ms-word-addin/src/components/AdaptContainer.vue
index 413531d9..e761f692 100644
--- a/apps/ms-word-addin/src/components/AdaptContainer.vue
+++ b/apps/ms-word-addin/src/components/AdaptContainer.vue
@@ -2,7 +2,7 @@
 import { adaptHtmlElementAsync } from '@/visualEngine/adaptHtmlElementAsync'
 import { removeStyleElement } from '@readapt/visual-engine'
 import { Settings } from '@readapt/settings'
-import { defineComponent, PropType, ref, onMounted, onUnmounted, watch } from '@vue/composition-api'
+import { defineComponent, PropType, ref, onUnmounted, watch } from '@vue/composition-api'
 import { BSpinner } from 'bootstrap-vue'
 
 const AdaptContainer = defineComponent({
@@ -36,8 +36,6 @@ const AdaptContainer = defineComponent({
       { deep: true, flush: 'post' }
     )
 
-    onMounted(() => adaptContent())
-
     onUnmounted(() => removeStyleElement(props.scope))
 
     const onClick = () => emit('edit')

From ecc9385a74914581026d25a4f7a014b265db200d Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Tue, 28 Jun 2022 16:34:40 +0200
Subject: [PATCH 22/42] v1.1.1

---
 apps/chrome-extension/package.json      | 10 +++++-----
 apps/ms-word-addin/package.json         | 10 +++++-----
 lerna.json                              |  2 +-
 packages/dictionaries/package.json      |  2 +-
 packages/settings/package.json          |  2 +-
 packages/shared-components/package.json |  4 ++--
 packages/text-engine/package.json       |  4 ++--
 packages/visual-engine/package.json     |  6 +++---
 8 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/apps/chrome-extension/package.json b/apps/chrome-extension/package.json
index d3ce71ed..8a09ba32 100644
--- a/apps/chrome-extension/package.json
+++ b/apps/chrome-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chrome-extension",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -14,10 +14,10 @@
     "postinstall": "scripts/init-env"
   },
   "dependencies": {
-    "@readapt/settings": "^1.1.0",
-    "@readapt/shared-components": "^1.1.0",
-    "@readapt/text-engine": "^1.1.0",
-    "@readapt/visual-engine": "^1.1.0",
+    "@readapt/settings": "^1.1.1",
+    "@readapt/shared-components": "^1.1.1",
+    "@readapt/text-engine": "^1.1.1",
+    "@readapt/visual-engine": "^1.1.1",
     "@vue/composition-api": "~1.4.5",
     "bootstrap": "~4.6.1",
     "bootstrap-vue": "~2.22.0",
diff --git a/apps/ms-word-addin/package.json b/apps/ms-word-addin/package.json
index e2755155..a3cfaafb 100644
--- a/apps/ms-word-addin/package.json
+++ b/apps/ms-word-addin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ms-word-addin",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -19,10 +19,10 @@
     "postinstall": "scripts/init-env"
   },
   "dependencies": {
-    "@readapt/settings": "^1.1.0",
-    "@readapt/shared-components": "^1.1.0",
-    "@readapt/text-engine": "^1.1.0",
-    "@readapt/visual-engine": "^1.1.0",
+    "@readapt/settings": "^1.1.1",
+    "@readapt/shared-components": "^1.1.1",
+    "@readapt/text-engine": "^1.1.1",
+    "@readapt/visual-engine": "^1.1.1",
     "@vue/composition-api": "~1.4.5",
     "bootstrap": "~4.6.1",
     "bootstrap-vue": "~2.22.0",
diff --git a/lerna.json b/lerna.json
index 7150bee8..9e53d6ef 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.1.0",
+  "version": "1.1.1",
   "npmClient": "yarn",
   "useWorkspaces": true
 }
diff --git a/packages/dictionaries/package.json b/packages/dictionaries/package.json
index 53902847..89ff49cf 100644
--- a/packages/dictionaries/package.json
+++ b/packages/dictionaries/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@readapt/dictionaries",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "types": "dist/index.d.ts",
   "main": "",
   "targets": {
diff --git a/packages/settings/package.json b/packages/settings/package.json
index 91d18c91..4aff3214 100644
--- a/packages/settings/package.json
+++ b/packages/settings/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@readapt/settings",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "main": "dist/readapt-settings.js",
   "module": "dist/readapt-settings.esm.js",
   "types": "dist/types.d.ts",
diff --git a/packages/shared-components/package.json b/packages/shared-components/package.json
index 6bce4b27..d1041f6c 100644
--- a/packages/shared-components/package.json
+++ b/packages/shared-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@readapt/shared-components",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "main": "dist/readapt-shared-components.common.js",
   "module": "dist/readapt-shared-components.common.js",
   "types": "dist/types.d.ts",
@@ -26,7 +26,7 @@
     "url": "git+https://github.com/ContentSquare/readapt.git"
   },
   "dependencies": {
-    "@readapt/settings": "^1.1.0",
+    "@readapt/settings": "^1.1.1",
     "bootstrap": "~4.6.1",
     "bootstrap-vue": "~2.22.0",
     "core-js": "^3.8.3"
diff --git a/packages/text-engine/package.json b/packages/text-engine/package.json
index a5707c9d..a251f725 100644
--- a/packages/text-engine/package.json
+++ b/packages/text-engine/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@readapt/text-engine",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "main": "dist/readapt-text-engine.js",
   "module": "dist/readapt-text-engine.esm.js",
   "types": "dist/types.d.ts",
@@ -25,6 +25,6 @@
     "src/*"
   ],
   "dependencies": {
-    "@readapt/dictionaries": "^1.1.0"
+    "@readapt/dictionaries": "^1.1.1"
   }
 }
diff --git a/packages/visual-engine/package.json b/packages/visual-engine/package.json
index 5af1aba0..9fd8bf6a 100644
--- a/packages/visual-engine/package.json
+++ b/packages/visual-engine/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@readapt/visual-engine",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "main": "dist/readapt-visual-engine.js",
   "module": "dist/readapt-visual-engine.esm.js",
   "types": "dist/types.d.ts",
@@ -22,8 +22,8 @@
     "src/*"
   ],
   "dependencies": {
-    "@readapt/settings": "^1.1.0",
-    "@readapt/text-engine": "^1.1.0",
+    "@readapt/settings": "^1.1.1",
+    "@readapt/text-engine": "^1.1.1",
     "lodash": "^4.17.21"
   },
   "devDependencies": {

From 36820be394e1a1881d9501fd16770fca098bc7a9 Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Wed, 29 Jun 2022 12:28:08 +0200
Subject: [PATCH 23/42] feat(settings): add ticknessOptions

---
 packages/settings/src/options/index.ts            | 1 +
 packages/settings/src/options/thicknessOptions.ts | 7 +++++++
 2 files changed, 8 insertions(+)
 create mode 100644 packages/settings/src/options/thicknessOptions.ts

diff --git a/packages/settings/src/options/index.ts b/packages/settings/src/options/index.ts
index 061f07bc..bc73a7ef 100644
--- a/packages/settings/src/options/index.ts
+++ b/packages/settings/src/options/index.ts
@@ -4,6 +4,7 @@ export { languageOptions } from './languageOptions'
 export { letterSpacingOptions } from './letterSpacingOptions'
 export { lineSpacingOptions } from './lineSpacingOptions'
 export { opacityOptions } from './opacityOptions'
+export { thicknessOptions } from './thicknessOptions'
 export { silentLetterOpacityOptions } from './silentLetterOpacityOptions'
 export { wordSpacingOptions } from './wordSpacingOptions'
 export { colors } from './colors'
diff --git a/packages/settings/src/options/thicknessOptions.ts b/packages/settings/src/options/thicknessOptions.ts
new file mode 100644
index 00000000..e8a0d05e
--- /dev/null
+++ b/packages/settings/src/options/thicknessOptions.ts
@@ -0,0 +1,7 @@
+import { Option } from '../models'
+
+export const thicknessOptions: Option[] = [
+  { value: '1', text: '1' },
+  { value: '2', text: '2' },
+  { value: '3', text: '3' }
+]

From e6b4e75bce45d386e817808844496010434efb2f Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Wed, 29 Jun 2022 12:29:09 +0200
Subject: [PATCH 24/42] refactor(chrome-extension): remove local
 ticknessOptions interface

---
 apps/chrome-extension/src/components/QuickActivate.vue | 3 +--
 apps/chrome-extension/src/constants/ticknessOptions.ts | 5 -----
 2 files changed, 1 insertion(+), 7 deletions(-)
 delete mode 100644 apps/chrome-extension/src/constants/ticknessOptions.ts

diff --git a/apps/chrome-extension/src/components/QuickActivate.vue b/apps/chrome-extension/src/components/QuickActivate.vue
index bb90ae8e..310620b5 100644
--- a/apps/chrome-extension/src/components/QuickActivate.vue
+++ b/apps/chrome-extension/src/components/QuickActivate.vue
@@ -1,9 +1,8 @@
 <script lang="ts">
 import { defineComponent, ref, watchEffect } from '@vue/composition-api'
 import { BTableSimple, BTbody, BTd, BTh, BTr } from 'bootstrap-vue'
-import { opacityOptions } from '@readapt/settings'
+import { opacityOptions, thicknessOptions } from '@readapt/settings'
 
-import { thicknessOptions } from '@/constants/ticknessOptions'
 import { buildDefaultSettingsReadingTool } from '@/constants/defaultSettingsReadingTool'
 import { SettingsReadingTool } from '@/interfaces/settingsReadingTool'
 import utils from '@/chrome'
diff --git a/apps/chrome-extension/src/constants/ticknessOptions.ts b/apps/chrome-extension/src/constants/ticknessOptions.ts
deleted file mode 100644
index 3d248cc2..00000000
--- a/apps/chrome-extension/src/constants/ticknessOptions.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export const thicknessOptions = [
-  { value: '1', text: '1' },
-  { value: '2', text: '2' },
-  { value: '3', text: '3' }
-]

From ab3c4353e1fc3d2a29e8c0bb56a1aee535448c57 Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Wed, 29 Jun 2022 12:30:13 +0200
Subject: [PATCH 25/42] refactor(ms-word-addin): simplify sendDocument logic

---
 apps/ms-word-addin/src/views/DialogBox.vue |  23 ++-
 apps/ms-word-addin/src/views/MainMenu.vue  | 169 +++++++++------------
 2 files changed, 83 insertions(+), 109 deletions(-)

diff --git a/apps/ms-word-addin/src/views/DialogBox.vue b/apps/ms-word-addin/src/views/DialogBox.vue
index 79dd7b81..fa7cb43b 100644
--- a/apps/ms-word-addin/src/views/DialogBox.vue
+++ b/apps/ms-word-addin/src/views/DialogBox.vue
@@ -11,6 +11,7 @@ import {
   wordSpacingOptions,
   lineSpacingOptions,
   languageOptions,
+  thicknessOptions,
   SettingsKey,
   Option
 } from '@readapt/settings'
@@ -56,16 +57,10 @@ const DialogBox = defineComponent({
       { value: '5', text: '5' }
     ]
 
-    const sizeOptions: Option[] = [
-      { value: '1', text: '1' },
-      { value: '2', text: '2' },
-      { value: '3', text: '3' }
-    ]
-
-    let opacityMaskSelected = ref<string>('1')
-    let opacityRulerSelected = ref<string>('1')
-    let heightMaskSelected = ref<string>('1')
-    let heightRulerSelected = ref<string>('1')
+    const opacityMaskSelected = ref<string>('1')
+    const opacityRulerSelected = ref<string>('1')
+    const heightMaskSelected = ref<string>('1')
+    const heightRulerSelected = ref<string>('1')
 
     const settings = computed<Settings>(() => store.getters.getSettings)
     const allItemsLettersActive = computed<boolean>(() => settings.value.lettersActive)
@@ -140,7 +135,7 @@ const DialogBox = defineComponent({
       if (!mask) mask = document.getElementById('mask') as HTMLElement
       if (!maskBeforeReadingZone) maskBeforeReadingZone = document.getElementById('before-readingzone') as HTMLElement
       if (!topBarZone) topBarZone = document.getElementById('topbar')
-      let heightMax = document.body.scrollHeight
+      const heightMax = document.body.scrollHeight
       mask.style.height = `${heightMax.toString()}px`
 
       if (topBarZone && event.pageY > topBarZone.offsetHeight) {
@@ -219,7 +214,7 @@ const DialogBox = defineComponent({
       opacityMaskSelected,
       opacityRulerChange,
       opacityRulerSelected,
-      sizeOptions,
+      thicknessOptions,
       heightRulerSelected,
       heightMaskSelected,
       rulerHeightChange
@@ -360,7 +355,7 @@ export default DialogBox
                 <b-tr>
                   <b-td>{{ $t('GENERAL.THICKNESS') }}</b-td>
                   <b-td>
-                    <RangeBar :value="heightMaskSelected" :options="sizeOptions" @change="maskHeightChange($event)" />
+                    <RangeBar :value="heightMaskSelected" :options="thicknessOptions" @change="maskHeightChange($event)" />
                   </b-td>
                 </b-tr>
                 <b-tr>
@@ -373,7 +368,7 @@ export default DialogBox
                 <b-tr>
                   <b-td>{{ $t('GENERAL.THICKNESS') }}</b-td>
                   <b-td>
-                    <RangeBar :value="heightRulerSelected" :options="sizeOptions" @change="rulerHeightChange($event)" />
+                    <RangeBar :value="heightRulerSelected" :options="thicknessOptions" @change="rulerHeightChange($event)" />
                   </b-td>
                 </b-tr>
               </b-tbody>
diff --git a/apps/ms-word-addin/src/views/MainMenu.vue b/apps/ms-word-addin/src/views/MainMenu.vue
index 3b2cfa0f..6c531aaa 100644
--- a/apps/ms-word-addin/src/views/MainMenu.vue
+++ b/apps/ms-word-addin/src/views/MainMenu.vue
@@ -1,18 +1,15 @@
 <script lang="ts">
-/* global Office Word OfficeExtension */
+/* global Office Word */
 import { computed, defineComponent, ref } from '@vue/composition-api'
+import { BButton, BImg } from 'bootstrap-vue'
 import isEqual from 'lodash/isEqual'
+
 import store from '@/store'
-import { BButton, BImg } from 'bootstrap-vue'
 import i18n from '@/i18n'
 import { buildDefaultProfiles } from '@/constants/defaultProfiles'
 import { Profiles } from '@/interfaces'
 import { trackAdaptEvent } from '@/services/stats'
-
-export interface OfficeCustomImageData {
-  htmlImage: HTMLImageElement
-  base64Image: OfficeExtension.ClientResult<string>
-}
+import { Settings } from '@readapt/settings'
 
 const MainMenu = defineComponent({
   components: {
@@ -31,110 +28,73 @@ const MainMenu = defineComponent({
       return isEqual(settings.value, defaultSettings)
     })
 
-    const sendMessage = (message: string) => {
-      const dialogBox = dialogContext.value
-      if (Office.context.requirements.isSetSupported('DialogApi', '1.2')) {
-        dialogBox?.messageChild(message)
-      } else {
-        console.warn('dialogApi not supported')
-      }
+    const getDocumentBody = (): Promise<HTMLElement> => {
+      return Word.run(async (context: Word.RequestContext) => {
+        const htmlDocument = context.document.body.getHtml()
+        await context.sync()
+        const domDocument = new DOMParser().parseFromString(htmlDocument.value, 'text/html')
+        return domDocument.body
+      })
     }
 
-    const sendDocument = (bodyHTML: string) => {
-      let lang = i18n.locale
-      sendMessage(JSON.stringify({ html: bodyHTML, settings: settings.value, lang }))
-    }
+    const convertImages = async (body: HTMLElement) => {
+      if (Office.context.platform === Office.PlatformType.OfficeOnline) {
+        return // nothing to do
+      }
 
-    const imageFormat = () => {
-      return Word.run(async (context) => {
-        var htmlDocumentBody = context.document.body.getHtml()
+      await Word.run(async (context: Word.RequestContext) => {
+        const documentPictures = context.document.body.inlinePictures.load({ $all: true })
         await context.sync()
-        if (Office.context.platform === Office.PlatformType.OfficeOnline) {
-          let documentDom = new DOMParser().parseFromString(htmlDocumentBody.value, 'text/html')
-          return documentDom.body
-        }
-        let myImages = context.document.body.inlinePictures.load({ $all: true })
-        return context.sync().then(async () => {
-          let documentDom = new DOMParser().parseFromString(htmlDocumentBody.value, 'text/html')
-          let htmlImages = documentDom.getElementsByTagName('img')
-          const values: OfficeCustomImageData[] = []
-          for (let i = 0; i < myImages.items.length; i++) {
-            const base64 = myImages.items[i].getBase64ImageSrc()
-            await context.sync()
-            values.push({
-              base64Image: base64,
-              htmlImage: htmlImages[i]
-            })
+        const htmlImages = body.getElementsByTagName('img')
+        for (let i = 0; i < documentPictures.items.length; i++) {
+          const base64 = documentPictures.items[i].getBase64ImageSrc()
+          await context.sync()
+          const base64Image = base64.value
+          let mimeType = ''
+          if (base64Image.startsWith('iVBORw')) {
+            mimeType = 'image/png'
+          } else if (base64Image.startsWith('/9j/4AAQSkZJRg')) {
+            mimeType = 'image/jpeg'
+          } else if (base64Image.startsWith('R0lGO')) {
+            mimeType = 'image/gif'
+          } else if (base64Image.startsWith('PHN2Zy')) {
+            mimeType = 'image/svg+xml'
           }
-          for (let i = 0; i < myImages.items.length; i++) {
-            // Format PNG
-            if (values[i].base64Image.value.startsWith('iVBORw')) {
-              htmlImages[i].src = 'data:image/png;base64,' + values[i].base64Image.value
-            }
-            // Format Jpeg
-            else if (values[i].base64Image.value.startsWith('/9j/4AAQSkZJRg')) {
-              htmlImages[i].src = 'data:image/jpeg;base64,' + values[i].base64Image.value
-            }
-            // Format GIF
-            else if (values[i].base64Image.value.startsWith('R0lGO')) {
-              htmlImages[i].src = 'data:image/gif;base64,' + values[i].base64Image.value
-            }
-            // Format SVG
-            else if (values[i].base64Image.value.startsWith('PHN2Zy')) {
-              htmlImages[i].src = 'data:image/svg+xml;base64,' + values[i].base64Image.value
-            }
+          if (mimeType) {
+            htmlImages[i].src = `data:${mimeType};base64,${base64Image}`
           }
-          return documentDom.body
-        })
+        }
       })
     }
 
-    const listFormat = (body: HTMLElement) => {
+    const addListStyles = (body: HTMLElement) => {
       let listMarker = Array.from(body.getElementsByClassName('ListMarkerWrappingSpan')) as HTMLElement[]
 
-      //Format des listMarker
-      for (let index = 0; index < listMarker.length; index++) {
-        var sibling = listMarker[index].nextElementSibling as HTMLElement
+      listMarker.forEach((item) => {
+        const sibling = item.nextElementSibling as HTMLElement
 
-        if (listMarker[index].innerText === '·') {
-          listMarker[index].style.fontFamily = 'Symbol, Symbol_MSFontService, sans-serif'
+        if (item.innerText === '·') {
+          item.style.fontFamily = 'Symbol, Symbol_MSFontService, sans-serif'
         } else {
-          listMarker[index].style.fontFamily = sibling.style.fontFamily
+          item.style.fontFamily = sibling.style.fontFamily
         }
 
-        listMarker[index].innerText = listMarker[index].innerText + '\t'
-        listMarker[index].style.fontSize = sibling.style.fontSize
-        listMarker[index].style.color = sibling.style.color
-        listMarker[index].style.lineHeight = sibling.style.lineHeight
-      }
-      return body
+        item.innerText = item.innerText + '\t'
+        item.style.fontSize = sibling.style.fontSize
+        item.style.color = sibling.style.color
+        item.style.lineHeight = sibling.style.lineHeight
+      })
     }
 
-    const fontFormat = (body: HTMLElement) => {
+    const removeFontStyles = (body: HTMLElement) => {
       let elements = Array.from(body.getElementsByTagName('*')) as HTMLElement[]
 
-      for (let index = 0; index < elements.length; index++) {
-        elements[index].style.fontFamily = ''
-        elements[index].style.fontSize = ''
+      elements.forEach((item) => {
+        item.style.fontFamily = ''
+        item.style.fontSize = ''
 
         // Décallage des listes
-        elements[index].style.textIndent = '0'
-      }
-      return body
-    }
-
-    const onMessage = () => {
-      let document = imageFormat()
-      document.then((doc) => {
-        // Suppression des FontSize et FontFamily
-        let htmlFormated = fontFormat(doc as HTMLElement)
-
-        // Modification de HTML List
-        htmlFormated = listFormat(doc as HTMLElement)
-
-        //XML Seralizer
-        const newHTML = new XMLSerializer().serializeToString(htmlFormated)
-        sendDocument(newHTML)
+        item.style.textIndent = '0'
       })
     }
 
@@ -151,12 +111,31 @@ const MainMenu = defineComponent({
       )
     }
 
+    const onMessage = async () => {
+      const body = await getDocumentBody()
+      await convertImages(body)
+      removeFontStyles(body)
+      addListStyles(body)
+
+      const newHTML = new XMLSerializer().serializeToString(body)
+
+      sendDocument(newHTML, settings.value, i18n.locale)
+    }
+
+    const sendDocument = (html: string, settings: Settings, lang: string) => {
+      const message = JSON.stringify({ html: html, settings, lang })
+
+      const dialogBox = dialogContext.value
+      if (Office.context.requirements.isSetSupported('DialogApi', '1.2')) {
+        dialogBox?.messageChild(message)
+      } else {
+        console.warn('dialogApi not supported')
+      }
+    }
+
     return {
-      dialogContext,
-      // methods
-      sendMessage,
-      openDialogBox,
-      isDefaultSettings
+      isDefaultSettings,
+      openDialogBox
     }
   },
   methods: {

From cafc745f4f09f71b58c80d5a3ca26f46393c23a0 Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Wed, 29 Jun 2022 14:20:20 +0200
Subject: [PATCH 26/42] build: avoid error on Windows yarn install

---
 apps/chrome-extension/package.json | 2 +-
 apps/ms-word-addin/package.json    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/chrome-extension/package.json b/apps/chrome-extension/package.json
index 8a09ba32..581aef59 100644
--- a/apps/chrome-extension/package.json
+++ b/apps/chrome-extension/package.json
@@ -11,7 +11,7 @@
     "test:unit": "vue-cli-service test:unit",
     "lint": "vue-cli-service lint",
     "package": "scripts/package-release",
-    "postinstall": "scripts/init-env"
+    "postinstall": "node scripts/init-env"
   },
   "dependencies": {
     "@readapt/settings": "^1.1.1",
diff --git a/apps/ms-word-addin/package.json b/apps/ms-word-addin/package.json
index a3cfaafb..2e5eee48 100644
--- a/apps/ms-word-addin/package.json
+++ b/apps/ms-word-addin/package.json
@@ -16,7 +16,7 @@
     "validate": "office-addin-manifest validate manifest.xml",
     "cert:install": "node ./node_modules/.bin/office-addin-dev-certs install",
     "cert:uninstall": "node ./node_modules/.bin/office-addin-dev-certs uninstall",
-    "postinstall": "scripts/init-env"
+    "postinstall": "node scripts/init-env"
   },
   "dependencies": {
     "@readapt/settings": "^1.1.1",

From 7fa485c39b0ffc173ca01c0aa3e9efab519e7a58 Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Wed, 29 Jun 2022 14:48:03 +0200
Subject: [PATCH 27/42] feat(ms-word-addin): replace images by default image
 when Word image list is not equal to html image list to avoid wrong
 conversion

---
 apps/ms-word-addin/public/assets/no-image.png | Bin 0 -> 1317 bytes
 apps/ms-word-addin/src/views/MainMenu.vue     |  22 ++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 apps/ms-word-addin/public/assets/no-image.png

diff --git a/apps/ms-word-addin/public/assets/no-image.png b/apps/ms-word-addin/public/assets/no-image.png
new file mode 100644
index 0000000000000000000000000000000000000000..53666ee11873d37c3abda18f30c7247c6089a63d
GIT binary patch
literal 1317
zcmaJ>Yd8~n82@j>88TV&V1&sfmt0fQBiD_yW@OTGiMef#%St+m+@6ilF=9?eF>(y$
zesBuW+;SVqB?qP4DwoDNrIMZb(AV?fcYWXIdB44Bt}a*^DP<`DfQ++~!&#Bqh;R}v
zA!0Cc@tTMsQD?Dspn6#4ohXQf*y3#gsAEd+_=}6OB+ZEw1puOJ4-l3<0wpRPg3db!
z<MBXG<lz94N(Evf2N6M81OQ;g5C9V?WUniR{+NoND2Dy;Vo&!LX)Q2c(alh22U{Y=
zeyso(hVqb45#|fdsQ#Vi{FaX4LXm0sv7<I_?1SVan=rpo8Kfgw+OC#+o=E0Nq~UQd
zh=%G!sFU~+Cv}JMJUow=Ne*1}FXtRZ;|u!mIaActDM3bTkEd?7jzIH(>GrS=DP+l)
ze|Whlif`$uiR<*Mg(qeIbx>hmT-OVVLZNoJCZp!Rsj;Te!1C4P<WHoC!46${DMeM)
zS+re#`R&7k(jH!4vneFKyT?!p)Be&U(Q6=!zg+j|QTmmWL)cFWILZBpR5`fV{xpaE
zQVe4Yixi?>cgSan0eDBH-0f$F3te=G9^+=mv<#8xoM#^+^O;&=H@nGwi<e#H8O&UD
zh|^7qc|Ufr7YXfpD+rI3MQUU_eKgyuqXXi-PgTNNI`FOW<nLm#P8?#U7UeUkP?g;{
z<r<$h9zV3Sp~0OALOqV#54%HG*VmUcmjcp3coDts_OpQPtI*+2=b4trJt39l&CQ;K
z<VH0P{mxMEzXSq7b|&JuFz?H1s99snJsyXTrc4B?xc)r3Anj<N)euuRkfCpMx`H_l
z9l!C_^~n7)e{GNOluE6}mds3P_n3vm&6+Jb8n;53_&5-UeBS%EWhbPNPfQ(HOy)0}
z&3;+q;u7a6Dg@b~j%BxbKLl$2T+p^RqV;-^0^hrx5jMvzc)%9lHjYu#iQh)88R{)a
zm1Qhh&FGZ~_BAG5DwH(bRQlkW10r`$rH(x@EN&w`tcb8uHJv6k7JiL}5WLwK1J<J1
zH^Mmd)aTjoefXLcLgT$Z7}bJfmRWuBv=uwW4HJ{Ayh$^CN}FPjATm-zu_}Q_WC4QA
zEImP^%&OMQ-0`{Q%IY?3HmRa4+S*-J?fa#RMt{~^EC?upjtwaNQ?D`>{Z6}GSoJCI
z8WzHpqqd!3Fai<2d22(-B^=f)b8~srD44c6JuE}aWKH~vS+_lDmH8QF5_A4#St_R<
zHL_X4z13j7z)}kteX2M1x(gN`6x4JuaiZdK1Ty!rk3s2%IMG&DIi*yRvaC(}K5TF8
z{$~Axf=)b}(XS%B5~^g~Y;W{9y%R|!1xD9ame$3#TbasI{h;LuHLZjF%ADQZc>3>S
zEB+eMv{cg&i|a5}|9n}sLL6<!t@TF0q4){6>xBq&%lqstmn6rH3r&gU8Mkt<2=eQf
zy?0_vcXn+SF_Z;gBtjur$l9XM*_d=zB)$KpoeqzMuRY+DtW@c|J1ZG6D&O`sPKng%
zX+W)C_F>P^IUtw&{!3}_NY}&_l-H{lK5T(nmYUvy?Db!|<_y+_a!p`HD#H*oKP5|d
zJgl99()11fuR^zi6eG+q;pqIs4^bm$;#8Z8!U8uH<93bbPEAWZdG%zm`z8k*z)`*L
z-hh|apWcud)V^!<hS6Ja>A?_*1V-bH>l{I{10~SHijXU*u6$K#;hbw?0>D=0Px^aY
Rp5FUD&W<h))pmZ#{{dwBMKk~a

literal 0
HcmV?d00001

diff --git a/apps/ms-word-addin/src/views/MainMenu.vue b/apps/ms-word-addin/src/views/MainMenu.vue
index 6c531aaa..70519ff5 100644
--- a/apps/ms-word-addin/src/views/MainMenu.vue
+++ b/apps/ms-word-addin/src/views/MainMenu.vue
@@ -37,7 +37,7 @@ const MainMenu = defineComponent({
       })
     }
 
-    const convertImages = async (body: HTMLElement) => {
+    const convertImages = async (body: HTMLElement): Promise<void> => {
       if (Office.context.platform === Office.PlatformType.OfficeOnline) {
         return // nothing to do
       }
@@ -45,7 +45,15 @@ const MainMenu = defineComponent({
       await Word.run(async (context: Word.RequestContext) => {
         const documentPictures = context.document.body.inlinePictures.load({ $all: true })
         await context.sync()
-        const htmlImages = body.getElementsByTagName('img')
+        const htmlImages = Array.from(body.getElementsByTagName('img')) as HTMLImageElement[]
+        if (documentPictures.items.length !== htmlImages.length) {
+          htmlImages.forEach((image) => {
+            image.src = `assets/no-image.png`
+            image.width = 64
+            image.height = 58
+          })
+          return
+        }
         for (let i = 0; i < documentPictures.items.length; i++) {
           const base64 = documentPictures.items[i].getBase64ImageSrc()
           await context.sync()
@@ -67,7 +75,7 @@ const MainMenu = defineComponent({
       })
     }
 
-    const addListStyles = (body: HTMLElement) => {
+    const addListStyles = (body: HTMLElement): void => {
       let listMarker = Array.from(body.getElementsByClassName('ListMarkerWrappingSpan')) as HTMLElement[]
 
       listMarker.forEach((item) => {
@@ -86,7 +94,7 @@ const MainMenu = defineComponent({
       })
     }
 
-    const removeFontStyles = (body: HTMLElement) => {
+    const removeFontStyles = (body: HTMLElement): void => {
       let elements = Array.from(body.getElementsByTagName('*')) as HTMLElement[]
 
       elements.forEach((item) => {
@@ -98,7 +106,7 @@ const MainMenu = defineComponent({
       })
     }
 
-    const openDialogBox = () => {
+    const openDialogBox = (): void => {
       trackAdaptEvent()
       Office.context.ui.displayDialogAsync(
         `${window.location.origin}/#/dialog-box`,
@@ -111,7 +119,7 @@ const MainMenu = defineComponent({
       )
     }
 
-    const onMessage = async () => {
+    const onMessage = async (): Promise<void> => {
       const body = await getDocumentBody()
       await convertImages(body)
       removeFontStyles(body)
@@ -122,7 +130,7 @@ const MainMenu = defineComponent({
       sendDocument(newHTML, settings.value, i18n.locale)
     }
 
-    const sendDocument = (html: string, settings: Settings, lang: string) => {
+    const sendDocument = (html: string, settings: Settings, lang: string): void => {
       const message = JSON.stringify({ html: html, settings, lang })
 
       const dialogBox = dialogContext.value

From bc726c60bcd5c412e4caae38f250640086ef2946 Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Wed, 29 Jun 2022 17:05:33 +0200
Subject: [PATCH 28/42] build: remove develop branch on pull_request check

---
 .github/workflows/main.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 25b90468..362291eb 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -2,7 +2,7 @@ name: readapt ci
 
 on:
   pull_request:
-    branches: [ "master", "develop", "release/ms-word-addin"]
+    branches: [ "master", "release/ms-word-addin"]
   push:
     branches: [ "master" ]
 

From ca22bc724b99626f787ff74273095d0f76aa5bb8 Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Wed, 29 Jun 2022 17:26:27 +0200
Subject: [PATCH 29/42] build: add a status badge in the readme

---
 .github/CODEOWNERS | 28 ----------------------------
 Makefile           |  2 --
 README.md          |  2 ++
 3 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 .github/CODEOWNERS
 delete mode 100644 Makefile

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
deleted file mode 100644
index 3d8be98f..00000000
--- a/.github/CODEOWNERS
+++ /dev/null
@@ -1,28 +0,0 @@
-# CODEOWNERS documentation : https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github/about-code-owners
-
-# ==============
-# Platform stuff
-# ==============
-# !!! Always keep it on the last lines of the CODEOWNERS file !!!
-
-# Deployfile gives rights to modify productions resources
-/Deployfile @ContentSquare/Platform
-
-# Jenkinsfile has access to secrets and grants access to AWS resources
-/Jenkinsfile @ContentSquare/Platform
-
-# Makefile are called by Jenkinsfile and inherit their access
-Makefile* @ContentSquare/Platform
-
-# Dockerfile describes the images that will be put into production
-Dockerfile* @ContentSquare/Platform
-
-# .github controls CODEOWNERS and Github actions (not used at the moment)
-/.github/ @ContentSquare/Platform
-
-# .infra describes the production resources
-.infra/ @ContentSquare/Platform
-
-# ==============
-# Platform stuff
-# ==============
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 886b109b..00000000
--- a/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-# This file will be reviewed by Platform team because it is called by the Jenkinsfile with additional AWS rights and/or access to secrets
-# You can modify it but a platformer approval will be required before merging it
diff --git a/README.md b/README.md
index c2caa1ac..39d44e71 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # Readapt
 
+[![readapt ci](https://github.com/ContentSquare/readapt/actions/workflows/main.yaml/badge.svg)](https://github.com/ContentSquare/readapt/actions/workflows/main.yaml)
+
 ## Introduction
 
 Created by [Contentsquare Foundation](https://contentsquare-foundation.org/), Readapt is a software platform that aims

From 197347895b05e6bda9af55f51af845e310bf727a Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Thu, 30 Jun 2022 14:02:52 +0200
Subject: [PATCH 30/42] fix: pull up <p> tag to parent component in
 AdaptContainer

Solves a problem with AdaptContainer in MS Word addin
---
 .../src/components/AdaptContainer.vue            | 16 +++++-----------
 .../src/components/PreviewContainer.vue          |  6 +++---
 .../src/components/TemplateSelectorOption.vue    |  8 +++++---
 .../src/components/AdaptContainer.vue            | 16 +++++-----------
 .../src/components/PreviewContainer.vue          |  6 +++---
 5 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/apps/chrome-extension/src/components/AdaptContainer.vue b/apps/chrome-extension/src/components/AdaptContainer.vue
index e761f692..3c04710c 100644
--- a/apps/chrome-extension/src/components/AdaptContainer.vue
+++ b/apps/chrome-extension/src/components/AdaptContainer.vue
@@ -15,11 +15,10 @@ const AdaptContainer = defineComponent({
   setup(props, { emit }) {
     const isLoading = ref(true)
     const containerElement = ref<HTMLDivElement>()
-    const contentElement = ref<HTMLParagraphElement>()
 
     const adaptContent = async () => {
-      if (containerElement.value && contentElement.value && props.contentToAdapt) {
-        contentElement.value.innerHTML = props.contentToAdapt
+      if (containerElement.value && props.contentToAdapt) {
+        containerElement.value.innerHTML = props.contentToAdapt
         await adaptHtmlElementAsync(containerElement.value, props.settings, props.scope)
         isLoading.value = false
         emit('ready') // Only for ms-word addin
@@ -29,8 +28,7 @@ const AdaptContainer = defineComponent({
     watch(
       () => ({
         ...props,
-        containerElement: containerElement.value,
-        contentElement: contentElement.value
+        containerElement: containerElement.value
       }),
       () => adaptContent(),
       { deep: true, flush: 'post' }
@@ -38,9 +36,7 @@ const AdaptContainer = defineComponent({
 
     onUnmounted(() => removeStyleElement(props.scope))
 
-    const onClick = () => emit('edit')
-
-    return { isLoading, containerElement, contentElement, onClick }
+    return { isLoading, containerElement }
   }
 })
 export default AdaptContainer
@@ -55,9 +51,7 @@ export default AdaptContainer
     </template>
 
     <div :class="{ loading: isLoading }">
-      <div ref="containerElement" @click="onClick">
-        <p ref="contentElement" />
-      </div>
+      <div ref="containerElement"></div>
     </div>
   </div>
 </template>
diff --git a/apps/chrome-extension/src/components/PreviewContainer.vue b/apps/chrome-extension/src/components/PreviewContainer.vue
index fb5abb1c..e075b599 100644
--- a/apps/chrome-extension/src/components/PreviewContainer.vue
+++ b/apps/chrome-extension/src/components/PreviewContainer.vue
@@ -43,9 +43,9 @@ export default PreviewContainer
   <div class="mb-auto">
     <textarea class="textarea-container form-control" rows="5" ref="textToAdaptElement" v-model="textToAdapt" @blur="onRead" :hidden="isReading" />
 
-    <template v-if="isReading">
-      <AdaptContainer class="adapt-container" :content-to-adapt="$sanitize(textToAdapt)" :settings="settings" :scope="scope" @edit="onEdit" />
-    </template>
+    <div v-if="isReading" @click="onEdit">
+      <AdaptContainer class="adapt-container" :content-to-adapt="$sanitize('<p>' + textToAdapt + '</p>')" :settings="settings" :scope="scope" />
+    </div>
   </div>
 </template>
 
diff --git a/apps/chrome-extension/src/components/TemplateSelectorOption.vue b/apps/chrome-extension/src/components/TemplateSelectorOption.vue
index 64f961b1..13dd458a 100644
--- a/apps/chrome-extension/src/components/TemplateSelectorOption.vue
+++ b/apps/chrome-extension/src/components/TemplateSelectorOption.vue
@@ -1,5 +1,5 @@
 <script lang="ts">
-import { defineComponent, PropType, ref } from '@vue/composition-api'
+import { computed, defineComponent, PropType, ref } from '@vue/composition-api'
 import { BButton, BCard, BCardText, BFormRadio } from 'bootstrap-vue'
 import AdaptContainer from '@/components/AdaptContainer.vue'
 import { SettingsTemplate } from '@/interfaces/settingsTemplate'
@@ -14,6 +14,8 @@ const TemplateSelectorOption = defineComponent({
   setup(props, { emit }) {
     const valueModel = ref(props.value)
 
+    const templateContent = computed(() => `<p>${props.template.content}</p>`)
+
     const isSelected = () => props.value.value === props.template.value
 
     const onSelect = (value: SettingsTemplate) => {
@@ -25,7 +27,7 @@ const TemplateSelectorOption = defineComponent({
 
     const onModify = () => emit('modify', props.template.settings)
 
-    return { valueModel, isSelected, onSelect, onChange, onModify }
+    return { valueModel, isSelected, onSelect, onChange, onModify, templateContent }
   }
 })
 export default TemplateSelectorOption
@@ -49,7 +51,7 @@ export default TemplateSelectorOption
       </ul>
     </b-card-text>
 
-    <AdaptContainer class="template-preview" :content-to-adapt="template.content" :settings="template.settings" :scope="template.value" />
+    <AdaptContainer class="template-preview" :content-to-adapt="templateContent" :settings="template.settings" :scope="template.value" />
   </b-card>
 </template>
 
diff --git a/apps/ms-word-addin/src/components/AdaptContainer.vue b/apps/ms-word-addin/src/components/AdaptContainer.vue
index e761f692..3c04710c 100644
--- a/apps/ms-word-addin/src/components/AdaptContainer.vue
+++ b/apps/ms-word-addin/src/components/AdaptContainer.vue
@@ -15,11 +15,10 @@ const AdaptContainer = defineComponent({
   setup(props, { emit }) {
     const isLoading = ref(true)
     const containerElement = ref<HTMLDivElement>()
-    const contentElement = ref<HTMLParagraphElement>()
 
     const adaptContent = async () => {
-      if (containerElement.value && contentElement.value && props.contentToAdapt) {
-        contentElement.value.innerHTML = props.contentToAdapt
+      if (containerElement.value && props.contentToAdapt) {
+        containerElement.value.innerHTML = props.contentToAdapt
         await adaptHtmlElementAsync(containerElement.value, props.settings, props.scope)
         isLoading.value = false
         emit('ready') // Only for ms-word addin
@@ -29,8 +28,7 @@ const AdaptContainer = defineComponent({
     watch(
       () => ({
         ...props,
-        containerElement: containerElement.value,
-        contentElement: contentElement.value
+        containerElement: containerElement.value
       }),
       () => adaptContent(),
       { deep: true, flush: 'post' }
@@ -38,9 +36,7 @@ const AdaptContainer = defineComponent({
 
     onUnmounted(() => removeStyleElement(props.scope))
 
-    const onClick = () => emit('edit')
-
-    return { isLoading, containerElement, contentElement, onClick }
+    return { isLoading, containerElement }
   }
 })
 export default AdaptContainer
@@ -55,9 +51,7 @@ export default AdaptContainer
     </template>
 
     <div :class="{ loading: isLoading }">
-      <div ref="containerElement" @click="onClick">
-        <p ref="contentElement" />
-      </div>
+      <div ref="containerElement"></div>
     </div>
   </div>
 </template>
diff --git a/apps/ms-word-addin/src/components/PreviewContainer.vue b/apps/ms-word-addin/src/components/PreviewContainer.vue
index fb5abb1c..e075b599 100644
--- a/apps/ms-word-addin/src/components/PreviewContainer.vue
+++ b/apps/ms-word-addin/src/components/PreviewContainer.vue
@@ -43,9 +43,9 @@ export default PreviewContainer
   <div class="mb-auto">
     <textarea class="textarea-container form-control" rows="5" ref="textToAdaptElement" v-model="textToAdapt" @blur="onRead" :hidden="isReading" />
 
-    <template v-if="isReading">
-      <AdaptContainer class="adapt-container" :content-to-adapt="$sanitize(textToAdapt)" :settings="settings" :scope="scope" @edit="onEdit" />
-    </template>
+    <div v-if="isReading" @click="onEdit">
+      <AdaptContainer class="adapt-container" :content-to-adapt="$sanitize('<p>' + textToAdapt + '</p>')" :settings="settings" :scope="scope" />
+    </div>
   </div>
 </template>
 

From 43cc9a96ba43fbff6251d79078ff15d65d77694c Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Thu, 30 Jun 2022 15:38:17 +0200
Subject: [PATCH 31/42] feat(ms-word-addin): adapt selected text

---
 apps/ms-word-addin/src/i18n/en.json        |  1 +
 apps/ms-word-addin/src/i18n/fr.json        |  1 +
 apps/ms-word-addin/src/views/DialogBox.vue |  4 --
 apps/ms-word-addin/src/views/MainMenu.vue  | 52 +++++++++++++++++-----
 4 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/apps/ms-word-addin/src/i18n/en.json b/apps/ms-word-addin/src/i18n/en.json
index ed57b44a..6ba57b5e 100644
--- a/apps/ms-word-addin/src/i18n/en.json
+++ b/apps/ms-word-addin/src/i18n/en.json
@@ -1,6 +1,7 @@
 {
   "MAIN_MENU": {
     "ADAPT_DOC": "Adapt document!",
+    "ADAPT_SELECTION": "Adapt selected text",
     "SEE_MODIFY_CURRENT_PROFILE": "See/Modify current profile",
     "CREATE_A_PROFILE": "Click here to create a profile!",
     "WELCOME_1": "See an adaptation of your document’s text tailored to your specific needs so that you can read more comfortably.",
diff --git a/apps/ms-word-addin/src/i18n/fr.json b/apps/ms-word-addin/src/i18n/fr.json
index 32f4c02a..1c7a6e5a 100644
--- a/apps/ms-word-addin/src/i18n/fr.json
+++ b/apps/ms-word-addin/src/i18n/fr.json
@@ -1,6 +1,7 @@
 {
   "MAIN_MENU": {
     "ADAPT_DOC": "Adapte le document !",
+    "ADAPT_SELECTION": "Adapte le texte selectioné",
     "SEE_MODIFY_CURRENT_PROFILE": "Voir/Modifier le profil en cours",
     "CREATE_A_PROFILE": "Cliquez ici pour créer un profil !",
     "WELCOME_1": "Visualisez le texte de votre document adapté en fonction de vos besoins spécifiques afin de pouvoir le lire plus confortablement !",
diff --git a/apps/ms-word-addin/src/views/DialogBox.vue b/apps/ms-word-addin/src/views/DialogBox.vue
index fa7cb43b..debd864a 100644
--- a/apps/ms-word-addin/src/views/DialogBox.vue
+++ b/apps/ms-word-addin/src/views/DialogBox.vue
@@ -437,10 +437,6 @@ export default DialogBox
     visibility: hidden !important;
   }
 }
-.loading {
-  opacity: 0.5;
-  background-color: var(--light);
-}
 .top-bar {
   z-index: 4;
   background-color: white;
diff --git a/apps/ms-word-addin/src/views/MainMenu.vue b/apps/ms-word-addin/src/views/MainMenu.vue
index 70519ff5..00f36c4b 100644
--- a/apps/ms-word-addin/src/views/MainMenu.vue
+++ b/apps/ms-word-addin/src/views/MainMenu.vue
@@ -37,6 +37,17 @@ const MainMenu = defineComponent({
       })
     }
 
+    const getDocumentSelection = (): Promise<HTMLElement> => {
+      return Word.run(async (context: Word.RequestContext) => {
+        const rangeSelection = context.document.getSelection()
+        await context.sync()
+        const htmlSelection = rangeSelection.getHtml()
+        await context.sync()
+        const domSelection = new DOMParser().parseFromString(htmlSelection.value, 'text/html')
+        return domSelection.body
+      })
+    }
+
     const convertImages = async (body: HTMLElement): Promise<void> => {
       if (Office.context.platform === Office.PlatformType.OfficeOnline) {
         return // nothing to do
@@ -106,26 +117,26 @@ const MainMenu = defineComponent({
       })
     }
 
-    const openDialogBox = (): void => {
+    const openDialogBox = (document: HTMLElement): void => {
       trackAdaptEvent()
+      const sendDocument = buildSendDocument(document)
       Office.context.ui.displayDialogAsync(
         `${window.location.origin}/#/dialog-box`,
         { height: 90, width: 90 },
         (asyncResult: Office.AsyncResult<Office.Dialog>) => {
           dialogContext.value = asyncResult.value
-          dialogContext.value.addEventHandler(Office.EventType.DialogMessageReceived, onMessage)
-          dialogContext.value.addEventHandler(Office.EventType.DialogEventReceived, onMessage)
+          dialogContext.value.addEventHandler(Office.EventType.DialogMessageReceived, sendDocument)
+          dialogContext.value.addEventHandler(Office.EventType.DialogEventReceived, sendDocument)
         }
       )
     }
 
-    const onMessage = async (): Promise<void> => {
-      const body = await getDocumentBody()
-      await convertImages(body)
-      removeFontStyles(body)
-      addListStyles(body)
+    const buildSendDocument = (documentBody: HTMLElement) => async (): Promise<void> => {
+      await convertImages(documentBody)
+      removeFontStyles(documentBody)
+      addListStyles(documentBody)
 
-      const newHTML = new XMLSerializer().serializeToString(body)
+      const newHTML = new XMLSerializer().serializeToString(documentBody)
 
       sendDocument(newHTML, settings.value, i18n.locale)
     }
@@ -141,9 +152,23 @@ const MainMenu = defineComponent({
       }
     }
 
+    const adaptDocument = async () => {
+      const document = await getDocumentBody()
+      openDialogBox(document)
+    }
+    const adaptSelection = async () => {
+      try {
+        const selection = await getDocumentSelection()
+        openDialogBox(selection)
+      } catch (error) {
+        console.error(error)
+      }
+    }
+
     return {
       isDefaultSettings,
-      openDialogBox
+      adaptDocument,
+      adaptSelection
     }
   },
   methods: {
@@ -167,7 +192,12 @@ export default MainMenu
         </div>
       </div>
       <div class="my-2" style="min-width: 250px" v-if="!isDefaultSettings">
-        <b-button class="w-100" size="md" variant="primary" @click="openDialogBox">
+        <b-button class="w-100" size="md" variant="primary" @click="adaptSelection">
+          {{ $t('MAIN_MENU.ADAPT_SELECTION') }}
+        </b-button>
+      </div>
+      <div class="my-2" style="min-width: 250px" v-if="!isDefaultSettings">
+        <b-button class="w-100" size="md" variant="primary" @click="adaptDocument">
           {{ $t('MAIN_MENU.ADAPT_DOC') }}
         </b-button>
       </div>

From 2dbc47733cb17bd10991530aef5691712f06231b Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Fri, 1 Jul 2022 12:21:45 +0200
Subject: [PATCH 32/42] refactor(ms-word-addin): reading tools in DialogBox

---
 apps/ms-word-addin/src/views/DialogBox.vue | 198 +++++++++------------
 1 file changed, 82 insertions(+), 116 deletions(-)

diff --git a/apps/ms-word-addin/src/views/DialogBox.vue b/apps/ms-word-addin/src/views/DialogBox.vue
index debd864a..7c0c5636 100644
--- a/apps/ms-word-addin/src/views/DialogBox.vue
+++ b/apps/ms-word-addin/src/views/DialogBox.vue
@@ -1,6 +1,6 @@
 <script lang="ts">
 /* global Office */
-import { computed, defineComponent, onMounted, ref } from '@vue/composition-api'
+import { computed, defineComponent, onMounted, ref, unref } from '@vue/composition-api'
 import { BButton, BFormCheckbox, BFormSelect, BTableSimple, BTbody, BTr, BTd, BTh, BIconList, BSidebar } from 'bootstrap-vue'
 
 import {
@@ -12,6 +12,7 @@ import {
   lineSpacingOptions,
   languageOptions,
   thicknessOptions,
+  opacityOptions,
   SettingsKey,
   Option
 } from '@readapt/settings'
@@ -43,24 +44,13 @@ const DialogBox = defineComponent({
     const rulerActivated = ref(false)
     const maskActivated = ref(false)
 
-    let heightMask = 25
-    let heightRuler = 1
+    const heightMask = 25
+    const BASE_COLOR = '#000000'
 
-    let opacityMask = 0.2
-    let opacityRuler = 0.2
-
-    const opacityOptions: Option[] = [
-      { value: '1', text: '1' },
-      { value: '2', text: '2' },
-      { value: '3', text: '3' },
-      { value: '4', text: '4' },
-      { value: '5', text: '5' }
-    ]
-
-    const opacityMaskSelected = ref<string>('1')
-    const opacityRulerSelected = ref<string>('1')
-    const heightMaskSelected = ref<string>('1')
-    const heightRulerSelected = ref<string>('1')
+    const opacityMaskSelected = ref<string>(opacityOptions[0].value)
+    const opacityRulerSelected = ref<string>(opacityOptions[0].value)
+    const heightMaskSelected = ref<string>(thicknessOptions[0].value)
+    const heightRulerSelected = ref<string>(thicknessOptions[0].value)
 
     const settings = computed<Settings>(() => store.getters.getSettings)
     const allItemsLettersActive = computed<boolean>(() => settings.value.lettersActive)
@@ -71,19 +61,15 @@ const DialogBox = defineComponent({
       return shadeAlternateLinesActive ? lineSpacingOptions.slice(1) : lineSpacingOptions
     })
 
-    let ruler = document.getElementById('ruler')
-    let mask = document.getElementById('mask')
-    let maskBeforeReadingZone = document.getElementById('before-readingzone')
-    let topBarZone = document.getElementById('topbar')
+    const ruler = ref<HTMLDivElement>()
+    const mask = ref<HTMLDivElement>()
+    const maskBeforeReadingZone = ref<HTMLDivElement>()
+    const maskReadingZone = ref<HTMLDivElement>()
+    const maskAfterReadingZone = ref<HTMLDivElement>()
+    const topBarZone = ref<HTMLDivElement>()
 
     const docHtml = ref<string>('')
 
-    const onReady = () => {
-      // Setting the default height of the Mask
-      const maskReadingZone = document.getElementById('mask-readingzone') as HTMLElement
-      maskReadingZone.style.height = `${heightMask}px`
-    }
-
     const onMessage = (event: Office.DialogParentMessageReceivedEventArgs) => {
       try {
         const message = event.message
@@ -108,10 +94,26 @@ const DialogBox = defineComponent({
     }
 
     onMounted(() => {
-      Office.onReady().then((info: { platform: Office.PlatformType }) => {
+      Office.onReady((info: { platform: Office.PlatformType }) => {
         Office.context.ui.addHandlerAsync(Office.EventType.DialogParentMessageReceived, onMessage, onRegister)
         userPlatform.value = info.platform
       })
+
+      document.addEventListener('mousemove', (event: MouseEvent) => {
+        if (mask.value) {
+          const heightMax = document.body.scrollHeight
+          mask.value.style.height = `${heightMax.toString()}px`
+        }
+
+        if (topBarZone.value && event.pageY > topBarZone.value.offsetHeight) {
+          if (ruler.value && rulerActivated.value) {
+            ruler.value.style.top = `${event.pageY - 2}px`
+          }
+          if (maskBeforeReadingZone.value && maskActivated.value) {
+            maskBeforeReadingZone.value.style.height = `${event.pageY - topBarZone.value.offsetHeight - 20}px`
+          }
+        }
+      })
     })
 
     const print = () => {
@@ -130,34 +132,15 @@ const DialogBox = defineComponent({
       document.body.className = maskActivated.value ? 'showmask' : ''
     }
 
-    document.body.onmousemove = (event) => {
-      if (!ruler) ruler = document.getElementById('ruler') as HTMLElement
-      if (!mask) mask = document.getElementById('mask') as HTMLElement
-      if (!maskBeforeReadingZone) maskBeforeReadingZone = document.getElementById('before-readingzone') as HTMLElement
-      if (!topBarZone) topBarZone = document.getElementById('topbar')
-      const heightMax = document.body.scrollHeight
-      mask.style.height = `${heightMax.toString()}px`
-
-      if (topBarZone && event.pageY > topBarZone.offsetHeight) {
-        if (ruler && rulerActivated.value) {
-          ruler.style.top = `${event.pageY - 2}px`
-        }
-        if (mask && maskActivated.value) {
-          // clientY - (top zone height) - (mask height/2)
-          maskBeforeReadingZone.style.height = `${event.pageY - topBarZone.offsetHeight - 20}px`
-        }
-      }
-    }
-
     const maskHeightChange = (size: string) => {
-      let maskReadingZone = document.getElementById('mask-readingzone') as HTMLElement
-      maskReadingZone.style.height = `${(heightMask * parseInt(size)).toString()}px`
+      const maskReadingZoneElem = unref(maskReadingZone) as HTMLDivElement
+      maskReadingZoneElem.style.height = `${(heightMask * parseInt(size)).toString()}px`
       heightMaskSelected.value = size
     }
 
     const rulerHeightChange = (size: string) => {
-      let ruler = document.getElementById('ruler') as HTMLElement
-      ruler.style.borderTop = `${(heightRuler * parseInt(size)).toString()}px solid black`
+      const rulerElem = unref(ruler) as HTMLDivElement
+      rulerElem.style.borderTopWidth = `${size}px`
       heightRulerSelected.value = size
     }
 
@@ -171,20 +154,20 @@ const DialogBox = defineComponent({
       }
     }
 
-    const opacityMaskChange = (options: number) => {
-      let beforeReadingZone = document.getElementById('before-readingzone') as HTMLElement
-      let afterReadingZone = document.getElementById('after-readingzone') as HTMLElement
+    const opacityMaskChange = (opacity: string) => {
+      const maskBeforeReadingZoneElem = unref(maskBeforeReadingZone) as HTMLElement
+      const maskAfterReadingZoneElem = unref(maskAfterReadingZone) as HTMLElement
 
-      beforeReadingZone.style.opacity = (opacityMask * options).toString()
-      afterReadingZone.style.opacity = (opacityMask * options).toString()
-      opacityMaskSelected.value = opacityOptions[options - 1].value
+      maskBeforeReadingZoneElem.style.backgroundColor = BASE_COLOR + opacity
+      maskAfterReadingZoneElem.style.backgroundColor = BASE_COLOR + opacity
+      opacityMaskSelected.value = opacity
     }
 
-    const opacityRulerChange = (options: number) => {
-      let ruler = document.getElementById('ruler') as HTMLElement
+    const opacityRulerChange = (opacity: string) => {
+      const ruleElem = unref(ruler) as HTMLDivElement
 
-      ruler.style.opacity = (opacityRuler * options).toString()
-      opacityRulerSelected.value = opacityOptions[options - 1].value
+      ruleElem.style.borderColor = BASE_COLOR + opacity
+      opacityRulerSelected.value = opacity
     }
 
     return {
@@ -193,7 +176,6 @@ const DialogBox = defineComponent({
       docHtml,
       print,
       userPlatform,
-      onReady,
       toggleRuler,
       toggleMask,
       maskHeightChange,
@@ -217,7 +199,13 @@ const DialogBox = defineComponent({
       thicknessOptions,
       heightRulerSelected,
       heightMaskSelected,
-      rulerHeightChange
+      rulerHeightChange,
+      topBarZone,
+      mask,
+      maskBeforeReadingZone,
+      maskReadingZone,
+      maskAfterReadingZone,
+      ruler
     }
   }
 })
@@ -228,10 +216,10 @@ export default DialogBox
   <div>
     <div v-if="error">{{ error }}</div>
     <div class="container-fluid">
-      <div id="topbar" class="sticky-top top-bar">
-        <b-button v-if="userPlatform !== 'Mac'" size="sm" variant="primary" @click="print()" style="margin-right: 10px">{{
-          $t('DIALOG_BOX.PRINT')
-        }}</b-button>
+      <div id="topbar" ref="topBarZone" class="sticky-top top-bar">
+        <b-button v-if="userPlatform !== 'Mac'" size="sm" variant="primary" @click="print()" style="margin-right: 10px">
+          {{ $t('DIALOG_BOX.PRINT') }}
+        </b-button>
         <b-form-checkbox :checked="maskActivated" @change="toggleMask()" inline switch>{{ $t('DIALOG_BOX.MASK') }}</b-form-checkbox>
         <b-form-checkbox :checked="rulerActivated" @change="toggleRuler()" inline switch>{{ $t('DIALOG_BOX.RULER') }}</b-form-checkbox>
 
@@ -241,27 +229,21 @@ export default DialogBox
             <b-table-simple striped responsive class="mb-0">
               <b-tbody>
                 <b-tr>
-                  <b-th rowspan="1" class="bg-white">
-                    {{ $t('GENERAL.FONT') }}
-                  </b-th>
+                  <b-th class="bg-white"> {{ $t('GENERAL.FONT') }} </b-th>
                   <b-td>
                     <b-form-select :options="fontFamilyOptions" :value="settings.fontFamily" @change="updateOption('fontFamily', $event)" />
                   </b-td>
                   <b-td />
                 </b-tr>
                 <b-tr>
-                  <b-th rowspan="1" class="bg-white">
-                    {{ $t('GENERAL.FONT_SIZE') }}
-                  </b-th>
+                  <b-th class="bg-white"> {{ $t('GENERAL.FONT_SIZE') }} </b-th>
                   <b-td>
                     <SelectPercentage :options="fontSizeOptions" :value="settings.fontSize" @change="updateOption('fontSize', $event)" />
                   </b-td>
                   <b-td />
                 </b-tr>
                 <b-tr>
-                  <b-th :rowspan="1" class="bg-white">
-                    {{ $t('GENERAL.LETTER_SPACING') }}
-                  </b-th>
+                  <b-th class="bg-white"> {{ $t('GENERAL.LETTER_SPACING') }} </b-th>
                   <b-td>
                     <SelectPercentage
                       :options="letterSpacingOptions"
@@ -272,18 +254,14 @@ export default DialogBox
                   <b-td />
                 </b-tr>
                 <b-tr>
-                  <b-th :rowspan="1" class="bg-white">
-                    {{ $t('GENERAL.WORD_SPACING') }}
-                  </b-th>
+                  <b-th class="bg-white"> {{ $t('GENERAL.WORD_SPACING') }} </b-th>
                   <b-td>
                     <SelectPercentage :options="wordSpacingOptions" :value="settings.wordSpacing" @change="updateOption('wordSpacing', $event)" />
                   </b-td>
                   <b-td />
                 </b-tr>
                 <b-tr>
-                  <b-th :rowspan="1" class="bg-white">
-                    {{ $t('GENERAL.LINE_SPACING') }}
-                  </b-th>
+                  <b-th class="bg-white"> {{ $t('GENERAL.LINE_SPACING') }} </b-th>
                   <b-td>
                     <SelectPercentage
                       :options="lineSpacingOptionsOptimized"
@@ -294,59 +272,49 @@ export default DialogBox
                   <b-td />
                 </b-tr>
                 <b-tr>
-                  <b-th :rowspan="1" class="bg-white">
-                    {{ $t('GENERAL.HIGHLIGHT_ALTERNATING_SYLLABLES') }}
-                  </b-th>
+                  <b-th class="bg-white"> {{ $t('GENERAL.HIGHLIGHT_ALTERNATING_SYLLABLES') }} </b-th>
                   <b-td />
                   <b-td class="text-right">
                     <b-form-checkbox :checked="settings.syllableActive" @change="updateOption('syllableActive', $event)" switch />
                   </b-td>
                 </b-tr>
                 <b-tr>
-                  <b-th :rowspan="1" class="bg-white">
-                    {{ $t('GENERAL.GREY_SILENT_LETTERS') }}
-                  </b-th>
+                  <b-th class="bg-white"> {{ $t('GENERAL.GREY_SILENT_LETTERS') }} </b-th>
                   <b-td />
                   <b-td class="text-right">
                     <b-form-checkbox :checked="settings.silentLetterActive" @change="updateOption('silentLetterActive', $event)" switch />
                   </b-td>
                 </b-tr>
                 <b-tr>
-                  <b-th :rowspan="1" class="bg-white">
-                    {{ $t('SETTINGS.ALL_PHONEMES_SETTINGS') }}
-                  </b-th>
+                  <b-th class="bg-white"> {{ $t('SETTINGS.ALL_PHONEMES_SETTINGS') }} </b-th>
                   <b-td />
                   <b-td class="text-right">
                     <b-form-checkbox :checked="allItemsPhonemesActive" @change="updateOption('phonemesActive', $event)" switch />
                   </b-td>
                 </b-tr>
                 <b-tr>
-                  <b-th :rowspan="1" class="bg-white">
-                    {{ $t('SETTINGS.ALL_LETTERS_SETTINGS') }}
-                  </b-th>
+                  <b-th class="bg-white"> {{ $t('SETTINGS.ALL_LETTERS_SETTINGS') }} </b-th>
                   <b-td />
                   <b-td class="text-right">
                     <b-form-checkbox :checked="allItemsLettersActive" @change="updateOption('lettersActive', $event)" switch />
                   </b-td>
                 </b-tr>
                 <b-tr v-if="settings.language === 'fr'">
-                  <b-th :rowspan="1" class="bg-white">{{ $t('GENERAL.SHOW_LIAISONS') }}</b-th>
+                  <b-th class="bg-white">{{ $t('GENERAL.SHOW_LIAISONS') }}</b-th>
                   <b-td />
                   <b-td class="text-right">
                     <b-form-checkbox :checked="settings.liaisonsActive" @change="updateOption('liaisonsActive', $event)" switch />
                   </b-td>
                 </b-tr>
                 <b-tr>
-                  <b-th :rowspan="1" class="bg-white">
-                    {{ $t('GENERAL.SHADE_ALTERNATE_LINES') }}
-                  </b-th>
+                  <b-th class="bg-white"> {{ $t('GENERAL.SHADE_ALTERNATE_LINES') }} </b-th>
                   <b-td />
                   <b-td class="text-right">
                     <b-form-checkbox :checked="settings.shadeAlternateLinesActive" @change="updateShadeAlternateLines" switch />
                   </b-td>
                 </b-tr>
                 <b-tr>
-                  <b-th class="bg-white" :rowspan="2">{{ $t('DIALOG_BOX.READING_MASK') }}</b-th>
+                  <b-th class="bg-white" rowspan="2">{{ $t('DIALOG_BOX.READING_MASK') }}</b-th>
                   <b-td>{{ $t('GENERAL.OPACITY') }}</b-td>
                   <b-td>
                     <RangeBar :value="opacityMaskSelected" :options="opacityOptions" @change="opacityMaskChange($event)" />
@@ -359,7 +327,7 @@ export default DialogBox
                   </b-td>
                 </b-tr>
                 <b-tr>
-                  <b-th :rowspan="2" class="bg-white bt-0">{{ $t('DIALOG_BOX.READING_RULER') }}</b-th>
+                  <b-th class="bg-white bt-0" rowspan="2">{{ $t('DIALOG_BOX.READING_RULER') }}</b-th>
                   <b-td>{{ $t('GENERAL.OPACITY') }}</b-td>
                   <b-td>
                     <RangeBar :value="opacityRulerSelected" :options="opacityOptions" @change="opacityRulerChange($event)" />
@@ -377,13 +345,13 @@ export default DialogBox
         </div>
       </div>
 
-      <AdaptContainer :settings="settings" :content-to-adapt="docHtml" @ready="onReady" />
+      <AdaptContainer :settings="settings" :content-to-adapt="docHtml" />
     </div>
-    <div id="ruler"></div>
-    <div id="mask">
-      <div id="before-readingzone"></div>
-      <div id="mask-readingzone"></div>
-      <div id="after-readingzone"></div>
+    <div id="ruler" ref="ruler"></div>
+    <div id="mask" ref="mask">
+      <div id="before-reading-zone" ref="maskBeforeReadingZone"></div>
+      <div id="mask-reading-zone" ref="maskReadingZone"></div>
+      <div id="after-reading-zone" ref="maskAfterReadingZone"></div>
     </div>
   </div>
 </template>
@@ -394,8 +362,7 @@ export default DialogBox
   display: none;
   z-index: 3;
   width: 100%;
-  border-top: 1px solid black;
-  opacity: 0.2;
+  border-top: 1px solid #00000033;
 }
 .showruler #ruler {
   display: block;
@@ -410,17 +377,16 @@ export default DialogBox
   z-index: 3;
   width: 100%;
 }
-#before-readingzone,
-#after-readingzone {
-  background: #202020;
-  opacity: 0.2;
+#before-reading-zone,
+#after-reading-zone {
+  background: #20202033;
 }
-#after-readingzone {
+#after-reading-zone {
   flex-grow: 2;
 }
-#mask-readingzone {
+#mask-reading-zone {
   width: 100%;
-  height: 40px; /* should be equal to line-height or max line height */
+  height: 25px;
 }
 .showmask #mask {
   display: flex;

From 2b42e8c696cc2e95193e7379dbeb34fbfc3601d9 Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Fri, 1 Jul 2022 14:18:20 +0200
Subject: [PATCH 33/42] refactor: remove unused emit in AdaptContainer

---
 apps/chrome-extension/src/components/AdaptContainer.vue | 3 +--
 apps/ms-word-addin/src/components/AdaptContainer.vue    | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/apps/chrome-extension/src/components/AdaptContainer.vue b/apps/chrome-extension/src/components/AdaptContainer.vue
index 3c04710c..99d172a5 100644
--- a/apps/chrome-extension/src/components/AdaptContainer.vue
+++ b/apps/chrome-extension/src/components/AdaptContainer.vue
@@ -12,7 +12,7 @@ const AdaptContainer = defineComponent({
     settings: { type: Object as PropType<Settings>, required: true },
     scope: { type: String, default: 'preview' }
   },
-  setup(props, { emit }) {
+  setup(props) {
     const isLoading = ref(true)
     const containerElement = ref<HTMLDivElement>()
 
@@ -21,7 +21,6 @@ const AdaptContainer = defineComponent({
         containerElement.value.innerHTML = props.contentToAdapt
         await adaptHtmlElementAsync(containerElement.value, props.settings, props.scope)
         isLoading.value = false
-        emit('ready') // Only for ms-word addin
       }
     }
 
diff --git a/apps/ms-word-addin/src/components/AdaptContainer.vue b/apps/ms-word-addin/src/components/AdaptContainer.vue
index 3c04710c..99d172a5 100644
--- a/apps/ms-word-addin/src/components/AdaptContainer.vue
+++ b/apps/ms-word-addin/src/components/AdaptContainer.vue
@@ -12,7 +12,7 @@ const AdaptContainer = defineComponent({
     settings: { type: Object as PropType<Settings>, required: true },
     scope: { type: String, default: 'preview' }
   },
-  setup(props, { emit }) {
+  setup(props) {
     const isLoading = ref(true)
     const containerElement = ref<HTMLDivElement>()
 
@@ -21,7 +21,6 @@ const AdaptContainer = defineComponent({
         containerElement.value.innerHTML = props.contentToAdapt
         await adaptHtmlElementAsync(containerElement.value, props.settings, props.scope)
         isLoading.value = false
-        emit('ready') // Only for ms-word addin
       }
     }
 

From bbe43686c85efba2e3f0a35b97feabde82e1a07c Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Fri, 1 Jul 2022 14:34:42 +0200
Subject: [PATCH 34/42] fix(ms-word-addin): PreviewContainer size

---
 apps/ms-word-addin/src/components/PreviewContainer.vue | 2 --
 apps/ms-word-addin/src/views/SettingsMenu.vue          | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/ms-word-addin/src/components/PreviewContainer.vue b/apps/ms-word-addin/src/components/PreviewContainer.vue
index e075b599..93886faa 100644
--- a/apps/ms-word-addin/src/components/PreviewContainer.vue
+++ b/apps/ms-word-addin/src/components/PreviewContainer.vue
@@ -51,8 +51,6 @@ export default PreviewContainer
 
 <style lang="scss" scoped>
 .adapt-container {
-  max-height: 67vh;
-  overflow-y: scroll;
   cursor: pointer;
 
   &:hover {
diff --git a/apps/ms-word-addin/src/views/SettingsMenu.vue b/apps/ms-word-addin/src/views/SettingsMenu.vue
index 9526649b..a46db71d 100644
--- a/apps/ms-word-addin/src/views/SettingsMenu.vue
+++ b/apps/ms-word-addin/src/views/SettingsMenu.vue
@@ -52,7 +52,7 @@ export default SettingsMenu
         <router-view />
       </b-col>
       <b-col lg="3" class="m-1" style="max-height: 32vh">
-        <PreviewContainer :settings="settings" :content-to-adapt="contentToAdapt" />
+        <PreviewContainer class="text-preview" :settings="settings" :content-to-adapt="contentToAdapt" />
 
         <div style="max-height: 8vh">
           <div class="mt-3 d-flex justify-content-between">

From d61a06418c1056a9f0e4f09e8ba330b04b7a73d8 Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Wed, 6 Jul 2022 14:16:23 +0200
Subject: [PATCH 35/42] build: bump lerna to 5.1.x

---
 package.json |    2 +-
 yarn.lock    | 1776 ++++++++++++++++++++++++++++----------------------
 2 files changed, 980 insertions(+), 798 deletions(-)

diff --git a/package.json b/package.json
index e187fafc..831bf026 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
     "jest": "^27.1.0",
     "parcel": "^2.3.1",
     "prettier": "^2.4.1",
+    "lerna": "^5.1.6",
     "rollup": "^2.66.1",
     "rollup-plugin-dts": "^4.2.0",
     "rollup-plugin-terser": "^7.0.2",
@@ -41,7 +42,6 @@
     "apps/*"
   ],
   "dependencies": {
-    "lerna": "^4.0.0",
     "tslib": "^2.3.1"
   },
   "engines": {
diff --git a/yarn.lock b/yarn.lock
index 5d124a40..ed1397b6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -994,7 +994,7 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@gar/promisify@^1.0.1":
+"@gar/promisify@^1.0.1", "@gar/promisify@^1.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
@@ -1030,6 +1030,11 @@
   resolved "https://registry.yarnpkg.com/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz#98c23c950a3d9b6c8f0daed06da6c3af06981340"
   integrity sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==
 
+"@isaacs/string-locale-compare@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz#291c227e93fd407a96ecd59879a35809120e432b"
+  integrity sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ==
+
 "@istanbuljs/load-nyc-config@^1.0.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
@@ -1268,180 +1273,179 @@
   resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.3.tgz#0300943770e04231041a51bd39f0439b5c7ab4f0"
   integrity sha512-nkalE/f1RvRGChwBnEIoBfSEYOXnCRdleKuv6+lePbMDrMZXeDQnqak5XDOeBgrPPyPfAdcCu/B5z+v3VhplGg==
 
-"@lerna/add@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/add/-/add-4.0.0.tgz#c36f57d132502a57b9e7058d1548b7a565ef183f"
-  integrity sha512-cpmAH1iS3k8JBxNvnMqrGTTjbY/ZAiKa1ChJzFevMYY3eeqbvhsBKnBcxjRXtdrJ6bd3dCQM+ZtK+0i682Fhng==
-  dependencies:
-    "@lerna/bootstrap" "4.0.0"
-    "@lerna/command" "4.0.0"
-    "@lerna/filter-options" "4.0.0"
-    "@lerna/npm-conf" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
+"@lerna/add@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/add/-/add-5.1.6.tgz#f839096084a5d34da9e4813ea230da16c99b54c2"
+  integrity sha512-+dc5LUxFSxlTgDcC+nTdbFnUphmcGsypPF0eeYPc6tqUrpOpp3Ubn07dRGG0DbpZjk/roZj38DAvx7LYFalZAQ==
+  dependencies:
+    "@lerna/bootstrap" "5.1.6"
+    "@lerna/command" "5.1.6"
+    "@lerna/filter-options" "5.1.6"
+    "@lerna/npm-conf" "5.1.6"
+    "@lerna/validation-error" "5.1.6"
     dedent "^0.7.0"
     npm-package-arg "^8.1.0"
     p-map "^4.0.0"
-    pacote "^11.2.6"
+    pacote "^13.4.1"
     semver "^7.3.4"
 
-"@lerna/bootstrap@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/bootstrap/-/bootstrap-4.0.0.tgz#5f5c5e2c6cfc8fcec50cb2fbe569a8c607101891"
-  integrity sha512-RkS7UbeM2vu+kJnHzxNRCLvoOP9yGNgkzRdy4UV2hNalD7EP41bLvRVOwRYQ7fhc2QcbhnKNdOBihYRL0LcKtw==
-  dependencies:
-    "@lerna/command" "4.0.0"
-    "@lerna/filter-options" "4.0.0"
-    "@lerna/has-npm-version" "4.0.0"
-    "@lerna/npm-install" "4.0.0"
-    "@lerna/package-graph" "4.0.0"
-    "@lerna/pulse-till-done" "4.0.0"
-    "@lerna/rimraf-dir" "4.0.0"
-    "@lerna/run-lifecycle" "4.0.0"
-    "@lerna/run-topologically" "4.0.0"
-    "@lerna/symlink-binary" "4.0.0"
-    "@lerna/symlink-dependencies" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
+"@lerna/bootstrap@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/bootstrap/-/bootstrap-5.1.6.tgz#70c643071cade4568fc9b22798a183afd787fb66"
+  integrity sha512-mCPYySlkreBmhK+uKhnwmBynVN0v7a6DCy4n3WiZ6oJ2puM/F1+8vjCBsWKmnR8YiLtUQt0dwL1fm/dCZgZy8g==
+  dependencies:
+    "@lerna/command" "5.1.6"
+    "@lerna/filter-options" "5.1.6"
+    "@lerna/has-npm-version" "5.1.6"
+    "@lerna/npm-install" "5.1.6"
+    "@lerna/package-graph" "5.1.6"
+    "@lerna/pulse-till-done" "5.1.6"
+    "@lerna/rimraf-dir" "5.1.6"
+    "@lerna/run-lifecycle" "5.1.6"
+    "@lerna/run-topologically" "5.1.6"
+    "@lerna/symlink-binary" "5.1.6"
+    "@lerna/symlink-dependencies" "5.1.6"
+    "@lerna/validation-error" "5.1.6"
+    "@npmcli/arborist" "5.2.0"
     dedent "^0.7.0"
     get-port "^5.1.1"
     multimatch "^5.0.0"
     npm-package-arg "^8.1.0"
-    npmlog "^4.1.2"
+    npmlog "^6.0.2"
     p-map "^4.0.0"
     p-map-series "^2.1.0"
     p-waterfall "^2.1.1"
-    read-package-tree "^5.3.1"
     semver "^7.3.4"
 
-"@lerna/changed@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/changed/-/changed-4.0.0.tgz#b9fc76cea39b9292a6cd263f03eb57af85c9270b"
-  integrity sha512-cD+KuPRp6qiPOD+BO6S6SN5cARspIaWSOqGBpGnYzLb4uWT8Vk4JzKyYtc8ym1DIwyoFXHosXt8+GDAgR8QrgQ==
+"@lerna/changed@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/changed/-/changed-5.1.6.tgz#bf1c60cb90ac451191eb8cfd3fc807ee7a05ad19"
+  integrity sha512-+dy+qcKZTXmETJm9VVQHuVXfk9OeqPNcJ3qeMvvYBRuMYttEbGZDOrcCjE2vomLGhLpXElHKXnCaJEDAwEla8Q==
   dependencies:
-    "@lerna/collect-updates" "4.0.0"
-    "@lerna/command" "4.0.0"
-    "@lerna/listable" "4.0.0"
-    "@lerna/output" "4.0.0"
+    "@lerna/collect-updates" "5.1.6"
+    "@lerna/command" "5.1.6"
+    "@lerna/listable" "5.1.6"
+    "@lerna/output" "5.1.6"
 
-"@lerna/check-working-tree@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/check-working-tree/-/check-working-tree-4.0.0.tgz#257e36a602c00142e76082a19358e3e1ae8dbd58"
-  integrity sha512-/++bxM43jYJCshBiKP5cRlCTwSJdRSxVmcDAXM+1oUewlZJVSVlnks5eO0uLxokVFvLhHlC5kHMc7gbVFPHv6Q==
+"@lerna/check-working-tree@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/check-working-tree/-/check-working-tree-5.1.6.tgz#c9913325ef8467990217823cfe652e40e1acf964"
+  integrity sha512-WeTO1Vjyw7ZZzM/o1Q+UWFYvvbludM++MaDhEodpNZxL1bDMR3/bvtKa/SNq52aBr4nSKOLVz1BO0Lg+yNaZXQ==
   dependencies:
-    "@lerna/collect-uncommitted" "4.0.0"
-    "@lerna/describe-ref" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
+    "@lerna/collect-uncommitted" "5.1.6"
+    "@lerna/describe-ref" "5.1.6"
+    "@lerna/validation-error" "5.1.6"
 
-"@lerna/child-process@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-4.0.0.tgz#341b96a57dffbd9705646d316e231df6fa4df6e1"
-  integrity sha512-XtCnmCT9eyVsUUHx6y/CTBYdV9g2Cr/VxyseTWBgfIur92/YKClfEtJTbOh94jRT62hlKLqSvux/UhxXVh613Q==
+"@lerna/child-process@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-5.1.6.tgz#d9e88c4fb8287d568938db395937b11c94627d7d"
+  integrity sha512-f0SPxNqXaurSoUMHDVCDjU1uA7/Qa9HnGdxiE9OoDaXaErlVloUT7Wpjbp5khryaJZC4PQ9HnnI3FSA/S/SHaA==
   dependencies:
     chalk "^4.1.0"
     execa "^5.0.0"
     strong-log-transformer "^2.1.0"
 
-"@lerna/clean@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/clean/-/clean-4.0.0.tgz#8f778b6f2617aa2a936a6b5e085ae62498e57dc5"
-  integrity sha512-uugG2iN9k45ITx2jtd8nEOoAtca8hNlDCUM0N3lFgU/b1mEQYAPRkqr1qs4FLRl/Y50ZJ41wUz1eazS+d/0osA==
-  dependencies:
-    "@lerna/command" "4.0.0"
-    "@lerna/filter-options" "4.0.0"
-    "@lerna/prompt" "4.0.0"
-    "@lerna/pulse-till-done" "4.0.0"
-    "@lerna/rimraf-dir" "4.0.0"
+"@lerna/clean@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/clean/-/clean-5.1.6.tgz#5507910ebde670bf4cb843ddb86844f441038f39"
+  integrity sha512-SHRXg6R38NfAtwS8R3hYAacmdDds2Z/51G7YE8bMvmoE4c60eFsBwsCXwwdpPBXL/SdfEGSzoxwEvWHi+f6r7g==
+  dependencies:
+    "@lerna/command" "5.1.6"
+    "@lerna/filter-options" "5.1.6"
+    "@lerna/prompt" "5.1.6"
+    "@lerna/pulse-till-done" "5.1.6"
+    "@lerna/rimraf-dir" "5.1.6"
     p-map "^4.0.0"
     p-map-series "^2.1.0"
     p-waterfall "^2.1.1"
 
-"@lerna/cli@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/cli/-/cli-4.0.0.tgz#8eabd334558836c1664df23f19acb95e98b5bbf3"
-  integrity sha512-Neaw3GzFrwZiRZv2g7g6NwFjs3er1vhraIniEs0jjVLPMNC4eata0na3GfE5yibkM/9d3gZdmihhZdZ3EBdvYA==
+"@lerna/cli@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/cli/-/cli-5.1.6.tgz#94a95cfdc0dd1e482f7b609a8771005e29cb3330"
+  integrity sha512-+cQoaOBK2ISw0z5uuHoP2QlV3EZZMdTPuPCVsLDuUwiJCDI3hF3Ps2qQauAZTKO8Ull7z3qid8Yv8sLNEMNrCA==
   dependencies:
-    "@lerna/global-options" "4.0.0"
+    "@lerna/global-options" "5.1.6"
     dedent "^0.7.0"
-    npmlog "^4.1.2"
+    npmlog "^6.0.2"
     yargs "^16.2.0"
 
-"@lerna/collect-uncommitted@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/collect-uncommitted/-/collect-uncommitted-4.0.0.tgz#855cd64612969371cfc2453b90593053ff1ba779"
-  integrity sha512-ufSTfHZzbx69YNj7KXQ3o66V4RC76ffOjwLX0q/ab//61bObJ41n03SiQEhSlmpP+gmFbTJ3/7pTe04AHX9m/g==
+"@lerna/collect-uncommitted@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/collect-uncommitted/-/collect-uncommitted-5.1.6.tgz#56d0994e4039ec340c0c7d0e6ce5a2cd78df6079"
+  integrity sha512-IvAmcaENJZKXjTsxsalM8+GuApooqcsKJ74q/9yUGwO3FIMevQyz/VDOFDq7e0WCQoq6ttrdNihEjU/QTjNsMw==
   dependencies:
-    "@lerna/child-process" "4.0.0"
+    "@lerna/child-process" "5.1.6"
     chalk "^4.1.0"
-    npmlog "^4.1.2"
+    npmlog "^6.0.2"
 
-"@lerna/collect-updates@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/collect-updates/-/collect-updates-4.0.0.tgz#8e208b1bafd98a372ff1177f7a5e288f6bea8041"
-  integrity sha512-bnNGpaj4zuxsEkyaCZLka9s7nMs58uZoxrRIPJ+nrmrZYp1V5rrd+7/NYTuunOhY2ug1sTBvTAxj3NZQ+JKnOw==
+"@lerna/collect-updates@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/collect-updates/-/collect-updates-5.1.6.tgz#1ff373f01e5cd8b849f5918f2ab8585da3612433"
+  integrity sha512-CjKK3bteJpDzqrNOZMGYSwqF5CQsjiPv6soRdayBlJGXB3YW32M2UFcPD77Fvef/Q0xM7FEch3R3ZnBxgzGprg==
   dependencies:
-    "@lerna/child-process" "4.0.0"
-    "@lerna/describe-ref" "4.0.0"
+    "@lerna/child-process" "5.1.6"
+    "@lerna/describe-ref" "5.1.6"
     minimatch "^3.0.4"
-    npmlog "^4.1.2"
+    npmlog "^6.0.2"
     slash "^3.0.0"
 
-"@lerna/command@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/command/-/command-4.0.0.tgz#991c7971df8f5bf6ae6e42c808869a55361c1b98"
-  integrity sha512-LM9g3rt5FsPNFqIHUeRwWXLNHJ5NKzOwmVKZ8anSp4e1SPrv2HNc1V02/9QyDDZK/w+5POXH5lxZUI1CHaOK/A==
-  dependencies:
-    "@lerna/child-process" "4.0.0"
-    "@lerna/package-graph" "4.0.0"
-    "@lerna/project" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
-    "@lerna/write-log-file" "4.0.0"
+"@lerna/command@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/command/-/command-5.1.6.tgz#22b4218d2ae5fc6f41ef7024d2b55995f8b4d986"
+  integrity sha512-zRiQels/N8LrR3ntkOn9dRE/0kzRKYTvJTdWcjfF7BC7Lz9VsNhPVy7tdv+Un5GZjVKhDQa/Tpn1h2t6/SLaSQ==
+  dependencies:
+    "@lerna/child-process" "5.1.6"
+    "@lerna/package-graph" "5.1.6"
+    "@lerna/project" "5.1.6"
+    "@lerna/validation-error" "5.1.6"
+    "@lerna/write-log-file" "5.1.6"
     clone-deep "^4.0.1"
     dedent "^0.7.0"
     execa "^5.0.0"
     is-ci "^2.0.0"
-    npmlog "^4.1.2"
+    npmlog "^6.0.2"
 
-"@lerna/conventional-commits@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/conventional-commits/-/conventional-commits-4.0.0.tgz#660fb2c7b718cb942ead70110df61f18c6f99750"
-  integrity sha512-CSUQRjJHFrH8eBn7+wegZLV3OrNc0Y1FehYfYGhjLE2SIfpCL4bmfu/ViYuHh9YjwHaA+4SX6d3hR+xkeseKmw==
+"@lerna/conventional-commits@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/conventional-commits/-/conventional-commits-5.1.6.tgz#a37f671a46974ed7221e2fab801d5d41de9eb069"
+  integrity sha512-kgdQNglEtsIL6wWAhJieghcvvgpZxG2t2HPy+G/wx1qUbeUqTVkw0z88BDDZ7xOfQh6ffJ5GvLZhAj+LjijYxQ==
   dependencies:
-    "@lerna/validation-error" "4.0.0"
+    "@lerna/validation-error" "5.1.6"
     conventional-changelog-angular "^5.0.12"
     conventional-changelog-core "^4.2.2"
     conventional-recommended-bump "^6.1.0"
     fs-extra "^9.1.0"
     get-stream "^6.0.0"
-    lodash.template "^4.5.0"
     npm-package-arg "^8.1.0"
-    npmlog "^4.1.2"
+    npmlog "^6.0.2"
     pify "^5.0.0"
     semver "^7.3.4"
 
-"@lerna/create-symlink@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/create-symlink/-/create-symlink-4.0.0.tgz#8c5317ce5ae89f67825443bd7651bf4121786228"
-  integrity sha512-I0phtKJJdafUiDwm7BBlEUOtogmu8+taxq6PtIrxZbllV9hWg59qkpuIsiFp+no7nfRVuaasNYHwNUhDAVQBig==
+"@lerna/create-symlink@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/create-symlink/-/create-symlink-5.1.6.tgz#1a8e003a194da246e3ba0a22d7b4e4c847c15809"
+  integrity sha512-qkooK66GY2veqHEarbMraCzdgFpg8hwt3vjuBp9sMddYccXb7HHIsTXIOJPn4H5xFizblcRzf8fUJ73XkQZpUw==
   dependencies:
     cmd-shim "^4.1.0"
     fs-extra "^9.1.0"
-    npmlog "^4.1.2"
+    npmlog "^6.0.2"
 
-"@lerna/create@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/create/-/create-4.0.0.tgz#b6947e9b5dfb6530321952998948c3e63d64d730"
-  integrity sha512-mVOB1niKByEUfxlbKTM1UNECWAjwUdiioIbRQZEeEabtjCL69r9rscIsjlGyhGWCfsdAG5wfq4t47nlDXdLLag==
+"@lerna/create@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/create/-/create-5.1.6.tgz#0e84aabcb4777c17b080f732b9e53d69aa8ae9cb"
+  integrity sha512-KVwxoYQsojgoUl3AxYSOM40Pa0Coo0SLKV57abVKfHmxfIEyvcGgtxNn6eA3M1lDVntqdlaBmNatkZRt3N1EHg==
   dependencies:
-    "@lerna/child-process" "4.0.0"
-    "@lerna/command" "4.0.0"
-    "@lerna/npm-conf" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
+    "@lerna/child-process" "5.1.6"
+    "@lerna/command" "5.1.6"
+    "@lerna/npm-conf" "5.1.6"
+    "@lerna/validation-error" "5.1.6"
     dedent "^0.7.0"
     fs-extra "^9.1.0"
     globby "^11.0.2"
     init-package-json "^2.0.2"
     npm-package-arg "^8.1.0"
     p-reduce "^2.1.0"
-    pacote "^11.2.6"
+    pacote "^13.4.1"
     pify "^5.0.0"
     semver "^7.3.4"
     slash "^3.0.0"
@@ -1450,493 +1454,504 @@
     whatwg-url "^8.4.0"
     yargs-parser "20.2.4"
 
-"@lerna/describe-ref@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/describe-ref/-/describe-ref-4.0.0.tgz#53c53b4ea65fdceffa072a62bfebe6772c45d9ec"
-  integrity sha512-eTU5+xC4C5Gcgz+Ey4Qiw9nV2B4JJbMulsYJMW8QjGcGh8zudib7Sduj6urgZXUYNyhYpRs+teci9M2J8u+UvQ==
-  dependencies:
-    "@lerna/child-process" "4.0.0"
-    npmlog "^4.1.2"
-
-"@lerna/diff@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/diff/-/diff-4.0.0.tgz#6d3071817aaa4205a07bf77cfc6e932796d48b92"
-  integrity sha512-jYPKprQVg41+MUMxx6cwtqsNm0Yxx9GDEwdiPLwcUTFx+/qKCEwifKNJ1oGIPBxyEHX2PFCOjkK39lHoj2qiag==
-  dependencies:
-    "@lerna/child-process" "4.0.0"
-    "@lerna/command" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
-    npmlog "^4.1.2"
-
-"@lerna/exec@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/exec/-/exec-4.0.0.tgz#eb6cb95cb92d42590e9e2d628fcaf4719d4a8be6"
-  integrity sha512-VGXtL/b/JfY84NB98VWZpIExfhLOzy0ozm/0XaS4a2SmkAJc5CeUfrhvHxxkxiTBLkU+iVQUyYEoAT0ulQ8PCw==
-  dependencies:
-    "@lerna/child-process" "4.0.0"
-    "@lerna/command" "4.0.0"
-    "@lerna/filter-options" "4.0.0"
-    "@lerna/profiler" "4.0.0"
-    "@lerna/run-topologically" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
+"@lerna/describe-ref@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/describe-ref/-/describe-ref-5.1.6.tgz#417c4f55b9b3a7d76131fe2da5dd1fa891c7f769"
+  integrity sha512-1VIy0hTkTnlcPqy5Q1hBMJALZbVhjMvRhCnzSgkP0dEuYjaRTyxr0DbhZ4CThREQuqfE3PB2f3DaHVRO8pSSeA==
+  dependencies:
+    "@lerna/child-process" "5.1.6"
+    npmlog "^6.0.2"
+
+"@lerna/diff@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/diff/-/diff-5.1.6.tgz#07b1cc1cc6a1b38d05a4779d5915468f938d7dfc"
+  integrity sha512-UdZ2yHkeTczfwevY8zTIz3kX9gl57e7fkVfNM5zEXifvhbmIozjreurgD2LWf6k/fkEORaFeQ+4dcWGerE70rQ==
+  dependencies:
+    "@lerna/child-process" "5.1.6"
+    "@lerna/command" "5.1.6"
+    "@lerna/validation-error" "5.1.6"
+    npmlog "^6.0.2"
+
+"@lerna/exec@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/exec/-/exec-5.1.6.tgz#de3fb272a14f6c66d4f6bd798ccd458bd4475ef7"
+  integrity sha512-1OGca09bVdMD5a2jr7kBQMyWMger6rzwgBWOdHxPaIajPJVUTqhcLBrtJA9qVZol7jztWgDLR3mFxrvmqGijaQ==
+  dependencies:
+    "@lerna/child-process" "5.1.6"
+    "@lerna/command" "5.1.6"
+    "@lerna/filter-options" "5.1.6"
+    "@lerna/profiler" "5.1.6"
+    "@lerna/run-topologically" "5.1.6"
+    "@lerna/validation-error" "5.1.6"
     p-map "^4.0.0"
 
-"@lerna/filter-options@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/filter-options/-/filter-options-4.0.0.tgz#ac94cc515d7fa3b47e2f7d74deddeabb1de5e9e6"
-  integrity sha512-vV2ANOeZhOqM0rzXnYcFFCJ/kBWy/3OA58irXih9AMTAlQLymWAK0akWybl++sUJ4HB9Hx12TOqaXbYS2NM5uw==
+"@lerna/filter-options@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/filter-options/-/filter-options-5.1.6.tgz#cd9a9bba7ec040f5165d46cef5f0496bef140881"
+  integrity sha512-lssUzYGXEJONS14NHCMp5ddL2aNLamDQufYJh9ziNswcG2lxnis+aeboPxCAQooLptGqcIs6QXkcLo27GXsmbg==
   dependencies:
-    "@lerna/collect-updates" "4.0.0"
-    "@lerna/filter-packages" "4.0.0"
+    "@lerna/collect-updates" "5.1.6"
+    "@lerna/filter-packages" "5.1.6"
     dedent "^0.7.0"
-    npmlog "^4.1.2"
+    npmlog "^6.0.2"
 
-"@lerna/filter-packages@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/filter-packages/-/filter-packages-4.0.0.tgz#b1f70d70e1de9cdd36a4e50caa0ac501f8d012f2"
-  integrity sha512-+4AJIkK7iIiOaqCiVTYJxh/I9qikk4XjNQLhE3kixaqgMuHl1NQ99qXRR0OZqAWB9mh8Z1HA9bM5K1HZLBTOqA==
+"@lerna/filter-packages@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/filter-packages/-/filter-packages-5.1.6.tgz#438477438fec319d237d35833cd147323f3c800e"
+  integrity sha512-5cpAdwQoaGsutsY0xmd0x59IixFVZdpovxXiuhIGAakBdrwbNxNpstqJjnOEakOZ/arVQ0ozTUtZK7Vk0GjR9A==
   dependencies:
-    "@lerna/validation-error" "4.0.0"
+    "@lerna/validation-error" "5.1.6"
     multimatch "^5.0.0"
-    npmlog "^4.1.2"
+    npmlog "^6.0.2"
 
-"@lerna/get-npm-exec-opts@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-4.0.0.tgz#dc955be94a4ae75c374ef9bce91320887d34608f"
-  integrity sha512-yvmkerU31CTWS2c7DvmAWmZVeclPBqI7gPVr5VATUKNWJ/zmVcU4PqbYoLu92I9Qc4gY1TuUplMNdNuZTSL7IQ==
+"@lerna/get-npm-exec-opts@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-5.1.6.tgz#83f81184ac295c3423752b50382b8e0665c987f4"
+  integrity sha512-YQDHGrN/Ti56sAwBkV5y/Bn2H/aJ8fQzKG+blWdkcJgoBV04I5po0IbgKiGKl57+pd2bPpDEtcA6WYPyI1Spfw==
   dependencies:
-    npmlog "^4.1.2"
+    npmlog "^6.0.2"
 
-"@lerna/get-packed@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/get-packed/-/get-packed-4.0.0.tgz#0989d61624ac1f97e393bdad2137c49cd7a37823"
-  integrity sha512-rfWONRsEIGyPJTxFzC8ECb3ZbsDXJbfqWYyeeQQDrJRPnEJErlltRLPLgC2QWbxFgFPsoDLeQmFHJnf0iDfd8w==
+"@lerna/get-packed@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/get-packed/-/get-packed-5.1.6.tgz#af3a2992849573b5dece17322c5d9ce80fd9f832"
+  integrity sha512-m2LojNTkwSiC5dqvLP2gCj5ljPE1e8I2G/U8hIqdVttMwz5JAGbIx3MfACUBG83d5FzSqnCIA1xNkrEZFB4cQg==
   dependencies:
     fs-extra "^9.1.0"
     ssri "^8.0.1"
     tar "^6.1.0"
 
-"@lerna/github-client@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/github-client/-/github-client-4.0.0.tgz#2ced67721363ef70f8e12ffafce4410918f4a8a4"
-  integrity sha512-2jhsldZtTKXYUBnOm23Lb0Fx8G4qfSXF9y7UpyUgWUj+YZYd+cFxSuorwQIgk5P4XXrtVhsUesIsli+BYSThiw==
+"@lerna/github-client@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/github-client/-/github-client-5.1.6.tgz#6c20168ee8dc8ac55f2296ffb9ff204f3bc12664"
+  integrity sha512-ZydjvlhjUKT9HrB1xdcfBB7u/9Vlod1U2V91qj2CqCaWfwG5ob9jXK4v6tLEzZMGxUKKE2OQCyF7o20tHfkcJQ==
   dependencies:
-    "@lerna/child-process" "4.0.0"
+    "@lerna/child-process" "5.1.6"
     "@octokit/plugin-enterprise-rest" "^6.0.1"
     "@octokit/rest" "^18.1.0"
     git-url-parse "^11.4.4"
-    npmlog "^4.1.2"
+    npmlog "^6.0.2"
 
-"@lerna/gitlab-client@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/gitlab-client/-/gitlab-client-4.0.0.tgz#00dad73379c7b38951d4b4ded043504c14e2b67d"
-  integrity sha512-OMUpGSkeDWFf7BxGHlkbb35T7YHqVFCwBPSIR6wRsszY8PAzCYahtH3IaJzEJyUg6vmZsNl0FSr3pdA2skhxqA==
+"@lerna/gitlab-client@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/gitlab-client/-/gitlab-client-5.1.6.tgz#1d600363ccfb798a93ce41a2a62084a148d57125"
+  integrity sha512-ck5XsIz7mQdBNtfKhH4dPrD6t1UZxWBrQeIUsCLO+NorXqYcG8Oqvmzrfm0iByCvaC1QCf+zImJYvMOzjozIpg==
   dependencies:
     node-fetch "^2.6.1"
-    npmlog "^4.1.2"
+    npmlog "^6.0.2"
     whatwg-url "^8.4.0"
 
-"@lerna/global-options@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/global-options/-/global-options-4.0.0.tgz#c7d8b0de6a01d8a845e2621ea89e7f60f18c6a5f"
-  integrity sha512-TRMR8afAHxuYBHK7F++Ogop2a82xQjoGna1dvPOY6ltj/pEx59pdgcJfYcynYqMkFIk8bhLJJN9/ndIfX29FTQ==
+"@lerna/global-options@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/global-options/-/global-options-5.1.6.tgz#f6f6f4988c1dcb39d3877c0ef629e0256ed81b44"
+  integrity sha512-NHMVGs5zhxbtqnBuwujzanYhf7q/HsXBtPn0M/eJpEvcAXaMZgttUMyS2/1JnAUelrAbSMbT+0iOUzSlyD1gtw==
 
-"@lerna/has-npm-version@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/has-npm-version/-/has-npm-version-4.0.0.tgz#d3fc3292c545eb28bd493b36e6237cf0279f631c"
-  integrity sha512-LQ3U6XFH8ZmLCsvsgq1zNDqka0Xzjq5ibVN+igAI5ccRWNaUsE/OcmsyMr50xAtNQMYMzmpw5GVLAivT2/YzCg==
+"@lerna/has-npm-version@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/has-npm-version/-/has-npm-version-5.1.6.tgz#5e6f7a0b2f24382a56e654be187d0002950cf109"
+  integrity sha512-hDY5/qxp98oacg9fhBfbDmjuRCVHm1brdKsY76FJ4vN+m89sVhXLqqsSHNKCTiQ8OgSzokO2iQeysvgM7ZlqAg==
   dependencies:
-    "@lerna/child-process" "4.0.0"
+    "@lerna/child-process" "5.1.6"
     semver "^7.3.4"
 
-"@lerna/import@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/import/-/import-4.0.0.tgz#bde656c4a451fa87ae41733ff8a8da60547c5465"
-  integrity sha512-FaIhd+4aiBousKNqC7TX1Uhe97eNKf5/SC7c5WZANVWtC7aBWdmswwDt3usrzCNpj6/Wwr9EtEbYROzxKH8ffg==
-  dependencies:
-    "@lerna/child-process" "4.0.0"
-    "@lerna/command" "4.0.0"
-    "@lerna/prompt" "4.0.0"
-    "@lerna/pulse-till-done" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
+"@lerna/import@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/import/-/import-5.1.6.tgz#2cd7a8c3a5ef8df1992d0e8f8a31110a3380fb66"
+  integrity sha512-RhWC/3heIevWseY+jzOfGiqPmTofaYyOOqd7+SVaVdSy79TGU0crxWpUECo7COc/FMflFVa+jlk1/JSXWpqG8g==
+  dependencies:
+    "@lerna/child-process" "5.1.6"
+    "@lerna/command" "5.1.6"
+    "@lerna/prompt" "5.1.6"
+    "@lerna/pulse-till-done" "5.1.6"
+    "@lerna/validation-error" "5.1.6"
     dedent "^0.7.0"
     fs-extra "^9.1.0"
     p-map-series "^2.1.0"
 
-"@lerna/info@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/info/-/info-4.0.0.tgz#b9fb0e479d60efe1623603958a831a88b1d7f1fc"
-  integrity sha512-8Uboa12kaCSZEn4XRfPz5KU9XXoexSPS4oeYGj76s2UQb1O1GdnEyfjyNWoUl1KlJ2i/8nxUskpXIftoFYH0/Q==
+"@lerna/info@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/info/-/info-5.1.6.tgz#d6f2b79a2c18eba14f8655b14601f1f84c60e61e"
+  integrity sha512-iB4rNweghxng4U7VUsN03M2mDRgjDr8Bv+llXGhtJoSrZ9XzJYyCvGaExG30sBr5VHaArIzJ11nnF0kSDg3bXg==
   dependencies:
-    "@lerna/command" "4.0.0"
-    "@lerna/output" "4.0.0"
+    "@lerna/command" "5.1.6"
+    "@lerna/output" "5.1.6"
     envinfo "^7.7.4"
 
-"@lerna/init@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/init/-/init-4.0.0.tgz#dadff67e6dfb981e8ccbe0e6a310e837962f6c7a"
-  integrity sha512-wY6kygop0BCXupzWj5eLvTUqdR7vIAm0OgyV9WHpMYQGfs1V22jhztt8mtjCloD/O0nEe4tJhdG62XU5aYmPNQ==
+"@lerna/init@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/init/-/init-5.1.6.tgz#2a00a242f69a30f710fa55f39501c2aeb4cd9618"
+  integrity sha512-S8N2vjWcHrqaowYLrX2KEbhXrs31q5wU5sfsjaJ4UxQd/cBUXvp4OWI98lRTQmXOOcw9XwJNDHhZXIR30Pn0aA==
   dependencies:
-    "@lerna/child-process" "4.0.0"
-    "@lerna/command" "4.0.0"
+    "@lerna/child-process" "5.1.6"
+    "@lerna/command" "5.1.6"
     fs-extra "^9.1.0"
     p-map "^4.0.0"
     write-json-file "^4.3.0"
 
-"@lerna/link@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/link/-/link-4.0.0.tgz#c3a38aabd44279d714e90f2451e31b63f0fb65ba"
-  integrity sha512-KlvPi7XTAcVOByfaLlOeYOfkkDcd+bejpHMCd1KcArcFTwijOwXOVi24DYomIeHvy6HsX/IUquJ4PPUJIeB4+w==
+"@lerna/link@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/link/-/link-5.1.6.tgz#93123d2b03307444440698c96ff889e56044623f"
+  integrity sha512-H94MHjhltS8lMA3J38fzcbtQvNe1OoaMO/ZgacC9HvrntIoepqG/2boOKprW6cnTBSwmIFVCn2+LQloBJ2Nwbw==
   dependencies:
-    "@lerna/command" "4.0.0"
-    "@lerna/package-graph" "4.0.0"
-    "@lerna/symlink-dependencies" "4.0.0"
+    "@lerna/command" "5.1.6"
+    "@lerna/package-graph" "5.1.6"
+    "@lerna/symlink-dependencies" "5.1.6"
     p-map "^4.0.0"
     slash "^3.0.0"
 
-"@lerna/list@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/list/-/list-4.0.0.tgz#24b4e6995bd73f81c556793fe502b847efd9d1d7"
-  integrity sha512-L2B5m3P+U4Bif5PultR4TI+KtW+SArwq1i75QZ78mRYxPc0U/piau1DbLOmwrdqr99wzM49t0Dlvl6twd7GHFg==
+"@lerna/list@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/list/-/list-5.1.6.tgz#61e25437a3a642866cabd1a162d53e95b45c2066"
+  integrity sha512-GofR6H1YKoVMj0Rczk9Y+Z/y7ymOKkklRLsUJQE0nWmlKkH8/tdxGHIgfR4sX2oiwtQGfFDc8ddtLX7DHAhMiA==
   dependencies:
-    "@lerna/command" "4.0.0"
-    "@lerna/filter-options" "4.0.0"
-    "@lerna/listable" "4.0.0"
-    "@lerna/output" "4.0.0"
+    "@lerna/command" "5.1.6"
+    "@lerna/filter-options" "5.1.6"
+    "@lerna/listable" "5.1.6"
+    "@lerna/output" "5.1.6"
 
-"@lerna/listable@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/listable/-/listable-4.0.0.tgz#d00d6cb4809b403f2b0374fc521a78e318b01214"
-  integrity sha512-/rPOSDKsOHs5/PBLINZOkRIX1joOXUXEtyUs5DHLM8q6/RP668x/1lFhw6Dx7/U+L0+tbkpGtZ1Yt0LewCLgeQ==
+"@lerna/listable@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/listable/-/listable-5.1.6.tgz#4b77de64f699f96bae8ccfe07d917f68bd10ffae"
+  integrity sha512-Aslj1Lo/t1jnyX+uKvBY4vyAsYKqW9A6nJ8+o1egkQ/bha8Ic4dr5z7HCBKhJl73iAHRMVNn8KlxM+E7pjwsoQ==
   dependencies:
-    "@lerna/query-graph" "4.0.0"
+    "@lerna/query-graph" "5.1.6"
     chalk "^4.1.0"
-    columnify "^1.5.4"
+    columnify "^1.6.0"
 
-"@lerna/log-packed@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/log-packed/-/log-packed-4.0.0.tgz#95168fe2e26ac6a71e42f4be857519b77e57a09f"
-  integrity sha512-+dpCiWbdzgMAtpajLToy9PO713IHoE6GV/aizXycAyA07QlqnkpaBNZ8DW84gHdM1j79TWockGJo9PybVhrrZQ==
+"@lerna/log-packed@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/log-packed/-/log-packed-5.1.6.tgz#90b95915610b52b67ded3a62d5de20d73024eafd"
+  integrity sha512-yCtgNgEmicqCVb39RO9pRQQGJaugGcsKtvaS1cDLR+M7vlF8gaSvo9t4bZExFzEF5oWcPf4T1FMuhNV12h/uJg==
   dependencies:
     byte-size "^7.0.0"
-    columnify "^1.5.4"
+    columnify "^1.6.0"
     has-unicode "^2.0.1"
-    npmlog "^4.1.2"
+    npmlog "^6.0.2"
 
-"@lerna/npm-conf@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/npm-conf/-/npm-conf-4.0.0.tgz#b259fd1e1cee2bf5402b236e770140ff9ade7fd2"
-  integrity sha512-uS7H02yQNq3oejgjxAxqq/jhwGEE0W0ntr8vM3EfpCW1F/wZruwQw+7bleJQ9vUBjmdXST//tk8mXzr5+JXCfw==
+"@lerna/npm-conf@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-conf/-/npm-conf-5.1.6.tgz#534707babd7ad83d14c70ecb3f36b3c2c3dfa880"
+  integrity sha512-7x8334t9SO2bih7qJa2s8LFuSOZk5QzZ9q1xG9xNSF8BjrhjsGOVghQ1R97l/1zTkBwhqmb1sxLcvH1e21h+MQ==
   dependencies:
     config-chain "^1.1.12"
     pify "^5.0.0"
 
-"@lerna/npm-dist-tag@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/npm-dist-tag/-/npm-dist-tag-4.0.0.tgz#d1e99b4eccd3414142f0548ad331bf2d53f3257a"
-  integrity sha512-F20sg28FMYTgXqEQihgoqSfwmq+Id3zT23CnOwD+XQMPSy9IzyLf1fFVH319vXIw6NF6Pgs4JZN2Qty6/CQXGw==
+"@lerna/npm-dist-tag@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-dist-tag/-/npm-dist-tag-5.1.6.tgz#5231193e2512669a1244c910489c26463e6bdc35"
+  integrity sha512-mwjnjqN+Z8z2lAAnOE/2L8OiLChCL374ltaxNOGnhLyWKdCFoit7qhiIIV05CgoE2/iJQoOZP7ioP3H7JtJbsw==
   dependencies:
-    "@lerna/otplease" "4.0.0"
+    "@lerna/otplease" "5.1.6"
     npm-package-arg "^8.1.0"
     npm-registry-fetch "^9.0.0"
-    npmlog "^4.1.2"
+    npmlog "^6.0.2"
 
-"@lerna/npm-install@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/npm-install/-/npm-install-4.0.0.tgz#31180be3ab3b7d1818a1a0c206aec156b7094c78"
-  integrity sha512-aKNxq2j3bCH3eXl3Fmu4D54s/YLL9WSwV8W7X2O25r98wzrO38AUN6AB9EtmAx+LV/SP15et7Yueg9vSaanRWg==
+"@lerna/npm-install@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-install/-/npm-install-5.1.6.tgz#424c6a18042329c1057d55d9a1c7fe52df58239f"
+  integrity sha512-SKqXATVPVEGS2xtNNjxGhY1/C9huxYnETelpwAB/eSLcMT4FFBVxeQ83NF9log4w+iCUaS+veElfuF2uvPxaPg==
   dependencies:
-    "@lerna/child-process" "4.0.0"
-    "@lerna/get-npm-exec-opts" "4.0.0"
+    "@lerna/child-process" "5.1.6"
+    "@lerna/get-npm-exec-opts" "5.1.6"
     fs-extra "^9.1.0"
     npm-package-arg "^8.1.0"
-    npmlog "^4.1.2"
+    npmlog "^6.0.2"
     signal-exit "^3.0.3"
     write-pkg "^4.0.0"
 
-"@lerna/npm-publish@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/npm-publish/-/npm-publish-4.0.0.tgz#84eb62e876fe949ae1fd62c60804423dbc2c4472"
-  integrity sha512-vQb7yAPRo5G5r77DRjHITc9piR9gvEKWrmfCH7wkfBnGWEqu7n8/4bFQ7lhnkujvc8RXOsYpvbMQkNfkYibD/w==
+"@lerna/npm-publish@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-publish/-/npm-publish-5.1.6.tgz#74b41aa670e6a043ed7841679e27424542ab8447"
+  integrity sha512-ce5UMVZZwjpwkKdekXc1xCtwb4ZKwRVsxHCQFoCisE1/3Pw6+5DBptBOgjmJGa1VA7glxGgp5a6aSERA5grA/g==
   dependencies:
-    "@lerna/otplease" "4.0.0"
-    "@lerna/run-lifecycle" "4.0.0"
+    "@lerna/otplease" "5.1.6"
+    "@lerna/run-lifecycle" "5.1.6"
     fs-extra "^9.1.0"
     libnpmpublish "^4.0.0"
     npm-package-arg "^8.1.0"
-    npmlog "^4.1.2"
+    npmlog "^6.0.2"
     pify "^5.0.0"
     read-package-json "^3.0.0"
 
-"@lerna/npm-run-script@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/npm-run-script/-/npm-run-script-4.0.0.tgz#dfebf4f4601442e7c0b5214f9fb0d96c9350743b"
-  integrity sha512-Jmyh9/IwXJjOXqKfIgtxi0bxi1pUeKe5bD3S81tkcy+kyng/GNj9WSqD5ZggoNP2NP//s4CLDAtUYLdP7CU9rA==
+"@lerna/npm-run-script@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-run-script/-/npm-run-script-5.1.6.tgz#9d1c4b5fa615fb10a1cf55c09a1428e6c3a0b158"
+  integrity sha512-9M7XGnrBoitRnzAT6UGzHtBdQB+HmpsMd+ks7laK7VeqP1rR3t7XXZOm0avMBx2lSBBFSpDIkD4HV0/MeDtcZQ==
   dependencies:
-    "@lerna/child-process" "4.0.0"
-    "@lerna/get-npm-exec-opts" "4.0.0"
-    npmlog "^4.1.2"
+    "@lerna/child-process" "5.1.6"
+    "@lerna/get-npm-exec-opts" "5.1.6"
+    npmlog "^6.0.2"
 
-"@lerna/otplease@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/otplease/-/otplease-4.0.0.tgz#84972eb43448f8a1077435ba1c5e59233b725850"
-  integrity sha512-Sgzbqdk1GH4psNiT6hk+BhjOfIr/5KhGBk86CEfHNJTk9BK4aZYyJD4lpDbDdMjIV4g03G7pYoqHzH765T4fxw==
+"@lerna/otplease@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/otplease/-/otplease-5.1.6.tgz#31548e54d0e3d0853d9ac1dd1e72a464a6bb4f02"
+  integrity sha512-HFiiMIuP2BoiN/V8I5KS2xZjlrnBEJSKY/oIkIRFIoL/9uvHRorKjlsi0KsQLnLHx3+pZ+AL65LXjt54sJdWiQ==
   dependencies:
-    "@lerna/prompt" "4.0.0"
+    "@lerna/prompt" "5.1.6"
 
-"@lerna/output@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/output/-/output-4.0.0.tgz#b1d72215c0e35483e4f3e9994debc82c621851f2"
-  integrity sha512-Un1sHtO1AD7buDQrpnaYTi2EG6sLF+KOPEAMxeUYG5qG3khTs2Zgzq5WE3dt2N/bKh7naESt20JjIW6tBELP0w==
+"@lerna/output@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/output/-/output-5.1.6.tgz#e69dd303bbb636971caf0c24e9259aafb92b207a"
+  integrity sha512-FjZfnDwiKHeKMEZVN2eWbVd0pKINwXRjDXV0CGo1HrTvbXQI3lcrhgoPkDE42BSALaH7E9N0YCUYOYVWlJvSzQ==
   dependencies:
-    npmlog "^4.1.2"
+    npmlog "^6.0.2"
 
-"@lerna/pack-directory@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/pack-directory/-/pack-directory-4.0.0.tgz#8b617db95d20792f043aaaa13a9ccc0e04cb4c74"
-  integrity sha512-NJrmZNmBHS+5aM+T8N6FVbaKFScVqKlQFJNY2k7nsJ/uklNKsLLl6VhTQBPwMTbf6Tf7l6bcKzpy7aePuq9UiQ==
+"@lerna/pack-directory@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/pack-directory/-/pack-directory-5.1.6.tgz#64fbd571ba346da6b0dbc4e7339851df1b97092c"
+  integrity sha512-dKFFQ95BheshI4eWOVYT7DF6iM8VITTwOfueLnnUe8h8OgBDHnZJOEHT+zNjvXo6sA0DtN8pvpxA8VVEroq2KQ==
   dependencies:
-    "@lerna/get-packed" "4.0.0"
-    "@lerna/package" "4.0.0"
-    "@lerna/run-lifecycle" "4.0.0"
+    "@lerna/get-packed" "5.1.6"
+    "@lerna/package" "5.1.6"
+    "@lerna/run-lifecycle" "5.1.6"
+    "@lerna/temp-write" "5.1.6"
     npm-packlist "^2.1.4"
-    npmlog "^4.1.2"
+    npmlog "^6.0.2"
     tar "^6.1.0"
-    temp-write "^4.0.0"
 
-"@lerna/package-graph@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/package-graph/-/package-graph-4.0.0.tgz#16a00253a8ac810f72041481cb46bcee8d8123dd"
-  integrity sha512-QED2ZCTkfXMKFoTGoccwUzjHtZMSf3UKX14A4/kYyBms9xfFsesCZ6SLI5YeySEgcul8iuIWfQFZqRw+Qrjraw==
+"@lerna/package-graph@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/package-graph/-/package-graph-5.1.6.tgz#553edc82bc489449127386f420d0e0f78574b49b"
+  integrity sha512-kAmcZLbFcgzdwwEE34ls2hKKwLNXrp++Lb3QgLi5oZl95cGEXjhGNqECdY+hAgBxaSOAgrAd9dvxoR36zl5LJw==
   dependencies:
-    "@lerna/prerelease-id-from-version" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
+    "@lerna/prerelease-id-from-version" "5.1.6"
+    "@lerna/validation-error" "5.1.6"
     npm-package-arg "^8.1.0"
-    npmlog "^4.1.2"
+    npmlog "^6.0.2"
     semver "^7.3.4"
 
-"@lerna/package@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/package/-/package-4.0.0.tgz#1b4c259c4bcff45c876ee1d591a043aacbc0d6b7"
-  integrity sha512-l0M/izok6FlyyitxiQKr+gZLVFnvxRQdNhzmQ6nRnN9dvBJWn+IxxpM+cLqGACatTnyo9LDzNTOj2Db3+s0s8Q==
+"@lerna/package@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/package/-/package-5.1.6.tgz#90159a4d3857178bc35c53a4e53636b4cf68ea35"
+  integrity sha512-OwsYEVVDEFIybYSh3edn5ZH7EoMPEmfl92pri3rqtaGYj76/ENGaQZSXT5ZH2oJKg5Jh9LrtaYAc+r/fZ+1vuQ==
   dependencies:
     load-json-file "^6.2.0"
     npm-package-arg "^8.1.0"
     write-pkg "^4.0.0"
 
-"@lerna/prerelease-id-from-version@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-4.0.0.tgz#c7e0676fcee1950d85630e108eddecdd5b48c916"
-  integrity sha512-GQqguzETdsYRxOSmdFZ6zDBXDErIETWOqomLERRY54f4p+tk4aJjoVdd9xKwehC9TBfIFvlRbL1V9uQGHh1opg==
+"@lerna/prerelease-id-from-version@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-5.1.6.tgz#ce03815e967433784bbfe9b989e3368008684642"
+  integrity sha512-LJYIuxw9rpKkCWtE10gOOyqpcKRzV34Ljk0L0WSaXILlcWf5bAb0ZmF8t5UJ/MzhGklYwT/Fk0yPtVtu7GnBaA==
   dependencies:
     semver "^7.3.4"
 
-"@lerna/profiler@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/profiler/-/profiler-4.0.0.tgz#8a53ab874522eae15d178402bff90a14071908e9"
-  integrity sha512-/BaEbqnVh1LgW/+qz8wCuI+obzi5/vRE8nlhjPzdEzdmWmZXuCKyWSEzAyHOJWw1ntwMiww5dZHhFQABuoFz9Q==
+"@lerna/profiler@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/profiler/-/profiler-5.1.6.tgz#9d67bde76e119187f35f5dc8d5c1ffe8cf92ee83"
+  integrity sha512-ZFU7WPIk7FxblnGx9Ux0W+NLnTGTIpjdVWEzi/8QkJssmjxerbW62lO5tvGzv6kjPQsml2kC7yPBwX9JEOFCdQ==
   dependencies:
     fs-extra "^9.1.0"
-    npmlog "^4.1.2"
+    npmlog "^6.0.2"
     upath "^2.0.1"
 
-"@lerna/project@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/project/-/project-4.0.0.tgz#ff84893935833533a74deff30c0e64ddb7f0ba6b"
-  integrity sha512-o0MlVbDkD5qRPkFKlBZsXZjoNTWPyuL58564nSfZJ6JYNmgAptnWPB2dQlAc7HWRZkmnC2fCkEdoU+jioPavbg==
+"@lerna/project@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/project/-/project-5.1.6.tgz#a8a79c78f9c9b5406cba77ab75986e265e61940a"
+  integrity sha512-9EXc2uTDfruvJcWnW3UrDZCAgZ/LUOQDC92xBSi1qazSE3fEsfrLBJmMqUzBRTuGoGh5BPnJgA2l0It01z51dQ==
   dependencies:
-    "@lerna/package" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
+    "@lerna/package" "5.1.6"
+    "@lerna/validation-error" "5.1.6"
     cosmiconfig "^7.0.0"
     dedent "^0.7.0"
     dot-prop "^6.0.1"
     glob-parent "^5.1.1"
     globby "^11.0.2"
     load-json-file "^6.2.0"
-    npmlog "^4.1.2"
+    npmlog "^6.0.2"
     p-map "^4.0.0"
     resolve-from "^5.0.0"
     write-json-file "^4.3.0"
 
-"@lerna/prompt@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/prompt/-/prompt-4.0.0.tgz#5ec69a803f3f0db0ad9f221dad64664d3daca41b"
-  integrity sha512-4Ig46oCH1TH5M7YyTt53fT6TuaKMgqUUaqdgxvp6HP6jtdak6+amcsqB8YGz2eQnw/sdxunx84DfI9XpoLj4bQ==
+"@lerna/prompt@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/prompt/-/prompt-5.1.6.tgz#3f1ea0655f047ae0a001a8645152df4c0a77816a"
+  integrity sha512-3Ds/N8mzb1zyTq079CMPCg2wfo5cwVBtr0N5Bh9A+NERQuLavxF1tBRKRYLF4h9zHdybNvAMkKfoQkkyJNliQg==
   dependencies:
     inquirer "^7.3.3"
-    npmlog "^4.1.2"
-
-"@lerna/publish@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-4.0.0.tgz#f67011305adeba120066a3b6d984a5bb5fceef65"
-  integrity sha512-K8jpqjHrChH22qtkytA5GRKIVFEtqBF6JWj1I8dWZtHs4Jywn8yB1jQ3BAMLhqmDJjWJtRck0KXhQQKzDK2UPg==
-  dependencies:
-    "@lerna/check-working-tree" "4.0.0"
-    "@lerna/child-process" "4.0.0"
-    "@lerna/collect-updates" "4.0.0"
-    "@lerna/command" "4.0.0"
-    "@lerna/describe-ref" "4.0.0"
-    "@lerna/log-packed" "4.0.0"
-    "@lerna/npm-conf" "4.0.0"
-    "@lerna/npm-dist-tag" "4.0.0"
-    "@lerna/npm-publish" "4.0.0"
-    "@lerna/otplease" "4.0.0"
-    "@lerna/output" "4.0.0"
-    "@lerna/pack-directory" "4.0.0"
-    "@lerna/prerelease-id-from-version" "4.0.0"
-    "@lerna/prompt" "4.0.0"
-    "@lerna/pulse-till-done" "4.0.0"
-    "@lerna/run-lifecycle" "4.0.0"
-    "@lerna/run-topologically" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
-    "@lerna/version" "4.0.0"
+    npmlog "^6.0.2"
+
+"@lerna/publish@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-5.1.6.tgz#9148b47e73e3fdcc0dace0f2c079951f0f63b2a5"
+  integrity sha512-ZGB4JJBUTBnx5N37qNdyZ+iZX4KXtjbEnB3WU7HH7IzMHc4JZbDEQhAyfELKdvB4gEdYJTsfA8v8J75U3HcluA==
+  dependencies:
+    "@lerna/check-working-tree" "5.1.6"
+    "@lerna/child-process" "5.1.6"
+    "@lerna/collect-updates" "5.1.6"
+    "@lerna/command" "5.1.6"
+    "@lerna/describe-ref" "5.1.6"
+    "@lerna/log-packed" "5.1.6"
+    "@lerna/npm-conf" "5.1.6"
+    "@lerna/npm-dist-tag" "5.1.6"
+    "@lerna/npm-publish" "5.1.6"
+    "@lerna/otplease" "5.1.6"
+    "@lerna/output" "5.1.6"
+    "@lerna/pack-directory" "5.1.6"
+    "@lerna/prerelease-id-from-version" "5.1.6"
+    "@lerna/prompt" "5.1.6"
+    "@lerna/pulse-till-done" "5.1.6"
+    "@lerna/run-lifecycle" "5.1.6"
+    "@lerna/run-topologically" "5.1.6"
+    "@lerna/validation-error" "5.1.6"
+    "@lerna/version" "5.1.6"
     fs-extra "^9.1.0"
     libnpmaccess "^4.0.1"
     npm-package-arg "^8.1.0"
     npm-registry-fetch "^9.0.0"
-    npmlog "^4.1.2"
+    npmlog "^6.0.2"
     p-map "^4.0.0"
     p-pipe "^3.1.0"
-    pacote "^11.2.6"
+    pacote "^13.4.1"
     semver "^7.3.4"
 
-"@lerna/pulse-till-done@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/pulse-till-done/-/pulse-till-done-4.0.0.tgz#04bace7d483a8205c187b806bcd8be23d7bb80a3"
-  integrity sha512-Frb4F7QGckaybRhbF7aosLsJ5e9WuH7h0KUkjlzSByVycxY91UZgaEIVjS2oN9wQLrheLMHl6SiFY0/Pvo0Cxg==
+"@lerna/pulse-till-done@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/pulse-till-done/-/pulse-till-done-5.1.6.tgz#0b79ea17c877ae06a6ae2d41386cd2503df96e66"
+  integrity sha512-R9YpgGAlRB9XyYBZt41i8rLsnLqUDB8LYlOFhfrBX0Y1mI0/+9iYIHF0xBemrHqimQftu3QxvEoxpsDrXUJBIg==
   dependencies:
-    npmlog "^4.1.2"
+    npmlog "^6.0.2"
 
-"@lerna/query-graph@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/query-graph/-/query-graph-4.0.0.tgz#09dd1c819ac5ee3f38db23931143701f8a6eef63"
-  integrity sha512-YlP6yI3tM4WbBmL9GCmNDoeQyzcyg1e4W96y/PKMZa5GbyUvkS2+Jc2kwPD+5KcXou3wQZxSPzR3Te5OenaDdg==
+"@lerna/query-graph@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/query-graph/-/query-graph-5.1.6.tgz#8729cf6d634d7ad978a35674184a9693418bc6c2"
+  integrity sha512-67dzRjCGjYjEUpO3PwFIcTpgJhaQO4WT687bpJh8M5XaS0xeaz2g+e1C9U/n8xIHJm3N2PlKYMSczuvPhSayCw==
   dependencies:
-    "@lerna/package-graph" "4.0.0"
+    "@lerna/package-graph" "5.1.6"
 
-"@lerna/resolve-symlink@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/resolve-symlink/-/resolve-symlink-4.0.0.tgz#6d006628a210c9b821964657a9e20a8c9a115e14"
-  integrity sha512-RtX8VEUzqT+uLSCohx8zgmjc6zjyRlh6i/helxtZTMmc4+6O4FS9q5LJas2uGO2wKvBlhcD6siibGt7dIC3xZA==
+"@lerna/resolve-symlink@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/resolve-symlink/-/resolve-symlink-5.1.6.tgz#57928c17d76971749f862f89fe6de8b84bc81e34"
+  integrity sha512-+2rCXIj8jM31WRPqUffBAb1e5TimgSDSPTM/q52cvSs+JRgqiw+aVx/8FgG/a/bMg+5+Zx/+A4c8KxnWCjLF5A==
   dependencies:
     fs-extra "^9.1.0"
-    npmlog "^4.1.2"
+    npmlog "^6.0.2"
     read-cmd-shim "^2.0.0"
 
-"@lerna/rimraf-dir@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/rimraf-dir/-/rimraf-dir-4.0.0.tgz#2edf3b62d4eb0ef4e44e430f5844667d551ec25a"
-  integrity sha512-QNH9ABWk9mcMJh2/muD9iYWBk1oQd40y6oH+f3wwmVGKYU5YJD//+zMiBI13jxZRtwBx0vmBZzkBkK1dR11cBg==
+"@lerna/rimraf-dir@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/rimraf-dir/-/rimraf-dir-5.1.6.tgz#dff2eb82bcbde1cd5a4d186d1df8aa5cb03b816e"
+  integrity sha512-8J9LrlW/IzSvDXxk7hbobofSOXvKS2o+q6vdamrwLapk2KfI/KGh0auBo/s4Rvr5t6OZfpr4/woLJyQFdnwWWA==
   dependencies:
-    "@lerna/child-process" "4.0.0"
-    npmlog "^4.1.2"
+    "@lerna/child-process" "5.1.6"
+    npmlog "^6.0.2"
     path-exists "^4.0.0"
     rimraf "^3.0.2"
 
-"@lerna/run-lifecycle@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/run-lifecycle/-/run-lifecycle-4.0.0.tgz#e648a46f9210a9bcd7c391df6844498cb5079334"
-  integrity sha512-IwxxsajjCQQEJAeAaxF8QdEixfI7eLKNm4GHhXHrgBu185JcwScFZrj9Bs+PFKxwb+gNLR4iI5rpUdY8Y0UdGQ==
+"@lerna/run-lifecycle@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/run-lifecycle/-/run-lifecycle-5.1.6.tgz#8a43e28660b8929b76f6a16088a055fb31ecba1b"
+  integrity sha512-rTLQwIwUtN6+WpyFceZoahi1emTlLwJYwTMBZZla3w6aBwERdfpEvB4MVz2F6/TTYmJ2uzWa1Y85faGH4x4blA==
   dependencies:
-    "@lerna/npm-conf" "4.0.0"
-    npm-lifecycle "^3.1.5"
-    npmlog "^4.1.2"
+    "@lerna/npm-conf" "5.1.6"
+    "@npmcli/run-script" "^3.0.2"
+    npmlog "^6.0.2"
 
-"@lerna/run-topologically@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/run-topologically/-/run-topologically-4.0.0.tgz#af846eeee1a09b0c2be0d1bfb5ef0f7b04bb1827"
-  integrity sha512-EVZw9hGwo+5yp+VL94+NXRYisqgAlj0jWKWtAIynDCpghRxCE5GMO3xrQLmQgqkpUl9ZxQFpICgYv5DW4DksQA==
+"@lerna/run-topologically@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/run-topologically/-/run-topologically-5.1.6.tgz#a34e5ce84dcddaa3e94d742c44b7233e7baf1ed8"
+  integrity sha512-2THwjyU/aq7NOUmjCKQYK7l78fUoBwBtWXFGfeqK5xN5LBc2zr293cC1Z7CAZHUVh1JklLWL0PXX8Z34g3210g==
   dependencies:
-    "@lerna/query-graph" "4.0.0"
+    "@lerna/query-graph" "5.1.6"
     p-queue "^6.6.2"
 
-"@lerna/run@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/run/-/run-4.0.0.tgz#4bc7fda055a729487897c23579694f6183c91262"
-  integrity sha512-9giulCOzlMPzcZS/6Eov6pxE9gNTyaXk0Man+iCIdGJNMrCnW7Dme0Z229WWP/UoxDKg71F2tMsVVGDiRd8fFQ==
-  dependencies:
-    "@lerna/command" "4.0.0"
-    "@lerna/filter-options" "4.0.0"
-    "@lerna/npm-run-script" "4.0.0"
-    "@lerna/output" "4.0.0"
-    "@lerna/profiler" "4.0.0"
-    "@lerna/run-topologically" "4.0.0"
-    "@lerna/timer" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
+"@lerna/run@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/run/-/run-5.1.6.tgz#1e47bfb792109e37740d65786e7079c666c3fd15"
+  integrity sha512-WMZF4tKFL/hGhUHphcYJNUDGvpHdrLD8ysACiqgIyu5ssIWiXb0wbUO0OeGWMss0b7TNOUG1y6DGOPFWFWRd3w==
+  dependencies:
+    "@lerna/command" "5.1.6"
+    "@lerna/filter-options" "5.1.6"
+    "@lerna/npm-run-script" "5.1.6"
+    "@lerna/output" "5.1.6"
+    "@lerna/profiler" "5.1.6"
+    "@lerna/run-topologically" "5.1.6"
+    "@lerna/timer" "5.1.6"
+    "@lerna/validation-error" "5.1.6"
     p-map "^4.0.0"
 
-"@lerna/symlink-binary@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/symlink-binary/-/symlink-binary-4.0.0.tgz#21009f62d53a425f136cb4c1a32c6b2a0cc02d47"
-  integrity sha512-zualodWC4q1QQc1pkz969hcFeWXOsVYZC5AWVtAPTDfLl+TwM7eG/O6oP+Rr3fFowspxo6b1TQ6sYfDV6HXNWA==
+"@lerna/symlink-binary@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/symlink-binary/-/symlink-binary-5.1.6.tgz#ce4d5be8d8a4885c3f3e81007137c4ae393311d0"
+  integrity sha512-nj5a77e8Vk+AZY+batyr+lCo3EcGTiGjSP0MFnkXKn1wUyUUZiKgS48J/9RTNdTpWZRC4G2PneR6BUmnF6Mnlg==
   dependencies:
-    "@lerna/create-symlink" "4.0.0"
-    "@lerna/package" "4.0.0"
+    "@lerna/create-symlink" "5.1.6"
+    "@lerna/package" "5.1.6"
     fs-extra "^9.1.0"
     p-map "^4.0.0"
 
-"@lerna/symlink-dependencies@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/symlink-dependencies/-/symlink-dependencies-4.0.0.tgz#8910eca084ae062642d0490d8972cf2d98e9ebbd"
-  integrity sha512-BABo0MjeUHNAe2FNGty1eantWp8u83BHSeIMPDxNq0MuW2K3CiQRaeWT3EGPAzXpGt0+hVzBrA6+OT0GPn7Yuw==
+"@lerna/symlink-dependencies@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/symlink-dependencies/-/symlink-dependencies-5.1.6.tgz#38f5a94e6450b0bff0c17b3e44b4d527827cea24"
+  integrity sha512-nMVTEm8oi3TrKXmDeS9445zngWQR31AShKH+u9f+YZVYE1Ncv4/XpgDSkTNsbm//vMi0ilWH+QQxjBC+pDXd8Q==
   dependencies:
-    "@lerna/create-symlink" "4.0.0"
-    "@lerna/resolve-symlink" "4.0.0"
-    "@lerna/symlink-binary" "4.0.0"
+    "@lerna/create-symlink" "5.1.6"
+    "@lerna/resolve-symlink" "5.1.6"
+    "@lerna/symlink-binary" "5.1.6"
     fs-extra "^9.1.0"
     p-map "^4.0.0"
     p-map-series "^2.1.0"
 
-"@lerna/timer@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/timer/-/timer-4.0.0.tgz#a52e51bfcd39bfd768988049ace7b15c1fd7a6da"
-  integrity sha512-WFsnlaE7SdOvjuyd05oKt8Leg3ENHICnvX3uYKKdByA+S3g+TCz38JsNs7OUZVt+ba63nC2nbXDlUnuT2Xbsfg==
-
-"@lerna/validation-error@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/validation-error/-/validation-error-4.0.0.tgz#af9d62fe8304eaa2eb9a6ba1394f9aa807026d35"
-  integrity sha512-1rBOM5/koiVWlRi3V6dB863E1YzJS8v41UtsHgMr6gB2ncJ2LsQtMKlJpi3voqcgh41H8UsPXR58RrrpPpufyw==
+"@lerna/temp-write@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/temp-write/-/temp-write-5.1.6.tgz#3b486297b1ccc732c3dbea34e6f42a6198ba2c82"
+  integrity sha512-Ycb0dNBi5bwgVyc/aeZ5JmgSEWfaJjh9efFqDfsj763HBLr9sBZvqQYBRXGAWxBdDWy+lXTXximsQw5gJZZxpw==
   dependencies:
-    npmlog "^4.1.2"
+    graceful-fs "^4.1.15"
+    is-stream "^2.0.0"
+    make-dir "^3.0.0"
+    temp-dir "^1.0.0"
+    uuid "^8.3.2"
 
-"@lerna/version@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/version/-/version-4.0.0.tgz#532659ec6154d8a8789c5ab53878663e244e3228"
-  integrity sha512-otUgiqs5W9zGWJZSCCMRV/2Zm2A9q9JwSDS7s/tlKq4mWCYriWo7+wsHEA/nPTMDyYyBO5oyZDj+3X50KDUzeA==
-  dependencies:
-    "@lerna/check-working-tree" "4.0.0"
-    "@lerna/child-process" "4.0.0"
-    "@lerna/collect-updates" "4.0.0"
-    "@lerna/command" "4.0.0"
-    "@lerna/conventional-commits" "4.0.0"
-    "@lerna/github-client" "4.0.0"
-    "@lerna/gitlab-client" "4.0.0"
-    "@lerna/output" "4.0.0"
-    "@lerna/prerelease-id-from-version" "4.0.0"
-    "@lerna/prompt" "4.0.0"
-    "@lerna/run-lifecycle" "4.0.0"
-    "@lerna/run-topologically" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
+"@lerna/timer@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/timer/-/timer-5.1.6.tgz#a0fdebc3cbce93907b6855515726c31e8e5c50ac"
+  integrity sha512-m28ufTfg7zibqPujxborrTy9WrocCmoMXvw1PuSZ0LCf5hhK3HUJJ8ybxYAGpUXdZqjzvRQNlc954GsOkCSJEA==
+
+"@lerna/validation-error@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/validation-error/-/validation-error-5.1.6.tgz#12371dcc8dc610e04644b1bcf05535c6487755ca"
+  integrity sha512-6+rc1bGTqaRMvML8Qew+RoqZFxyESSX+GBCTv0pW1SBcNo/yC76fq9y/WSA3dn6GuqHWyX3H0Yki7HutezM7/A==
+  dependencies:
+    npmlog "^6.0.2"
+
+"@lerna/version@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/version/-/version-5.1.6.tgz#7d0906e130bd29046a3827088033b9b7d2289545"
+  integrity sha512-UE7ZHUdHtlmHQPK8ZSc62BHnWXIPqV7nzQAM/tQngIGSAH0oXHjxktP4ysPRqX8U0jfl212fSveVK7HK988zoQ==
+  dependencies:
+    "@lerna/check-working-tree" "5.1.6"
+    "@lerna/child-process" "5.1.6"
+    "@lerna/collect-updates" "5.1.6"
+    "@lerna/command" "5.1.6"
+    "@lerna/conventional-commits" "5.1.6"
+    "@lerna/github-client" "5.1.6"
+    "@lerna/gitlab-client" "5.1.6"
+    "@lerna/output" "5.1.6"
+    "@lerna/prerelease-id-from-version" "5.1.6"
+    "@lerna/prompt" "5.1.6"
+    "@lerna/run-lifecycle" "5.1.6"
+    "@lerna/run-topologically" "5.1.6"
+    "@lerna/temp-write" "5.1.6"
+    "@lerna/validation-error" "5.1.6"
     chalk "^4.1.0"
     dedent "^0.7.0"
     load-json-file "^6.2.0"
     minimatch "^3.0.4"
-    npmlog "^4.1.2"
+    npmlog "^6.0.2"
     p-map "^4.0.0"
     p-pipe "^3.1.0"
     p-reduce "^2.1.0"
     p-waterfall "^2.1.1"
     semver "^7.3.4"
     slash "^3.0.0"
-    temp-write "^4.0.0"
     write-json-file "^4.3.0"
 
-"@lerna/write-log-file@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/write-log-file/-/write-log-file-4.0.0.tgz#18221a38a6a307d6b0a5844dd592ad53fa27091e"
-  integrity sha512-XRG5BloiArpXRakcnPHmEHJp+4AtnhRtpDIHSghmXD5EichI1uD73J7FgPp30mm2pDRq3FdqB0NbwSEsJ9xFQg==
+"@lerna/write-log-file@5.1.6":
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/@lerna/write-log-file/-/write-log-file-5.1.6.tgz#88f62ca90dd947246a0bf0a45c3012e919002ec6"
+  integrity sha512-UfuERC0dN5cw6Vc11/8fDfnXfuEQXKbOweJ2D83nrNJIZS/HwWkAoYVZ493w7xJzrqKi6V352BY3m9D7pi8h5g==
   dependencies:
-    npmlog "^4.1.2"
+    npmlog "^6.0.2"
     write-file-atomic "^3.0.3"
 
 "@mdn/browser-compat-data@^4.1.16":
@@ -1972,6 +1987,46 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
+"@npmcli/arborist@5.2.0":
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-5.2.0.tgz#ee40dfe1f81ae1524819ee39c8f3e7022b0d6269"
+  integrity sha512-zWV7scFGL0SmpvfQyIWnMFbU/0YgtMNyvJiJwR98kyjUSntJGWFFR0O600d5W+TrDcTg0GyDbY+HdzGEg+GXLg==
+  dependencies:
+    "@isaacs/string-locale-compare" "^1.1.0"
+    "@npmcli/installed-package-contents" "^1.0.7"
+    "@npmcli/map-workspaces" "^2.0.3"
+    "@npmcli/metavuln-calculator" "^3.0.1"
+    "@npmcli/move-file" "^2.0.0"
+    "@npmcli/name-from-folder" "^1.0.1"
+    "@npmcli/node-gyp" "^2.0.0"
+    "@npmcli/package-json" "^2.0.0"
+    "@npmcli/run-script" "^3.0.0"
+    bin-links "^3.0.0"
+    cacache "^16.0.6"
+    common-ancestor-path "^1.0.1"
+    json-parse-even-better-errors "^2.3.1"
+    json-stringify-nice "^1.1.4"
+    mkdirp "^1.0.4"
+    mkdirp-infer-owner "^2.0.0"
+    nopt "^5.0.0"
+    npm-install-checks "^5.0.0"
+    npm-package-arg "^9.0.0"
+    npm-pick-manifest "^7.0.0"
+    npm-registry-fetch "^13.0.0"
+    npmlog "^6.0.2"
+    pacote "^13.0.5"
+    parse-conflict-json "^2.0.1"
+    proc-log "^2.0.0"
+    promise-all-reject-late "^1.0.0"
+    promise-call-limit "^1.0.1"
+    read-package-json-fast "^2.0.2"
+    readdir-scoped-modules "^1.1.0"
+    rimraf "^3.0.2"
+    semver "^7.3.7"
+    ssri "^9.0.0"
+    treeverse "^2.0.0"
+    walk-up-path "^1.0.0"
+
 "@npmcli/ci-detect@^1.0.0":
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/@npmcli/ci-detect/-/ci-detect-1.4.0.tgz#18478bbaa900c37bfbd8a2006a6262c62e8b0fe1"
@@ -1985,21 +2040,30 @@
     "@gar/promisify" "^1.0.1"
     semver "^7.3.5"
 
-"@npmcli/git@^2.1.0":
+"@npmcli/fs@^2.1.0":
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-2.1.0.tgz#2fbd77e147530247d37f325930d457b3ebe894f6"
-  integrity sha512-/hBFX/QG1b+N7PZBFs0bi+evgRZcK9nWBxQKZkGoXUT5hJSwl5c4d7y8/hm+NQZRPhQ67RzFaj5UM9YeyKoryw==
+  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.0.tgz#f2a21c28386e299d1a9fae8051d35ad180e33109"
+  integrity sha512-DmfBvNXGaetMxj9LTp8NAN9vEidXURrf5ZTslQzEAi/6GbW+4yjaLFQc6Tue5cpZ9Frlk4OBo/Snf1Bh/S7qTQ==
   dependencies:
-    "@npmcli/promise-spawn" "^1.3.2"
-    lru-cache "^6.0.0"
+    "@gar/promisify" "^1.1.3"
+    semver "^7.3.5"
+
+"@npmcli/git@^3.0.0":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-3.0.1.tgz#049b99b1381a2ddf7dc56ba3e91eaf76ca803a8d"
+  integrity sha512-UU85F/T+F1oVn3IsB/L6k9zXIMpXBuUBE25QDH0SsURwT6IOBqkC7M16uqo2vVZIyji3X1K4XH9luip7YekH1A==
+  dependencies:
+    "@npmcli/promise-spawn" "^3.0.0"
+    lru-cache "^7.4.4"
     mkdirp "^1.0.4"
-    npm-pick-manifest "^6.1.1"
+    npm-pick-manifest "^7.0.0"
+    proc-log "^2.0.0"
     promise-inflight "^1.0.1"
     promise-retry "^2.0.1"
     semver "^7.3.5"
     which "^2.0.2"
 
-"@npmcli/installed-package-contents@^1.0.6":
+"@npmcli/installed-package-contents@^1.0.7":
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz#ab7408c6147911b970a8abe261ce512232a3f4fa"
   integrity sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw==
@@ -2007,6 +2071,26 @@
     npm-bundled "^1.1.1"
     npm-normalize-package-bin "^1.0.1"
 
+"@npmcli/map-workspaces@^2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@npmcli/map-workspaces/-/map-workspaces-2.0.3.tgz#2d3c75119ee53246e9aa75bc469a55281cd5f08f"
+  integrity sha512-X6suAun5QyupNM8iHkNPh0AHdRC2rb1W+MTdMvvA/2ixgmqZwlq5cGUBgmKHUHT2LgrkKJMAXbfAoTxOigpK8Q==
+  dependencies:
+    "@npmcli/name-from-folder" "^1.0.1"
+    glob "^8.0.1"
+    minimatch "^5.0.1"
+    read-package-json-fast "^2.0.3"
+
+"@npmcli/metavuln-calculator@^3.0.1":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/metavuln-calculator/-/metavuln-calculator-3.1.1.tgz#9359bd72b400f8353f6a28a25c8457b562602622"
+  integrity sha512-n69ygIaqAedecLeVH3KnO39M6ZHiJ2dEv5A7DGvcqCB8q17BGUgW8QaanIkbWUo2aYGZqJaOORTLAlIvKjNDKA==
+  dependencies:
+    cacache "^16.0.0"
+    json-parse-even-better-errors "^2.3.1"
+    pacote "^13.0.3"
+    semver "^7.3.5"
+
 "@npmcli/move-file@^1.0.1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
@@ -2015,27 +2099,58 @@
     mkdirp "^1.0.4"
     rimraf "^3.0.2"
 
-"@npmcli/node-gyp@^1.0.2":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-1.0.3.tgz#a912e637418ffc5f2db375e93b85837691a43a33"
-  integrity sha512-fnkhw+fmX65kiLqk6E3BFLXNC26rUhK90zVwe2yncPliVT/Qos3xjhTLE59Df8KnPlcwIERXKVlU1bXoUQ+liA==
+"@npmcli/move-file@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.0.tgz#417f585016081a0184cef3e38902cd917a9bbd02"
+  integrity sha512-UR6D5f4KEGWJV6BGPH3Qb2EtgH+t+1XQ1Tt85c7qicN6cezzuHPdZwwAxqZr4JLtnQu0LZsTza/5gmNmSl8XLg==
+  dependencies:
+    mkdirp "^1.0.4"
+    rimraf "^3.0.2"
 
-"@npmcli/promise-spawn@^1.2.0", "@npmcli/promise-spawn@^1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-1.3.2.tgz#42d4e56a8e9274fba180dabc0aea6e38f29274f5"
-  integrity sha512-QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg==
+"@npmcli/name-from-folder@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/name-from-folder/-/name-from-folder-1.0.1.tgz#77ecd0a4fcb772ba6fe927e2e2e155fbec2e6b1a"
+  integrity sha512-qq3oEfcLFwNfEYOQ8HLimRGKlD8WSeGEdtUa7hmzpR8Sa7haL1KVQrvgO6wqMjhWFFVjgtrh1gIxDz+P8sjUaA==
+
+"@npmcli/node-gyp@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-2.0.0.tgz#8c20e53e34e9078d18815c1d2dda6f2420d75e35"
+  integrity sha512-doNI35wIe3bBaEgrlPfdJPaCpUR89pJWep4Hq3aRdh6gKazIVWfs0jHttvSSoq47ZXgC7h73kDsUl8AoIQUB+A==
+
+"@npmcli/package-json@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-2.0.0.tgz#3bbcf4677e21055adbe673d9f08c9f9cde942e4a"
+  integrity sha512-42jnZ6yl16GzjWSH7vtrmWyJDGVa/LXPdpN2rcUWolFjc9ON2N3uz0qdBbQACfmhuJZ2lbKYtmK5qx68ZPLHMA==
+  dependencies:
+    json-parse-even-better-errors "^2.3.1"
+
+"@npmcli/promise-spawn@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-3.0.0.tgz#53283b5f18f855c6925f23c24e67c911501ef573"
+  integrity sha512-s9SgS+p3a9Eohe68cSI3fi+hpcZUmXq5P7w0kMlAsWVtR7XbK3ptkZqKT2cK1zLDObJ3sR+8P59sJE0w/KTL1g==
   dependencies:
     infer-owner "^1.0.4"
 
-"@npmcli/run-script@^1.8.2":
-  version "1.8.6"
-  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-1.8.6.tgz#18314802a6660b0d4baa4c3afe7f1ad39d8c28b7"
-  integrity sha512-e42bVZnC6VluBZBAFEr3YrdqSspG3bgilyg4nSLBJ7TRGNCzxHa92XAHxQBLYg0BmgwO4b2mf3h/l5EkEWRn3g==
+"@npmcli/run-script@^3.0.0", "@npmcli/run-script@^3.0.2":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-3.0.3.tgz#66afa6e0c4c3484056195f295fa6c1d1a45ddf58"
+  integrity sha512-ZXL6qgC5NjwfZJ2nET+ZSLEz/PJgJ/5CU90C2S66dZY4Jw73DasS4ZCXuy/KHWYP0imjJ4VtA+Gebb5BxxKp9Q==
+  dependencies:
+    "@npmcli/node-gyp" "^2.0.0"
+    "@npmcli/promise-spawn" "^3.0.0"
+    node-gyp "^8.4.1"
+    read-package-json-fast "^2.0.3"
+
+"@npmcli/run-script@^4.1.0":
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-4.1.5.tgz#d60a7d41321612a9c0e1433797c10c19d0213d55"
+  integrity sha512-FyrZkZ+O0bCnQqm+mRb6sKbEJgyJudInwFN84gCcMUcxrWkR15Ags1uOHwnxHYdpj3T5eqrCZNW/Ys20MGTQ6Q==
   dependencies:
-    "@npmcli/node-gyp" "^1.0.2"
-    "@npmcli/promise-spawn" "^1.3.2"
-    node-gyp "^7.1.0"
-    read-package-json-fast "^2.0.1"
+    "@npmcli/node-gyp" "^2.0.0"
+    "@npmcli/promise-spawn" "^3.0.0"
+    node-gyp "^9.0.0"
+    read-package-json-fast "^2.0.3"
+    which "^2.0.2"
 
 "@nuxt/opencollective@^0.3.2":
   version "0.3.2"
@@ -2900,6 +3015,11 @@
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
   integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
 
+"@tootallnate/once@2":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
+  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
+
 "@trysound/sax@0.2.0":
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad"
@@ -3986,7 +4106,7 @@ agent-base@6, agent-base@^6.0.2:
   dependencies:
     debug "4"
 
-agentkeepalive@^4.1.3:
+agentkeepalive@^4.1.3, agentkeepalive@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717"
   integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==
@@ -4064,11 +4184,6 @@ ansi-html-community@^0.0.8:
   resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41"
   integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==
 
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
-
 ansi-regex@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1"
@@ -4126,12 +4241,7 @@ applicationinsights@^1.7.3:
     diagnostic-channel "0.3.1"
     diagnostic-channel-publishers "0.4.4"
 
-aproba@^1.0.3:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
-
-aproba@^2.0.0:
+"aproba@^1.0.3 || ^2.0.0", aproba@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
   integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
@@ -4141,13 +4251,13 @@ arch@^2.1.1:
   resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11"
   integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==
 
-are-we-there-yet@~1.1.2:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146"
-  integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==
+are-we-there-yet@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz#ba20bd6b553e31d62fc8c31bd23d22b95734390d"
+  integrity sha512-0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw==
   dependencies:
     delegates "^1.0.0"
-    readable-stream "^2.0.6"
+    readable-stream "^3.6.0"
 
 arg@^4.1.0:
   version "4.1.3"
@@ -4439,6 +4549,18 @@ big.js@^5.2.2:
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
   integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
 
+bin-links@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-3.0.1.tgz#cc70ffb481988b22c527d3e6e454787876987a49"
+  integrity sha512-9vx+ypzVhASvHTS6K+YSGf7nwQdANoz7v6MTC0aCtYnOEZ87YvMf81aY737EZnGZdpbRM3sfWjO9oWkKmuIvyQ==
+  dependencies:
+    cmd-shim "^5.0.0"
+    mkdirp-infer-owner "^2.0.0"
+    npm-normalize-package-bin "^1.0.0"
+    read-cmd-shim "^3.0.0"
+    rimraf "^3.0.0"
+    write-file-atomic "^4.0.0"
+
 binary-extensions@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
@@ -4596,10 +4718,12 @@ builtins@^1.0.3:
   resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
   integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og=
 
-byline@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
-  integrity sha1-dBxSFkaOrcRXsDQQEYrXfejB3bE=
+builtins@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.0.1.tgz#87f6db9ab0458be728564fa81d876d8d74552fa9"
+  integrity sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==
+  dependencies:
+    semver "^7.0.0"
 
 byte-size@^7.0.0:
   version "7.0.1"
@@ -4640,6 +4764,30 @@ cacache@^15.0.5, cacache@^15.2.0:
     tar "^6.0.2"
     unique-filename "^1.1.1"
 
+cacache@^16.0.0, cacache@^16.0.6, cacache@^16.1.0:
+  version "16.1.1"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.1.tgz#4e79fb91d3efffe0630d5ad32db55cc1b870669c"
+  integrity sha512-VDKN+LHyCQXaaYZ7rA/qtkURU+/yYhviUdvqEv2LT6QPZU8jpyzEkEVAcKlKLt5dJ5BRp11ym8lo3NKLluEPLg==
+  dependencies:
+    "@npmcli/fs" "^2.1.0"
+    "@npmcli/move-file" "^2.0.0"
+    chownr "^2.0.0"
+    fs-minipass "^2.1.0"
+    glob "^8.0.1"
+    infer-owner "^1.0.4"
+    lru-cache "^7.7.1"
+    minipass "^3.1.6"
+    minipass-collect "^1.0.2"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    mkdirp "^1.0.4"
+    p-map "^4.0.0"
+    promise-inflight "^1.0.1"
+    rimraf "^3.0.2"
+    ssri "^9.0.0"
+    tar "^6.1.11"
+    unique-filename "^1.1.1"
+
 call-bind@^1.0.0, call-bind@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
@@ -4783,11 +4931,6 @@ child_process@^1.0.2:
   optionalDependencies:
     fsevents "~2.3.2"
 
-chownr@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
-  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
-
 chownr@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
@@ -4919,16 +5062,18 @@ cmd-shim@^4.1.0:
   dependencies:
     mkdirp-infer-owner "^2.0.0"
 
+cmd-shim@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-5.0.0.tgz#8d0aaa1a6b0708630694c4dbde070ed94c707724"
+  integrity sha512-qkCtZ59BidfEwHltnJwkyVZn+XQojdAySM1D1gSeh11Z4pW1Kpolkyo53L5noc0nrxmIvyFwTmJRo4xs7FFLPw==
+  dependencies:
+    mkdirp-infer-owner "^2.0.0"
+
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
   integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
 
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
-
 collect-v8-coverage@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
@@ -4958,6 +5103,11 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
+color-support@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
+  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
+
 colord@^2.9.1:
   version "2.9.2"
   resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.2.tgz#25e2bacbbaa65991422c07ea209e2089428effb1"
@@ -4968,7 +5118,7 @@ colorette@^2.0.10:
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da"
   integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==
 
-columnify@^1.5.4:
+columnify@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.6.0.tgz#6989531713c9008bb29735e61e37acf5bd553cf3"
   integrity sha512-lomjuFZKfM6MSAnV9aCZC9sc0qGbmZdfygNv+nCpqVkSKdCxCklLtd16O0EILGkImHw9ZpHkAnHaB+8Zxq5W6Q==
@@ -5003,6 +5153,11 @@ commander@^8.3.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
   integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
 
+common-ancestor-path@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz#4f7d2d1394d91b7abdf51871c62f71eadb0182a7"
+  integrity sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w==
+
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@@ -5099,10 +5254,10 @@ consola@^2.15.0:
   resolved "https://registry.yarnpkg.com/consola/-/consola-2.15.3.tgz#2e11f98d6a4be71ff72e0bdf07bd23e12cb61550"
   integrity sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==
 
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+console-control-strings@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
+  integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
 
 consolidate@^0.15.1:
   version "0.15.1"
@@ -5930,7 +6085,7 @@ encodeurl@~1.0.2:
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
-encoding@^0.1.12:
+encoding@^0.1.12, encoding@^0.1.13:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
   integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
@@ -6714,13 +6869,6 @@ fs-extra@^9.0.0, fs-extra@^9.0.1, fs-extra@^9.1.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-minipass@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
-  integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
-  dependencies:
-    minipass "^2.6.0"
-
 fs-minipass@^2.0.0, fs-minipass@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
@@ -6758,19 +6906,19 @@ functions-have-names@^1.2.2:
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.2.tgz#98d93991c39da9361f8e50b337c4f6e41f120e21"
   integrity sha512-bLgc3asbWdwPbx2mNk2S49kmJCuQeu0nfmaOgbs8WIyzzkw3r4htszdIi9Q9EMezDPTYuJx2wvjZ/EwgAthpnA==
 
-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
+gauge@^4.0.3:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
+  integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
   dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
+    aproba "^1.0.3 || ^2.0.0"
+    color-support "^1.1.3"
+    console-control-strings "^1.1.0"
+    has-unicode "^2.0.1"
+    signal-exit "^3.0.7"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
+    wide-align "^1.1.5"
 
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
@@ -6928,6 +7076,17 @@ glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, gl
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^8.0.1:
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e"
+  integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^5.0.1"
+    once "^1.3.0"
+
 globals@^11.1.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
@@ -6952,7 +7111,7 @@ globby@^11.0.2, globby@^11.0.3, globby@^11.0.4:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.3, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
@@ -7038,7 +7197,7 @@ has-tostringtag@^1.0.0:
   dependencies:
     has-symbols "^1.0.2"
 
-has-unicode@^2.0.0, has-unicode@^2.0.1:
+has-unicode@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
   integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
@@ -7087,6 +7246,13 @@ hosted-git-info@^4.0.0, hosted-git-info@^4.0.1:
   dependencies:
     lru-cache "^6.0.0"
 
+hosted-git-info@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-5.0.0.tgz#df7a06678b4ebd722139786303db80fdf302ea56"
+  integrity sha512-rRnjWu0Bxj+nIfUOkz0695C0H6tRrN5iYIzYejb0tDEefe2AekHu/U5Kn9pEie5vsJqpNQU02az7TGSH3qpz4Q==
+  dependencies:
+    lru-cache "^7.5.1"
+
 hpack.js@^2.1.6:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
@@ -7233,6 +7399,15 @@ http-proxy-agent@^4.0.1:
     agent-base "6"
     debug "4"
 
+http-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
+  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
+  dependencies:
+    "@tootallnate/once" "2"
+    agent-base "6"
+    debug "4"
+
 http-proxy-middleware@^2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.4.tgz#03af0f4676d172ae775cb5c33f592f40e1a4e07a"
@@ -7313,6 +7488,13 @@ ignore-walk@^3.0.3:
   dependencies:
     minimatch "^3.0.4"
 
+ignore-walk@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-5.0.1.tgz#5f199e23e1288f518d90358d461387788a154776"
+  integrity sha512-yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw==
+  dependencies:
+    minimatch "^5.0.1"
+
 ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
@@ -7547,13 +7729,6 @@ is-file-esm@^1.0.0:
   dependencies:
     read-pkg-up "^7.0.1"
 
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
-  dependencies:
-    number-is-nan "^1.0.0"
-
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
@@ -8373,7 +8548,7 @@ json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
-json-parse-even-better-errors@^2.3.0:
+json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
@@ -8403,6 +8578,11 @@ json-stable-stringify-without-jsonify@^1.0.1:
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
   integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
 
+json-stringify-nice@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz#2c937962b80181d3f317dd39aa323e14f5a60a67"
+  integrity sha512-5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw==
+
 json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
@@ -8479,6 +8659,16 @@ junk@^3.1.0:
   resolved "https://registry.yarnpkg.com/junk/-/junk-3.1.0.tgz#31499098d902b7e98c5d9b9c80f43457a88abfa1"
   integrity sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==
 
+just-diff-apply@^5.2.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/just-diff-apply/-/just-diff-apply-5.3.1.tgz#30f40809ffed55ad76dccf73fa9b85a76964c867"
+  integrity sha512-dgFenZnMsc1xGNqgdtgnh7DK+Oy352CE3VZLbzcbQpsBs9iI2K3M0IRrdgREZ72eItTjbl0suRyvKRdVQa9GbA==
+
+just-diff@^5.0.1:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/just-diff/-/just-diff-5.0.3.tgz#4c9c514dec5526b25ab977590e3c39a0cf271554"
+  integrity sha512-a8p80xcpJ6sdurk5PxDKb4mav9MeKjA3zFKZpCWBIfvg8mznfnmb13MKZvlrwJ+Lhis0wM3uGAzE0ArhFHvIcg==
+
 kind-of@^3.0.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -8516,29 +8706,29 @@ launch-editor@^2.2.1, launch-editor@^2.3.0:
     picocolors "^1.0.0"
     shell-quote "^1.6.1"
 
-lerna@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/lerna/-/lerna-4.0.0.tgz#b139d685d50ea0ca1be87713a7c2f44a5b678e9e"
-  integrity sha512-DD/i1znurfOmNJb0OBw66NmNqiM8kF6uIrzrJ0wGE3VNdzeOhz9ziWLYiRaZDGGwgbcjOo6eIfcx9O5Qynz+kg==
-  dependencies:
-    "@lerna/add" "4.0.0"
-    "@lerna/bootstrap" "4.0.0"
-    "@lerna/changed" "4.0.0"
-    "@lerna/clean" "4.0.0"
-    "@lerna/cli" "4.0.0"
-    "@lerna/create" "4.0.0"
-    "@lerna/diff" "4.0.0"
-    "@lerna/exec" "4.0.0"
-    "@lerna/import" "4.0.0"
-    "@lerna/info" "4.0.0"
-    "@lerna/init" "4.0.0"
-    "@lerna/link" "4.0.0"
-    "@lerna/list" "4.0.0"
-    "@lerna/publish" "4.0.0"
-    "@lerna/run" "4.0.0"
-    "@lerna/version" "4.0.0"
+lerna@^5.1.6:
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/lerna/-/lerna-5.1.6.tgz#07db65b5cc3683a237f655feb7671f2c2a27255b"
+  integrity sha512-eiLj3IurbEas1rGtntW4Cf2/6y90Ot2oQaU2wv4uo2rHf6GRXUBEZ0nrE4yseDlNtsS/H7bqfrvlAYb3PWUG1A==
+  dependencies:
+    "@lerna/add" "5.1.6"
+    "@lerna/bootstrap" "5.1.6"
+    "@lerna/changed" "5.1.6"
+    "@lerna/clean" "5.1.6"
+    "@lerna/cli" "5.1.6"
+    "@lerna/create" "5.1.6"
+    "@lerna/diff" "5.1.6"
+    "@lerna/exec" "5.1.6"
+    "@lerna/import" "5.1.6"
+    "@lerna/info" "5.1.6"
+    "@lerna/init" "5.1.6"
+    "@lerna/link" "5.1.6"
+    "@lerna/list" "5.1.6"
+    "@lerna/publish" "5.1.6"
+    "@lerna/run" "5.1.6"
+    "@lerna/version" "5.1.6"
     import-local "^3.0.2"
-    npmlog "^4.1.2"
+    npmlog "^6.0.2"
 
 leven@^3.1.0:
   version "3.1.0"
@@ -8668,11 +8858,6 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
-lodash._reinterpolate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
-  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
-
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
@@ -8713,21 +8898,6 @@ lodash.sortby@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
   integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
 
-lodash.template@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
-  integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
-  dependencies:
-    lodash._reinterpolate "^3.0.0"
-    lodash.templatesettings "^4.0.0"
-
-lodash.templatesettings@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33"
-  integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==
-  dependencies:
-    lodash._reinterpolate "^3.0.0"
-
 lodash.truncate@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
@@ -8789,6 +8959,11 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
+lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1:
+  version "7.12.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.12.0.tgz#be2649a992c8a9116efda5c487538dcf715f3476"
+  integrity sha512-OIP3DwzRZDfLg9B9VP/huWBlpvbkmbfiBy8xmsXp4RPmE4A3MhwNozc5ZJ3fWnSg8fDcdlE/neRTPG2ycEKliw==
+
 lunr@^2.3.9:
   version "2.3.9"
   resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.3.9.tgz#18b123142832337dd6e964df1a5a7707b25d35e1"
@@ -8828,6 +9003,28 @@ make-error@1.x, make-error@^1.1.1:
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
+make-fetch-happen@^10.0.3, make-fetch-happen@^10.0.6:
+  version "10.1.8"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.1.8.tgz#3b6e93dd8d8fdb76c0d7bf32e617f37c3108435a"
+  integrity sha512-0ASJbG12Au6+N5I84W+8FhGS6iM8MyzvZady+zaQAu+6IOaESFzCLLD0AR1sAFF3Jufi8bxm586ABN6hWd3k7g==
+  dependencies:
+    agentkeepalive "^4.2.1"
+    cacache "^16.1.0"
+    http-cache-semantics "^4.1.0"
+    http-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.0"
+    is-lambda "^1.0.1"
+    lru-cache "^7.7.1"
+    minipass "^3.1.6"
+    minipass-collect "^1.0.2"
+    minipass-fetch "^2.0.3"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    negotiator "^0.6.3"
+    promise-retry "^2.0.1"
+    socks-proxy-agent "^7.0.0"
+    ssri "^9.0.0"
+
 make-fetch-happen@^8.0.9:
   version "8.0.14"
   resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-8.0.14.tgz#aaba73ae0ab5586ad8eaa68bd83332669393e222"
@@ -8849,7 +9046,7 @@ make-fetch-happen@^8.0.9:
     socks-proxy-agent "^5.0.0"
     ssri "^8.0.0"
 
-make-fetch-happen@^9.0.1:
+make-fetch-happen@^9.0.1, make-fetch-happen@^9.1.0:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968"
   integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==
@@ -9052,6 +9249,17 @@ minipass-fetch@^1.3.0, minipass-fetch@^1.3.2:
   optionalDependencies:
     encoding "^0.1.12"
 
+minipass-fetch@^2.0.3:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.0.tgz#ca1754a5f857a3be99a9271277246ac0b44c3ff8"
+  integrity sha512-H9U4UVBGXEyyWJnqYDCLp1PwD8XIkJ4akNHp1aGVI+2Ym7wQMlxDKi4IB4JbmyU+pl9pEs/cVrK6cOuvmbK4Sg==
+  dependencies:
+    minipass "^3.1.6"
+    minipass-sized "^1.0.3"
+    minizlib "^2.1.2"
+  optionalDependencies:
+    encoding "^0.1.13"
+
 minipass-flush@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
@@ -9081,14 +9289,6 @@ minipass-sized@^1.0.3:
   dependencies:
     minipass "^3.0.0"
 
-minipass@^2.6.0, minipass@^2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
-  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
-  dependencies:
-    safe-buffer "^5.1.2"
-    yallist "^3.0.0"
-
 minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3:
   version "3.1.6"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee"
@@ -9096,14 +9296,14 @@ minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3:
   dependencies:
     yallist "^4.0.0"
 
-minizlib@^1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
-  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
+minipass@^3.1.6:
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz#ca99f95dd77c43c7a76bf51e6d200025eee0ffae"
+  integrity sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==
   dependencies:
-    minipass "^2.9.0"
+    yallist "^4.0.0"
 
-minizlib@^2.0.0, minizlib@^2.1.1:
+minizlib@^2.0.0, minizlib@^2.1.1, minizlib@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
   integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
@@ -9129,7 +9329,7 @@ mkdirp-infer-owner@^2.0.0:
     infer-owner "^1.0.4"
     mkdirp "^1.0.3"
 
-mkdirp@^0.5.1, mkdirp@^0.5.5:
+mkdirp@^0.5.5:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
   integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
@@ -9280,7 +9480,7 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
-negotiator@0.6.3, negotiator@^0.6.2:
+negotiator@0.6.3, negotiator@^0.6.2, negotiator@^0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
@@ -9359,37 +9559,36 @@ node-gyp-build@^4.2.3, node-gyp-build@^4.3.0:
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.4.0.tgz#42e99687ce87ddeaf3a10b99dc06abc11021f3f4"
   integrity sha512-amJnQCcgtRVw9SvoebO3BKGESClrfXGCUTX9hSn1OuGQTQBOZmVd0Z0OlecpuRksKvbsUqALE8jls/ErClAPuQ==
 
-node-gyp@^5.0.2:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.1.1.tgz#eb915f7b631c937d282e33aed44cb7a025f62a3e"
-  integrity sha512-WH0WKGi+a4i4DUt2mHnvocex/xPLp9pYt5R6M2JdFB7pJ7Z34hveZ4nDTGTiLXCkitA9T8HFZjhinBCiVHYcWw==
+node-gyp@^8.4.1:
+  version "8.4.1"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937"
+  integrity sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==
   dependencies:
     env-paths "^2.2.0"
     glob "^7.1.4"
-    graceful-fs "^4.2.2"
-    mkdirp "^0.5.1"
-    nopt "^4.0.1"
-    npmlog "^4.1.2"
-    request "^2.88.0"
-    rimraf "^2.6.3"
-    semver "^5.7.1"
-    tar "^4.4.12"
-    which "^1.3.1"
+    graceful-fs "^4.2.6"
+    make-fetch-happen "^9.1.0"
+    nopt "^5.0.0"
+    npmlog "^6.0.0"
+    rimraf "^3.0.2"
+    semver "^7.3.5"
+    tar "^6.1.2"
+    which "^2.0.2"
 
-node-gyp@^7.1.0:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae"
-  integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==
+node-gyp@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.0.0.tgz#e1da2067427f3eb5bb56820cb62bc6b1e4bd2089"
+  integrity sha512-Ma6p4s+XCTPxCuAMrOA/IJRmVy16R8Sdhtwl4PrCr7IBlj4cPawF0vg/l7nOT1jPbuNS7lIRJpBSvVsXwEZuzw==
   dependencies:
     env-paths "^2.2.0"
     glob "^7.1.4"
-    graceful-fs "^4.2.3"
+    graceful-fs "^4.2.6"
+    make-fetch-happen "^10.0.3"
     nopt "^5.0.0"
-    npmlog "^4.1.2"
-    request "^2.88.2"
+    npmlog "^6.0.0"
     rimraf "^3.0.2"
-    semver "^7.3.2"
-    tar "^6.0.2"
+    semver "^7.3.5"
+    tar "^6.1.2"
     which "^2.0.2"
 
 node-int64@^0.4.0:
@@ -9402,14 +9601,6 @@ node-releases@^2.0.2:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.3.tgz#225ee7488e4a5e636da8da52854844f9d716ca96"
   integrity sha512-maHFz6OLqYxz+VQyCAtA3PTX4UP/53pa05fyDNc9CwjvJ0yEh6+xBwKsgCxMNhS8taUKBFYxfuiaD9U/55iFaw==
 
-nopt@^4.0.1:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48"
-  integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==
-  dependencies:
-    abbrev "1"
-    osenv "^0.1.4"
-
 nopt@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
@@ -9417,7 +9608,7 @@ nopt@^5.0.0:
   dependencies:
     abbrev "1"
 
-normalize-package-data@^2.0.0, normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
+normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -9437,6 +9628,16 @@ normalize-package-data@^3.0.0, normalize-package-data@^3.0.2:
     semver "^7.3.4"
     validate-npm-package-license "^3.0.1"
 
+normalize-package-data@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-4.0.0.tgz#1122d5359af21d4cd08718b92b058a658594177c"
+  integrity sha512-m+GL22VXJKkKbw62ZaBBjv8u6IE3UI4Mh5QakIqs3fWiKe0Xyi6L97hakwZK41/LD4R/2ly71Bayx0NLMwLA/g==
+  dependencies:
+    hosted-git-info "^5.0.0"
+    is-core-module "^2.8.1"
+    semver "^7.3.5"
+    validate-npm-package-license "^3.0.4"
+
 normalize-path@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379"
@@ -9457,40 +9658,26 @@ normalize-url@^6.0.1, normalize-url@^6.1.0:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
   integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
 
-npm-bundled@^1.1.1:
+npm-bundled@^1.1.1, npm-bundled@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1"
   integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==
   dependencies:
     npm-normalize-package-bin "^1.0.1"
 
-npm-install-checks@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-4.0.0.tgz#a37facc763a2fde0497ef2c6d0ac7c3fbe00d7b4"
-  integrity sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w==
+npm-install-checks@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-5.0.0.tgz#5ff27d209a4e3542b8ac6b0c1db6063506248234"
+  integrity sha512-65lUsMI8ztHCxFz5ckCEC44DRvEGdZX5usQFriauxHEwt7upv1FKaQEmAtU0YnOAdwuNWCmk64xYiQABNrEyLA==
   dependencies:
     semver "^7.1.1"
 
-npm-lifecycle@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-3.1.5.tgz#9882d3642b8c82c815782a12e6a1bfeed0026309"
-  integrity sha512-lDLVkjfZmvmfvpvBzA4vzee9cn+Me4orq0QF8glbswJVEbIcSNWib7qGOffolysc3teCqbbPZZkzbr3GQZTL1g==
-  dependencies:
-    byline "^5.0.0"
-    graceful-fs "^4.1.15"
-    node-gyp "^5.0.2"
-    resolve-from "^4.0.0"
-    slide "^1.1.6"
-    uid-number "0.0.6"
-    umask "^1.1.0"
-    which "^1.3.1"
-
 npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
   integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
 
-npm-package-arg@^8.0.0, npm-package-arg@^8.0.1, npm-package-arg@^8.1.0, npm-package-arg@^8.1.2, npm-package-arg@^8.1.5:
+npm-package-arg@^8.0.0, npm-package-arg@^8.1.0, npm-package-arg@^8.1.2, npm-package-arg@^8.1.5:
   version "8.1.5"
   resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.5.tgz#3369b2d5fe8fdc674baa7f1786514ddc15466e44"
   integrity sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==
@@ -9499,6 +9686,16 @@ npm-package-arg@^8.0.0, npm-package-arg@^8.0.1, npm-package-arg@^8.1.0, npm-pack
     semver "^7.3.4"
     validate-npm-package-name "^3.0.0"
 
+npm-package-arg@^9.0.0, npm-package-arg@^9.0.1:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-9.1.0.tgz#a60e9f1e7c03e4e3e4e994ea87fff8b90b522987"
+  integrity sha512-4J0GL+u2Nh6OnhvUKXRr2ZMG4lR8qtLp+kv7UiV00Y+nGiSxtttCyIRHCt5L5BNkXQld/RceYItau3MDOoGiBw==
+  dependencies:
+    hosted-git-info "^5.0.0"
+    proc-log "^2.0.1"
+    semver "^7.3.5"
+    validate-npm-package-name "^4.0.0"
+
 npm-packlist@^2.1.4:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-2.2.2.tgz#076b97293fa620f632833186a7a8f65aaa6148c8"
@@ -9509,15 +9706,25 @@ npm-packlist@^2.1.4:
     npm-bundled "^1.1.1"
     npm-normalize-package-bin "^1.0.1"
 
-npm-pick-manifest@^6.0.0, npm-pick-manifest@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz#7b5484ca2c908565f43b7f27644f36bb816f5148"
-  integrity sha512-dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA==
+npm-packlist@^5.1.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-5.1.1.tgz#79bcaf22a26b6c30aa4dd66b976d69cc286800e0"
+  integrity sha512-UfpSvQ5YKwctmodvPPkK6Fwk603aoVsf8AEbmVKAEECrfvL8SSe1A2YIwrJ6xmTHAITKPwwZsWo7WwEbNk0kxw==
   dependencies:
-    npm-install-checks "^4.0.0"
+    glob "^8.0.1"
+    ignore-walk "^5.0.1"
+    npm-bundled "^1.1.2"
     npm-normalize-package-bin "^1.0.1"
-    npm-package-arg "^8.1.2"
-    semver "^7.3.4"
+
+npm-pick-manifest@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-7.0.1.tgz#76dda30a7cd6b99be822217a935c2f5eacdaca4c"
+  integrity sha512-IA8+tuv8KujbsbLQvselW2XQgmXWS47t3CB0ZrzsRZ82DbDfkcFunOaPm4X7qNuhMfq+FmV7hQT4iFVpHqV7mg==
+  dependencies:
+    npm-install-checks "^5.0.0"
+    npm-normalize-package-bin "^1.0.1"
+    npm-package-arg "^9.0.0"
+    semver "^7.3.5"
 
 npm-registry-fetch@^11.0.0:
   version "11.0.0"
@@ -9531,6 +9738,19 @@ npm-registry-fetch@^11.0.0:
     minizlib "^2.0.0"
     npm-package-arg "^8.0.0"
 
+npm-registry-fetch@^13.0.0, npm-registry-fetch@^13.0.1:
+  version "13.1.1"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-13.1.1.tgz#26dc4b26d0a545886e807748032ba2aefaaae96b"
+  integrity sha512-5p8rwe6wQPLJ8dMqeTnA57Dp9Ox6GH9H60xkyJup07FmVlu3Mk7pf/kIIpl9gaN5bM8NM+UUx3emUWvDNTt39w==
+  dependencies:
+    make-fetch-happen "^10.0.6"
+    minipass "^3.1.6"
+    minipass-fetch "^2.0.3"
+    minipass-json-stream "^1.0.1"
+    minizlib "^2.1.2"
+    npm-package-arg "^9.0.1"
+    proc-log "^2.0.0"
+
 npm-registry-fetch@^9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-9.0.0.tgz#86f3feb4ce00313bc0b8f1f8f69daae6face1661"
@@ -9559,15 +9779,15 @@ npm-run-path@^4.0.1:
   dependencies:
     path-key "^3.0.0"
 
-npmlog@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
+npmlog@^6.0.0, npmlog@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
+  integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
   dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
+    are-we-there-yet "^3.0.0"
+    console-control-strings "^1.1.0"
+    gauge "^4.0.3"
+    set-blocking "^2.0.0"
 
 nth-check@^2.0.1:
   version "2.0.1"
@@ -9588,11 +9808,6 @@ nullthrows@^1.1.1:
   resolved "https://registry.yarnpkg.com/nullthrows/-/nullthrows-1.1.1.tgz#7818258843856ae971eae4208ad7d7eb19a431b1"
   integrity sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw==
 
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
-
 "nwmatcher@>= 1.3.7 < 2.0.0":
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.4.tgz#2285631f34a95f0d0395cd900c96ed39b58f346e"
@@ -9608,7 +9823,7 @@ oauth-sign@~0.9.0:
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
   integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
-object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+object-assign@^4.0.1, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -9656,15 +9871,6 @@ object.fromentries@^2.0.5:
     define-properties "^1.1.3"
     es-abstract "^1.19.1"
 
-object.getownpropertydescriptors@^2.0.3:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz#b223cf38e17fefb97a63c10c91df72ccb386df9e"
-  integrity sha512-VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
-
 object.hasown@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.0.tgz#7232ed266f34d197d15cac5880232f7a4790afe5"
@@ -9893,24 +10099,11 @@ ordered-binary@^1.2.4:
   resolved "https://registry.yarnpkg.com/ordered-binary/-/ordered-binary-1.2.5.tgz#6208c45067eae9d14b8f44791a1d7037adad9147"
   integrity sha512-djRmZoEpOGvIRW7ufsCDHtvcUa18UC9TxnPbHhSVFZHsoyg0dtut1bWtBZ/fmxdPN62oWXrV6adM7NoWU+CneA==
 
-os-homedir@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
-
-os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
+os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-osenv@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
-  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
-
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
@@ -10006,30 +10199,32 @@ p-waterfall@^2.1.1:
   dependencies:
     p-reduce "^2.0.0"
 
-pacote@^11.2.6:
-  version "11.3.5"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-11.3.5.tgz#73cf1fc3772b533f575e39efa96c50be8c3dc9d2"
-  integrity sha512-fT375Yczn4zi+6Hkk2TBe1x1sP8FgFsEIZ2/iWaXY2r/NkhDJfxbcn5paz1+RTFCyNf+dPnaoBDJoAxXSU8Bkg==
+pacote@^13.0.3, pacote@^13.0.5, pacote@^13.4.1:
+  version "13.6.1"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-13.6.1.tgz#ac6cbd9032b4c16e5c1e0c60138dfe44e4cc589d"
+  integrity sha512-L+2BI1ougAPsFjXRyBhcKmfT016NscRFLv6Pz5EiNf1CCFJFU0pSKKQwsZTyAQB+sTuUL4TyFyp6J1Ork3dOqw==
   dependencies:
-    "@npmcli/git" "^2.1.0"
-    "@npmcli/installed-package-contents" "^1.0.6"
-    "@npmcli/promise-spawn" "^1.2.0"
-    "@npmcli/run-script" "^1.8.2"
-    cacache "^15.0.5"
+    "@npmcli/git" "^3.0.0"
+    "@npmcli/installed-package-contents" "^1.0.7"
+    "@npmcli/promise-spawn" "^3.0.0"
+    "@npmcli/run-script" "^4.1.0"
+    cacache "^16.0.0"
     chownr "^2.0.0"
     fs-minipass "^2.1.0"
     infer-owner "^1.0.4"
-    minipass "^3.1.3"
-    mkdirp "^1.0.3"
-    npm-package-arg "^8.0.1"
-    npm-packlist "^2.1.4"
-    npm-pick-manifest "^6.0.0"
-    npm-registry-fetch "^11.0.0"
+    minipass "^3.1.6"
+    mkdirp "^1.0.4"
+    npm-package-arg "^9.0.0"
+    npm-packlist "^5.1.0"
+    npm-pick-manifest "^7.0.0"
+    npm-registry-fetch "^13.0.1"
+    proc-log "^2.0.0"
     promise-retry "^2.0.1"
-    read-package-json-fast "^2.0.1"
+    read-package-json "^5.0.0"
+    read-package-json-fast "^2.0.3"
     rimraf "^3.0.2"
-    ssri "^8.0.1"
-    tar "^6.1.0"
+    ssri "^9.0.0"
+    tar "^6.1.11"
 
 pako@~1.0.2:
   version "1.0.11"
@@ -10071,6 +10266,15 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
+parse-conflict-json@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/parse-conflict-json/-/parse-conflict-json-2.0.2.tgz#3d05bc8ffe07d39600dc6436c6aefe382033d323"
+  integrity sha512-jDbRGb00TAPFsKWCpZZOT93SxVP9nONOSgES3AevqRq/CHvavEBvKAjxX9p5Y5F0RZLxH9Ufd9+RwtCsa+lFDA==
+  dependencies:
+    json-parse-even-better-errors "^2.3.1"
+    just-diff "^5.0.1"
+    just-diff-apply "^5.2.0"
+
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
@@ -10624,6 +10828,11 @@ pretty@2.0.0, pretty@^2.0.0:
     extend-shallow "^2.0.1"
     js-beautify "^1.6.12"
 
+proc-log@^2.0.0, proc-log@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-2.0.1.tgz#8f3f69a1f608de27878f91f5c688b225391cb685"
+  integrity sha512-Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw==
+
 process-nextick-args@~2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
@@ -10648,6 +10857,16 @@ progress@^2.0.0:
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
+promise-all-reject-late@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/promise-all-reject-late/-/promise-all-reject-late-1.0.1.tgz#f8ebf13483e5ca91ad809ccc2fcf25f26f8643c2"
+  integrity sha512-vuf0Lf0lOxyQREH7GDIOUMLS7kz+gs8i6B+Yi8dC68a2sychGrHTJYghMBD6k7eUcH0H5P73EckCA48xijWqXw==
+
+promise-call-limit@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/promise-call-limit/-/promise-call-limit-1.0.1.tgz#4bdee03aeb85674385ca934da7114e9bcd3c6e24"
+  integrity sha512-3+hgaa19jzCGLuSCbieeRsu5C2joKfYn8pY6JAuXFRVfF4IO+L7UPpFWNTeWT9pM7uhskvbPPd/oEOktCn317Q==
+
 promise-inflight@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
@@ -10810,7 +11029,12 @@ read-cmd-shim@^2.0.0:
   resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-2.0.0.tgz#4a50a71d6f0965364938e9038476f7eede3928d9"
   integrity sha512-HJpV9bQpkl6KwjxlJcBoqu9Ba0PQg8TqSNIOrulGt54a0uup0HtevreFHzYzkm0lpnleRdNBzXznKrgxglEHQw==
 
-read-package-json-fast@^2.0.1, read-package-json-fast@^2.0.2:
+read-cmd-shim@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-3.0.0.tgz#62b8c638225c61e6cc607f8f4b779f3b8238f155"
+  integrity sha512-KQDVjGqhZk92PPNRj9ZEXEuqg8bUobSKRw+q0YQ3TKI5xkce7bUJobL4Z/OtiEbAAv70yEpYIXp4iQ9L8oPVog==
+
+read-package-json-fast@^2.0.2, read-package-json-fast@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz#323ca529630da82cb34b36cc0b996693c98c2b83"
   integrity sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==
@@ -10818,16 +11042,6 @@ read-package-json-fast@^2.0.1, read-package-json-fast@^2.0.2:
     json-parse-even-better-errors "^2.3.0"
     npm-normalize-package-bin "^1.0.1"
 
-read-package-json@^2.0.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.1.2.tgz#6992b2b66c7177259feb8eaac73c3acd28b9222a"
-  integrity sha512-D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA==
-  dependencies:
-    glob "^7.1.1"
-    json-parse-even-better-errors "^2.3.0"
-    normalize-package-data "^2.0.0"
-    npm-normalize-package-bin "^1.0.0"
-
 read-package-json@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-3.0.1.tgz#c7108f0b9390257b08c21e3004d2404c806744b9"
@@ -10848,14 +11062,15 @@ read-package-json@^4.1.1:
     normalize-package-data "^3.0.0"
     npm-normalize-package-bin "^1.0.0"
 
-read-package-tree@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.3.1.tgz#a32cb64c7f31eb8a6f31ef06f9cedf74068fe636"
-  integrity sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==
+read-package-json@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-5.0.1.tgz#1ed685d95ce258954596b13e2e0e76c7d0ab4c26"
+  integrity sha512-MALHuNgYWdGW3gKzuNMuYtcSSZbGQm94fAp16xt8VsYTLBjUSc55bLMKe6gzpWue0Tfi6CBgwCSdDAqutGDhMg==
   dependencies:
-    read-package-json "^2.0.0"
-    readdir-scoped-modules "^1.0.0"
-    util-promisify "^2.1.0"
+    glob "^8.0.1"
+    json-parse-even-better-errors "^2.3.1"
+    normalize-package-data "^4.0.0"
+    npm-normalize-package-bin "^1.0.1"
 
 read-pkg-up@^3.0.0:
   version "3.0.0"
@@ -10910,7 +11125,7 @@ readable-stream@1.1:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.4.0:
+readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.4.0, readable-stream@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
   integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -10919,7 +11134,7 @@ readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stre
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@^2.0.1, readable-stream@^2.0.6, readable-stream@~2.3.6:
+readable-stream@^2.0.1, readable-stream@~2.3.6:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -10932,7 +11147,7 @@ readable-stream@^2.0.1, readable-stream@^2.0.6, readable-stream@~2.3.6:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readdir-scoped-modules@^1.0.0:
+readdir-scoped-modules@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
   integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==
@@ -11047,7 +11262,7 @@ renderkid@^3.0.0:
     lodash "^4.17.21"
     strip-ansi "^6.0.1"
 
-request@^2.55.0, request@^2.72.0, request@^2.88.0, request@^2.88.2:
+request@^2.55.0, request@^2.72.0:
   version "2.88.2"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
   integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
@@ -11168,13 +11383,6 @@ reusify@^1.0.4:
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rimraf@^2.6.3:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
-  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
-  dependencies:
-    glob "^7.1.3"
-
 rimraf@^3.0.0, rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
@@ -11248,7 +11456,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
+safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -11366,7 +11574,7 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@7.x, semver@^7.1.1, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7:
+semver@7.x, semver@^7.0.0, semver@^7.1.1, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7:
   version "7.3.7"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
   integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
@@ -11434,10 +11642,10 @@ serve-static@1.14.2:
     parseurl "~1.3.3"
     send "0.17.2"
 
-set-blocking@~2.0.0:
+set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
+  integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
 
 set-immediate-shim@~1.0.1:
   version "1.0.1"
@@ -11535,7 +11743,7 @@ sigmund@^1.0.1:
   resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
   integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=
 
-signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
+signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
@@ -11573,11 +11781,6 @@ slice-ansi@^4.0.0:
     astral-regex "^2.0.0"
     is-fullwidth-code-point "^3.0.0"
 
-slide@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
-  integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=
-
 smart-buffer@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
@@ -11610,6 +11813,15 @@ socks-proxy-agent@^6.0.0:
     debug "^4.3.3"
     socks "^2.6.2"
 
+socks-proxy-agent@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6"
+  integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==
+  dependencies:
+    agent-base "^6.0.2"
+    debug "^4.3.3"
+    socks "^2.6.2"
+
 socks@^2.3.3, socks@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.2.tgz#ec042d7960073d40d94268ff3bb727dc685f111a"
@@ -11781,6 +11993,13 @@ ssri@^8.0.0, ssri@^8.0.1:
   dependencies:
     minipass "^3.1.1"
 
+ssri@^9.0.0:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057"
+  integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==
+  dependencies:
+    minipass "^3.1.1"
+
 stable@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
@@ -11829,15 +12048,6 @@ string-length@^5.0.1:
     char-regex "^2.0.0"
     strip-ansi "^7.0.1"
 
-string-width@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
 "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
@@ -11904,13 +12114,6 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
-  dependencies:
-    ansi-regex "^2.0.0"
-
 strip-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
@@ -12069,20 +12272,7 @@ tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
-tar@^4.4.12:
-  version "4.4.19"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.19.tgz#2e4d7263df26f2b914dee10c825ab132123742f3"
-  integrity sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==
-  dependencies:
-    chownr "^1.1.4"
-    fs-minipass "^1.2.7"
-    minipass "^2.9.0"
-    minizlib "^1.3.3"
-    mkdirp "^0.5.5"
-    safe-buffer "^5.2.1"
-    yallist "^3.1.1"
-
-tar@^6.0.2, tar@^6.1.0:
+tar@^6.0.2, tar@^6.1.0, tar@^6.1.11, tar@^6.1.2:
   version "6.1.11"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
   integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
@@ -12099,17 +12289,6 @@ temp-dir@^1.0.0:
   resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
   integrity sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=
 
-temp-write@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/temp-write/-/temp-write-4.0.0.tgz#cd2e0825fc826ae72d201dc26eef3bf7e6fc9320"
-  integrity sha512-HIeWmj77uOOHb0QX7siN3OtwV3CTntquin6TNVg6SHOqCP3hYKmox90eeFOGaY1MqJ9WYDDjkyZrW6qS5AWpbw==
-  dependencies:
-    graceful-fs "^4.1.15"
-    is-stream "^2.0.0"
-    make-dir "^3.0.0"
-    temp-dir "^1.0.0"
-    uuid "^3.3.2"
-
 term-size@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.1.tgz#2a6a54840432c2fb6320fea0f415531e90189f54"
@@ -12303,6 +12482,11 @@ tr46@~0.0.1, tr46@~0.0.3:
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
   integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
 
+treeverse@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/treeverse/-/treeverse-2.0.0.tgz#036dcef04bc3fd79a9b79a68d4da03e882d8a9ca"
+  integrity sha512-N5gJCkLu1aXccpOTtqV6ddSEi6ZmGkh3hjmbu1IjcavJK4qyOVQmi0myQKM7z5jVGmD68SJoliaVrMmVObhj6A==
+
 trim-newlines@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
@@ -12487,16 +12671,6 @@ uglify-js@^3.1.4:
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.5.tgz#2b10f9e0bfb3f5c15a8e8404393b6361eaeb33b3"
   integrity sha512-hNM5q5GbBRB5xB+PMqVRcgYe4c8jbyZ1pzZhS6jbq54/4F2gFK869ZheiE5A8/t+W5jtTNpWef/5Q9zk639FNQ==
 
-uid-number@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
-  integrity sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=
-
-umask@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d"
-  integrity sha1-8pzr8B31F5ErtY/5xOUP3o4zMg0=
-
 unbox-primitive@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
@@ -12586,13 +12760,6 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
-util-promisify@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/util-promisify/-/util-promisify-2.1.0.tgz#3c2236476c4d32c5ff3c47002add7c13b9a82a53"
-  integrity sha1-PCI2R2xNMsX/PEcAKt18E7moKlM=
-  dependencies:
-    object.getownpropertydescriptors "^2.0.3"
-
 util@^0.10.3:
   version "0.10.4"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
@@ -12659,6 +12826,13 @@ validate-npm-package-name@^3.0.0:
   dependencies:
     builtins "^1.0.3"
 
+validate-npm-package-name@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-4.0.0.tgz#fe8f1c50ac20afdb86f177da85b3600f0ac0d747"
+  integrity sha512-mzR0L8ZDktZjpX4OB46KT+56MAhl4EIazWP/+G/HPGuvfdaqg4YsCdtOm6U9+LOFyYDoh4dpnpxZRB9MQQns5Q==
+  dependencies:
+    builtins "^5.0.0"
+
 vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
@@ -12777,6 +12951,11 @@ w3c-xmlserializer@^2.0.0:
   dependencies:
     xml-name-validator "^3.0.0"
 
+walk-up-path@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/walk-up-path/-/walk-up-path-1.0.0.tgz#d4745e893dd5fd0dbb58dd0a4c6a33d9c9fec53e"
+  integrity sha512-hwj/qMDUEjCU5h0xr90KGCf0tg0/LgJbmOWgrWKYlcJZM7XvquvUJZ0G/HMGr7F7OQMOUuPHWP9JpriinkAlkg==
+
 walker@^1.0.7:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
@@ -13028,7 +13207,7 @@ which-boxed-primitive@^1.0.2:
     is-string "^1.0.5"
     is-symbol "^1.0.3"
 
-which@^1.2.9, which@^1.3.1:
+which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
@@ -13042,7 +13221,7 @@ which@^2.0.1, which@^2.0.2:
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.0:
+wide-align@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
   integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
@@ -13110,6 +13289,14 @@ write-file-atomic@^3.0.0, write-file-atomic@^3.0.3:
     signal-exit "^3.0.2"
     typedarray-to-buffer "^3.1.5"
 
+write-file-atomic@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.1.tgz#9faa33a964c1c85ff6f849b80b42a88c2c537c8f"
+  integrity sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==
+  dependencies:
+    imurmurhash "^0.1.4"
+    signal-exit "^3.0.7"
+
 write-json-file@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-3.2.0.tgz#65bbdc9ecd8a1458e15952770ccbadfcff5fe62a"
@@ -13201,11 +13388,6 @@ yallist@^2.1.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
-yallist@^3.0.0, yallist@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
-  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
-
 yallist@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"

From 635327b4fa8bccbe901e54f8206f4f639ed0c891 Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Fri, 1 Jul 2022 16:14:42 +0200
Subject: [PATCH 36/42] feat(ms-word-addin): reduce min width to better fit in
 the task pane

---
 apps/ms-word-addin/src/i18n/en.json                |  4 ----
 apps/ms-word-addin/src/i18n/fr.json                |  4 ----
 .../src/views/SettingsMenuGeneral.vue              | 14 +-------------
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/apps/ms-word-addin/src/i18n/en.json b/apps/ms-word-addin/src/i18n/en.json
index 6ba57b5e..64e82170 100644
--- a/apps/ms-word-addin/src/i18n/en.json
+++ b/apps/ms-word-addin/src/i18n/en.json
@@ -53,17 +53,13 @@
     "THICKNESS": "Thickness",
     "ACTIVATE": "Activate",
     "PROFILE_LANGUAGE": "Profile language",
-    "FONT_SETTINGS": "Font settings",
     "FONT": "Font",
     "FONT_SIZE": "Font size",
-    "SPACING": "Spacing",
     "LETTER_SPACING": "Letter spacing",
     "WORD_SPACING": "Word spacing",
     "LINE_SPACING": "Line spacing",
-    "TEXT_HINT": "Text hint",
     "HIGHLIGHT_ALTERNATING_SYLLABLES": "Highlight alternating syllables",
     "SHOW_LIAISONS": "Show liaisons",
-    "READING_TOOLS": "Reading tools",
     "GREY_SILENT_LETTERS": "Grey silent letters",
     "SHADE_ALTERNATE_LINES": "Shade alternate lines"
   },
diff --git a/apps/ms-word-addin/src/i18n/fr.json b/apps/ms-word-addin/src/i18n/fr.json
index 1c7a6e5a..de0ea070 100644
--- a/apps/ms-word-addin/src/i18n/fr.json
+++ b/apps/ms-word-addin/src/i18n/fr.json
@@ -53,17 +53,13 @@
     "THICKNESS": "Épaisseur",
     "ACTIVATE": "Activer",
     "PROFILE_LANGUAGE": "Langue du profil",
-    "FONT_SETTINGS": "Paramètres de police",
     "FONT": "Police",
     "FONT_SIZE": "Taille de police",
-    "SPACING": "Espacement",
     "LETTER_SPACING": "Espace entre chaque lettre",
     "WORD_SPACING": "Espace entre chaque mot",
     "LINE_SPACING": "Espace entre chaque ligne",
-    "TEXT_HINT": "Indices de lecture",
     "HIGHLIGHT_ALTERNATING_SYLLABLES": "Différenciation des syllabes",
     "SHOW_LIAISONS": "Afficher les liaisons",
-    "READING_TOOLS": "Outils de lecture",
     "GREY_SILENT_LETTERS": "Griser les lettres muettes",
     "SHADE_ALTERNATE_LINES": "Distinction des lignes"
   },
diff --git a/apps/ms-word-addin/src/views/SettingsMenuGeneral.vue b/apps/ms-word-addin/src/views/SettingsMenuGeneral.vue
index 2ae490e8..1617a0b9 100644
--- a/apps/ms-word-addin/src/views/SettingsMenuGeneral.vue
+++ b/apps/ms-word-addin/src/views/SettingsMenuGeneral.vue
@@ -77,7 +77,6 @@ export default SettingsMenuGeneral
     <b-table-simple striped sticky-header="60vh" responsive class="mb-0">
       <b-thead>
         <b-tr>
-          <b-th />
           <b-th />
           <b-th>{{ $t('GENERAL.SETTING') }}</b-th>
           <b-th>{{ $t('GENERAL.OPACITY') }}</b-th>
@@ -86,8 +85,7 @@ export default SettingsMenuGeneral
       </b-thead>
       <b-tbody>
         <b-tr>
-          <b-th class="bg-white">{{ $t('GENERAL.PROFILE_LANGUAGE') }}</b-th>
-          <b-th />
+          <b-td>{{ $t('GENERAL.PROFILE_LANGUAGE') }}</b-td>
           <b-td>
             <b-form-select :options="languageOptions" :value="settings.language" @change="changeLanguage($event)" />
           </b-td>
@@ -95,9 +93,6 @@ export default SettingsMenuGeneral
           <b-td />
         </b-tr>
         <b-tr>
-          <b-th rowspan="2" class="bg-white">
-            {{ $t('GENERAL.FONT_SETTINGS') }}
-          </b-th>
           <b-td>{{ $t('GENERAL.FONT') }}</b-td>
           <b-td>
             <b-form-select :options="fontFamilyOptions" :value="settings.fontFamily" @change="updateOption('fontFamily', $event)" />
@@ -114,9 +109,6 @@ export default SettingsMenuGeneral
           <b-td />
         </b-tr>
         <b-tr>
-          <b-th rowspan="3" class="bg-white">
-            {{ $t('GENERAL.SPACING') }}
-          </b-th>
           <b-td>{{ $t('GENERAL.LETTER_SPACING') }}</b-td>
           <b-td>
             <SelectPercentage :options="letterSpacingOptions" :value="settings.letterSpacing" @change="updateOption('letterSpacing', $event)" />
@@ -141,9 +133,6 @@ export default SettingsMenuGeneral
           <b-td />
         </b-tr>
         <b-tr>
-          <b-th :rowspan="settings.language === 'fr' ? 3 : 2" class="bg-white">
-            {{ $t('GENERAL.TEXT_HINT') }}
-          </b-th>
           <b-td>{{ $t('GENERAL.HIGHLIGHT_ALTERNATING_SYLLABLES') }}</b-td>
           <b-td>
             <div class="d-flex justify-content-center">
@@ -188,7 +177,6 @@ export default SettingsMenuGeneral
           </b-td>
         </b-tr>
         <b-tr>
-          <b-th class="bg-white">{{ $t('GENERAL.READING_TOOLS') }}</b-th>
           <b-td>{{ $t('GENERAL.SHADE_ALTERNATE_LINES') }}</b-td>
           <b-td />
           <b-td>

From 61154f13a4c8656ee9b61854cf35b7f863a77e58 Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Wed, 6 Jul 2022 14:06:13 +0200
Subject: [PATCH 37/42] fix(ms-word-addin): move <img> elements outside <p>
 elements to avoid wrong shade lines height calculation

---
 apps/ms-word-addin/src/views/MainMenu.vue | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/apps/ms-word-addin/src/views/MainMenu.vue b/apps/ms-word-addin/src/views/MainMenu.vue
index 00f36c4b..a60b0307 100644
--- a/apps/ms-word-addin/src/views/MainMenu.vue
+++ b/apps/ms-word-addin/src/views/MainMenu.vue
@@ -65,6 +65,16 @@ const MainMenu = defineComponent({
           })
           return
         }
+        // Move <img> elements outside <p> elements to avoid to be taked account on shade lines height calculation
+        const pElements = Array.from(body.getElementsByTagName('p')) as HTMLElement[]
+        pElements
+          .filter((pElem) => pElem.getElementsByTagName('img').length > 0) //
+          .forEach((pElem) => {
+            const images = Array.from(pElem.getElementsByTagName('img')) as HTMLElement[]
+            images.forEach((image) => {
+              pElem.parentElement?.insertBefore(image, pElem)
+            })
+          })
         for (let i = 0; i < documentPictures.items.length; i++) {
           const base64 = documentPictures.items[i].getBase64ImageSrc()
           await context.sync()

From dc62552b6279c4d1df8af1fb3e7e8522f3665a53 Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Fri, 1 Jul 2022 16:47:21 +0200
Subject: [PATCH 38/42] feat(ms-word-addin): optimize settings UI for 350px

---
 .../src/components/PreviewContainer.vue       |  2 +-
 apps/ms-word-addin/src/i18n/en.json           | 13 ++--
 apps/ms-word-addin/src/i18n/fr.json           |  7 +-
 apps/ms-word-addin/src/views/SettingsMenu.vue | 10 +--
 .../src/views/SettingsMenuGeneral.vue         | 69 +++++++------------
 .../src/views/SettingsMenuLetters.vue         | 27 +++++---
 .../src/views/SettingsMenuPhonemes.vue        | 27 +++++---
 .../visual-engine/src/buildItemPreview.ts     |  1 +
 8 files changed, 76 insertions(+), 80 deletions(-)

diff --git a/apps/ms-word-addin/src/components/PreviewContainer.vue b/apps/ms-word-addin/src/components/PreviewContainer.vue
index 93886faa..b71b4c38 100644
--- a/apps/ms-word-addin/src/components/PreviewContainer.vue
+++ b/apps/ms-word-addin/src/components/PreviewContainer.vue
@@ -40,7 +40,7 @@ const PreviewContainer = defineComponent({
 export default PreviewContainer
 </script>
 <template>
-  <div class="mb-auto">
+  <div>
     <textarea class="textarea-container form-control" rows="5" ref="textToAdaptElement" v-model="textToAdapt" @blur="onRead" :hidden="isReading" />
 
     <div v-if="isReading" @click="onEdit">
diff --git a/apps/ms-word-addin/src/i18n/en.json b/apps/ms-word-addin/src/i18n/en.json
index 64e82170..02e75952 100644
--- a/apps/ms-word-addin/src/i18n/en.json
+++ b/apps/ms-word-addin/src/i18n/en.json
@@ -25,9 +25,9 @@
   "SETTINGS": {
     "MY_PREFERENCES": "My preferences",
     "DOWNLOAD_SETTINGS": "Download Settings",
-    "GENERAL_SETTINGS": "General settings",
-    "PHONEME_SETTINGS": "Phoneme settings",
-    "LETTER_SETTINGS": "Letter settings",
+    "GENERAL_SETTINGS": "General",
+    "PHONEME_SETTINGS": "Phonemes",
+    "LETTER_SETTINGS": "Letters",
     "TEXT_PREVIEW": "Text preview",
     "SAVE": "Save",
     "CLOSE": "Back",
@@ -38,10 +38,9 @@
     "LEAVE_UNSAVED_CHANGES": "Any unsaved changes will be lost.",
     "YES_CLOSE": "Yes, take me to the main menu",
     "NO_STAY": "No, I want to stay",
-    "PHONEME": "Phoneme",
-    "LETTER": "Letter",
-    "EXAMPLE": "Example",
-    "TEXT_COLOR": "Text Color",
+    "PHONEME_AND_EXAMPLE": "Phoneme and example",
+    "LETTER_AND_EXAMPLE": "Letter and example",
+    "TEXT_COLOR": "Color",
     "BOLD": "Bold",
     "ACTIVATE": "Activate",
     "ALL_PHONEMES_SETTINGS": "All phonemes settings",
diff --git a/apps/ms-word-addin/src/i18n/fr.json b/apps/ms-word-addin/src/i18n/fr.json
index de0ea070..8d406654 100644
--- a/apps/ms-word-addin/src/i18n/fr.json
+++ b/apps/ms-word-addin/src/i18n/fr.json
@@ -25,7 +25,7 @@
   "SETTINGS": {
     "MY_PREFERENCES": "Mes préférences",
     "DOWNLOAD_SETTINGS": "Exporter les paramètres",
-    "GENERAL_SETTINGS": "Paramètres generaux",
+    "GENERAL_SETTINGS": "Paramètres",
     "PHONEME_SETTINGS": "Phonèmes",
     "LETTER_SETTINGS": "Lettres",
     "TEXT_PREVIEW": "Pré-visualisation du texte",
@@ -38,9 +38,8 @@
     "LEAVE_UNSAVED_CHANGES": "Toutes les modifications non enregistrées seront perdues.",
     "YES_CLOSE": "Oui, je veux quitter",
     "NO_STAY": "Non, je veux rester",
-    "PHONEME": "Phonème",
-    "LETTER": "Lettre",
-    "EXAMPLE": "Exemple",
+    "PHONEME_AND_EXAMPLE": "Phonème et exemple",
+    "LETTER_AND_EXAMPLE": "Lettre et exemple",
     "TEXT_COLOR": "Couleur",
     "BOLD": "Texte Gras",
     "ACTIVATE": "Activer",
diff --git a/apps/ms-word-addin/src/views/SettingsMenu.vue b/apps/ms-word-addin/src/views/SettingsMenu.vue
index a46db71d..b876f131 100644
--- a/apps/ms-word-addin/src/views/SettingsMenu.vue
+++ b/apps/ms-word-addin/src/views/SettingsMenu.vue
@@ -47,12 +47,12 @@ export default SettingsMenu
       <router-link class="p-3" to="/settings/letters">{{ $t('SETTINGS.LETTER_SETTINGS') }}</router-link>
     </nav>
 
-    <b-row>
-      <b-col lg="8" class="mb-2" style="max-height: 60vh; height: 60vh">
-        <router-view />
+    <b-row style="max-height: 92vh">
+      <b-col lg="12">
+        <router-view class="my-3" style="max-height: 60vh; height: 60vh" />
       </b-col>
-      <b-col lg="3" class="m-1" style="max-height: 32vh">
-        <PreviewContainer class="text-preview" :settings="settings" :content-to-adapt="contentToAdapt" />
+      <b-col lg="12" style="max-height: 32vh">
+        <PreviewContainer class="text-preview mb-auto" :settings="settings" :content-to-adapt="contentToAdapt" />
 
         <div style="max-height: 8vh">
           <div class="mt-3 d-flex justify-content-between">
diff --git a/apps/ms-word-addin/src/views/SettingsMenuGeneral.vue b/apps/ms-word-addin/src/views/SettingsMenuGeneral.vue
index 1617a0b9..946a9282 100644
--- a/apps/ms-word-addin/src/views/SettingsMenuGeneral.vue
+++ b/apps/ms-word-addin/src/views/SettingsMenuGeneral.vue
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { computed, defineComponent } from '@vue/composition-api'
-import { BFormCheckbox, BFormSelect, BTableSimple, BTbody, BTd, BTh, BTr, BThead } from 'bootstrap-vue'
+import { BFormCheckbox, BFormSelect, BTableSimple, BTbody, BTd, BTr } from 'bootstrap-vue'
 
 import {
   fontFamilyOptions,
@@ -27,9 +27,7 @@ const SettingsMenuGeneral = defineComponent({
     BTableSimple,
     BTbody,
     BTr,
-    BTh,
     BTd,
-    BThead,
     RangeBar,
     SelectPercentage,
     ColorPicker
@@ -75,82 +73,65 @@ export default SettingsMenuGeneral
 <template>
   <div>
     <b-table-simple striped sticky-header="60vh" responsive class="mb-0">
-      <b-thead>
-        <b-tr>
-          <b-th />
-          <b-th>{{ $t('GENERAL.SETTING') }}</b-th>
-          <b-th>{{ $t('GENERAL.OPACITY') }}</b-th>
-          <b-th>{{ $t('GENERAL.ACTIVATE') }}</b-th>
-        </b-tr>
-      </b-thead>
       <b-tbody>
         <b-tr>
-          <b-td>{{ $t('GENERAL.PROFILE_LANGUAGE') }}</b-td>
           <b-td>
+            <div>{{ $t('GENERAL.PROFILE_LANGUAGE') }}</div>
             <b-form-select :options="languageOptions" :value="settings.language" @change="changeLanguage($event)" />
           </b-td>
-          <b-td />
-          <b-td />
+          <b-td class="px-0" />
         </b-tr>
         <b-tr>
-          <b-td>{{ $t('GENERAL.FONT') }}</b-td>
           <b-td>
+            <div>{{ $t('GENERAL.FONT') }}</div>
             <b-form-select :options="fontFamilyOptions" :value="settings.fontFamily" @change="updateOption('fontFamily', $event)" />
           </b-td>
-          <b-td />
-          <b-td />
+          <b-td class="px-0" />
         </b-tr>
         <b-tr>
-          <b-td>{{ $t('GENERAL.FONT_SIZE') }}</b-td>
           <b-td>
+            <div>{{ $t('GENERAL.FONT_SIZE') }}</div>
             <SelectPercentage :options="fontSizeOptions" :value="settings.fontSize" @change="updateOption('fontSize', $event)" />
           </b-td>
           <b-td />
-          <b-td />
         </b-tr>
         <b-tr>
-          <b-td>{{ $t('GENERAL.LETTER_SPACING') }}</b-td>
           <b-td>
+            <div>{{ $t('GENERAL.LETTER_SPACING') }}</div>
             <SelectPercentage :options="letterSpacingOptions" :value="settings.letterSpacing" @change="updateOption('letterSpacing', $event)" />
           </b-td>
-          <b-td />
-          <b-td />
+          <b-td class="px-0" />
         </b-tr>
         <b-tr>
-          <b-td>{{ $t('GENERAL.WORD_SPACING') }}</b-td>
           <b-td>
+            <div>{{ $t('GENERAL.WORD_SPACING') }}</div>
             <SelectPercentage :options="wordSpacingOptions" :value="settings.wordSpacing" @change="updateOption('wordSpacing', $event)" />
           </b-td>
-          <b-td />
-          <b-td />
+          <b-td class="px-0" />
         </b-tr>
         <b-tr>
-          <b-td>{{ $t('GENERAL.LINE_SPACING') }}</b-td>
           <b-td>
+            <div>{{ $t('GENERAL.LINE_SPACING') }}</div>
             <SelectPercentage :options="lineSpacingOptionsOptimized" :value="settings.lineSpacing" @change="updateOption('lineSpacing', $event)" />
           </b-td>
-          <b-td />
-          <b-td />
+          <b-td class="px-0" />
         </b-tr>
         <b-tr>
-          <b-td>{{ $t('GENERAL.HIGHLIGHT_ALTERNATING_SYLLABLES') }}</b-td>
           <b-td>
-            <div class="d-flex justify-content-center">
+            <div>{{ $t('GENERAL.HIGHLIGHT_ALTERNATING_SYLLABLES') }}</div>
+            <div class="d-flex">
               <ColorPicker class="m-1" :value="settings.syllableColor1" @selectColor="updateOption('syllableColor1', $event)" />
               <ColorPicker class="m-1" :value="settings.syllableColor2" @selectColor="updateOption('syllableColor2', $event)" />
             </div>
-          </b-td>
-          <b-td>
             <RangeBar :value="settings.syllableOpacity" :options="opacityOptions" @change="updateOption('syllableOpacity', $event)" />
           </b-td>
-          <b-td>
+          <b-td class="d-flex justify-content-end px-0">
             <b-form-checkbox :checked="settings.syllableActive" @change="updateOption('syllableActive', $event)" switch />
           </b-td>
         </b-tr>
         <b-tr v-if="settings.language === 'fr'">
-          <b-td>{{ $t('GENERAL.SHOW_LIAISONS') }}</b-td>
-          <b-td />
           <b-td>
+            <div>{{ $t('GENERAL.SHOW_LIAISONS') }}</div>
             <RangeBar
               :disabled="settings.language === 'en'"
               :value="settings.liaisonsOpacity"
@@ -158,35 +139,33 @@ export default SettingsMenuGeneral
               @change="updateOption('liaisonsOpacity', $event)"
             />
           </b-td>
-          <b-td>
+          <b-td class="d-flex justify-content-end px-0">
             <b-form-checkbox :checked="settings.liaisonsActive" @change="updateOption('liaisonsActive', $event)" switch />
           </b-td>
         </b-tr>
         <b-tr>
-          <b-td>{{ $t('GENERAL.GREY_SILENT_LETTERS') }}</b-td>
-          <b-td />
           <b-td>
+            <div>{{ $t('GENERAL.GREY_SILENT_LETTERS') }}</div>
             <RangeBar
               :value="settings.silentLetterOpacity"
               :options="silentLetterOpacityOptions"
               @change="updateOption('silentLetterOpacity', $event)"
             />
           </b-td>
-          <b-td>
+          <b-td class="d-flex justify-content-end px-0">
             <b-form-checkbox :checked="settings.silentLetterActive" @change="updateOption('silentLetterActive', $event)" switch />
           </b-td>
         </b-tr>
         <b-tr>
-          <b-td>{{ $t('GENERAL.SHADE_ALTERNATE_LINES') }}</b-td>
-          <b-td />
           <b-td>
+            <div>{{ $t('GENERAL.SHADE_ALTERNATE_LINES') }}</div>
             <RangeBar
               :value="settings.shadeAlternateLinesOpacity"
               :options="opacityOptions"
               @change="updateOption('shadeAlternateLinesOpacity', $event)"
             />
           </b-td>
-          <b-td>
+          <b-td class="d-flex justify-content-end px-0">
             <b-form-checkbox :checked="settings.shadeAlternateLinesActive" @change="updateShadeAlternateLines" switch />
           </b-td>
         </b-tr>
@@ -194,4 +173,8 @@ export default SettingsMenuGeneral
     </b-table-simple>
   </div>
 </template>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+td {
+  font-size: 15px;
+}
+</style>
diff --git a/apps/ms-word-addin/src/views/SettingsMenuLetters.vue b/apps/ms-word-addin/src/views/SettingsMenuLetters.vue
index 40962077..05a32581 100644
--- a/apps/ms-word-addin/src/views/SettingsMenuLetters.vue
+++ b/apps/ms-word-addin/src/views/SettingsMenuLetters.vue
@@ -18,8 +18,7 @@ const SettingsMenuLetters = defineComponent({
   },
   setup() {
     const tableFields = [
-      { key: 'value', label: i18n.t('SETTINGS.LETTER') },
-      { key: 'example', label: i18n.t('SETTINGS.EXAMPLE') },
+      { key: 'value', label: i18n.t('SETTINGS.LETTER_AND_EXAMPLE') },
       { key: 'color', label: i18n.t('SETTINGS.TEXT_COLOR') },
       { key: 'bold', label: i18n.t('SETTINGS.BOLD') },
       { key: 'activate', label: i18n.t('SETTINGS.ACTIVATE') }
@@ -90,22 +89,26 @@ export default SettingsMenuLetters
 
 <template>
   <div>
-    <div class="d-flex pt-2 pb-2">
+    <div class="d-flex pt-2 pb-2" style="max-height: 10%">
       <b-form-checkbox :checked="allItemsActive" @change="switchAllItems" switch />
       <div class="ml-2">{{ $t('SETTINGS.ALL_LETTERS_SETTINGS') }}</div>
     </div>
-    <b-table striped sticky-header="50vh" :items="tableItems" :fields="tableFields">
+    <b-table style="margin-bottom: 0" sticky-header="90%" striped :items="tableItems" :fields="tableFields" responsive>
+      <template #head(value)="value">
+        <div class="h7">{{ value.label }}</div>
+      </template>
       <template #head(color)="color">
-        <div class="text-center">{{ color.label }}</div>
+        <div class="text-center h7">{{ color.label }}</div>
       </template>
       <template #head(bold)="bold">
-        <div class="text-center">{{ bold.label }}</div>
+        <div class="text-center h7">{{ bold.label }}</div>
       </template>
       <template #head(activate)="activate">
-        <div class="text-center">{{ activate.label }}</div>
+        <div class="text-center h7">{{ activate.label }}</div>
       </template>
-      <template #cell(example)="row">
-        <div class="d-flex" v-html="row.item.example" />
+      <template #cell(value)="row">
+        <div class="h7 mb-2">{{ row.item.value }}</div>
+        <div class="d-flex flex-wrap h7" v-html="row.item.example" />
       </template>
       <template #cell(color)="row">
         <div class="d-flex justify-content-center p-2">
@@ -126,4 +129,8 @@ export default SettingsMenuLetters
   </div>
 </template>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.h7 {
+  font-size: 15px;
+}
+</style>
diff --git a/apps/ms-word-addin/src/views/SettingsMenuPhonemes.vue b/apps/ms-word-addin/src/views/SettingsMenuPhonemes.vue
index 947fcd82..d2d3c783 100644
--- a/apps/ms-word-addin/src/views/SettingsMenuPhonemes.vue
+++ b/apps/ms-word-addin/src/views/SettingsMenuPhonemes.vue
@@ -18,8 +18,7 @@ const SettingsMenuPhonemes = defineComponent({
   },
   setup() {
     const tableFields = [
-      { key: 'value', label: i18n.t('SETTINGS.PHONEME') },
-      { key: 'example', label: i18n.t('SETTINGS.EXAMPLE') },
+      { key: 'value', label: i18n.t('SETTINGS.PHONEME_AND_EXAMPLE') },
       { key: 'color', label: i18n.t('SETTINGS.TEXT_COLOR') },
       { key: 'bold', label: i18n.t('SETTINGS.BOLD') },
       { key: 'activate', label: i18n.t('SETTINGS.ACTIVATE') }
@@ -90,22 +89,26 @@ export default SettingsMenuPhonemes
 
 <template>
   <div>
-    <div class="d-flex pt-2 pb-2">
+    <div class="d-flex pt-2 pb-2" style="max-height: 10%">
       <b-form-checkbox :checked="allItemsActive" @change="switchAllItems" switch />
       <div class="ml-2">{{ $t('SETTINGS.ALL_PHONEMES_SETTINGS') }}</div>
     </div>
-    <b-table striped sticky-header="50vh" :items="tableItems" :fields="tableFields" responsive="sm">
+    <b-table style="margin-bottom: 0" sticky-header="90%" striped :items="tableItems" :fields="tableFields" responsive>
+      <template #head(value)="value">
+        <div class="h7">{{ value.label }}</div>
+      </template>
       <template #head(color)="color">
-        <div class="text-center">{{ color.label }}</div>
+        <div class="text-center h7">{{ color.label }}</div>
       </template>
       <template #head(bold)="bold">
-        <div class="text-center">{{ bold.label }}</div>
+        <div class="text-center h7">{{ bold.label }}</div>
       </template>
       <template #head(activate)="activate">
-        <div class="text-center">{{ activate.label }}</div>
+        <div class="text-center h7">{{ activate.label }}</div>
       </template>
-      <template #cell(example)="row">
-        <div class="d-flex" v-html="row.item.example" />
+      <template #cell(value)="row">
+        <div class="h7 mb-2">{{ row.item.value }}</div>
+        <div class="d-flex flex-wrap h7" v-html="row.item.example" />
       </template>
       <template #cell(color)="row">
         <div class="d-flex justify-content-center p-2">
@@ -126,4 +129,8 @@ export default SettingsMenuPhonemes
   </div>
 </template>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.h7 {
+  font-size: 15px;
+}
+</style>
diff --git a/packages/visual-engine/src/buildItemPreview.ts b/packages/visual-engine/src/buildItemPreview.ts
index 9fcae214..d2098934 100644
--- a/packages/visual-engine/src/buildItemPreview.ts
+++ b/packages/visual-engine/src/buildItemPreview.ts
@@ -14,6 +14,7 @@ const adaptExample = (examples: string[], { color, bold }: { color?: string; bol
 
   return examples
     .map((item: string) => item.replace(/<span>/g, `<span style="${style}">`)) //
+    .map((item: string) => `<span>${item}</span>`)
     .join(',&nbsp;')
 }
 

From 9a9239379af008880bbd451cf6bf3864d6860096 Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Thu, 7 Jul 2022 10:39:44 +0200
Subject: [PATCH 39/42] fix(ms-word-addin): remove images when the document has
 floting images

---
 apps/ms-word-addin/src/views/MainMenu.vue | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/apps/ms-word-addin/src/views/MainMenu.vue b/apps/ms-word-addin/src/views/MainMenu.vue
index a60b0307..6f797bd6 100644
--- a/apps/ms-word-addin/src/views/MainMenu.vue
+++ b/apps/ms-word-addin/src/views/MainMenu.vue
@@ -57,15 +57,14 @@ const MainMenu = defineComponent({
         const documentPictures = context.document.body.inlinePictures.load({ $all: true })
         await context.sync()
         const htmlImages = Array.from(body.getElementsByTagName('img')) as HTMLImageElement[]
+        // When the document has floating images, their are badly positioned.
+        // inlinePictures.load() method do not return floating images
+        // This workaround remove the images in this case until we find a better solution
         if (documentPictures.items.length !== htmlImages.length) {
-          htmlImages.forEach((image) => {
-            image.src = `assets/no-image.png`
-            image.width = 64
-            image.height = 58
-          })
+          htmlImages.forEach((image) => image.remove())
           return
         }
-        // Move <img> elements outside <p> elements to avoid to be taked account on shade lines height calculation
+        // Move <img> elements outside <p> elements to avoid to be taken account on shade lines height calculation
         const pElements = Array.from(body.getElementsByTagName('p')) as HTMLElement[]
         pElements
           .filter((pElem) => pElem.getElementsByTagName('img').length > 0) //

From 47d04a5e60d3903a4851f24b2b064d96e94f9018 Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Thu, 7 Jul 2022 11:11:21 +0200
Subject: [PATCH 40/42] fix(ms-word-addin): same tratement of images in
 OfficeOnline

---
 apps/ms-word-addin/src/views/MainMenu.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/ms-word-addin/src/views/MainMenu.vue b/apps/ms-word-addin/src/views/MainMenu.vue
index 6f797bd6..d27d104e 100644
--- a/apps/ms-word-addin/src/views/MainMenu.vue
+++ b/apps/ms-word-addin/src/views/MainMenu.vue
@@ -49,10 +49,6 @@ const MainMenu = defineComponent({
     }
 
     const convertImages = async (body: HTMLElement): Promise<void> => {
-      if (Office.context.platform === Office.PlatformType.OfficeOnline) {
-        return // nothing to do
-      }
-
       await Word.run(async (context: Word.RequestContext) => {
         const documentPictures = context.document.body.inlinePictures.load({ $all: true })
         await context.sync()
@@ -74,6 +70,11 @@ const MainMenu = defineComponent({
               pElem.parentElement?.insertBefore(image, pElem)
             })
           })
+
+        if (Office.context.platform === Office.PlatformType.OfficeOnline) {
+          return
+        }
+        // If the platform is not office online replace image link to base64 encodig image
         for (let i = 0; i < documentPictures.items.length; i++) {
           const base64 = documentPictures.items[i].getBase64ImageSrc()
           await context.sync()

From f8b46de0a8cd404fbbda8567bdced48401c2be44 Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Thu, 7 Jul 2022 11:34:06 +0200
Subject: [PATCH 41/42] fix(ms-word-addin): handle images in adapt selection

---
 apps/ms-word-addin/src/views/MainMenu.vue | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/apps/ms-word-addin/src/views/MainMenu.vue b/apps/ms-word-addin/src/views/MainMenu.vue
index d27d104e..09a87fdb 100644
--- a/apps/ms-word-addin/src/views/MainMenu.vue
+++ b/apps/ms-word-addin/src/views/MainMenu.vue
@@ -48,9 +48,16 @@ const MainMenu = defineComponent({
       })
     }
 
-    const convertImages = async (body: HTMLElement): Promise<void> => {
+    const convertImages = async (body: HTMLElement, isSelection: boolean): Promise<void> => {
       await Word.run(async (context: Word.RequestContext) => {
-        const documentPictures = context.document.body.inlinePictures.load({ $all: true })
+        let documentPictures
+        if (isSelection) {
+          const selection = context.document.getSelection()
+          await context.sync()
+          documentPictures = selection.inlinePictures.load({ $all: true })
+        } else {
+          documentPictures = context.document.body.inlinePictures.load({ $all: true })
+        }
         await context.sync()
         const htmlImages = Array.from(body.getElementsByTagName('img')) as HTMLImageElement[]
         // When the document has floating images, their are badly positioned.
@@ -127,9 +134,9 @@ const MainMenu = defineComponent({
       })
     }
 
-    const openDialogBox = (document: HTMLElement): void => {
+    const openDialogBox = (document: HTMLElement, isSelection = false): void => {
       trackAdaptEvent()
-      const sendDocument = buildSendDocument(document)
+      const sendDocument = buildSendDocument(document, isSelection)
       Office.context.ui.displayDialogAsync(
         `${window.location.origin}/#/dialog-box`,
         { height: 90, width: 90 },
@@ -141,8 +148,8 @@ const MainMenu = defineComponent({
       )
     }
 
-    const buildSendDocument = (documentBody: HTMLElement) => async (): Promise<void> => {
-      await convertImages(documentBody)
+    const buildSendDocument = (documentBody: HTMLElement, isSelection: boolean) => async (): Promise<void> => {
+      await convertImages(documentBody, isSelection)
       removeFontStyles(documentBody)
       addListStyles(documentBody)
 
@@ -169,7 +176,7 @@ const MainMenu = defineComponent({
     const adaptSelection = async () => {
       try {
         const selection = await getDocumentSelection()
-        openDialogBox(selection)
+        openDialogBox(selection, true)
       } catch (error) {
         console.error(error)
       }

From 9d0536ba4d1473737d15ef3d6c67f61533997974 Mon Sep 17 00:00:00 2001
From: Elias Boukamza <elias.boukamza@contentsquare-ext.com>
Date: Thu, 7 Jul 2022 13:35:57 +0200
Subject: [PATCH 42/42] v1.2.0

---
 apps/chrome-extension/package.json      | 10 +++++-----
 apps/ms-word-addin/package.json         | 10 +++++-----
 lerna.json                              |  2 +-
 packages/dictionaries/package.json      |  2 +-
 packages/settings/package.json          |  2 +-
 packages/shared-components/package.json |  4 ++--
 packages/text-engine/package.json       |  4 ++--
 packages/visual-engine/package.json     |  6 +++---
 8 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/apps/chrome-extension/package.json b/apps/chrome-extension/package.json
index 581aef59..fb36a4da 100644
--- a/apps/chrome-extension/package.json
+++ b/apps/chrome-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chrome-extension",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -14,10 +14,10 @@
     "postinstall": "node scripts/init-env"
   },
   "dependencies": {
-    "@readapt/settings": "^1.1.1",
-    "@readapt/shared-components": "^1.1.1",
-    "@readapt/text-engine": "^1.1.1",
-    "@readapt/visual-engine": "^1.1.1",
+    "@readapt/settings": "^1.2.0",
+    "@readapt/shared-components": "^1.2.0",
+    "@readapt/text-engine": "^1.2.0",
+    "@readapt/visual-engine": "^1.2.0",
     "@vue/composition-api": "~1.4.5",
     "bootstrap": "~4.6.1",
     "bootstrap-vue": "~2.22.0",
diff --git a/apps/ms-word-addin/package.json b/apps/ms-word-addin/package.json
index 2e5eee48..f8ba9d96 100644
--- a/apps/ms-word-addin/package.json
+++ b/apps/ms-word-addin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ms-word-addin",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -19,10 +19,10 @@
     "postinstall": "node scripts/init-env"
   },
   "dependencies": {
-    "@readapt/settings": "^1.1.1",
-    "@readapt/shared-components": "^1.1.1",
-    "@readapt/text-engine": "^1.1.1",
-    "@readapt/visual-engine": "^1.1.1",
+    "@readapt/settings": "^1.2.0",
+    "@readapt/shared-components": "^1.2.0",
+    "@readapt/text-engine": "^1.2.0",
+    "@readapt/visual-engine": "^1.2.0",
     "@vue/composition-api": "~1.4.5",
     "bootstrap": "~4.6.1",
     "bootstrap-vue": "~2.22.0",
diff --git a/lerna.json b/lerna.json
index 9e53d6ef..6e3e9212 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.1.1",
+  "version": "1.2.0",
   "npmClient": "yarn",
   "useWorkspaces": true
 }
diff --git a/packages/dictionaries/package.json b/packages/dictionaries/package.json
index 89ff49cf..9f1076b3 100644
--- a/packages/dictionaries/package.json
+++ b/packages/dictionaries/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@readapt/dictionaries",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "types": "dist/index.d.ts",
   "main": "",
   "targets": {
diff --git a/packages/settings/package.json b/packages/settings/package.json
index 4aff3214..09e95739 100644
--- a/packages/settings/package.json
+++ b/packages/settings/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@readapt/settings",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "main": "dist/readapt-settings.js",
   "module": "dist/readapt-settings.esm.js",
   "types": "dist/types.d.ts",
diff --git a/packages/shared-components/package.json b/packages/shared-components/package.json
index d1041f6c..f9149eea 100644
--- a/packages/shared-components/package.json
+++ b/packages/shared-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@readapt/shared-components",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "main": "dist/readapt-shared-components.common.js",
   "module": "dist/readapt-shared-components.common.js",
   "types": "dist/types.d.ts",
@@ -26,7 +26,7 @@
     "url": "git+https://github.com/ContentSquare/readapt.git"
   },
   "dependencies": {
-    "@readapt/settings": "^1.1.1",
+    "@readapt/settings": "^1.2.0",
     "bootstrap": "~4.6.1",
     "bootstrap-vue": "~2.22.0",
     "core-js": "^3.8.3"
diff --git a/packages/text-engine/package.json b/packages/text-engine/package.json
index a251f725..2a4eabf2 100644
--- a/packages/text-engine/package.json
+++ b/packages/text-engine/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@readapt/text-engine",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "main": "dist/readapt-text-engine.js",
   "module": "dist/readapt-text-engine.esm.js",
   "types": "dist/types.d.ts",
@@ -25,6 +25,6 @@
     "src/*"
   ],
   "dependencies": {
-    "@readapt/dictionaries": "^1.1.1"
+    "@readapt/dictionaries": "^1.2.0"
   }
 }
diff --git a/packages/visual-engine/package.json b/packages/visual-engine/package.json
index 9fd8bf6a..2648e33e 100644
--- a/packages/visual-engine/package.json
+++ b/packages/visual-engine/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@readapt/visual-engine",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "main": "dist/readapt-visual-engine.js",
   "module": "dist/readapt-visual-engine.esm.js",
   "types": "dist/types.d.ts",
@@ -22,8 +22,8 @@
     "src/*"
   ],
   "dependencies": {
-    "@readapt/settings": "^1.1.1",
-    "@readapt/text-engine": "^1.1.1",
+    "@readapt/settings": "^1.2.0",
+    "@readapt/text-engine": "^1.2.0",
     "lodash": "^4.17.21"
   },
   "devDependencies": {