From 64dad4da62487fce27f67127782b0f91f55e365f Mon Sep 17 00:00:00 2001
From: "Sakamoto, Kazunori" <exKAZUu@users.noreply.github.com>
Date: Mon, 27 Feb 2023 21:01:35 +0900
Subject: [PATCH] fix: upgrade dependencies (#836)

---
 .dockerignore                                 |   8 +
 .editorconfig                                 |   2 +-
 .eslintignore                                 |  18 +-
 .gitattributes                                |   2 +
 .github/workflows/add-issue-to-project.yml    |  11 +
 .github/workflows/close-comment.yml           |   8 +
 .github/workflows/notify-ready.yml            |  10 +
 .github/workflows/release.yml                 |   5 +-
 .github/workflows/test.yml                    |  12 +-
 .github/workflows/wbfy-merge.yml              |   4 +-
 .github/workflows/wbfy.yml                    |   4 +-
 .gitignore                                    |  13 +-
 .husky/post-merge                             |  12 +-
 .husky/pre-commit                             |   2 +-
 .husky/pre-push                               |   2 +-
 .idea/watcherTasks.xml                        |  12 +-
 .lintstagedrc.cjs                             |  13 +-
 .node-version                                 |   1 -
 .prettierignore                               |  14 +-
 .releaserc.json                               |   5 +-
 .tool-versions                                |   2 +
 .yarn/plugins/plugin-auto-install.cjs         |   5 +-
 .yarnrc.yml                                   |  10 +-
 README.md                                     |   2 +-
 package.json                                  |  29 +-
 rollup.config.js => rollup.config.mjs         |   2 +-
 src/background.ts                             |  50 +-
 src/components/Footer.svelte                  |   6 +-
 src/config.ts                                 |   2 +-
 src/{content_scripts.ts => contentScripts.ts} |  21 +-
 src/encoder/plantUmlEncoder.ts                |   3 +
 src/finder/codeBlockFinder.ts                 |   2 +-
 src/finder/finder.ts                          |   4 +-
 src/finder/gitHubFinder.ts                    | 174 -------
 src/finder/github/gitHubFileViewFinder.ts     |  88 ++++
 .../github/gitHubPullRequestDiffFinder.ts     |  97 ++++
 src/mutator/descriptionMutator.ts             |  12 +-
 src/mutator/diffMutator.ts                    |  12 +-
 src/popup.svelte                              |   8 +-
 .../index.d.ts => src/types/svelte.d.ts       |   0
 tsconfig.json                                 |   6 +-
 yarn.lock                                     | 438 +++++++++---------
 42 files changed, 611 insertions(+), 520 deletions(-)
 create mode 100644 .dockerignore
 create mode 100644 .github/workflows/add-issue-to-project.yml
 create mode 100644 .github/workflows/close-comment.yml
 create mode 100644 .github/workflows/notify-ready.yml
 delete mode 100644 .node-version
 create mode 100644 .tool-versions
 rename rollup.config.js => rollup.config.mjs (96%)
 rename src/{content_scripts.ts => contentScripts.ts} (78%)
 delete mode 100644 src/finder/gitHubFinder.ts
 create mode 100644 src/finder/github/gitHubFileViewFinder.ts
 create mode 100644 src/finder/github/gitHubPullRequestDiffFinder.ts
 rename @types/svelte/index.d.ts => src/types/svelte.d.ts (100%)

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000000000..ed61def0d
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,8 @@
+# Project-specific settings (head)
+
+
+# Generated by wbfy
+
+**/*.sqlite3*
+
+# Project-specific settings (tail)
diff --git a/.editorconfig b/.editorconfig
index c19598280..329bb8224 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -6,7 +6,7 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.{cjs,cpp,dart,htm,html,js,json,json5,jsx,mjs,pu,puml,rb,ts,tsx,vue,yaml,yml}]
+[*.{cjs,cpp,cts,dart,htm,html,js,json,json5,jsx,mjs,mts,pu,puml,rb,ts,tsx,vue,yaml,yml}]
 indent_size = 2
 indent_style = space
 
diff --git a/.eslintignore b/.eslintignore
index 46f12d401..7ab9bc170 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,4 +1,4 @@
-# Project-specific settings
+# Project-specific settings (head)
 
 
 # Generated by @willbooster/willboosterify
@@ -10,20 +10,18 @@ android/
 ios/
 no-format/
 test-fixtures/
-*.config.js
+*.config.*js
 *.d.ts
-*.min.js
+*.min.*js
 .yarn/
 .pnp.js
-
 dist.zip
 
 .devcontainer/
 dist/
 temp/
 Icon[
]
-*.sqlite3
-*.sqlite3-journal
+!.keep
 # Created by https://www.toptal.com/developers/gitignore/api/windows
 # Edit at https://www.toptal.com/developers/gitignore?templates=windows
 
@@ -252,12 +250,6 @@ fabric.properties
 .history
 .ionide
 
-# Support for Project snippet scope
-.vscode/*.code-snippets
-
-# Ignore code-workspaces
-*.code-workspace
-
 # End of https://www.toptal.com/developers/gitignore/api/visualstudiocode
 
 # Created by https://www.toptal.com/developers/gitignore/api/emacs
@@ -507,3 +499,5 @@ dist
 .svelte-kit
 
 # End of https://www.toptal.com/developers/gitignore/api/node
+
+# Project-specific settings (tail)
diff --git a/.gitattributes b/.gitattributes
index e60dc4f65..2d4b19fd8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,6 +4,7 @@
 
 *.cjs text eol=lf
 *.cpp text eol=lf
+*.cts text eol=lf
 *.dart text eol=lf
 *.htm text eol=lf
 *.html text eol=lf
@@ -12,6 +13,7 @@
 *.json5 text eol=lf
 *.jsx text eol=lf
 *.mjs text eol=lf
+*.mts text eol=lf
 *.pu text eol=lf
 *.puml text eol=lf
 *.rb text eol=lf
diff --git a/.github/workflows/add-issue-to-project.yml b/.github/workflows/add-issue-to-project.yml
new file mode 100644
index 000000000..aba5e7c48
--- /dev/null
+++ b/.github/workflows/add-issue-to-project.yml
@@ -0,0 +1,11 @@
+name: Add issue to github project
+on:
+  issues:
+    types:
+      - labeled
+jobs:
+  add-issue-to-project:
+    uses: WillBooster/reusable-workflows/.github/workflows/add-issue-to-project.yml@main
+    secrets:
+      GH_PROJECT_URL: ${{ secrets.GH_PROJECT_URL }}
+      GH_TOKEN: ${{ secrets.PUBLIC_GH_BOT_PAT }}
diff --git a/.github/workflows/close-comment.yml b/.github/workflows/close-comment.yml
new file mode 100644
index 000000000..5b6487b6a
--- /dev/null
+++ b/.github/workflows/close-comment.yml
@@ -0,0 +1,8 @@
+name: Add close comment
+on:
+  pull_request:
+    types:
+      - opened
+jobs:
+  close-comment:
+    uses: WillBooster/reusable-workflows/.github/workflows/close-comment.yml@main
diff --git a/.github/workflows/notify-ready.yml b/.github/workflows/notify-ready.yml
new file mode 100644
index 000000000..1aed4aa02
--- /dev/null
+++ b/.github/workflows/notify-ready.yml
@@ -0,0 +1,10 @@
+name: Notify ready
+on:
+  issues:
+    types:
+      - labeled
+jobs:
+  notify-ready:
+    uses: WillBooster/reusable-workflows/.github/workflows/notify-ready.yml@main
+    secrets:
+      DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL_FOR_READY }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 51e4ffacd..6ca9c125c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,11 +2,14 @@ name: Release
 on:
   schedule:
     - cron: 0 5 * * 0
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: false
 jobs:
   release:
     uses: WillBooster/reusable-workflows/.github/workflows/release.yml@main
     with:
-      dot_env_path: .env
+      github_hosted_runner: true
     secrets:
       DOT_ENV: ${{ secrets.DOT_ENV }}
       GH_TOKEN: ${{ secrets.PUBLIC_GH_BOT_PAT }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 77303cf68..1a7a7d95e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,16 +1,24 @@
 name: Test
 on:
   pull_request:
+    paths-ignore:
+      - '**.md'
+      - '**/docs/**'
   push:
     branches:
       - main
       - wbfy
       - renovate/**
+    paths-ignore:
+      - '**.md'
+      - '**/docs/**'
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
 jobs:
   test:
     uses: WillBooster/reusable-workflows/.github/workflows/test.yml@main
     with:
-      dot_env_path: .env
+      github_hosted_runner: true
     secrets:
-      DOT_ENV: ${{ secrets.DOT_ENV }}
       GH_TOKEN: ${{ secrets.PUBLIC_GH_BOT_PAT }}
diff --git a/.github/workflows/wbfy-merge.yml b/.github/workflows/wbfy-merge.yml
index 50ac7ebff..8bd3b766f 100644
--- a/.github/workflows/wbfy-merge.yml
+++ b/.github/workflows/wbfy-merge.yml
@@ -2,9 +2,11 @@ name: Merge wbfy
 on:
   workflow_dispatch:
   schedule:
-    - cron: 8 15 * * *
+    - cron: 9 16 * * *
 jobs:
   wbfy-merge:
     uses: WillBooster/reusable-workflows/.github/workflows/wbfy-merge.yml@main
+    with:
+      github_hosted_runner: true
     secrets:
       GH_TOKEN: ${{ secrets.PUBLIC_GH_BOT_PAT }}
diff --git a/.github/workflows/wbfy.yml b/.github/workflows/wbfy.yml
index 041f15c4d..a1b123edd 100644
--- a/.github/workflows/wbfy.yml
+++ b/.github/workflows/wbfy.yml
@@ -2,9 +2,11 @@ name: Willboosterify
 on:
   workflow_dispatch:
   schedule:
-    - cron: 15 13 * * *
+    - cron: 7 14 * * *
 jobs:
   wbfy:
     uses: WillBooster/reusable-workflows/.github/workflows/wbfy.yml@main
+    with:
+      github_hosted_runner: true
     secrets:
       GH_TOKEN: ${{ secrets.PUBLIC_GH_BOT_PAT }}
diff --git a/.gitignore b/.gitignore
index f7a127437..ecbf7a54c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-# Project-specific settings
+# Project-specific settings (head)
 
 dist.zip
 
@@ -8,8 +8,7 @@ dist.zip
 dist/
 temp/
 Icon[
]
-*.sqlite3
-*.sqlite3-journal
+!.keep
 # Created by https://www.toptal.com/developers/gitignore/api/windows
 # Edit at https://www.toptal.com/developers/gitignore?templates=windows
 
@@ -238,12 +237,6 @@ fabric.properties
 .history
 .ionide
 
-# Support for Project snippet scope
-.vscode/*.code-snippets
-
-# Ignore code-workspaces
-*.code-workspace
-
 # End of https://www.toptal.com/developers/gitignore/api/visualstudiocode
 
 # Created by https://www.toptal.com/developers/gitignore/api/emacs
@@ -494,3 +487,5 @@ dist
 .svelte-kit
 
 # End of https://www.toptal.com/developers/gitignore/api/node
+
+# Project-specific settings (tail)
diff --git a/.husky/post-merge b/.husky/post-merge
index bd4977192..6eaba37f2 100755
--- a/.husky/post-merge
+++ b/.husky/post-merge
@@ -1,4 +1,14 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-yarn
+changed_files="$(git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD)"
+
+run_if_changed() {
+  if echo "$changed_files" | grep --quiet -E "$1"; then
+    eval "$2"
+  fi
+}
+
+run_if_changed "\..+-version" "asdf plugin update --all"
+run_if_changed "\..+-version" "asdf install"
+run_if_changed "package\.json" "yarn"
diff --git a/.husky/pre-commit b/.husky/pre-commit
index 5a182ef10..1df1cdeab 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-yarn lint-staged
+node node_modules/.bin/lint-staged
diff --git a/.husky/pre-push b/.husky/pre-push
index bc073f5a0..ee71011ee 100755
--- a/.husky/pre-push
+++ b/.husky/pre-push
@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-yarn typecheck
+node node_modules/.bin/tsc --noEmit --Pretty
diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml
index 0bdd1ac05..71a277458 100644
--- a/.idea/watcherTasks.xml
+++ b/.idea/watcherTasks.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectTasksOptions">
     <TaskOptions isEnabled="true">
-      <option name="arguments" value="prettier --write $FilePathRelativeToProjectRoot$" />
+      <option name="arguments" value="node node_modules/.bin/prettier --cache --write $FilePathRelativeToProjectRoot$" />
       <option name="checkSyntaxErrors" value="false" />
       <option name="description" />
       <option name="exitCodeBehavior" value="ERROR" />
@@ -22,7 +22,7 @@
       <envs />
     </TaskOptions>
     <TaskOptions isEnabled="true">
-      <option name="arguments" value="prettier --write $FilePathRelativeToProjectRoot$" />
+      <option name="arguments" value="node node_modules/.bin/prettier --cache --write $FilePathRelativeToProjectRoot$" />
       <option name="checkSyntaxErrors" value="false" />
       <option name="description" />
       <option name="exitCodeBehavior" value="ERROR" />
@@ -42,7 +42,7 @@
       <envs />
     </TaskOptions>
     <TaskOptions isEnabled="true">
-      <option name="arguments" value="prettier --write $FilePathRelativeToProjectRoot$" />
+      <option name="arguments" value="node node_modules/.bin/prettier --cache --write $FilePathRelativeToProjectRoot$" />
       <option name="checkSyntaxErrors" value="false" />
       <option name="description" />
       <option name="exitCodeBehavior" value="ERROR" />
@@ -62,7 +62,7 @@
       <envs />
     </TaskOptions>
     <TaskOptions isEnabled="true">
-      <option name="arguments" value="prettier --write $FilePathRelativeToProjectRoot$" />
+      <option name="arguments" value="node node_modules/.bin/prettier --cache --write $FilePathRelativeToProjectRoot$" />
       <option name="checkSyntaxErrors" value="false" />
       <option name="description" />
       <option name="exitCodeBehavior" value="ERROR" />
@@ -82,7 +82,7 @@
       <envs />
     </TaskOptions>
     <TaskOptions isEnabled="true">
-      <option name="arguments" value="prettier --write $FilePathRelativeToProjectRoot$" />
+      <option name="arguments" value="node node_modules/.bin/prettier --cache --write $FilePathRelativeToProjectRoot$" />
       <option name="checkSyntaxErrors" value="false" />
       <option name="description" />
       <option name="exitCodeBehavior" value="ERROR" />
@@ -102,7 +102,7 @@
       <envs />
     </TaskOptions>
     <TaskOptions isEnabled="true">
-      <option name="arguments" value="prettier --write $FilePathRelativeToProjectRoot$" />
+      <option name="arguments" value="node node_modules/.bin/prettier --cache --write $FilePathRelativeToProjectRoot$" />
       <option name="checkSyntaxErrors" value="false" />
       <option name="description" />
       <option name="exitCodeBehavior" value="ERROR" />
diff --git a/.lintstagedrc.cjs b/.lintstagedrc.cjs
index 7c9898b81..e81f4b2dd 100644
--- a/.lintstagedrc.cjs
+++ b/.lintstagedrc.cjs
@@ -1,14 +1,17 @@
 const micromatch = require('micromatch');
 
 module.exports = {
-  './{src,__tests__,scripts}/**/*.{cjs,js,jsx,mjs,ts,tsx}': ['eslint --fix', 'prettier --write'],
-  './**/*.{cjs,css,htm,html,js,json,json5,jsx,md,mjs,scss,ts,tsx,vue,yaml,yml}': (files) => {
-    files = micromatch.not(files, './{src,__tests__,scripts}/**/*.{cjs,js,jsx,mjs,ts,tsx}');
+  './{scripts,src,tests}/**/*.{cjs,cts,js,jsx,mjs,mts,ts,tsx}': [
+    'node node_modules/.bin/eslint --fix',
+    'node node_modules/.bin/prettier --cache --write',
+  ],
+  './**/*.{cjs,css,cts,htm,html,js,json,json5,jsx,md,mjs,mts,scss,ts,tsx,vue,yaml,yml}': (files) => {
+    files = micromatch.not(files, './{scripts,src,tests}/**/*.{cjs,cts,js,jsx,mjs,mts,ts,tsx}');
     const filteredFiles = files.filter((file) => !file.includes('/test-fixtures/') && !file.includes('/packages/'));
     if (filteredFiles.length === 0) return [];
-    const commands = [`prettier --write ${filteredFiles.join(' ')}`];
+    const commands = [`node node_modules/.bin/prettier --cache --write ${filteredFiles.join(' ')}`];
     if (filteredFiles.some((file) => file.endsWith('package.json'))) {
-      commands.push('yarn sort-package-json');
+      commands.push('node node_modules/.bin/sort-package-json');
     }
     return commands;
   },
diff --git a/.node-version b/.node-version
deleted file mode 100644
index 617bcf916..000000000
--- a/.node-version
+++ /dev/null
@@ -1 +0,0 @@
-18.14.1
diff --git a/.prettierignore b/.prettierignore
index ee9aa5f54..48c8110de 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,4 +1,4 @@
-# Project-specific settings
+# Project-specific settings (head)
 
 
 # Generated by @willbooster/willboosterify
@@ -12,15 +12,13 @@ test-fixtures/
 *.min.js
 .yarn/
 .pnp.js
-
 dist.zip
 
 .devcontainer/
 dist/
 temp/
 Icon[
]
-*.sqlite3
-*.sqlite3-journal
+!.keep
 # Created by https://www.toptal.com/developers/gitignore/api/windows
 # Edit at https://www.toptal.com/developers/gitignore?templates=windows
 
@@ -249,12 +247,6 @@ fabric.properties
 .history
 .ionide
 
-# Support for Project snippet scope
-.vscode/*.code-snippets
-
-# Ignore code-workspaces
-*.code-workspace
-
 # End of https://www.toptal.com/developers/gitignore/api/visualstudiocode
 
 # Created by https://www.toptal.com/developers/gitignore/api/emacs
@@ -504,3 +496,5 @@ dist
 .svelte-kit
 
 # End of https://www.toptal.com/developers/gitignore/api/node
+
+# Project-specific settings (tail)
diff --git a/.releaserc.json b/.releaserc.json
index 506cf88af..b9bbfa6cb 100644
--- a/.releaserc.json
+++ b/.releaserc.json
@@ -3,7 +3,10 @@
   "plugins": [
     ["@semantic-release/commit-analyzer", { "preset": "conventionalcommits" }],
     "@semantic-release/release-notes-generator",
-    "@semantic-release/github",
+    [
+      "@semantic-release/github",
+      { "successComment": false, "labels": ["r: semantic-release"], "releasedLabels": ["released :bookmark:"] }
+    ],
     [
       "semantic-release-firefox-add-on",
       { "extensionId": "{d324f64b-b423-4c2b-a9b4-d415705c26a9}", "targetXpi": "dist.xpi", "channel": "listed" }
diff --git a/.tool-versions b/.tool-versions
new file mode 100644
index 000000000..ac8baaa74
--- /dev/null
+++ b/.tool-versions
@@ -0,0 +1,2 @@
+nodejs 18.14.1
+yarn 1.22.19
diff --git a/.yarn/plugins/plugin-auto-install.cjs b/.yarn/plugins/plugin-auto-install.cjs
index c3459de88..9218bfcdc 100644
--- a/.yarn/plugins/plugin-auto-install.cjs
+++ b/.yarn/plugins/plugin-auto-install.cjs
@@ -1,3 +1,2 @@
-module.exports={name:"plugin-auto-install",factory:r=>{let p=r("child_process"),S=r("crypto"),a=r("fs"),o=r("path"),l="plugin-auto-install v1.8.1",d=!1,g="",j={validateProject(n){d=!0;let t=h(n);t&&t===u(n)||f(t,n)},afterAllInstalled(n){d=!1;let t=h(n);t&&t===u(n)||f(t,n)},async wrapScriptExecution(n,t,s,w,c){if(d)return n;try{let e=h(t);if(e&&e===u(t)||!f(e,t))return n;console.info(`${l} is running 'yarn install' due to dependency changes.`),p.spawnSync("yarn",["install"],{cwd:c.cwd,env:c.env}),console.info(`${l} finished 'yarn install'.`);let i=p.spawnSync("yarn",[w,...c.args],{cwd:c.cwd,env:c.env,stdio:"inherit",shell:!0});return async()=>i.status||0}catch{}return n}};function h(n){try{let t=S.createHash("sha256"),s=o.join(n.cwd,"yarn.lock");a.statSync(s,{throwIfNoEntry:!1})&&t.update(a.readFileSync(s,"utf-8"));for(let c of n.workspaces.map(e=>e.cwd).sort()){let e=o.join(c,"package.json"),i=JSON.parse(a.readFileSync(e,"utf-8")),m=Object.keys(i).filter(y=>y.endsWith("ependencies")),P=[];for(let y of m)P.push(...Object.entries(i[y]).map(([v,H])=>`${v}: ${H}`));t.update(P.sort().join(","))}return t.digest("hex")}catch{}}function u(n){try{let t=k(n);return a.readFileSync(o.join(t,"hash"),"utf-8")}catch{}}function f(n,t){if(!n||n===g)return!1;try{let s=k(t);a.mkdirSync(s,{recursive:!0}),a.writeFileSync(o.join(s,"hash"),n),a.writeFileSync(o.join(s,".gitignore"),`.gitignore
-hash`),console.info(`${l} updated dependency hash: ${n}`),g=n}catch{}return!0}function k(n){return o.join(n.cwd,".yarn","plugins","plugin-auto-install")}return{hooks:j}}};
-//# sourceMappingURL=index.cjs.map
+"use strict";var n={name:"plugin-auto-install",factory:n=>{const t=n("child_process"),e=n("crypto"),r=n("fs"),c=n("path"),s="plugin-auto-install v1.8.7";let i=!1,o="";function a(n){try{const t=e.createHash("sha256"),s=c.join(n.cwd,"yarn.lock");r.statSync(s,{throwIfNoEntry:!1})&&t.update(r.readFileSync(s,"utf8"));for(const e of n.workspaces.map((n=>n.cwd)).sort()){const n=c.join(e,"package.json"),s=JSON.parse(r.readFileSync(n,"utf8")),i=Object.keys(s).filter((n=>n.endsWith("ependencies"))),o=[];for(const n of i)o.push(...Object.entries(s[n]).map((([n,t])=>`${n}: ${t}`)));t.update(o.sort().join(","))}return t.digest("hex")}catch{}}function l(n){try{const t=d(n);return r.readFileSync(c.join(t,"hash"),"utf8")}catch{}}function u(n,t){if(!n||n===o)return!1;try{const e=d(t);r.mkdirSync(e,{recursive:!0}),r.writeFileSync(c.join(e,"hash"),n),r.writeFileSync(c.join(e,".gitignore"),".gitignore\nhash"),console.info(`${s} updated dependency hash: ${n}`),o=n}catch{}return!0}function d(n){return c.join(n.cwd,".yarn","plugins","plugin-auto-install")}return{hooks:{validateProject(n){i=!0;const t=a(n);t&&t===l(n)||u(t,n)},afterAllInstalled(n){i=!1;const t=a(n);t&&t===l(n)||u(t,n)},async wrapScriptExecution(n,e,r,c,o){if(i)return n;try{const r=a(e);if(r&&r===l(e))return n;if(!u(r,e))return n;console.info(`${s} is running 'yarn install' due to dependency changes.`),t.spawnSync("yarn",["install"],{cwd:o.cwd,env:o.env}),console.info(`${s} finished 'yarn install'.`);const i=t.spawnSync("yarn",[c,...o.args],{cwd:o.cwd,env:o.env,stdio:"inherit",shell:!0});return async()=>i.status||0}catch{}return n}}}}};module.exports=n;
+//# sourceMappingURL=index.min.cjs.map
diff --git a/.yarnrc.yml b/.yarnrc.yml
index b04979ec3..bac511f31 100644
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -1,13 +1,11 @@
 defaultSemverRangePrefix: ''
-
+enableGlobalCache: true
 nmMode: hardlinks-global
-
 nodeLinker: node-modules
-
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
     spec: '@yarnpkg/plugin-typescript'
-  - path: .yarn/plugins/plugin-auto-install.cjs
-    spec: 'https://github.com/WillBooster/yarn-plugin-auto-install/releases/download/v1.8.1/index.cjs'
-
+  - checksum: 0f32e7b2ab1a5128157f6b236a4cc061655bffbe41a1ed84441e4eb07caac0839b013e19cd1a065ce92c29b8eb1f530a613acd3594625108190a61b64612c019
+    path: .yarn/plugins/plugin-auto-install.cjs
+    spec: https://github.com/WillBooster/yarn-plugin-auto-install/releases/download/v1.8.7/index.min.cjs
 yarnPath: .yarn/releases/yarn-4.0.0-rc.39.cjs
diff --git a/README.md b/README.md
index 031115382..2a8369cb7 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # PlantUML Visualizer
 
+[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
 [![Test](https://github.com/WillBooster/plantuml-visualizer/actions/workflows/test.yml/badge.svg)](https://github.com/WillBooster/plantuml-visualizer/actions/workflows/test.yml)
 [![Release](https://github.com/WillBooster/plantuml-visualizer/actions/workflows/release.yml/badge.svg)](https://github.com/WillBooster/plantuml-visualizer/actions/workflows/release.yml)
-[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
 
 :factory: A Chrome / Firefox extension for visualizing PlantUML descriptions.
 
diff --git a/package.json b/package.json
index 6de892114..2067ba2e8 100644
--- a/package.json
+++ b/package.json
@@ -17,10 +17,12 @@
     "cleanup": "yarn format && yarn lint-fix",
     "format": "sort-package-json && yarn prettify",
     "postinstall": "husky install",
-    "lint": "eslint --color \"./{src,__tests__,scripts}/**/*.{cjs,js,jsx,mjs,ts,tsx}\"",
+    "lint": "eslint --color \"./{scripts,src,tests}/**/*.{cjs,cts,js,jsx,mjs,mts,ts,tsx}\"",
     "lint-fix": "yarn lint --fix",
+    "prepack": "pinst --disable",
+    "postpack": "pinst --enable",
     "package": "rm -f \"*.tgz\" \"*.zip\" && yarn pack && yarn build && cd dist && bestzip ../dist.zip *",
-    "prettify": "prettier --color --write \"**/{.*/,}*.{cjs,css,htm,html,js,json,json5,jsx,md,mjs,scss,ts,tsx,vue,yaml,yml}\" \"!**/test-fixtures/**\"",
+    "prettify": "prettier --cache --color --write \"**/{.*/,}*.{cjs,css,cts,htm,html,js,json,json5,jsx,md,mjs,mts,scss,ts,tsx,vue,yaml,yml}\" \"!**/test-fixtures/**\"",
     "recreate-dist": "rm -Rf dist && mkdir dist && cp -r src/popup.html icon manifest.json dist/",
     "release": "yarn build && dotenv -- semantic-release",
     "release-test": "dotenv -- semantic-release --dry-run",
@@ -33,25 +35,25 @@
     "zlib.es": "0.6.0"
   },
   "devDependencies": {
-    "@babel/core": "7.20.12",
+    "@babel/core": "7.21.0",
     "@babel/plugin-proposal-class-properties": "7.18.6",
     "@babel/plugin-proposal-numeric-separator": "7.18.6",
-    "@babel/plugin-proposal-optional-chaining": "7.20.7",
+    "@babel/plugin-proposal-optional-chaining": "7.21.0",
     "@babel/preset-env": "7.20.2",
     "@babel/preset-react": "7.18.6",
-    "@babel/preset-typescript": "7.18.6",
+    "@babel/preset-typescript": "7.21.0",
     "@rollup/plugin-babel": "6.0.3",
     "@rollup/plugin-commonjs": "24.0.1",
     "@rollup/plugin-node-resolve": "15.0.1",
     "@tsconfig/svelte": "3.0.0",
-    "@types/chrome": "0.0.213",
+    "@types/chrome": "0.0.217",
     "@types/eslint": "8.21.1",
     "@types/jquery": "3.5.16",
     "@types/micromatch": "4.0.2",
     "@types/sass": "1.43.1",
-    "@typescript-eslint/eslint-plugin": "5.52.0",
-    "@typescript-eslint/parser": "5.52.0",
-    "@willbooster/eslint-config-ts": "9.2.1",
+    "@typescript-eslint/eslint-plugin": "5.53.0",
+    "@typescript-eslint/parser": "5.53.0",
+    "@willbooster/eslint-config-ts": "10.0.8",
     "@willbooster/prettier-config": "9.1.1",
     "@willbooster/renovate-config": "9.5.0",
     "babel-plugin-transform-remove-console": "6.9.4",
@@ -59,30 +61,31 @@
     "conventional-changelog-conventionalcommits": "5.0.0",
     "cross-env": "7.0.3",
     "dotenv-cli": "7.0.0",
-    "eslint": "8.34.0",
+    "eslint": "8.35.0",
     "eslint-config-prettier": "8.6.0",
     "eslint-import-resolver-typescript": "3.5.3",
     "eslint-plugin-import": "2.27.5",
     "eslint-plugin-sort-class-members": "1.16.0",
     "eslint-plugin-sort-destructure-keys": "1.5.0",
     "eslint-plugin-svelte3": "4.0.0",
+    "eslint-plugin-unicorn": "45.0.2",
     "husky": "8.0.3",
     "lint-staged": "13.1.2",
     "micromatch": "4.0.5",
     "pinst": "3.0.0",
     "prettier": "2.8.4",
     "prettier-plugin-svelte": "2.9.0",
-    "rollup": "2.79.1",
+    "rollup": "3.17.3",
     "rollup-plugin-svelte": "7.1.3",
     "rollup-plugin-terser": "7.0.2",
-    "sass": "1.58.2",
+    "sass": "1.58.3",
     "semantic-release": "20.1.0",
     "semantic-release-chrome": "3.1.0",
     "semantic-release-firefox-add-on": "0.2.8",
     "sort-package-json": "2.4.1",
     "svelte": "3.55.1",
     "svelte-check": "3.0.4",
-    "svelte-preprocess": "4.10.7",
+    "svelte-preprocess": "5.0.1",
     "typescript": "4.9.5"
   },
   "packageManager": "yarn@4.0.0-rc.39"
diff --git a/rollup.config.js b/rollup.config.mjs
similarity index 96%
rename from rollup.config.js
rename to rollup.config.mjs
index ca8943c74..435c74962 100644
--- a/rollup.config.js
+++ b/rollup.config.mjs
@@ -28,7 +28,7 @@ export default [
     plugins,
   },
   {
-    input: 'src/content_scripts.ts',
+    input: 'src/contentScripts.ts',
     output: [
       {
         file: 'dist/content_scripts.js',
diff --git a/src/background.ts b/src/background.ts
index baacbd9bd..c85330d53 100644
--- a/src/background.ts
+++ b/src/background.ts
@@ -13,22 +13,27 @@ chrome.storage.sync.get((storage: Partial<Config>) => {
 
 chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
   switch (request.command) {
-    case Constants.commands.getConfig:
+    case Constants.commands.getConfig: {
       sendResponse(config);
       break;
-    case Constants.commands.getExtensionEnabled:
+    }
+    case Constants.commands.getExtensionEnabled: {
       sendResponse(config.extensionEnabled);
       break;
-    case Constants.commands.getAllowedUrls:
+    }
+    case Constants.commands.getAllowedUrls: {
       sendResponse(config.allowedUrls);
       break;
-    case Constants.commands.getDeniedUrls:
+    }
+    case Constants.commands.getDeniedUrls: {
       sendResponse(config.deniedUrls);
       break;
-    case Constants.commands.getPumlServerUrl:
+    }
+    case Constants.commands.getPumlServerUrl: {
       sendResponse(config.pumlServerUrl);
       break;
-    case Constants.commands.setConfig:
+    }
+    case Constants.commands.setConfig: {
       config = request.config;
       sendResponse(config);
       chrome.storage.sync.set(config);
@@ -36,42 +41,49 @@ chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
         if (tabs[0].id) chrome.tabs.reload(tabs[0].id);
       });
       break;
-    case Constants.commands.toggleExtensionEnabled:
+    }
+    case Constants.commands.toggleExtensionEnabled: {
       config.extensionEnabled = !config.extensionEnabled;
       sendResponse(config.extensionEnabled);
-      chrome.storage.sync.set({ extensionEnabled: config.extensionEnabled });
+      void chrome.storage.sync.set({ extensionEnabled: config.extensionEnabled });
       setIcon();
       chrome.tabs.query({ active: true, currentWindow: true }, (tabs) => {
-        if (tabs[0].id) chrome.tabs.reload(tabs[0].id);
+        if (tabs[0].id) void chrome.tabs.reload(tabs[0].id);
       });
       break;
-    case Constants.commands.setAllowedUrls:
+    }
+    case Constants.commands.setAllowedUrls: {
       config.allowedUrls = request.allowedUrls;
       sendResponse(config.allowedUrls);
-      chrome.storage.sync.set({ allowedUrls: config.allowedUrls });
+      void chrome.storage.sync.set({ allowedUrls: config.allowedUrls });
       chrome.tabs.query({ active: true, currentWindow: true }, (tabs) => {
-        if (tabs[0].id) chrome.tabs.reload(tabs[0].id);
+        if (tabs[0].id) void chrome.tabs.reload(tabs[0].id);
       });
       break;
-    case Constants.commands.setDeniedUrls:
+    }
+    case Constants.commands.setDeniedUrls: {
       config.deniedUrls = request.deniedUrls;
       sendResponse(config.deniedUrls);
-      chrome.storage.sync.set({ deniedUrls: config.deniedUrls });
+      void chrome.storage.sync.set({ deniedUrls: config.deniedUrls });
       chrome.tabs.query({ active: true, currentWindow: true }, (tabs) => {
-        if (tabs[0].id) chrome.tabs.reload(tabs[0].id);
+        if (tabs[0].id) void chrome.tabs.reload(tabs[0].id);
       });
       break;
-    case Constants.commands.setPumlServerUrl:
+    }
+    case Constants.commands.setPumlServerUrl: {
       config.pumlServerUrl = request.pumlServerUrl;
       sendResponse(config.pumlServerUrl);
-      chrome.storage.sync.set({ pumlServerUrl: config.pumlServerUrl });
+      void chrome.storage.sync.set({ pumlServerUrl: config.pumlServerUrl });
       chrome.tabs.query({ active: true, currentWindow: true }, (tabs) => {
-        if (tabs[0].id) chrome.tabs.reload(tabs[0].id);
+        if (tabs[0].id) void chrome.tabs.reload(tabs[0].id);
       });
       break;
+    }
   }
 });
 
 function setIcon(): void {
-  chrome.browserAction.setIcon({ path: config.extensionEnabled ? 'icon/icon16.png' : 'icon/icon16gray.png' });
+  chrome.browserAction.setIcon({ path: config.extensionEnabled ? 'icon/icon16.png' : 'icon/icon16gray.png' }, () => {
+    // do nothing
+  });
 }
diff --git a/src/components/Footer.svelte b/src/components/Footer.svelte
index a1d003b9d..875e242b3 100644
--- a/src/components/Footer.svelte
+++ b/src/components/Footer.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-  import { createEventDispatcher } from 'svelte';
+    import {createEventDispatcher} from 'svelte';
 
-  import Button from './Button.svelte';
+    import Button from './Button.svelte';
 
-  export let disabled: boolean = false;
+    export let disabled: boolean = false;
 
   const dispatch = createEventDispatcher<{ clickBackToDefault: undefined }>();
 </script>
diff --git a/src/config.ts b/src/config.ts
index d59e42eba..d8fe1c7ea 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -10,7 +10,7 @@ export function urlToRegExp(deniedUrl: string): RegExp {
     '^' +
       deniedUrl
         .split('*')
-        .map((str) => str.replace(/([.*+?^=!:${}()|[\]/\\])/g, '\\$1'))
+        .map((str) => str.replace(/([!$()*+./:=?[\\\]^{|}])/g, '\\$1'))
         .join('.*') +
       '$'
   );
diff --git a/src/content_scripts.ts b/src/contentScripts.ts
similarity index 78%
rename from src/content_scripts.ts
rename to src/contentScripts.ts
index e2afbe0f7..ee68b2169 100644
--- a/src/content_scripts.ts
+++ b/src/contentScripts.ts
@@ -4,10 +4,11 @@ import type { Config } from './config';
 import { urlToRegExp } from './config';
 import { Constants } from './constants';
 import { CodeBlockFinder } from './finder/codeBlockFinder';
-import type { DiffFinder, CodeFinder } from './finder/finder';
-import { GitHubFileViewFinder, GitHubPullRequestDiffFinder } from './finder/gitHubFinder';
-import { DescriptionMutator } from './mutator/descriptionMutator';
-import { DiffMutator } from './mutator/diffMutator';
+import type { CodeFinder, DiffFinder } from './finder/finder';
+import { GitHubFileViewFinder } from './finder/github/gitHubFileViewFinder';
+import { GitHubPullRequestDiffFinder } from './finder/github/gitHubPullRequestDiffFinder';
+import { descriptionMutator } from './mutator/descriptionMutator';
+import { diffMutator } from './mutator/diffMutator';
 
 const sleep = (msec: number): Promise<void> => new Promise((resolve) => setTimeout(resolve, msec));
 
@@ -49,16 +50,16 @@ async function embedPlantUmlImages(): Promise<void[]> {
   if (lastUrl === location.href && embedding) return [];
 
   embedding = true;
-  if (lastUrl !== location.href) {
+  if (lastUrl === location.href) {
+    // Deal with re-rendering multiple times (e.g. it occurs when updating a GitHub issue)
+    await sleep(1000);
+  } else {
     lastUrl = location.href;
     enabledFinders = allCodeFinders.filter((f) => f.canFind(location.href));
     enabledDiffFinders = allDiffFinders.filter((f) => f.canFind(location.href));
-  } else {
-    // Deal with re-rendering multiple times (e.g. it occurs when updating a GitHub issue)
-    await sleep(1000);
   }
   return Promise.all([
-    DescriptionMutator.embedPlantUmlImages(enabledFinders, location.href, $(document.body)),
-    DiffMutator.embedPlantUmlImages(enabledDiffFinders, location.href, $(document.body)),
+    descriptionMutator.embedPlantUmlImages(enabledFinders, location.href, $(document.body)),
+    diffMutator.embedPlantUmlImages(enabledDiffFinders, location.href, $(document.body)),
   ]);
 }
diff --git a/src/encoder/plantUmlEncoder.ts b/src/encoder/plantUmlEncoder.ts
index e31869c00..d004dd481 100644
--- a/src/encoder/plantUmlEncoder.ts
+++ b/src/encoder/plantUmlEncoder.ts
@@ -1,3 +1,6 @@
+/* eslint-disable unicorn/prefer-code-point */
+// fromCharCode is faster than codePointAt and enough for our use case.
+
 import { deflate } from 'zlib.es';
 
 import { Constants } from '../constants';
diff --git a/src/finder/codeBlockFinder.ts b/src/finder/codeBlockFinder.ts
index a3b782e6e..e9d34b414 100644
--- a/src/finder/codeBlockFinder.ts
+++ b/src/finder/codeBlockFinder.ts
@@ -11,7 +11,7 @@ export class CodeBlockFinder implements CodeFinder {
     return this.URL_REGEX.test(webPageUrl);
   }
 
-  async find(webPageUrl: string, $root: JQuery<Node>): Promise<UmlCodeContent[]> {
+  async findContents(webPageUrl: string, $root: JQuery<Node>): Promise<UmlCodeContent[]> {
     const $texts = $root.find(`pre:not([${Constants.ignoreAttribute}])`);
     const result = [];
     for (let i = 0; i < $texts.length; i++) {
diff --git a/src/finder/finder.ts b/src/finder/finder.ts
index 3c14da93d..a861cfafa 100644
--- a/src/finder/finder.ts
+++ b/src/finder/finder.ts
@@ -5,7 +5,7 @@ export interface UmlCodeContent {
 
 export interface CodeFinder {
   canFind(webPageUrl: string): boolean;
-  find(webPageUrl: string, $root: JQuery<Node>): Promise<UmlCodeContent[]>;
+  findContents(webPageUrl: string, $root: JQuery<Node>): Promise<UmlCodeContent[]>;
 }
 
 export interface UmlDiffContent {
@@ -18,5 +18,5 @@ export interface UmlDiffContent {
 
 export interface DiffFinder {
   canFind(webPageUrl: string): boolean;
-  find(webPageUrl: string, $root: JQuery<Node>): Promise<UmlDiffContent[]>;
+  findContents(webPageUrl: string, $root: JQuery<Node>): Promise<UmlDiffContent[]>;
 }
diff --git a/src/finder/gitHubFinder.ts b/src/finder/gitHubFinder.ts
deleted file mode 100644
index 5fc9e0f33..000000000
--- a/src/finder/gitHubFinder.ts
+++ /dev/null
@@ -1,174 +0,0 @@
-import $ from 'jquery';
-
-import { Constants } from '../constants';
-import { INCLUDE_REGEX, INCLUDESUB_REGEX } from '../directiveRegexes';
-
-import type { DiffFinder, CodeFinder, UmlCodeContent, UmlDiffContent } from './finder';
-import { extractSubIncludedText } from './finderUtil';
-
-export class GitHubFileViewFinder implements CodeFinder {
-  private readonly URL_REGEX = /^https:\/\/github\.com\/.*\/.*\.(plantuml|pu|puml|wsd)(\?.*)?$/;
-
-  canFind(webPageUrl: string): boolean {
-    return this.URL_REGEX.test(webPageUrl);
-  }
-
-  async find(webPageUrl: string, $root: JQuery<Node>): Promise<UmlCodeContent[]> {
-    const $texts = $root.find(`div[itemprop='text']:not([${Constants.ignoreAttribute}])`);
-    const result = [];
-    for (let i = 0; i < $texts.length; i++) {
-      const $text = $texts.eq(i);
-      const $fileLines = $text.find('tr');
-      let fileText = [...Array($fileLines.length).keys()]
-        .map((lineno) => $fileLines.eq(lineno).find("[id^='LC'").text() + '\n')
-        .join('');
-      fileText = await this.preprocessIncludeDirective(webPageUrl, fileText);
-      fileText = await this.preprocessIncludesubDirective(webPageUrl, fileText);
-      result.push({ $text, text: fileText });
-    }
-    return result;
-  }
-
-  private async preprocessIncludeDirective(webPageUrl: string, fileText: string): Promise<string> {
-    const fileTextLines = fileText.split('\n');
-    const dirUrl = webPageUrl.replace(/\/[^/]*\.(plantuml|pu|puml|wsd)(\?.*)?$/, '');
-
-    const preprocessedLines = [];
-    for (const line of fileTextLines) {
-      const match = INCLUDE_REGEX.exec(line);
-      if (!match) {
-        preprocessedLines.push(line);
-        continue;
-      }
-
-      const includedFileUrl = `${dirUrl}/${match[1]}`;
-      const response = await fetch(includedFileUrl);
-      if (!response.ok) {
-        preprocessedLines.push(line);
-        continue;
-      }
-      const htmlString = await response.text();
-      const $body = $(new DOMParser().parseFromString(htmlString, 'text/html')).find('body');
-      const fileTexts = await this.find(includedFileUrl, $body);
-      const includedText = fileTexts
-        .map((fileText) => fileText.text.replace(/@startuml/g, '').replace(/@enduml/g, ''))
-        .join('\n');
-      preprocessedLines.push(includedText);
-    }
-
-    return preprocessedLines.join('\n');
-  }
-
-  private async preprocessIncludesubDirective(webPageUrl: string, content: string): Promise<string> {
-    const contentLines = content.split('\n');
-    const dirUrl = webPageUrl.replace(/\/[^/]*\.(plantuml|pu|puml|wsd)(\?.*)?$/, '');
-
-    const preprocessedLines = [];
-    for (const line of contentLines) {
-      const match = INCLUDESUB_REGEX.exec(line);
-      if (!match) {
-        preprocessedLines.push(line);
-        continue;
-      }
-
-      const includedFileUrl = `${dirUrl}/${match[1]}`;
-      const response = await fetch(includedFileUrl);
-      if (!response.ok) {
-        preprocessedLines.push(line);
-        continue;
-      }
-      const htmlString = await response.text();
-      const $body = $(new DOMParser().parseFromString(htmlString, 'text/html')).find('body');
-      const fileTexts = await this.find(includedFileUrl, $body);
-      const includedText = fileTexts.map((fileText) => extractSubIncludedText(fileText.text, match[3])).join('\n');
-      preprocessedLines.push(includedText);
-    }
-
-    return preprocessedLines.join('\n');
-  }
-}
-
-export class GitHubPullRequestDiffFinder implements DiffFinder {
-  private static getBaseHeadFilePaths($diff: JQuery<Node>): [string, string] {
-    const title = $diff.find('div.file-info a').attr('title');
-    if (!title) return ['', ''];
-    const separator = ' → ';
-    const fragments = title.split(separator);
-    const filePaths = [];
-    let filePath = '';
-    for (const fragment of fragments) {
-      filePath += fragment;
-      if (filePath.match(/^.*\.(plantuml|pu|puml|wsd)$/)) {
-        filePaths.push(filePath);
-        filePath = '';
-      } else {
-        filePath += separator;
-      }
-    }
-    if (filePaths.length === 1) return [filePaths[0], filePaths[0]];
-    if (filePaths.length === 2) return [filePaths[0], filePaths[1]];
-    return ['', ''];
-  }
-  private static async getTexts(fileUrl: string): Promise<string[]> {
-    const response = await fetch(fileUrl);
-    if (!response.ok) return [];
-    const htmlString = await response.text();
-    const $body = $(new DOMParser().parseFromString(htmlString, 'text/html')).find('body');
-    const fileBlockFinder = new GitHubFileViewFinder();
-    const contents = await fileBlockFinder.find(fileUrl, $body);
-    return contents.map((content) => content.text);
-  }
-  private readonly URL_REGEX = /^https:\/\/github\.com\/.*\/pull\/\d+\/files/;
-
-  canFind(webPageUrl: string): boolean {
-    return this.URL_REGEX.test(webPageUrl);
-  }
-
-  async find(webPageUrl: string, $root: JQuery<Node>): Promise<UmlDiffContent[]> {
-    const blobRoot = webPageUrl.replace(/pull\/\d+\/files.*/, 'blob');
-    const [baseBranchName, headBranchName] = this.getBaseHeadBranchNames($root);
-    const diffs = this.getDiffs($root);
-    const result = await Promise.all(
-      diffs.map(($diff) => this.getDiffContent(blobRoot, baseBranchName, headBranchName, $diff))
-    );
-    return result.filter((content) => content.$diff.length > 0);
-  }
-
-  private getBaseHeadBranchNames($root: JQuery<Node>): [string, string] {
-    const getBranchNameSelector = (baseOrHead: 'base' | 'head'): string =>
-      `span.commit-ref.css-truncate.user-select-contain.expandable.${baseOrHead}-ref span.css-truncate-target`;
-    const $baseRef = $root.find(getBranchNameSelector('base'));
-    const $headRef = $root.find(getBranchNameSelector('head'));
-    return [$baseRef.text(), $headRef.text()];
-  }
-
-  private getDiffs($root: JQuery<Node>): JQuery<Node>[] {
-    const $diffs = $root.find(`div[id^='diff-']:not([${Constants.ignoreAttribute}])`);
-    return [...Array($diffs.length).keys()].map((i) => $diffs.eq(i));
-  }
-
-  private async getDiffContent(
-    blobRoot: string,
-    baseBranchName: string,
-    headBranchName: string,
-    $diff: JQuery<Node>
-  ): Promise<UmlDiffContent> {
-    const [baseFilePath, headFilePath] = GitHubPullRequestDiffFinder.getBaseHeadFilePaths($diff);
-    const $diffBlock = $diff.find('div.js-file-content.Details-content--hidden');
-    if (
-      (!baseFilePath && !headFilePath) ||
-      $diffBlock.length === 0 ||
-      $diffBlock.find('div.data.highlight.empty').length > 0
-    ) {
-      return { $diff: $(), baseBranchName, headBranchName, baseTexts: [], headTexts: [] };
-    }
-    const fileUrls = [
-      blobRoot + '/' + baseBranchName + '/' + baseFilePath,
-      blobRoot + '/' + headBranchName + '/' + headFilePath,
-    ];
-    const [baseTexts, headTexts] = await Promise.all(
-      fileUrls.map((fileUrl) => GitHubPullRequestDiffFinder.getTexts(fileUrl))
-    );
-    return { $diff: $diffBlock, baseBranchName, headBranchName, baseTexts, headTexts };
-  }
-}
diff --git a/src/finder/github/gitHubFileViewFinder.ts b/src/finder/github/gitHubFileViewFinder.ts
new file mode 100644
index 000000000..3fe0095a7
--- /dev/null
+++ b/src/finder/github/gitHubFileViewFinder.ts
@@ -0,0 +1,88 @@
+import $ from 'jquery';
+
+import { Constants } from '../../constants';
+import { INCLUDE_REGEX, INCLUDESUB_REGEX } from '../../directiveRegexes';
+import type { CodeFinder, UmlCodeContent } from '../finder';
+import { extractSubIncludedText } from '../finderUtil';
+
+export class GitHubFileViewFinder implements CodeFinder {
+  private readonly URL_REGEX = /^https:\/\/github\.com\/.*\/.*\.(plantuml|pu|puml|wsd)(\?.*)?$/;
+
+  canFind(webPageUrl: string): boolean {
+    return this.URL_REGEX.test(webPageUrl);
+  }
+
+  async findContents(webPageUrl: string, $root: JQuery<Node>): Promise<UmlCodeContent[]> {
+    const $texts = $root.find(`div[itemprop='text']:not([${Constants.ignoreAttribute}])`);
+    const result = [];
+    for (let i = 0; i < $texts.length; i++) {
+      const $text = $texts.eq(i);
+      const $fileLines = $text.find('tr');
+      let fileText = [...Array.from({ length: $fileLines.length }).keys()]
+        .map((lineno) => $fileLines.eq(lineno).find("[id^='LC'").text() + '\n')
+        .join('');
+      fileText = await this.preprocessIncludeDirective(webPageUrl, fileText);
+      fileText = await this.preprocessIncludeSubDirective(webPageUrl, fileText);
+      result.push({ $text, text: fileText });
+    }
+    return result;
+  }
+
+  private async preprocessIncludeDirective(webPageUrl: string, fileText: string): Promise<string> {
+    const fileTextLines = fileText.split('\n');
+    const dirUrl = webPageUrl.replace(/\/[^/]*\.(plantuml|pu|puml|wsd)(\?.*)?$/, '');
+
+    const preprocessedLines = [];
+    for (const line of fileTextLines) {
+      const match = INCLUDE_REGEX.exec(line);
+      if (!match) {
+        preprocessedLines.push(line);
+        continue;
+      }
+
+      const includedFileUrl = `${dirUrl}/${match[1]}`;
+      const response = await fetch(includedFileUrl);
+      if (!response.ok) {
+        preprocessedLines.push(line);
+        continue;
+      }
+      const htmlString = await response.text();
+      const $body = $(new DOMParser().parseFromString(htmlString, 'text/html')).find('body');
+      const fileTexts = await this.findContents(includedFileUrl, $body);
+      const includedText = fileTexts
+        .map((fileText) => fileText.text.replace(/@startuml/g, '').replace(/@enduml/g, ''))
+        .join('\n');
+      preprocessedLines.push(includedText);
+    }
+
+    return preprocessedLines.join('\n');
+  }
+
+  private async preprocessIncludeSubDirective(webPageUrl: string, content: string): Promise<string> {
+    const contentLines = content.split('\n');
+    const dirUrl = webPageUrl.replace(/\/[^/]*\.(plantuml|pu|puml|wsd)(\?.*)?$/, '');
+
+    const preprocessedLines = [];
+    for (const line of contentLines) {
+      const match = INCLUDESUB_REGEX.exec(line);
+      if (!match) {
+        preprocessedLines.push(line);
+        continue;
+      }
+
+      const includedFileUrl = `${dirUrl}/${match[1]}`;
+      const response = await fetch(includedFileUrl);
+      if (!response.ok) {
+        preprocessedLines.push(line);
+        continue;
+      }
+      const htmlString = await response.text();
+      const $body = $(new DOMParser().parseFromString(htmlString, 'text/html')).find('body');
+      const fileTexts = await this.findContents(includedFileUrl, $body);
+      const includedText = fileTexts.map((fileText) => extractSubIncludedText(fileText.text, match[3])).join('\n');
+      preprocessedLines.push(includedText);
+    }
+
+    return preprocessedLines.join('\n');
+  }
+}
diff --git a/src/finder/github/gitHubPullRequestDiffFinder.ts b/src/finder/github/gitHubPullRequestDiffFinder.ts
new file mode 100644
index 000000000..e52d9bfa8
--- /dev/null
+++ b/src/finder/github/gitHubPullRequestDiffFinder.ts
@@ -0,0 +1,97 @@
+/* eslint-disable unicorn/no-array-method-this-argument */
+
+import $ from 'jquery';
+
+import { Constants } from '../../constants';
+import type { DiffFinder, UmlDiffContent } from '../finder';
+
+import { GitHubFileViewFinder } from './gitHubFileViewFinder';
+
+export class GitHubPullRequestDiffFinder implements DiffFinder {
+  private static getBaseHeadFilePaths($diff: JQuery<Node>): [string, string] {
+    const title = $diff.find('div.file-info a').attr('title');
+    if (!title) return ['', ''];
+    const separator = ' → ';
+    const fragments = title.split(separator);
+    const filePaths = [];
+    let filePath = '';
+    for (const fragment of fragments) {
+      filePath += fragment;
+      if (/^.*\.(plantuml|pu|puml|wsd)$/.test(filePath)) {
+        filePaths.push(filePath);
+        filePath = '';
+      } else {
+        filePath += separator;
+      }
+    }
+    if (filePaths.length === 1) return [filePaths[0], filePaths[0]];
+    if (filePaths.length === 2) return [filePaths[0], filePaths[1]];
+    return ['', ''];
+  }
+
+  private static async getTexts(fileUrl: string): Promise<string[]> {
+    const response = await fetch(fileUrl);
+    if (!response.ok) return [];
+    const htmlString = await response.text();
+    const $body = $(new DOMParser().parseFromString(htmlString, 'text/html')).find('body');
+    const fileBlockFinder = new GitHubFileViewFinder();
+    const contents = await fileBlockFinder.findContents(fileUrl, $body);
+    return contents.map((content) => content.text);
+  }
+
+  private readonly URL_REGEX = /^https:\/\/github\.com\/.*\/pull\/\d+\/files/;
+
+  canFind(webPageUrl: string): boolean {
+    return this.URL_REGEX.test(webPageUrl);
+  }
+
+  async findContents(webPageUrl: string, $root: JQuery<Node>): Promise<UmlDiffContent[]> {
+    const blobRoot = webPageUrl.replace(/pull\/\d+\/files.*/, 'blob');
+    const [baseBranchName, headBranchName] = this.getBaseHeadBranchNames($root);
+    const diffs = this.getDiffs($root);
+    const result = await Promise.all(
+      diffs.map(($diff) => this.getDiffContent(blobRoot, baseBranchName, headBranchName, $diff))
+    );
+    return result.filter((content) => content.$diff.length > 0);
+  }
+
+  private getBaseHeadBranchNames($root: JQuery<Node>): [string, string] {
+    const $baseRef = $root.find(this.getBranchNameSelector('base'));
+    const $headRef = $root.find(this.getBranchNameSelector('head'));
+    return [$baseRef.text(), $headRef.text()];
+  }
+
+  private getBranchNameSelector(baseOrHead: 'base' | 'head'): string {
+    return `span.commit-ref.css-truncate.user-select-contain.expandable.${baseOrHead}-ref span.css-truncate-target`;
+  }
+
+  private getDiffs($root: JQuery<Node>): JQuery<Node>[] {
+    const $diffs = $root.find(`div[id^='diff-']:not([${Constants.ignoreAttribute}])`);
+    return [...Array.from({ length: $diffs.length }).keys()].map((i) => $diffs.eq(i));
+  }
+
+  private async getDiffContent(
+    blobRoot: string,
+    baseBranchName: string,
+    headBranchName: string,
+    $diff: JQuery<Node>
+  ): Promise<UmlDiffContent> {
+    const [baseFilePath, headFilePath] = GitHubPullRequestDiffFinder.getBaseHeadFilePaths($diff);
+    const $diffBlock = $diff.find('div.js-file-content.Details-content--hidden');
+    if (
+      (!baseFilePath && !headFilePath) ||
+      $diffBlock.length === 0 ||
+      $diffBlock.find('div.data.highlight.empty').length > 0
+    ) {
+      return { $diff: $(), baseBranchName, headBranchName, baseTexts: [], headTexts: [] };
+    }
+    const fileUrls = [
+      blobRoot + '/' + baseBranchName + '/' + baseFilePath,
+      blobRoot + '/' + headBranchName + '/' + headFilePath,
+    ];
+    const [baseTexts, headTexts] = await Promise.all(
+      fileUrls.map((fileUrl) => GitHubPullRequestDiffFinder.getTexts(fileUrl))
+    );
+    return { $diff: $diffBlock, baseBranchName, headBranchName, baseTexts, headTexts };
+  }
+}
diff --git a/src/mutator/descriptionMutator.ts b/src/mutator/descriptionMutator.ts
index c7022bca5..241892036 100644
--- a/src/mutator/descriptionMutator.ts
+++ b/src/mutator/descriptionMutator.ts
@@ -2,14 +2,14 @@ import type { CodeFinder } from '../finder/finder';
 
 import { markAsIgnore, setDblclickHandlers, textToImage } from './mutatorUtil';
 
-export const DescriptionMutator = {
+class DescriptionMutator {
   async embedPlantUmlImages(finders: CodeFinder[], webPageUrl: string, $root: JQuery<Node>): Promise<void> {
     await Promise.all(
       finders.map(async (finder) => {
-        const contents = await finder.find(webPageUrl, $root);
+        const contents = await finder.findContents(webPageUrl, $root);
         for (const content of contents) {
           // Skip if no PlantUML descriptions exist
-          if (!content.text.length) continue;
+          if (content.text.length === 0) continue;
 
           const $text = content.$text;
 
@@ -27,5 +27,7 @@ export const DescriptionMutator = {
         }
       })
     );
-  },
-};
+  }
+}
+
+export const descriptionMutator = new DescriptionMutator();
diff --git a/src/mutator/diffMutator.ts b/src/mutator/diffMutator.ts
index 70f18e3a0..a762bba2b 100644
--- a/src/mutator/diffMutator.ts
+++ b/src/mutator/diffMutator.ts
@@ -4,14 +4,14 @@ import type { DiffFinder } from '../finder/finder';
 
 import { markAsIgnore, setDblclickHandlers, textsToImages } from './mutatorUtil';
 
-export const DiffMutator = {
+class DiffMutator {
   async embedPlantUmlImages(diffFinders: DiffFinder[], webPageUrl: string, $root: JQuery<Node>): Promise<void> {
     await Promise.all(
       diffFinders.map(async (diffFinder) => {
-        const contents = await diffFinder.find(webPageUrl, $root);
+        const contents = await diffFinder.findContents(webPageUrl, $root);
         for (const content of contents) {
           // Skip if no PlantUML descriptions exist
-          if (!content.baseTexts.length && !content.headTexts.length) continue;
+          if (content.baseTexts.length === 0 && content.headTexts.length === 0) continue;
 
           const $diff = content.$diff;
 
@@ -67,5 +67,7 @@ export const DiffMutator = {
         }
       })
     );
-  },
-};
+  }
+}
+
+export const diffMutator = new DiffMutator();
diff --git a/src/popup.svelte b/src/popup.svelte
index 594044ad4..37d9d978d 100644
--- a/src/popup.svelte
+++ b/src/popup.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-  import { onMount } from 'svelte';
+  import {onMount} from 'svelte';
 
-  import type { Config } from './config';
+  import type {Config} from './config';
   import BodyContainer from './components/BodyContainer.svelte';
   import Footer from './components/Footer.svelte';
   import Header from './components/Header.svelte';
@@ -10,8 +10,8 @@
   import Switch from './components/Switch.svelte';
   import TextField from './components/TextField.svelte';
   import Button from './components/Button.svelte';
-  import { Constants } from './constants';
-  import { PlantUmlEncoder } from './encoder/plantUmlEncoder';
+  import {Constants} from './constants';
+  import {PlantUmlEncoder} from './encoder/plantUmlEncoder';
 
   let config: Config = { ...Constants.defaultConfig };
 
diff --git a/@types/svelte/index.d.ts b/src/types/svelte.d.ts
similarity index 100%
rename from @types/svelte/index.d.ts
rename to src/types/svelte.d.ts
diff --git a/tsconfig.json b/tsconfig.json
index fad5464d6..45df749bd 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "allowSyntheticDefaultImports": true,
     "alwaysStrict": true,
+    "declaration": true,
     "esModuleInterop": true,
     "importHelpers": false,
     "module": "esnext",
@@ -11,8 +12,9 @@
     "skipLibCheck": true,
     "sourceMap": true,
     "strict": true,
-    "target": "esnext"
+    "target": "esnext",
+    "typeRoots": ["./node_modules/@types", "./@types"]
   },
-  "include": ["src/**/*", "__tests__/**/*", "scripts/**/*", "./node_modules/@types", "./@types"],
+  "include": ["scripts/**/*", "src/**/*", "tests/**/*"],
   "extends": "@tsconfig/svelte/tsconfig.json"
 }
diff --git a/yarn.lock b/yarn.lock
index fc5c2eacf..5b4f004c6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5,7 +5,7 @@ __metadata:
   version: 7
   cacheKey: 9
 
-"@ampproject/remapping@npm:^2.1.0":
+"@ampproject/remapping@npm:^2.2.0":
   version: 2.2.0
   resolution: "@ampproject/remapping@npm:2.2.0"
   dependencies:
@@ -31,30 +31,30 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/core@npm:7.20.12":
-  version: 7.20.12
-  resolution: "@babel/core@npm:7.20.12"
+"@babel/core@npm:7.21.0":
+  version: 7.21.0
+  resolution: "@babel/core@npm:7.21.0"
   dependencies:
-    "@ampproject/remapping": "npm:^2.1.0"
+    "@ampproject/remapping": "npm:^2.2.0"
     "@babel/code-frame": "npm:^7.18.6"
-    "@babel/generator": "npm:^7.20.7"
+    "@babel/generator": "npm:^7.21.0"
     "@babel/helper-compilation-targets": "npm:^7.20.7"
-    "@babel/helper-module-transforms": "npm:^7.20.11"
-    "@babel/helpers": "npm:^7.20.7"
-    "@babel/parser": "npm:^7.20.7"
+    "@babel/helper-module-transforms": "npm:^7.21.0"
+    "@babel/helpers": "npm:^7.21.0"
+    "@babel/parser": "npm:^7.21.0"
     "@babel/template": "npm:^7.20.7"
-    "@babel/traverse": "npm:^7.20.12"
-    "@babel/types": "npm:^7.20.7"
+    "@babel/traverse": "npm:^7.21.0"
+    "@babel/types": "npm:^7.21.0"
     convert-source-map: "npm:^1.7.0"
     debug: "npm:^4.1.0"
     gensync: "npm:^1.0.0-beta.2"
     json5: "npm:^2.2.2"
     semver: "npm:^6.3.0"
-  checksum: 7ab10d7f3045e282786e7ed20b8da220b315b23131713f7fb4f75210110146bae2a5b3a0db36baf375356c1226d8c659d032a031ef129eea85c1dd3884c311c0
+  checksum: 012560d64c2b0e8e3cc6a13fec5813a547d22223bfa80cb4262b83540fa6ce46cecc281f4a0610422235172d655325d2cf4142064fd380083060d50189a55149
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.20.7, @babel/generator@npm:^7.21.1":
+"@babel/generator@npm:^7.21.0, @babel/generator@npm:^7.21.1":
   version: 7.21.1
   resolution: "@babel/generator@npm:7.21.1"
   dependencies:
@@ -199,7 +199,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-module-transforms@npm:^7.18.6, @babel/helper-module-transforms@npm:^7.20.11, @babel/helper-module-transforms@npm:^7.21.2":
+"@babel/helper-module-transforms@npm:^7.18.6, @babel/helper-module-transforms@npm:^7.20.11, @babel/helper-module-transforms@npm:^7.21.0, @babel/helper-module-transforms@npm:^7.21.2":
   version: 7.21.2
   resolution: "@babel/helper-module-transforms@npm:7.21.2"
   dependencies:
@@ -300,7 +300,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-validator-option@npm:^7.18.6":
+"@babel/helper-validator-option@npm:^7.18.6, @babel/helper-validator-option@npm:^7.21.0":
   version: 7.21.0
   resolution: "@babel/helper-validator-option@npm:7.21.0"
   checksum: a67581d08ad77c099fd3f4b693e4846e5e0463af6733ac323100304235ba1dc9257982491c9ca5c064730ec2e24c24dc4ab9e7d2cc9df06781074c97aae97392
@@ -319,7 +319,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.20.7":
+"@babel/helpers@npm:^7.21.0":
   version: 7.21.0
   resolution: "@babel/helpers@npm:7.21.0"
   dependencies:
@@ -341,7 +341,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.20.7, @babel/parser@npm:^7.21.2":
+"@babel/parser@npm:^7.20.7, @babel/parser@npm:^7.21.0, @babel/parser@npm:^7.21.2":
   version: 7.21.2
   resolution: "@babel/parser@npm:7.21.2"
   bin:
@@ -512,20 +512,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-optional-chaining@npm:7.20.7":
-  version: 7.20.7
-  resolution: "@babel/plugin-proposal-optional-chaining@npm:7.20.7"
-  dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.20.2"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.20.0"
-    "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3"
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 8f5b4343088225599a243f297334b4c52247e42c1ab4f8babbdd796be82029bf5eccf06f894c76e843d34fd5da882bb66f4a37af744f48a29398b9c3cfc41b08
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-optional-chaining@npm:^7.18.9, @babel/plugin-proposal-optional-chaining@npm:^7.20.7":
+"@babel/plugin-proposal-optional-chaining@npm:7.21.0, @babel/plugin-proposal-optional-chaining@npm:^7.18.9, @babel/plugin-proposal-optional-chaining@npm:^7.20.7":
   version: 7.21.0
   resolution: "@babel/plugin-proposal-optional-chaining@npm:7.21.0"
   dependencies:
@@ -1168,7 +1155,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-typescript@npm:^7.18.6":
+"@babel/plugin-transform-typescript@npm:^7.21.0":
   version: 7.21.0
   resolution: "@babel/plugin-transform-typescript@npm:7.21.0"
   dependencies:
@@ -1330,16 +1317,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/preset-typescript@npm:7.18.6":
-  version: 7.18.6
-  resolution: "@babel/preset-typescript@npm:7.18.6"
+"@babel/preset-typescript@npm:7.21.0":
+  version: 7.21.0
+  resolution: "@babel/preset-typescript@npm:7.21.0"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.18.6"
-    "@babel/helper-validator-option": "npm:^7.18.6"
-    "@babel/plugin-transform-typescript": "npm:^7.18.6"
+    "@babel/helper-plugin-utils": "npm:^7.20.2"
+    "@babel/helper-validator-option": "npm:^7.21.0"
+    "@babel/plugin-transform-typescript": "npm:^7.21.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 216a8afe21226496bbac1f8d6ef9462f6bdb98db8495aa382f67fec895c1d3526d204536a4856677fa1a73513bb4ff0623846cbda9a5dc20cd38260063a20bdf
+  checksum: 231c0b90a714f4be9894dc67347039ec4bdbb921542b5e79d7aeb09b67ff91b0b9aca42e3cb9551a5cfc914fa8637a2fbae9c4744ac0d545a25e35425996bb14
   languageName: node
   linkType: hard
 
@@ -1379,7 +1366,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.20.12, @babel/traverse@npm:^7.20.5, @babel/traverse@npm:^7.20.7, @babel/traverse@npm:^7.21.0, @babel/traverse@npm:^7.21.2":
+"@babel/traverse@npm:^7.20.5, @babel/traverse@npm:^7.20.7, @babel/traverse@npm:^7.21.0, @babel/traverse@npm:^7.21.2":
   version: 7.21.2
   resolution: "@babel/traverse@npm:7.21.2"
   dependencies:
@@ -1468,6 +1455,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@eslint-community/eslint-utils@npm:^4.1.2":
+  version: 4.1.2
+  resolution: "@eslint-community/eslint-utils@npm:4.1.2"
+  dependencies:
+    eslint-visitor-keys: "npm:^3.3.0"
+  peerDependencies:
+    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+  checksum: 81a68aaada6fbe216c9e757ae6739940792a0d993ba0b2d35beb4406240a91597f88debac01e76c3d982ed7e820b6f2e62b14650c7b9b07a7ac6a8f1b0185ad7
+  languageName: node
+  linkType: hard
+
 "@eslint/eslintrc@npm:^0.2.1":
   version: 0.2.2
   resolution: "@eslint/eslintrc@npm:0.2.2"
@@ -1486,9 +1484,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/eslintrc@npm:^1.4.1":
-  version: 1.4.1
-  resolution: "@eslint/eslintrc@npm:1.4.1"
+"@eslint/eslintrc@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@eslint/eslintrc@npm:2.0.0"
   dependencies:
     ajv: "npm:^6.12.4"
     debug: "npm:^4.3.2"
@@ -1499,7 +1497,14 @@ __metadata:
     js-yaml: "npm:^4.1.0"
     minimatch: "npm:^3.1.2"
     strip-json-comments: "npm:^3.1.1"
-  checksum: 4e469ed508c3154078503b1f22b9d7f2498e76e770ff3f8c61c9961a16760c817e977f2f00b02201d1e91d6a4ebc766c1c67aae9189b00d5c1fe2e7205b6ad72
+  checksum: 29a8b98afca4e088f84dc1e7be849e51ca6df31172a90ef3898dd201e7e022ee7d665d999b0134849ac7279497d5270867945bdf534ad3ca0ac036e1869b310c
+  languageName: node
+  linkType: hard
+
+"@eslint/js@npm:8.35.0":
+  version: 8.35.0
+  resolution: "@eslint/js@npm:8.35.0"
+  checksum: ada3a3a42de60014ddae9f2f81e96442168b74151c6785194191f17850497c8750ab0140ca37c143dda1bfaf149cfc63ff28adcf94c41ceada4afc05ff596711
   languageName: node
   linkType: hard
 
@@ -2253,13 +2258,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/chrome@npm:0.0.213":
-  version: 0.0.213
-  resolution: "@types/chrome@npm:0.0.213"
+"@types/chrome@npm:0.0.217":
+  version: 0.0.217
+  resolution: "@types/chrome@npm:0.0.217"
   dependencies:
     "@types/filesystem": "npm:*"
     "@types/har-format": "npm:*"
-  checksum: 9fabf1cffde23a85c0a8be4802195460e4fcedd94379aecd71a042634ebeb72ca028f86ebbfa1b273a282d8e2db27388ca3acd4481f394f362e7f1a87a79b394
+  checksum: 13b6a50407532655370d2cde31d53da0267f18ad65ab92e85a12a0d320acd2f88e07ae66c7c11f35046e1d345ab7e6e67b27f2cb78695dfe126b743a14eb75ee
   languageName: node
   linkType: hard
 
@@ -2366,9 +2371,9 @@ __metadata:
   linkType: hard
 
 "@types/node@npm:*":
-  version: 18.14.1
-  resolution: "@types/node@npm:18.14.1"
-  checksum: b91f3b982e51b2560373086d70b43b2938f28e8ec63ad3fb77f742050a54ac1205b92c16e5d96514445e74e3e190e495f61f0acbc90da96548b2ad4973e93a98
+  version: 18.14.2
+  resolution: "@types/node@npm:18.14.2"
+  checksum: 129305df2c8e761c22cfa7a88ab780577864c8fc53a5b70cabbe4dd595e4b38b211b73a4380d0a18bf5da3634081bfa554cccf52dfd5e228e7a27de12c857aaf
   languageName: node
   linkType: hard
 
@@ -2379,7 +2384,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/pug@npm:^2.0.4, @types/pug@npm:^2.0.6":
+"@types/pug@npm:^2.0.6":
   version: 2.0.6
   resolution: "@types/pug@npm:2.0.6"
   checksum: 78b5b53c0d80a756149a0ab6b92a2351eff73d25ded674189f972b2f9f78e8b4103c10a02ba95f9054b78af72e3b38284da77af7ee161d7c693e08176025670b
@@ -2409,7 +2414,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/sass@npm:1.43.1, @types/sass@npm:^1.16.0, @types/sass@npm:^1.43.1":
+"@types/sass@npm:1.43.1, @types/sass@npm:^1.43.1":
   version: 1.43.1
   resolution: "@types/sass@npm:1.43.1"
   dependencies:
@@ -2441,13 +2446,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/eslint-plugin@npm:5.52.0":
-  version: 5.52.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:5.52.0"
+"@typescript-eslint/eslint-plugin@npm:5.53.0":
+  version: 5.53.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:5.53.0"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:5.52.0"
-    "@typescript-eslint/type-utils": "npm:5.52.0"
-    "@typescript-eslint/utils": "npm:5.52.0"
+    "@typescript-eslint/scope-manager": "npm:5.53.0"
+    "@typescript-eslint/type-utils": "npm:5.53.0"
+    "@typescript-eslint/utils": "npm:5.53.0"
     debug: "npm:^4.3.4"
     grapheme-splitter: "npm:^1.0.4"
     ignore: "npm:^5.2.0"
@@ -2461,43 +2466,43 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 4544bb0f5e22db2b16e40e4db26cdfaf0bf4f7457f57a1c26864d4fadf659cdf286c37950f12fc05e402d37401a6c129316d47e452c6993a5b0e15a823209d5b
+  checksum: edfda0000f08b19eddc97465405975cd5087107244c2d432a74e341d7c919b9c37d8bb4e94d86129ac53e5f3c1369d985ba199b87bf16dec8bc2bafdee5f1559
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:5.52.0":
-  version: 5.52.0
-  resolution: "@typescript-eslint/parser@npm:5.52.0"
+"@typescript-eslint/parser@npm:5.53.0":
+  version: 5.53.0
+  resolution: "@typescript-eslint/parser@npm:5.53.0"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:5.52.0"
-    "@typescript-eslint/types": "npm:5.52.0"
-    "@typescript-eslint/typescript-estree": "npm:5.52.0"
+    "@typescript-eslint/scope-manager": "npm:5.53.0"
+    "@typescript-eslint/types": "npm:5.53.0"
+    "@typescript-eslint/typescript-estree": "npm:5.53.0"
     debug: "npm:^4.3.4"
   peerDependencies:
     eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 74d212e104e9ff300f88c71a955644d539706ef826ff08a06954b9edc69b856fb1c677c25562cc0b78d5673c379061adfed1854082e613838c895775767a0a73
+  checksum: e0e0b2202b8b48e0b92ab1a06973dcbf355bdc9b44257f7965a9adaf3d20fd70e365eb4081bfbe62c4f71c629b2e94d8ddc8ba0143e3db5a98ef125b292d6fe9
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:5.52.0":
-  version: 5.52.0
-  resolution: "@typescript-eslint/scope-manager@npm:5.52.0"
+"@typescript-eslint/scope-manager@npm:5.53.0":
+  version: 5.53.0
+  resolution: "@typescript-eslint/scope-manager@npm:5.53.0"
   dependencies:
-    "@typescript-eslint/types": "npm:5.52.0"
-    "@typescript-eslint/visitor-keys": "npm:5.52.0"
-  checksum: fb409093f2b3f5f2fd4fad2f8e70dcf9a08968c22453e6d220aba771c6498b2834e3b78bf417922d1e9889ff9fcde3a64aac133c21adcb7441f450e2dffe549b
+    "@typescript-eslint/types": "npm:5.53.0"
+    "@typescript-eslint/visitor-keys": "npm:5.53.0"
+  checksum: 1306242cb8cbfade1d918d566de085508b92ee014eb4d518c2f04ea153b8178edaf7ac9090cc18eafadfd91240c54be068d437303e311a91c46c03c6e8836cb1
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:5.52.0":
-  version: 5.52.0
-  resolution: "@typescript-eslint/type-utils@npm:5.52.0"
+"@typescript-eslint/type-utils@npm:5.53.0":
+  version: 5.53.0
+  resolution: "@typescript-eslint/type-utils@npm:5.53.0"
   dependencies:
-    "@typescript-eslint/typescript-estree": "npm:5.52.0"
-    "@typescript-eslint/utils": "npm:5.52.0"
+    "@typescript-eslint/typescript-estree": "npm:5.53.0"
+    "@typescript-eslint/utils": "npm:5.53.0"
     debug: "npm:^4.3.4"
     tsutils: "npm:^3.21.0"
   peerDependencies:
@@ -2505,23 +2510,23 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: fe936123d6abb08bc33883eabd9701e7103b7ef28bf8bfe491c75d40086015225add37ea61a53b7268e1fcbd6537125f2cab7379f8151f1e34b3e0e92959f968
+  checksum: df022881421bf8010f041880786dd0284200ccb5b5d940d028296a539174e2b44dacdb2db5d22ba14073400cd518284f20f92187309d27065847d68a6c1791a8
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:5.52.0":
-  version: 5.52.0
-  resolution: "@typescript-eslint/types@npm:5.52.0"
-  checksum: 05a35baff15cbf87b7981d97a217674c4f0586299cfbf28c65f440399b703fcd149dd7ff54dd0e24268916ef954cd65fd779616a0d2faf67f2d5b2afe362b5dd
+"@typescript-eslint/types@npm:5.53.0":
+  version: 5.53.0
+  resolution: "@typescript-eslint/types@npm:5.53.0"
+  checksum: 7efa45c831e9c68fcbb394426d948bbc5f97afd04e3d978f4567eb9eaa9fe722abccc9118098accf17a868190bdd7fe1e0b27fb15b476e5cb7df1eb559267417
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:5.52.0":
-  version: 5.52.0
-  resolution: "@typescript-eslint/typescript-estree@npm:5.52.0"
+"@typescript-eslint/typescript-estree@npm:5.53.0":
+  version: 5.53.0
+  resolution: "@typescript-eslint/typescript-estree@npm:5.53.0"
   dependencies:
-    "@typescript-eslint/types": "npm:5.52.0"
-    "@typescript-eslint/visitor-keys": "npm:5.52.0"
+    "@typescript-eslint/types": "npm:5.53.0"
+    "@typescript-eslint/visitor-keys": "npm:5.53.0"
     debug: "npm:^4.3.4"
     globby: "npm:^11.1.0"
     is-glob: "npm:^4.0.3"
@@ -2530,45 +2535,45 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 7a9e491a878d6da08587f9158f992454eba0b8911dd60f65a0ba6eb9672353e39bf46226af59600d1366b6d5af1678b4171bc96587d95e08bb6450aa70123145
+  checksum: dc7341ce17a332aecdefd9642720b89de12e79a2339e729573af8597014ac3b19456c8261a55344a40a27ac5e60631f9e754d37336fc88f171d23bed9b51168a
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:5.52.0":
-  version: 5.52.0
-  resolution: "@typescript-eslint/utils@npm:5.52.0"
+"@typescript-eslint/utils@npm:5.53.0":
+  version: 5.53.0
+  resolution: "@typescript-eslint/utils@npm:5.53.0"
   dependencies:
     "@types/json-schema": "npm:^7.0.9"
     "@types/semver": "npm:^7.3.12"
-    "@typescript-eslint/scope-manager": "npm:5.52.0"
-    "@typescript-eslint/types": "npm:5.52.0"
-    "@typescript-eslint/typescript-estree": "npm:5.52.0"
+    "@typescript-eslint/scope-manager": "npm:5.53.0"
+    "@typescript-eslint/types": "npm:5.53.0"
+    "@typescript-eslint/typescript-estree": "npm:5.53.0"
     eslint-scope: "npm:^5.1.1"
     eslint-utils: "npm:^3.0.0"
     semver: "npm:^7.3.7"
   peerDependencies:
     eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: e6d7a13bc299d65a41e6295ae6619a252c21396a40ceab4e0db4916bcb544f88956812e058a50f257075d785ae7cc9323704870fecd72ca5c8809cf32e9f6225
+  checksum: 408eda00e3b7e9ada89a82a30c8c822b2b6e88fe81bcf1bce88167f4b5792f0c8af85b887ea801fda2580f61829c22598b6edd000f5ad6a21da25720a93a8659
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:5.52.0":
-  version: 5.52.0
-  resolution: "@typescript-eslint/visitor-keys@npm:5.52.0"
+"@typescript-eslint/visitor-keys@npm:5.53.0":
+  version: 5.53.0
+  resolution: "@typescript-eslint/visitor-keys@npm:5.53.0"
   dependencies:
-    "@typescript-eslint/types": "npm:5.52.0"
+    "@typescript-eslint/types": "npm:5.53.0"
     eslint-visitor-keys: "npm:^3.3.0"
-  checksum: 5e6e95ceb1a3b90b3d311b05a1520669b7cbb18fccb21eb0ada2da05a3d36010d2fec402d45339bd1701765f196991806197d1c60712a2561a5a85bbbe765b85
+  checksum: bf2a2fd34988ea6b427bc786e9a149187cc35b07326d666b8370b6356dbe897bfa138804e9df9a9762475f753b2741f6c62fbcb5b5474d7488ab9b451dc2e25c
   languageName: node
   linkType: hard
 
-"@willbooster/eslint-config-ts@npm:9.2.1":
-  version: 9.2.1
-  resolution: "@willbooster/eslint-config-ts@npm:9.2.1"
+"@willbooster/eslint-config-ts@npm:10.0.8":
+  version: 10.0.8
+  resolution: "@willbooster/eslint-config-ts@npm:10.0.8"
   peerDependencies:
     "@typescript-eslint/eslint-plugin": ">=5"
     "@typescript-eslint/parser": ">=5"
-    "@willbooster/prettier-config": 9.1.0
+    "@willbooster/prettier-config": 9.1.1
     eslint: ">=8"
     eslint-config-prettier: ">=8"
     eslint-import-resolver-typescript: ">=2"
@@ -2576,7 +2581,7 @@ __metadata:
     eslint-plugin-sort-class-members: ">=1.14"
     eslint-plugin-sort-destructure-keys: ">=1.4"
     typescript: ">=4"
-  checksum: 8d61536e925a1af76a545282f6aee48fafff6a2589b5df571751d6bb653d08ce468f2a84d0e6e97cf7b3c891896dc027e6a157907513342871a5d781d8159b66
+  checksum: 9b5311fa094cf1f7dd4b3dcf499126bbe25edd114b860a4f9ed833e527bc1c28f034b245d2acca2552b670bc7e5d92a1ed45854470bc9d96cac19d39664233b1
   languageName: node
   linkType: hard
 
@@ -3862,6 +3867,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ci-info@npm:^3.6.1":
+  version: 3.8.0
+  resolution: "ci-info@npm:3.8.0"
+  checksum: cbde5915261038659da39e508b688acd0baa981a73dc34357865957403383e0475b050c2f44971a3b37523849973af345724feb8f2e4a8eddd6db41be708f4ba
+  languageName: node
+  linkType: hard
+
 "cidr-regex@npm:^3.1.1":
   version: 3.1.1
   resolution: "cidr-regex@npm:3.1.1"
@@ -3883,6 +3895,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"clean-regexp@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "clean-regexp@npm:1.0.0"
+  dependencies:
+    escape-string-regexp: "npm:^1.0.5"
+  checksum: e0ec8f9844d2de02bb703c04bf5ab636f7aa72fb5b794fc7951ea1d4a5a0504127147a3b874df7e9eca33cd04dc1b3ac812586a9f98a07d408e91cfb9a74d798
+  languageName: node
+  linkType: hard
+
 "clean-stack@npm:^2.0.0":
   version: 2.2.0
   resolution: "clean-stack@npm:2.2.0"
@@ -4321,11 +4342,11 @@ __metadata:
   linkType: hard
 
 "core-js-compat@npm:^3.25.1":
-  version: 3.28.0
-  resolution: "core-js-compat@npm:3.28.0"
+  version: 3.29.0
+  resolution: "core-js-compat@npm:3.29.0"
   dependencies:
     browserslist: "npm:^4.21.5"
-  checksum: 490c6b9d3b8be80b7dc1706bed34f3e57083476c3fe1f8d091ecd3250942649c1bd3eda5457f1d756487cd1b3efb7ec6e632edf6075b4108d11a804df5aaf57c
+  checksum: 33d0fd56234e1932ba3c380dc97c4e2bc14ef2779c43c05cfbe66ff488095eb0a3774ccaf6e684835f58cf45edc03d721311152ffafb0468635e1993d72818c4
   languageName: node
   linkType: hard
 
@@ -4718,7 +4739,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"detect-indent@npm:^6.0.0, detect-indent@npm:^6.1.0":
+"detect-indent@npm:^6.1.0":
   version: 6.1.0
   resolution: "detect-indent@npm:6.1.0"
   checksum: 0f487ae80c5304387dec92ab348cf709111c2860792e2681cd42cfdda0e2242dd32431862a32e8ece7f21fa0ab3205719b69e49fc887c43d79922f0cb2cc328b
@@ -5315,6 +5336,32 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eslint-plugin-unicorn@npm:45.0.2":
+  version: 45.0.2
+  resolution: "eslint-plugin-unicorn@npm:45.0.2"
+  dependencies:
+    "@babel/helper-validator-identifier": "npm:^7.19.1"
+    "@eslint-community/eslint-utils": "npm:^4.1.2"
+    ci-info: "npm:^3.6.1"
+    clean-regexp: "npm:^1.0.0"
+    esquery: "npm:^1.4.0"
+    indent-string: "npm:^4.0.0"
+    is-builtin-module: "npm:^3.2.0"
+    jsesc: "npm:^3.0.2"
+    lodash: "npm:^4.17.21"
+    pluralize: "npm:^8.0.0"
+    read-pkg-up: "npm:^7.0.1"
+    regexp-tree: "npm:^0.1.24"
+    regjsparser: "npm:^0.9.1"
+    safe-regex: "npm:^2.1.1"
+    semver: "npm:^7.3.8"
+    strip-indent: "npm:^3.0.0"
+  peerDependencies:
+    eslint: ">=8.28.0"
+  checksum: 65e5fa10190376c2b7958767aa79963832a1fad576b8d3ad57d9d579bd788577123c5002c1129f445bba2780deca0b4dd72b0dcb046385b1c6e0f484dcda940b
+  languageName: node
+  linkType: hard
+
 "eslint-scope@npm:^5.1.1":
   version: 5.1.1
   resolution: "eslint-scope@npm:5.1.1"
@@ -5430,11 +5477,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint@npm:8.34.0":
-  version: 8.34.0
-  resolution: "eslint@npm:8.34.0"
+"eslint@npm:8.35.0":
+  version: 8.35.0
+  resolution: "eslint@npm:8.35.0"
   dependencies:
-    "@eslint/eslintrc": "npm:^1.4.1"
+    "@eslint/eslintrc": "npm:^2.0.0"
+    "@eslint/js": "npm:8.35.0"
     "@humanwhocodes/config-array": "npm:^0.11.8"
     "@humanwhocodes/module-importer": "npm:^1.0.1"
     "@nodelib/fs.walk": "npm:^1.2.8"
@@ -5448,7 +5496,7 @@ __metadata:
     eslint-utils: "npm:^3.0.0"
     eslint-visitor-keys: "npm:^3.3.0"
     espree: "npm:^9.4.0"
-    esquery: "npm:^1.4.0"
+    esquery: "npm:^1.4.2"
     esutils: "npm:^2.0.2"
     fast-deep-equal: "npm:^3.1.3"
     file-entry-cache: "npm:^6.0.1"
@@ -5475,7 +5523,7 @@ __metadata:
     text-table: "npm:^0.2.0"
   bin:
     eslint: bin/eslint.js
-  checksum: ec20023e4d680f390b89509f27b40824957d6518ed19c43c52b979e891a3ee225cf09a7fc9e9f882b3636f5cfa34a7a2e20416a2b22047d94db9b1ac3a55e9d9
+  checksum: 9e49b49d9f877bcfbf376166e5a870c6a725b1e713e339f05b85a0d70ebd9ab3c72faceac27251b25fbbd53fd06594d6c00b335b5a59de3a36486eeeafa0f2bc
   languageName: node
   linkType: hard
 
@@ -5522,7 +5570,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esquery@npm:^1.2.0, esquery@npm:^1.4.0":
+"esquery@npm:^1.2.0, esquery@npm:^1.4.0, esquery@npm:^1.4.2":
   version: 1.4.2
   resolution: "esquery@npm:1.4.2"
   dependencies:
@@ -7745,6 +7793,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jsesc@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "jsesc@npm:3.0.2"
+  bin:
+    jsesc: bin/jsesc
+  checksum: fcac8cfe4f8a947d8f16ff1be77c9d4c81ddc66da7798eff79a6f8bd1c39e88a4e728a14576acfa2ae06303be6684113b46f322ca40681ad204fa48908e6a86d
+  languageName: node
+  linkType: hard
+
 "jsesc@npm:~0.5.0":
   version: 0.5.0
   resolution: "jsesc@npm:0.5.0"
@@ -8515,15 +8572,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"magic-string@npm:^0.25.7":
-  version: 0.25.9
-  resolution: "magic-string@npm:0.25.9"
-  dependencies:
-    sourcemap-codec: "npm:^1.4.8"
-  checksum: 8a2cb8470617fbe2fa9b924b4b1de9322686f035f8b506daa9bbe0dc5d1ba182da9e3b53fa9d3a932ab1b003b05ee81a49f9b9ea169f3c790a979f32222af5c2
-  languageName: node
-  linkType: hard
-
 "magic-string@npm:^0.27.0":
   version: 0.27.0
   resolution: "magic-string@npm:0.27.0"
@@ -10121,25 +10169,25 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "plantuml-visualizer@workspace:."
   dependencies:
-    "@babel/core": "npm:7.20.12"
+    "@babel/core": "npm:7.21.0"
     "@babel/plugin-proposal-class-properties": "npm:7.18.6"
     "@babel/plugin-proposal-numeric-separator": "npm:7.18.6"
-    "@babel/plugin-proposal-optional-chaining": "npm:7.20.7"
+    "@babel/plugin-proposal-optional-chaining": "npm:7.21.0"
     "@babel/preset-env": "npm:7.20.2"
     "@babel/preset-react": "npm:7.18.6"
-    "@babel/preset-typescript": "npm:7.18.6"
+    "@babel/preset-typescript": "npm:7.21.0"
     "@rollup/plugin-babel": "npm:6.0.3"
     "@rollup/plugin-commonjs": "npm:24.0.1"
     "@rollup/plugin-node-resolve": "npm:15.0.1"
     "@tsconfig/svelte": "npm:3.0.0"
-    "@types/chrome": "npm:0.0.213"
+    "@types/chrome": "npm:0.0.217"
     "@types/eslint": "npm:8.21.1"
     "@types/jquery": "npm:3.5.16"
     "@types/micromatch": "npm:4.0.2"
     "@types/sass": "npm:1.43.1"
-    "@typescript-eslint/eslint-plugin": "npm:5.52.0"
-    "@typescript-eslint/parser": "npm:5.52.0"
-    "@willbooster/eslint-config-ts": "npm:9.2.1"
+    "@typescript-eslint/eslint-plugin": "npm:5.53.0"
+    "@typescript-eslint/parser": "npm:5.53.0"
+    "@willbooster/eslint-config-ts": "npm:10.0.8"
     "@willbooster/prettier-config": "npm:9.1.1"
     "@willbooster/renovate-config": "npm:9.5.0"
     babel-plugin-transform-remove-console: "npm:6.9.4"
@@ -10147,13 +10195,14 @@ __metadata:
     conventional-changelog-conventionalcommits: "npm:5.0.0"
     cross-env: "npm:7.0.3"
     dotenv-cli: "npm:7.0.0"
-    eslint: "npm:8.34.0"
+    eslint: "npm:8.35.0"
     eslint-config-prettier: "npm:8.6.0"
     eslint-import-resolver-typescript: "npm:3.5.3"
     eslint-plugin-import: "npm:2.27.5"
     eslint-plugin-sort-class-members: "npm:1.16.0"
     eslint-plugin-sort-destructure-keys: "npm:1.5.0"
     eslint-plugin-svelte3: "npm:4.0.0"
+    eslint-plugin-unicorn: "npm:45.0.2"
     husky: "npm:8.0.3"
     jquery: "npm:3.6.3"
     lint-staged: "npm:13.1.2"
@@ -10161,22 +10210,29 @@ __metadata:
     pinst: "npm:3.0.0"
     prettier: "npm:2.8.4"
     prettier-plugin-svelte: "npm:2.9.0"
-    rollup: "npm:2.79.1"
+    rollup: "npm:3.17.3"
     rollup-plugin-svelte: "npm:7.1.3"
     rollup-plugin-terser: "npm:7.0.2"
-    sass: "npm:1.58.2"
+    sass: "npm:1.58.3"
     semantic-release: "npm:20.1.0"
     semantic-release-chrome: "npm:3.1.0"
     semantic-release-firefox-add-on: "npm:0.2.8"
     sort-package-json: "npm:2.4.1"
     svelte: "npm:3.55.1"
     svelte-check: "npm:3.0.4"
-    svelte-preprocess: "npm:4.10.7"
+    svelte-preprocess: "npm:5.0.1"
     typescript: "npm:4.9.5"
     zlib.es: "npm:0.6.0"
   languageName: unknown
   linkType: soft
 
+"pluralize@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "pluralize@npm:8.0.0"
+  checksum: e3bd882f49d220fbf7996a66c6c7f13fea43fbb7155de11cba8902ebfc7ed2a06cb2a706895738de9f6c089c72542bea8c855dab6abe11e54e75986ad19bfc7e
+  languageName: node
+  linkType: hard
+
 "posix-character-classes@npm:^0.1.0":
   version: 0.1.1
   resolution: "posix-character-classes@npm:0.1.1"
@@ -10639,6 +10695,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"regexp-tree@npm:^0.1.24, regexp-tree@npm:~0.1.1":
+  version: 0.1.24
+  resolution: "regexp-tree@npm:0.1.24"
+  bin:
+    regexp-tree: bin/regexp-tree
+  checksum: 90d0b729de0f4ba28bd31ac8042d3154642d20d7a39ee557f82ac259cc02340ba09a9902f1479a1dfa3afe1ba38164bb7aa42c22780858c00d7c4d429ea415ba
+  languageName: node
+  linkType: hard
+
 "regexp.prototype.flags@npm:^1.2.0, regexp.prototype.flags@npm:^1.4.3":
   version: 1.4.3
   resolution: "regexp.prototype.flags@npm:1.4.3"
@@ -10979,9 +11044,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rollup@npm:2.79.1":
-  version: 2.79.1
-  resolution: "rollup@npm:2.79.1"
+"rollup@npm:3.17.3":
+  version: 3.17.3
+  resolution: "rollup@npm:3.17.3"
   dependencies:
     fsevents: "npm:~2.3.2"
   dependenciesMeta:
@@ -10989,7 +11054,7 @@ __metadata:
       optional: true
   bin:
     rollup: dist/bin/rollup
-  checksum: b91c27c3b5234af864f282ffa2c13891d9caf25cad8ba7ad11f5201bdb6516f10c90a8c3402a5f72eafc74a555b1c685b6b04d107a6d6866195812a82f4aa308
+  checksum: d11f66c0103bb495c46dbe06c0a005fbe4244270f536359d36b894f2d011422684dd2db09f1e973618e13a693f2dc572f4b4ac1025f269e0cdc3b57eb3521a9e
   languageName: node
   linkType: hard
 
@@ -11061,6 +11126,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"safe-regex@npm:^2.1.1":
+  version: 2.1.1
+  resolution: "safe-regex@npm:2.1.1"
+  dependencies:
+    regexp-tree: "npm:~0.1.1"
+  checksum: 05af3bf0660ad3aff3ff3c6ebfe351d8e6d6e60ff6bb955355e86a532dec0caf67e846dbbebd2d920f65a2e0c02e40a98768343ebc6aa8c5cc002ab5ee687189
+  languageName: node
+  linkType: hard
+
 "safer-buffer@npm:>= 2.1.2 < 3.0.0, safer-buffer@npm:^2.0.2, safer-buffer@npm:^2.1.0, safer-buffer@npm:~2.1.0":
   version: 2.1.2
   resolution: "safer-buffer@npm:2.1.2"
@@ -11080,16 +11154,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sass@npm:1.58.2":
-  version: 1.58.2
-  resolution: "sass@npm:1.58.2"
+"sass@npm:1.58.3":
+  version: 1.58.3
+  resolution: "sass@npm:1.58.3"
   dependencies:
     chokidar: "npm:>=3.0.0 <4.0.0"
     immutable: "npm:^4.0.0"
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 5e9feb999fe858023ed129d0fe5d48e37ba4b1b232fd4aa40cd5cdb82c89f185dbde20a347e753478eedfeb6636c59afa634d90780b06f92687623dd60571deb
+  checksum: 050da7f5a507fb0f8892f86c92912ed028d441d7130ba30d488c635918391b5fdb83c45df6d84853a5d8344ede84546e734258eff3438beceabd73b81f31871b
   languageName: node
   linkType: hard
 
@@ -11216,7 +11290,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.1.2, semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7":
+"semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.1.2, semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8":
   version: 7.3.8
   resolution: "semver@npm:7.3.8"
   dependencies:
@@ -11480,20 +11554,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sorcery@npm:^0.10.0":
-  version: 0.10.0
-  resolution: "sorcery@npm:0.10.0"
-  dependencies:
-    buffer-crc32: "npm:^0.2.5"
-    minimist: "npm:^1.2.0"
-    sander: "npm:^0.5.0"
-    sourcemap-codec: "npm:^1.3.0"
-  bin:
-    sorcery: bin/index.js
-  checksum: 47a88dc2a5ec363dfe422f06582accf9520a7c44a8d613e1e782aaddac337d049d420298a9c1770618eb48137e7c05f74ea428da87ae9176e65502438feeaef5
-  languageName: node
-  linkType: hard
-
 "sorcery@npm:^0.11.0":
   version: 0.11.0
   resolution: "sorcery@npm:0.11.0"
@@ -11592,13 +11652,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sourcemap-codec@npm:^1.3.0, sourcemap-codec@npm:^1.4.8":
-  version: 1.4.8
-  resolution: "sourcemap-codec@npm:1.4.8"
-  checksum: 16bd825c262a260854606ce89d836312a36a9b7d70fba54f17c2d9c395ad99a61b4f6b333f3f830ce09a37c234668ff6a7ece172b9964a2d78f9d433bf0e1e93
-  languageName: node
-  linkType: hard
-
 "spawn-error-forwarder@npm:~1.0.0":
   version: 1.0.0
   resolution: "spawn-error-forwarder@npm:1.0.0"
@@ -12022,56 +12075,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"svelte-preprocess@npm:4.10.7":
-  version: 4.10.7
-  resolution: "svelte-preprocess@npm:4.10.7"
-  dependencies:
-    "@types/pug": "npm:^2.0.4"
-    "@types/sass": "npm:^1.16.0"
-    detect-indent: "npm:^6.0.0"
-    magic-string: "npm:^0.25.7"
-    sorcery: "npm:^0.10.0"
-    strip-indent: "npm:^3.0.0"
-  peerDependencies:
-    "@babel/core": ^7.10.2
-    coffeescript: ^2.5.1
-    less: ^3.11.3 || ^4.0.0
-    postcss: ^7 || ^8
-    postcss-load-config: ^2.1.0 || ^3.0.0 || ^4.0.0
-    pug: ^3.0.0
-    sass: ^1.26.8
-    stylus: ^0.55.0
-    sugarss: ^2.0.0
-    svelte: ^3.23.0
-    typescript: ^3.9.5 || ^4.0.0
-  peerDependenciesMeta:
-    "@babel/core":
-      optional: true
-    coffeescript:
-      optional: true
-    less:
-      optional: true
-    node-sass:
-      optional: true
-    postcss:
-      optional: true
-    postcss-load-config:
-      optional: true
-    pug:
-      optional: true
-    sass:
-      optional: true
-    stylus:
-      optional: true
-    sugarss:
-      optional: true
-    typescript:
-      optional: true
-  checksum: 940c658d9968ae33315ebb82433e699a495014f46c562b9f159344d2478e01b6e32debf0754219bc895f464954393abf763e7cba5d0bf32af5b9325661adff51
-  languageName: node
-  linkType: hard
-
-"svelte-preprocess@npm:^5.0.0":
+"svelte-preprocess@npm:5.0.1, svelte-preprocess@npm:^5.0.0":
   version: 5.0.1
   resolution: "svelte-preprocess@npm:5.0.1"
   dependencies: