From 81184cc45673da58b6480a6c09cec53003f16082 Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Sun, 23 Jun 2024 11:54:05 -0700
Subject: [PATCH 01/50] Documentation: Document `inject` util's purpose (#1505)

---
 src/utils/inject.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/utils/inject.js b/src/utils/inject.js
index 5f214ee6d..6bf9ec994 100644
--- a/src/utils/inject.js
+++ b/src/utils/inject.js
@@ -1,4 +1,8 @@
 /**
+ * Runs a script in the page's "main" execution environment and returns its result.
+ * This permits access to variables exposed by the Tumblr web platform that are normally inaccessible
+ * in the content script sandbox.
+ * See the src/main_world directory and [../main_world/index.js](../main_world/index.js).
  * @param {string} path - Absolute path of script to inject (will be fed to `runtime.getURL()`)
  * @param {Array} [args] - Array of arguments to pass to the script
  * @param {Element} [target] - Target element; will be accessible as the `this` value in the injected function.

From fade994a8ae3742aa2736adf085c236aa7fc75ca Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Sun, 23 Jun 2024 12:27:08 -0700
Subject: [PATCH 02/50] Parse `data-timeline-id` on Tumblr's new timeline
 component (#1482)

---
 src/features/collapsed_queue.js               | 14 +++---
 src/features/mutual_checker.js                |  3 +-
 .../no_recommended/hide_recommended_posts.js  |  3 +-
 src/features/seen_posts.js                    |  5 ++-
 src/features/show_originals.js                | 15 +++----
 src/features/tag_tracking_plus.js             |  3 +-
 src/features/tweaks/caught_up_line.js         |  3 +-
 src/features/tweaks/hide_liked_posts.js       |  3 +-
 src/features/tweaks/hide_my_posts.js          |  3 +-
 src/utils/interface.js                        | 20 ++++++---
 src/utils/timeline_id.js                      | 43 +++++++++++++++++++
 11 files changed, 86 insertions(+), 29 deletions(-)
 create mode 100644 src/utils/timeline_id.js

diff --git a/src/features/collapsed_queue.js b/src/features/collapsed_queue.js
index dbeaf1667..1d6561a57 100644
--- a/src/features/collapsed_queue.js
+++ b/src/features/collapsed_queue.js
@@ -2,16 +2,17 @@ import { filterPostElements } from '../utils/interface.js';
 import { getPreferences } from '../utils/preferences.js';
 import { onNewPosts } from '../utils/mutations.js';
 import { keyToCss } from '../utils/css_map.js';
+import { anyQueueTimelineFilter, anyDraftsTimelineFilter } from '../utils/timeline_id.js';
 
 const excludeClass = 'xkit-collapsed-queue-done';
 const wrapperClass = 'xkit-collapsed-queue-wrapper';
 const containerClass = 'xkit-collapsed-queue-container';
 const footerSelector = keyToCss('footerWrapper');
 
-let timelineRegex;
+let timeline;
 
 const processPosts = async function (postElements) {
-  filterPostElements(postElements, { excludeClass, timeline: timelineRegex }).forEach(async postElement => {
+  filterPostElements(postElements, { excludeClass, timeline }).forEach(async postElement => {
     const headerElement = postElement.querySelector('header');
     const footerElement = postElement.querySelector(footerSelector);
 
@@ -30,11 +31,10 @@ export const main = async function () {
   const { runInQueue, runInDrafts } = await getPreferences('collapsed_queue');
   if (![runInQueue, runInDrafts].some(Boolean)) return;
 
-  const regexGroup = [
-    ...runInQueue ? ['queue'] : [],
-    ...runInDrafts ? ['draft'] : []
-  ].join('|');
-  timelineRegex = new RegExp(`/v2/blog/[^/]+/posts/(${regexGroup})`);
+  timeline = [
+    runInQueue && anyQueueTimelineFilter,
+    runInDrafts && anyDraftsTimelineFilter
+  ].filter(Boolean);
 
   onNewPosts.addListener(processPosts);
 };
diff --git a/src/features/mutual_checker.js b/src/features/mutual_checker.js
index ef5577bfd..cb6614c62 100644
--- a/src/features/mutual_checker.js
+++ b/src/features/mutual_checker.js
@@ -7,6 +7,7 @@ import { onNewPosts, onNewNotifications, pageModifications } from '../utils/muta
 import { dom } from '../utils/dom.js';
 import { getPreferences } from '../utils/preferences.js';
 import { translate } from '../utils/language_data.js';
+import { followingTimelineSelector } from '../utils/timeline_id.js';
 
 const mutualIconClass = 'xkit-mutual-icon';
 const hiddenAttribute = 'data-mutual-checker-hidden';
@@ -34,7 +35,7 @@ const styleElement = buildStyle(`
     margin-right: 0.5ch;
   }
 
-  [data-timeline="/v2/timeline/dashboard"] [${hiddenAttribute}] article {
+  ${followingTimelineSelector} [${hiddenAttribute}] article {
     display: none;
   }
 
diff --git a/src/features/no_recommended/hide_recommended_posts.js b/src/features/no_recommended/hide_recommended_posts.js
index cbc3a6ad0..4db701d31 100644
--- a/src/features/no_recommended/hide_recommended_posts.js
+++ b/src/features/no_recommended/hide_recommended_posts.js
@@ -1,11 +1,12 @@
 import { buildStyle, getTimelineItemWrapper, filterPostElements, postSelector } from '../../utils/interface.js';
 import { onNewPosts } from '../../utils/mutations.js';
 import { timelineObject } from '../../utils/react_props.js';
+import { followingTimelineFilter } from '../../utils/timeline_id.js';
 
 const excludeClass = 'xkit-no-recommended-posts-done';
 const hiddenAttribute = 'data-no-recommended-posts-hidden';
 const unHiddenAttribute = 'data-no-recommended-posts-many';
-const timeline = /\/v2\/timeline\/dashboard/;
+const timeline = followingTimelineFilter;
 const includeFiltered = true;
 
 const styleElement = buildStyle(`
diff --git a/src/features/seen_posts.js b/src/features/seen_posts.js
index 7de74b98e..8b16ecedc 100644
--- a/src/features/seen_posts.js
+++ b/src/features/seen_posts.js
@@ -2,9 +2,10 @@ import { filterPostElements, getTimelineItemWrapper, postSelector } from '../uti
 import { getPreferences } from '../utils/preferences.js';
 import { onNewPosts } from '../utils/mutations.js';
 import { keyToCss } from '../utils/css_map.js';
+import { followingTimelineFilter, followingTimelineSelector } from '../utils/timeline_id.js';
 
 const excludeAttribute = 'data-seen-posts-done';
-const timeline = '/v2/timeline/dashboard';
+const timeline = followingTimelineFilter;
 const includeFiltered = true;
 
 const dimAttribute = 'data-seen-posts-seen';
@@ -45,7 +46,7 @@ const markAsSeen = (element) => {
 };
 
 const lengthenTimelines = () =>
-  [...document.querySelectorAll(`[data-timeline="${timeline}"]`)].forEach(timelineElement => {
+  [...document.querySelectorAll(followingTimelineSelector)].forEach(timelineElement => {
     if (!timelineElement.querySelector(keyToCss('manualPaginatorButtons'))) {
       timelineElement.classList.add(lengthenedClass);
     }
diff --git a/src/features/show_originals.js b/src/features/show_originals.js
index 383e7c9e0..39f29eefb 100644
--- a/src/features/show_originals.js
+++ b/src/features/show_originals.js
@@ -5,12 +5,12 @@ import { onNewPosts } from '../utils/mutations.js';
 import { keyToCss } from '../utils/css_map.js';
 import { translate } from '../utils/language_data.js';
 import { userBlogs } from '../utils/user.js';
+import { followingTimelineFilter, anyBlogTimelineFilter, blogTimelineFilter, blogSubsTimelineFilter, timelineSelector } from '../utils/timeline_id.js';
 
 const hiddenAttribute = 'data-show-originals-hidden';
 const lengthenedClass = 'xkit-show-originals-lengthened';
 const controlsClass = 'xkit-show-originals-controls';
 
-const blogTimelineRegex = /^\/v2\/blog\/[a-z0-9-]{1,32}\/posts$/;
 const channelSelector = `${keyToCss('bar')} ~ *`;
 
 const storageKey = 'show_originals.savedModes';
@@ -65,21 +65,20 @@ const addControls = async (timelineElement, location) => {
 };
 
 const getLocation = timelineElement => {
-  const { timeline, which } = timelineElement.dataset;
-
-  const isBlog = blogTimelineRegex.test(timeline) && !timelineElement.matches(channelSelector);
+  const isBlog =
+    anyBlogTimelineFilter(timelineElement) && !timelineElement.matches(channelSelector);
 
   const on = {
-    dashboard: timeline === '/v2/timeline/dashboard',
-    disabled: isBlog && disabledBlogs.some(name => timeline === `/v2/blog/${name}/posts`),
+    dashboard: followingTimelineFilter(timelineElement),
+    disabled: isBlog && disabledBlogs.some(name => blogTimelineFilter(name)(timelineElement)),
     peepr: isBlog,
-    blogSubscriptions: timeline.includes('blog_subscriptions') || which === 'blog_subscriptions'
+    blogSubscriptions: blogSubsTimelineFilter(timelineElement)
   };
   return Object.keys(on).find(location => on[location]);
 };
 
 const processTimelines = async () => {
-  [...document.querySelectorAll('[data-timeline]')].forEach(async timelineElement => {
+  [...document.querySelectorAll(timelineSelector)].forEach(async timelineElement => {
     const location = getLocation(timelineElement);
 
     const currentControls = [...timelineElement.children]
diff --git a/src/features/tag_tracking_plus.js b/src/features/tag_tracking_plus.js
index c79732e36..1469d67f2 100644
--- a/src/features/tag_tracking_plus.js
+++ b/src/features/tag_tracking_plus.js
@@ -6,6 +6,7 @@ import { onNewPosts, pageModifications } from '../utils/mutations.js';
 import { dom } from '../utils/dom.js';
 import { addSidebarItem, removeSidebarItem } from '../utils/sidebar.js';
 import { getPreferences } from '../utils/preferences.js';
+import { tagTimelineFilter } from '../utils/timeline_id.js';
 
 const storageKey = 'tag_tracking_plus.trackedTagTimestamps';
 let timestamps;
@@ -116,7 +117,7 @@ const processPosts = async function (postElements) {
   const currentTag = decodeURIComponent(encodedCurrentTag);
   if (!trackedTags.includes(currentTag)) return;
 
-  const timeline = new RegExp(`/v2/hubs/${encodedCurrentTag}/timeline`);
+  const timeline = tagTimelineFilter(currentTag);
 
   let updated = false;
 
diff --git a/src/features/tweaks/caught_up_line.js b/src/features/tweaks/caught_up_line.js
index a6e982b3f..b0ab92ee7 100644
--- a/src/features/tweaks/caught_up_line.js
+++ b/src/features/tweaks/caught_up_line.js
@@ -1,6 +1,7 @@
 import { keyToCss } from '../../utils/css_map.js';
 import { buildStyle, getTimelineItemWrapper } from '../../utils/interface.js';
 import { pageModifications } from '../../utils/mutations.js';
+import { followingTimelineSelector } from '../../utils/timeline_id.js';
 
 const hiddenAttribute = 'data-tweaks-caught-up-line-title';
 const borderAttribute = 'data-tweaks-caught-up-line-border';
@@ -23,7 +24,7 @@ const styleElement = buildStyle(`
 `);
 
 const listTimelineObjectSelector = keyToCss('listTimelineObject');
-const tagChicletCarouselLinkSelector = `[data-timeline="/v2/timeline/dashboard"] ${listTimelineObjectSelector} ${keyToCss('tagChicletLink')}`;
+const tagChicletCarouselLinkSelector = `${followingTimelineSelector} ${listTimelineObjectSelector} ${keyToCss('tagChicletLink')}`;
 
 const createCaughtUpLine = tagChicletCarouselItems => tagChicletCarouselItems
   .map(getTimelineItemWrapper)
diff --git a/src/features/tweaks/hide_liked_posts.js b/src/features/tweaks/hide_liked_posts.js
index e452fa76b..65f43d23f 100644
--- a/src/features/tweaks/hide_liked_posts.js
+++ b/src/features/tweaks/hide_liked_posts.js
@@ -1,8 +1,9 @@
 import { onNewPosts } from '../../utils/mutations.js';
 import { buildStyle, getTimelineItemWrapper, filterPostElements } from '../../utils/interface.js';
 import { isMyPost, timelineObject } from '../../utils/react_props.js';
+import { followingTimelineFilter } from '../../utils/timeline_id.js';
 
-const timeline = /\/v2\/timeline\/dashboard/;
+const timeline = followingTimelineFilter;
 
 const hiddenAttribute = 'data-tweaks-hide-liked-posts-hidden';
 const styleElement = buildStyle(`[${hiddenAttribute}] article { display: none; }`);
diff --git a/src/features/tweaks/hide_my_posts.js b/src/features/tweaks/hide_my_posts.js
index c572fd5ac..6b10b4923 100644
--- a/src/features/tweaks/hide_my_posts.js
+++ b/src/features/tweaks/hide_my_posts.js
@@ -1,9 +1,10 @@
 import { onNewPosts } from '../../utils/mutations.js';
 import { buildStyle, getTimelineItemWrapper, filterPostElements } from '../../utils/interface.js';
 import { isMyPost } from '../../utils/react_props.js';
+import { followingTimelineFilter } from '../../utils/timeline_id.js';
 
 const excludeClass = 'xkit-tweaks-hide-my-posts-done';
-const timeline = /\/v2\/timeline\/dashboard/;
+const timeline = followingTimelineFilter;
 
 const hiddenAttribute = 'data-tweaks-hide-my-posts-hidden';
 const styleElement = buildStyle(`[${hiddenAttribute}] article { display: none; }`);
diff --git a/src/utils/interface.js b/src/utils/interface.js
index 757653e90..3eb252ca5 100644
--- a/src/utils/interface.js
+++ b/src/utils/interface.js
@@ -1,5 +1,6 @@
 import { keyToCss } from './css_map.js';
 import { dom } from './dom.js';
+import { timelineSelector } from './timeline_id.js';
 
 export const postSelector = '[tabindex="-1"][data-id]';
 export const blogViewSelector = '[style*="--blog-title-color"] *';
@@ -19,7 +20,9 @@ const targetWrapperSelector = keyToCss(
  * @returns {Element | null} The timeline item wrapper
  */
 export const getTimelineItemWrapper = element =>
-  element.closest(cellSelector) || element.closest(listTimelineObjectSelector);
+  (element.closest('[data-timeline-id]') && element.closest(listTimelineObjectSelector)?.parentElement) ||
+  element.closest(cellSelector) ||
+  element.closest(listTimelineObjectSelector);
 
 /**
  * @param {Element} element Element within a popover wrapper
@@ -35,7 +38,7 @@ export const getPopoverWrapper = element => {
 /**
  * @typedef {object} PostFilterOptions
  * @property {string} [excludeClass] - Classname to exclude and add
- * @property {RegExp|string} [timeline] - Filter results to matching [data-timeline] children
+ * @property {Function|Function[]} [timeline] - Filter results to matching timeline element children
  * @property {boolean} [noBlogView] - Whether to exclude posts in the blog view modal
  * @property {boolean} [includeFiltered] - Whether to include filtered posts
  */
@@ -51,10 +54,15 @@ export const filterPostElements = function (postElements, { excludeClass, timeli
     .map(element => element.closest(postSelector))
     .filter(Boolean);
 
-  if (timeline instanceof RegExp) {
-    postElements = postElements.filter(postElement => timeline.test(postElement.closest('[data-timeline]')?.dataset.timeline));
-  } else if (timeline) {
-    postElements = postElements.filter(postElement => timeline === postElement.closest('[data-timeline]')?.dataset.timeline);
+  if (timeline) {
+    const timelineFilters = [timeline].flat().filter(Boolean);
+    postElements = postElements.filter(postElement => {
+      const timelineElement = postElement.closest(timelineSelector);
+      return (
+        timelineElement &&
+        timelineFilters.some(timelineFilter => timelineFilter(timelineElement))
+      );
+    });
   }
 
   if (noBlogView) {
diff --git a/src/utils/timeline_id.js b/src/utils/timeline_id.js
new file mode 100644
index 000000000..368b1d466
--- /dev/null
+++ b/src/utils/timeline_id.js
@@ -0,0 +1,43 @@
+const createSelector = (...components) => `:is(${components.filter(Boolean).join(', ')})`;
+
+export const timelineSelector = ':is([data-timeline], [data-timeline-id])';
+
+const anyBlog = '[a-z0-9-]{1,32}';
+
+export const followingTimelineFilter = ({ dataset: { timeline, timelineId } }) =>
+  timeline === '/v2/timeline/dashboard' ||
+  timelineId === '/dashboard/following';
+
+export const followingTimelineSelector = createSelector(
+  `[data-timeline="${'/v2/timeline/dashboard'}"]`,
+  `[data-timeline-id="${'/dashboard/following'}"]`
+);
+
+// includes "channel" user blog view page
+export const anyBlogTimelineFilter = ({ dataset: { timeline, timelineId } }) =>
+  timeline?.match(`/v2/blog/${anyBlog}/posts`) ||
+  timelineId?.match(`peepr-posts-${anyBlog}-undefined-undefined-undefined-undefined-undefined-undefined`) ||
+  timelineId?.match(`blog-view-${anyBlog}`);
+
+// includes "channel" user blog view page
+export const blogTimelineFilter = blog =>
+  ({ dataset: { timeline, timelineId } }) =>
+    timeline === `/v2/blog/${blog}/posts` ||
+    timelineId === `peepr-posts-${blog}-undefined-undefined-undefined-undefined-undefined-undefined` ||
+    timelineId === `blog-view-${blog}`;
+
+export const blogSubsTimelineFilter = ({ dataset: { timeline, which, timelineId } }) =>
+  timeline === '/v2/timeline?which=blog_subscriptions' ||
+  which === 'blog_subscriptions' ||
+  timelineId === '/dashboard/blog_subs';
+
+export const anyDraftsTimelineFilter = ({ dataset: { timeline, timelineId } }) =>
+  timeline?.match(`/v2/blog/${anyBlog}/posts/draft`);
+
+export const anyQueueTimelineFilter = ({ dataset: { timeline, timelineId } }) =>
+  timeline?.match(`/v2/blog/${anyBlog}/posts/queue`);
+
+export const tagTimelineFilter = tag =>
+  ({ dataset: { timeline, timelineId } }) =>
+    timeline === `/v2/hubs/${encodeURIComponent(tag)}/timeline` ||
+    timelineId?.startsWith(`hubsTimeline-${tag}-recent-`);

From daccae86816b62208b787fb066f1b89bbccb7e2a Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Sun, 23 Jun 2024 12:29:09 -0700
Subject: [PATCH 03/50] Warn about unloaded/updated extension errors in
 Chromium (#1486)

---
 src/utils/modals.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/utils/modals.js b/src/utils/modals.js
index 1a2d077a8..3449ee9db 100644
--- a/src/utils/modals.js
+++ b/src/utils/modals.js
@@ -47,7 +47,12 @@ export const showErrorModal = exception => {
   showModal({
     title: 'Something went wrong.',
     message: [
-      [exception.body?.errors?.[0]?.detail, exception.errors?.[0]?.detail, exception.message]
+      [
+        exception.body?.errors?.[0]?.detail,
+        exception.errors?.[0]?.detail,
+        exception.message,
+        browser.runtime?.id === undefined && 'Please refresh this browser tab!'
+      ]
         .filter(Boolean)
         .join('\n\n')
     ],

From 52f231acb4c136b282693907455932e5d204f475 Mon Sep 17 00:00:00 2001
From: April Sylph <28949509+AprilSylph@users.noreply.github.com>
Date: Sun, 23 Jun 2024 20:53:28 +0100
Subject: [PATCH 04/50] tooling: drop `WEB_EXT_ID` from Publish workflow

resolves:
UsageError: Cannot set custom ID *** because manifest.json declares ID ***
---
 .github/workflows/publish.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 8a7f121a4..3761ed140 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -29,7 +29,6 @@ jobs:
         env:
           WEB_EXT_API_KEY: ${{ secrets.WEB_EXT_API_KEY }}
           WEB_EXT_API_SECRET: ${{ secrets.WEB_EXT_API_SECRET }}
-          WEB_EXT_ID: ${{ secrets.WEB_EXT_ID }}
   chrome:
     name: Chrome
     runs-on: ubuntu-latest

From cdeb99bb8907a33ef67fcb216d4dfbab5cd9ad5f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2024 10:37:20 +0100
Subject: [PATCH 05/50] Update dev dependencies (#1532)

---
 package-lock.json | 103 ++++++++++++++++++++++++++++++++++++++--------
 package.json      |   6 +--
 2 files changed, 89 insertions(+), 20 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2306cf44b..be52e5e54 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,14 +14,14 @@
         "webextension-polyfill": "^0.12.0"
       },
       "devDependencies": {
-        "chrome-webstore-upload-cli": "^3.1.0",
+        "chrome-webstore-upload-cli": "^3.3.0",
         "eslint": "^8.57.0",
         "eslint-config-semistandard": "^17.0.0",
         "eslint-config-standard": "^17.1.0",
         "eslint-plugin-import": "^2.29.1",
-        "eslint-plugin-jsdoc": "^48.2.7",
+        "eslint-plugin-jsdoc": "^48.5.0",
         "eslint-plugin-n": "^15.7.0",
-        "eslint-plugin-promise": "^6.2.0",
+        "eslint-plugin-promise": "^6.4.0",
         "web-ext": "^7.12.0"
       }
     },
@@ -496,6 +496,19 @@
         "node": ">=14"
       }
     },
+    "node_modules/@pkgr/core": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz",
+      "integrity": "sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/unts"
+      }
+    },
     "node_modules/@pnpm/config.env-replace": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@pnpm/config.env-replace/-/config.env-replace-1.1.0.tgz",
@@ -1656,10 +1669,11 @@
       }
     },
     "node_modules/chrome-webstore-upload": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/chrome-webstore-upload/-/chrome-webstore-upload-3.0.2.tgz",
-      "integrity": "sha512-HqD4zdtvCROH5L6LVXCIFZUhbtBkSVqfxiZM0VVpWO01Dm6cjwCrnb0WY8upHboobfeJgzBGBQNuRMG9sPV9JQ==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/chrome-webstore-upload/-/chrome-webstore-upload-3.1.0.tgz",
+      "integrity": "sha512-FpJFVewoeazHEz86vi6KaWq8+YYuX5RgmH6oVGDjeLS75n62qzjlwx1VQP4U2UeOPMNuUA3PYQQI6qkoSWVN8A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=18"
       },
@@ -1668,12 +1682,13 @@
       }
     },
     "node_modules/chrome-webstore-upload-cli": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/chrome-webstore-upload-cli/-/chrome-webstore-upload-cli-3.1.0.tgz",
-      "integrity": "sha512-dctdp+1rPbYF63s0gZWZboReQcQHc+2yy3Chx6C1u7hMnMgDYCJ2JjkyXnDeILmV6Naf6XUsCaqsJgsdZ2HADw==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/chrome-webstore-upload-cli/-/chrome-webstore-upload-cli-3.3.0.tgz",
+      "integrity": "sha512-8KMq/hqqgy4PZ/PD8ElDphJPSn5szTxcc8frkQQ7yJgFAoV0Z5cpTeTY0wh6QcU08AqNiVM/lp62iFw0G6yJ8w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "chrome-webstore-upload": "^3.0.0",
+        "chrome-webstore-upload": "^3.1.0",
         "junk": "^4.0.1",
         "meow": "^12.1.1",
         "ora": "^7.0.1",
@@ -2448,6 +2463,13 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/es-module-lexer": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz",
+      "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/es-set-tostringtag": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz",
@@ -2775,9 +2797,9 @@
       }
     },
     "node_modules/eslint-plugin-jsdoc": {
-      "version": "48.2.7",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-48.2.7.tgz",
-      "integrity": "sha512-fYj3roTnkFL9OFFTB129rico8lerC5G8Vp2ZW9SjO9RNWG0exVvI+i/Y8Bpm1ufjR0uvT38xtoab/U0Hp8Ybog==",
+      "version": "48.5.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-48.5.0.tgz",
+      "integrity": "sha512-ukXPNpGby3KjCveCizIS8t1EbuJEHYEu/tBg8GCbn/YbHcXwphyvYCdvRZ/oMRfTscGSSzfsWoZ+ZkAP0/6YMQ==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -2787,8 +2809,10 @@
         "debug": "^4.3.4",
         "escape-string-regexp": "^4.0.0",
         "esquery": "^1.5.0",
+        "parse-imports": "^2.1.0",
         "semver": "^7.6.2",
-        "spdx-expression-parse": "^4.0.0"
+        "spdx-expression-parse": "^4.0.0",
+        "synckit": "^0.9.0"
       },
       "engines": {
         "node": ">=18"
@@ -2872,9 +2896,9 @@
       }
     },
     "node_modules/eslint-plugin-promise": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.2.0.tgz",
-      "integrity": "sha512-QmAqwizauvnKOlifxyDj2ObfULpHQawlg/zQdgEixur9vl0CvZGv/LCJV2rtj3210QCoeGBzVMfMXqGAOr/4fA==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.4.0.tgz",
+      "integrity": "sha512-/KWWRaD3fGkVCZsdR0RU53PSthFmoHVhZl+y9+6DqeDLSikLdlUVpVEAmI6iCRR5QyOjBYBqHZV/bdv4DJ4Gtw==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -5609,6 +5633,20 @@
         "node": ">=6"
       }
     },
+    "node_modules/parse-imports": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/parse-imports/-/parse-imports-2.1.0.tgz",
+      "integrity": "sha512-JQWgmK2o4w8leUkZeZPatWdAny6vXGU/3siIUvMF6J2rDCud9aTt8h/px9oZJ6U3EcfhngBJ635uPFI0q0VAeA==",
+      "dev": true,
+      "license": "Apache 2.0",
+      "dependencies": {
+        "es-module-lexer": "^1.5.3",
+        "slashes": "^3.0.12"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
     "node_modules/parse-json": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-6.0.2.tgz",
@@ -6569,6 +6607,13 @@
       "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
       "dev": true
     },
+    "node_modules/slashes": {
+      "version": "3.0.12",
+      "resolved": "https://registry.npmjs.org/slashes/-/slashes-3.0.12.tgz",
+      "integrity": "sha512-Q9VME8WyGkc7pJf6QEkj3wE+2CnvZMI+XJhwdTPR8Z/kWQRXi7boAWLDibRPyHRTUTPx5FaU7MsyrjI3yLB4HA==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/sonic-boom": {
       "version": "3.8.1",
       "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-3.8.1.tgz",
@@ -6949,6 +6994,23 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/synckit": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.0.tgz",
+      "integrity": "sha512-7RnqIMq572L8PeEzKeBINYEJDDxpcH8JEgLwUqBd3TkofhFRbkq4QLR0u+36avGAhCRbk2nnmjcW9SE531hPDg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@pkgr/core": "^0.1.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/unts"
+      }
+    },
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -7047,6 +7109,13 @@
         "strip-bom": "^3.0.0"
       }
     },
+    "node_modules/tslib": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
+      "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==",
+      "dev": true,
+      "license": "0BSD"
+    },
     "node_modules/tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
diff --git a/package.json b/package.json
index fa79e9b87..4421eac45 100644
--- a/package.json
+++ b/package.json
@@ -8,14 +8,14 @@
     "build": "web-ext build"
   },
   "devDependencies": {
-    "chrome-webstore-upload-cli": "^3.1.0",
+    "chrome-webstore-upload-cli": "^3.3.0",
     "eslint": "^8.57.0",
     "eslint-config-semistandard": "^17.0.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jsdoc": "^48.2.7",
+    "eslint-plugin-jsdoc": "^48.5.0",
     "eslint-plugin-n": "^15.7.0",
-    "eslint-plugin-promise": "^6.2.0",
+    "eslint-plugin-promise": "^6.4.0",
     "web-ext": "^7.12.0"
   },
   "dependencies": {

From 0756439c4a8dc8761b67091d583e580dbbf801e3 Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Sun, 7 Jul 2024 05:08:09 -0700
Subject: [PATCH 06/50] Refactor: Use Array.prototype.at (#1535)

---
 src/features/quick_reblog.js | 2 +-
 src/features/trim_reblogs.js | 2 +-
 src/utils/sidebar.js         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/features/quick_reblog.js b/src/features/quick_reblog.js
index e52fc9082..3d8077914 100644
--- a/src/features/quick_reblog.js
+++ b/src/features/quick_reblog.js
@@ -75,7 +75,7 @@ ${postSelector} footer button[aria-label="${translate('Reblog')}"]:not([role])
 const renderBlogAvatar = async () => {
   const { value: selectedUuid } = blogSelector;
   const { avatar } = userBlogs.find(({ uuid }) => uuid === selectedUuid);
-  const { url } = avatar[avatar.length - 1];
+  const { url } = avatar.at(-1);
   blogAvatar.style.backgroundImage = `url(${url})`;
 };
 blogSelector.addEventListener('change', renderBlogAvatar);
diff --git a/src/features/trim_reblogs.js b/src/features/trim_reblogs.js
index b1cbb2936..8d6509c05 100644
--- a/src/features/trim_reblogs.js
+++ b/src/features/trim_reblogs.js
@@ -73,7 +73,7 @@ const onButtonClicked = async function ({ currentTarget: controlButton }) {
 
   const createPreviewItem = ({ blog, brokenBlog, content, disableCheckbox = false }) => {
     const { avatar, name } = blog ?? brokenBlog ?? blogPlaceholder;
-    const { url: src } = avatar[avatar.length - 1];
+    const { url: src } = avatar.at(-1);
     const textContent = content.map(({ text }) => text).find(Boolean) ?? '\u22EF';
 
     const checkbox = dom('input', { type: 'checkbox' });
diff --git a/src/utils/sidebar.js b/src/utils/sidebar.js
index 290c874e6..6ada9a1e7 100644
--- a/src/utils/sidebar.js
+++ b/src/utils/sidebar.js
@@ -116,7 +116,7 @@ const addSidebarToPage = (siblingCandidates) => {
 const addSidebarToDrawer = (navItems) => {
   updateSidebarItemVisibility();
 
-  const lastNavItem = navItems[navItems.length - 1];
+  const lastNavItem = navItems.at(-1);
   lastNavItem?.after(sidebarItems);
 };
 

From 8c574abb57c7bede249aaa5b4531618f6f453b16 Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Sat, 13 Jul 2024 11:57:17 -0700
Subject: [PATCH 07/50] Main world injection: Prevent race condition (#1520)

---
 src/content_scripts/main.js | 18 ++++++++++++------
 src/main_world/index.js     |  2 ++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/content_scripts/main.js b/src/content_scripts/main.js
index d6c8ee1f1..50a30f844 100644
--- a/src/content_scripts/main.js
+++ b/src/content_scripts/main.js
@@ -76,24 +76,30 @@
     return installedScripts;
   };
 
-  const initMainWorld = () => {
+  const initMainWorld = () => new Promise(resolve => {
+    document.documentElement.addEventListener('xkitinjectionready', resolve, { once: true });
+
     const { nonce } = [...document.scripts].find(script => script.getAttributeNames().includes('nonce'));
     const script = document.createElement('script');
     script.type = 'module';
     script.nonce = nonce;
     script.src = browser.runtime.getURL('/main_world/index.js');
     document.documentElement.append(script);
-  };
+  });
 
   const init = async function () {
     $('style.xkit').remove();
 
-    initMainWorld();
-
     browser.storage.onChanged.addListener(onStorageChanged);
 
-    const installedScripts = await getInstalledScripts();
-    const { enabledScripts = [] } = await browser.storage.local.get('enabledScripts');
+    const [
+      installedScripts,
+      { enabledScripts = [] }
+    ] = await Promise.all([
+      getInstalledScripts(),
+      browser.storage.local.get('enabledScripts'),
+      initMainWorld()
+    ]);
 
     /**
      * fixes WebKit (Chromium, Safari) simultaneous import failure of files with unresolved top level await
diff --git a/src/main_world/index.js b/src/main_world/index.js
index 3d52111a8..2d015a182 100644
--- a/src/main_world/index.js
+++ b/src/main_world/index.js
@@ -28,3 +28,5 @@ document.documentElement.addEventListener('xkitinjectionrequest', async event =>
     );
   }
 });
+
+document.documentElement.dispatchEvent(new CustomEvent('xkitinjectionready'));

From 8cb0277fe0afe676bb32e8e4a39ff0c1897fc2bc Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Sat, 13 Jul 2024 11:58:50 -0700
Subject: [PATCH 08/50] Timeline ID util: Enforce exact matches (#1524)

---
 src/utils/timeline_id.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/utils/timeline_id.js b/src/utils/timeline_id.js
index 368b1d466..d7419c44e 100644
--- a/src/utils/timeline_id.js
+++ b/src/utils/timeline_id.js
@@ -2,6 +2,7 @@ const createSelector = (...components) => `:is(${components.filter(Boolean).join
 
 export const timelineSelector = ':is([data-timeline], [data-timeline-id])';
 
+const exactly = string => `^${string}$`;
 const anyBlog = '[a-z0-9-]{1,32}';
 
 export const followingTimelineFilter = ({ dataset: { timeline, timelineId } }) =>
@@ -15,9 +16,9 @@ export const followingTimelineSelector = createSelector(
 
 // includes "channel" user blog view page
 export const anyBlogTimelineFilter = ({ dataset: { timeline, timelineId } }) =>
-  timeline?.match(`/v2/blog/${anyBlog}/posts`) ||
-  timelineId?.match(`peepr-posts-${anyBlog}-undefined-undefined-undefined-undefined-undefined-undefined`) ||
-  timelineId?.match(`blog-view-${anyBlog}`);
+  timeline?.match(exactly(`/v2/blog/${anyBlog}/posts`)) ||
+  timelineId?.match(exactly(`peepr-posts-${anyBlog}-undefined-undefined-undefined-undefined-undefined-undefined`)) ||
+  timelineId?.match(exactly(`blog-view-${anyBlog}`));
 
 // includes "channel" user blog view page
 export const blogTimelineFilter = blog =>
@@ -32,10 +33,10 @@ export const blogSubsTimelineFilter = ({ dataset: { timeline, which, timelineId
   timelineId === '/dashboard/blog_subs';
 
 export const anyDraftsTimelineFilter = ({ dataset: { timeline, timelineId } }) =>
-  timeline?.match(`/v2/blog/${anyBlog}/posts/draft`);
+  timeline?.match(exactly(`/v2/blog/${anyBlog}/posts/draft`));
 
 export const anyQueueTimelineFilter = ({ dataset: { timeline, timelineId } }) =>
-  timeline?.match(`/v2/blog/${anyBlog}/posts/queue`);
+  timeline?.match(exactly(`/v2/blog/${anyBlog}/posts/queue`));
 
 export const tagTimelineFilter = tag =>
   ({ dataset: { timeline, timelineId } }) =>

From 3d4db5428a0d6a615bf12abf99e35c31a349ec04 Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Sat, 13 Jul 2024 12:04:58 -0700
Subject: [PATCH 09/50] Quick Reblog: Don't clear popup state on error (#1484)

---
 src/features/quick_reblog.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/features/quick_reblog.js b/src/features/quick_reblog.js
index 3d8077914..d48ae26f7 100644
--- a/src/features/quick_reblog.js
+++ b/src/features/quick_reblog.js
@@ -175,7 +175,6 @@ const reblogPost = async function ({ currentTarget }) {
 
   currentTarget.blur();
   actionButtons.disabled = true;
-  lastPostID = null;
 
   const postElement = currentTarget.closest(postSelector);
   const postID = postElement.dataset.id;
@@ -204,8 +203,12 @@ const reblogPost = async function ({ currentTarget }) {
     const { meta, response } = await apiFetch(requestPath, { method: 'POST', body: requestBody });
     if (meta.status === 201) {
       makeButtonReblogged({ buttonDiv: currentReblogButton, state });
-      if (lastPostID === null) {
+
+      if (lastPostID === postID) {
         popupElement.remove();
+        lastPostID = null;
+      } else {
+        // popup was moved to another post during apiFetch
       }
 
       notify(response.displayText);

From 4631a329ac0644e61116ac5e8b75dd46ed9418f7 Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Sat, 13 Jul 2024 12:07:56 -0700
Subject: [PATCH 10/50] Timeline ID util: Process current Tumblr Patio IDs
 (#1525)

---
 src/utils/timeline_id.js | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/utils/timeline_id.js b/src/utils/timeline_id.js
index d7419c44e..a70764bc9 100644
--- a/src/utils/timeline_id.js
+++ b/src/utils/timeline_id.js
@@ -4,28 +4,33 @@ export const timelineSelector = ':is([data-timeline], [data-timeline-id])';
 
 const exactly = string => `^${string}$`;
 const anyBlog = '[a-z0-9-]{1,32}';
+const uuidV4 = '[a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[a-f0-9]{4}-[a-f0-9]{12}';
 
 export const followingTimelineFilter = ({ dataset: { timeline, timelineId } }) =>
   timeline === '/v2/timeline/dashboard' ||
-  timelineId === '/dashboard/following';
+  timelineId === '/dashboard/following' ||
+  timelineId?.startsWith('following-');
 
 export const followingTimelineSelector = createSelector(
   `[data-timeline="${'/v2/timeline/dashboard'}"]`,
-  `[data-timeline-id="${'/dashboard/following'}"]`
+  `[data-timeline-id="${'/dashboard/following'}"]`,
+  `[data-timeline-id^="${'following-'}"]`
 );
 
 // includes "channel" user blog view page
 export const anyBlogTimelineFilter = ({ dataset: { timeline, timelineId } }) =>
   timeline?.match(exactly(`/v2/blog/${anyBlog}/posts`)) ||
   timelineId?.match(exactly(`peepr-posts-${anyBlog}-undefined-undefined-undefined-undefined-undefined-undefined`)) ||
-  timelineId?.match(exactly(`blog-view-${anyBlog}`));
+  timelineId?.match(exactly(`blog-view-${anyBlog}`)) ||
+  timelineId?.match(exactly(`blog-${uuidV4}-${anyBlog}`));
 
 // includes "channel" user blog view page
 export const blogTimelineFilter = blog =>
   ({ dataset: { timeline, timelineId } }) =>
     timeline === `/v2/blog/${blog}/posts` ||
     timelineId === `peepr-posts-${blog}-undefined-undefined-undefined-undefined-undefined-undefined` ||
-    timelineId === `blog-view-${blog}`;
+    timelineId === `blog-view-${blog}` ||
+    timelineId?.match(exactly(`blog-${uuidV4}-${blog}`));
 
 export const blogSubsTimelineFilter = ({ dataset: { timeline, which, timelineId } }) =>
   timeline === '/v2/timeline?which=blog_subscriptions' ||
@@ -33,12 +38,15 @@ export const blogSubsTimelineFilter = ({ dataset: { timeline, which, timelineId
   timelineId === '/dashboard/blog_subs';
 
 export const anyDraftsTimelineFilter = ({ dataset: { timeline, timelineId } }) =>
-  timeline?.match(exactly(`/v2/blog/${anyBlog}/posts/draft`));
+  timeline?.match(exactly(`/v2/blog/${anyBlog}/posts/draft`)) ||
+  timelineId?.match(exactly(`drafts-${uuidV4}-${anyBlog}`));
 
 export const anyQueueTimelineFilter = ({ dataset: { timeline, timelineId } }) =>
-  timeline?.match(exactly(`/v2/blog/${anyBlog}/posts/queue`));
+  timeline?.match(exactly(`/v2/blog/${anyBlog}/posts/queue`)) ||
+  timelineId?.match(exactly(`queue-${uuidV4}-${anyBlog}`));
 
 export const tagTimelineFilter = tag =>
   ({ dataset: { timeline, timelineId } }) =>
     timeline === `/v2/hubs/${encodeURIComponent(tag)}/timeline` ||
-    timelineId?.startsWith(`hubsTimeline-${tag}-recent-`);
+    timelineId?.startsWith(`hubsTimeline-${tag}-recent-`) ||
+    timelineId?.match(exactly(`tag-${uuidV4}-${tag}-recent`));

From f0d7867f3a4dac1f3bb489ed3f4b2577f93f23ed Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Sat, 13 Jul 2024 12:10:59 -0700
Subject: [PATCH 11/50] Tag Tracking+: Remove search dropdown mode (#1537)

Co-authored-by: April Sylph <28949509+AprilSylph@users.noreply.github.com>
---
 src/features/tag_tracking_plus.css  |  5 ---
 src/features/tag_tracking_plus.js   | 66 ++++-------------------------
 src/features/tag_tracking_plus.json | 14 +-----
 3 files changed, 11 insertions(+), 74 deletions(-)

diff --git a/src/features/tag_tracking_plus.css b/src/features/tag_tracking_plus.css
index ebe36fa30..c27fee4af 100644
--- a/src/features/tag_tracking_plus.css
+++ b/src/features/tag_tracking_plus.css
@@ -27,8 +27,3 @@
 #tag-tracking-plus[data-only-show-new="true"] li:not([data-new="true"]) {
   display: none;
 }
-
-[data-tag-tracking-plus-show-sidebar="false"] #tag-tracking-plus,
-[data-tag-tracking-plus-show-search="false"] .xkit-tag-tracking-plus-search-count {
-  display: none;
-}
diff --git a/src/features/tag_tracking_plus.js b/src/features/tag_tracking_plus.js
index 1469d67f2..2e838c2ac 100644
--- a/src/features/tag_tracking_plus.js
+++ b/src/features/tag_tracking_plus.js
@@ -1,9 +1,7 @@
 import { apiFetch, onClickNavigate } from '../utils/tumblr_helpers.js';
 import { filterPostElements } from '../utils/interface.js';
 import { timelineObject } from '../utils/react_props.js';
-import { keyToCss } from '../utils/css_map.js';
-import { onNewPosts, pageModifications } from '../utils/mutations.js';
-import { dom } from '../utils/dom.js';
+import { onNewPosts } from '../utils/mutations.js';
 import { addSidebarItem, removeSidebarItem } from '../utils/sidebar.js';
 import { getPreferences } from '../utils/preferences.js';
 import { tagTimelineFilter } from '../utils/timeline_id.js';
@@ -11,14 +9,9 @@ import { tagTimelineFilter } from '../utils/timeline_id.js';
 const storageKey = 'tag_tracking_plus.trackedTagTimestamps';
 let timestamps;
 
-const searchCountClass = 'xkit-tag-tracking-plus-search-count';
-
 const excludeClass = 'xkit-tag-tracking-plus-done';
 const includeFiltered = true;
 
-const tagLinkSelector = `${keyToCss('searchResult')} h3 ~ a${keyToCss('typeaheadRow')}[href^="/tagged/"]`;
-const tagTextSelector = keyToCss('tagText');
-
 let trackedTags;
 const unreadCounts = new Map();
 
@@ -65,19 +58,12 @@ const refreshCount = async function (tag) {
     console.error(exception);
   }
 
-  [document, ...(!sidebarItem || document.contains(sidebarItem) ? [] : [sidebarItem])]
-    .flatMap(node =>
-      [...node.querySelectorAll('[data-count-for]')].filter(
-        ({ dataset: { countFor } }) => countFor === `#${tag}`
-      )
-    )
-    .filter((value, index, array) => array.indexOf(value) === index)
-    .forEach(unreadCountElement => {
-      unreadCountElement.textContent = unreadCountString;
-      if (unreadCountElement.closest('li')) {
-        unreadCountElement.closest('li').dataset.new = unreadCountString !== '0';
-      }
-    });
+  const unreadCountElement = sidebarItem.querySelector(`[data-count-for="#${tag}"]`);
+
+  unreadCountElement.textContent = unreadCountString;
+  if (unreadCountElement.closest('li')) {
+    unreadCountElement.closest('li').dataset.new = unreadCountString !== '0';
+  }
 
   unreadCounts.set(tag, unreadCountString);
   updateSidebarStatus();
@@ -141,36 +127,12 @@ const processPosts = async function (postElements) {
   }
 };
 
-const processTagLinks = function (tagLinkElements) {
-  tagLinkElements.forEach(tagLinkElement => {
-    if (tagLinkElement.querySelector('[data-count-for]') !== null) return;
-
-    const tagTextElement = tagLinkElement.querySelector(tagTextSelector);
-    const tag = tagTextElement.textContent;
-    const unreadCountElement = dom(
-      'span',
-      {
-        class: searchCountClass,
-        'data-count-for': `#${tag}`,
-        style: 'margin-left: auto; margin-right: 1ch; opacity: 0.65;'
-      },
-      null,
-      [unreadCounts.get(tag) ?? '\u22EF']
-    );
-
-    tagTextElement.after(unreadCountElement);
-  });
-};
-
 export const onStorageChanged = async (changes, areaName) => {
   if (Object.keys(changes).includes(storageKey)) {
     timestamps = changes[storageKey].newValue;
   }
   if (Object.keys(changes).some(key => key.startsWith('tag_tracking_plus.preferences'))) {
-    const { showUnread, onlyShowNew } = await getPreferences('tag_tracking_plus');
-
-    document.body.dataset.tagTrackingPlusShowSearch = showUnread === 'both' || showUnread === 'search';
-    document.body.dataset.tagTrackingPlusShowSidebar = showUnread === 'both' || showUnread === 'sidebar';
+    const { onlyShowNew } = await getPreferences('tag_tracking_plus');
     sidebarItem.dataset.onlyShowNew = onlyShowNew;
   }
 };
@@ -183,11 +145,7 @@ export const main = async function () {
 
   ({ [storageKey]: timestamps = {} } = await browser.storage.local.get(storageKey));
 
-  const { showUnread, onlyShowNew } = await getPreferences('tag_tracking_plus');
-  document.body.dataset.tagTrackingPlusShowSearch = showUnread === 'both' || showUnread === 'search';
-  document.body.dataset.tagTrackingPlusShowSidebar = showUnread === 'both' || showUnread === 'sidebar';
-
-  pageModifications.register(tagLinkSelector, processTagLinks);
+  const { onlyShowNew } = await getPreferences('tag_tracking_plus');
 
   sidebarItem = addSidebarItem({
     id: 'tag-tracking-plus',
@@ -209,16 +167,10 @@ export const main = async function () {
 export const clean = async function () {
   stopRefreshInterval();
   onNewPosts.removeListener(processPosts);
-  pageModifications.unregister(processTagLinks);
 
   removeSidebarItem('tag-tracking-plus');
-  $(`.${searchCountClass}`).remove();
-
-  document.body.removeAttribute('data-tag-tracking-plus-show-sidebar');
-  document.body.removeAttribute('data-tag-tracking-plus-show-search');
 
   unreadCounts.clear();
-  sidebarItem = undefined;
 };
 
 export const stylesheet = true;
diff --git a/src/features/tag_tracking_plus.json b/src/features/tag_tracking_plus.json
index 490f21b26..0f28e38f2 100644
--- a/src/features/tag_tracking_plus.json
+++ b/src/features/tag_tracking_plus.json
@@ -1,6 +1,6 @@
 {
   "title": "Tag Tracking+",
-  "description": "Unread counts on followed tags",
+  "description": "Unread counts for followed tags",
   "icon": {
     "class_name": "ri-hashtag",
     "color": "white",
@@ -8,19 +8,9 @@
   },
   "help": "https://github.com/AprilSylph/XKit-Rewritten/wiki/Features#tag-tracking",
   "preferences": {
-    "showUnread": {
-      "type": "select",
-      "label": "Show unread counts",
-      "options": [
-        { "value": "both", "label": "Both in search & sidebar" },
-        { "value": "search", "label": "Only in the search dropdown" },
-        { "value": "sidebar", "label": "Only in the sidebar" }
-      ],
-      "default": "both"
-    },
     "onlyShowNew": {
       "type": "checkbox",
-      "label": "Only show tags with new posts in the sidebar",
+      "label": "Only show tags with new posts",
       "default": false
     }
   }

From dbf6b20ecaf74ffc56a63c98efde069f892aec65 Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Sat, 13 Jul 2024 12:11:08 -0700
Subject: [PATCH 12/50] Timeline id util: Process drafts timeline (#1530)

---
 src/utils/timeline_id.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/utils/timeline_id.js b/src/utils/timeline_id.js
index a70764bc9..f91755d3e 100644
--- a/src/utils/timeline_id.js
+++ b/src/utils/timeline_id.js
@@ -39,6 +39,7 @@ export const blogSubsTimelineFilter = ({ dataset: { timeline, which, timelineId
 
 export const anyDraftsTimelineFilter = ({ dataset: { timeline, timelineId } }) =>
   timeline?.match(exactly(`/v2/blog/${anyBlog}/posts/draft`)) ||
+  timelineId?.match(exactly(`drafts-${anyBlog}`)) ||
   timelineId?.match(exactly(`drafts-${uuidV4}-${anyBlog}`));
 
 export const anyQueueTimelineFilter = ({ dataset: { timeline, timelineId } }) =>

From ba2fce796644f5fce4c420a0ad2146f881162a3e Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Sat, 13 Jul 2024 12:17:04 -0700
Subject: [PATCH 13/50] Tweaks: Fix "restore attribution" breaking Communities
 (#1495)

---
 src/features/tweaks/restore_attribution_links.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/features/tweaks/restore_attribution_links.js b/src/features/tweaks/restore_attribution_links.js
index 8c33b2e6c..51a733b1a 100644
--- a/src/features/tweaks/restore_attribution_links.js
+++ b/src/features/tweaks/restore_attribution_links.js
@@ -29,7 +29,7 @@ const processPosts = async function (postElements) {
     } = await timelineObject(postElement);
     const postAttributionLink = postElement.querySelector(postAttributionLinkSelector);
 
-    if (postAttributionLink !== null) {
+    if (postAttributionLink && postAttributionLink.textContent === blogName) {
       postAttributionLink.href = postUrl;
       postAttributionLink.dataset.blogName = blogName;
       postAttributionLink.dataset.postId = id;
@@ -37,7 +37,7 @@ const processPosts = async function (postElements) {
     }
 
     const reblogAttributionLink = postElement.querySelector(reblogAttributionLinkSelector);
-    if (reblogAttributionLink !== null && rebloggedFromUrl !== undefined) {
+    if (reblogAttributionLink && reblogAttributionLink.textContent === rebloggedFromName) {
       reblogAttributionLink.href = rebloggedFromUrl;
       reblogAttributionLink.dataset.blogName = rebloggedFromName;
       reblogAttributionLink.dataset.postId = rebloggedFromId;

From d03d7fe3442aec2aa013de5e9d154ad7e049ec4d Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Sat, 13 Jul 2024 12:24:32 -0700
Subject: [PATCH 14/50] PostBlock: Block posts instantly (#1516)

---
 src/features/postblock.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/features/postblock.js b/src/features/postblock.js
index 5123b640d..802107487 100644
--- a/src/features/postblock.js
+++ b/src/features/postblock.js
@@ -10,9 +10,9 @@ const meatballButtonLabel = 'Block this post';
 const hiddenAttribute = 'data-postblock-hidden';
 const storageKey = 'postblock.blockedPostRootIDs';
 
-const processPosts = async function (postElements) {
-  const { [storageKey]: blockedPostRootIDs = [] } = await browser.storage.local.get(storageKey);
+let blockedPostRootIDs = [];
 
+const processPosts = postElements =>
   filterPostElements(postElements, { includeFiltered: true }).forEach(async postElement => {
     const postID = postElement.dataset.id;
     const { rebloggedRootId } = await timelineObject(postElement);
@@ -25,9 +25,8 @@ const processPosts = async function (postElements) {
       getTimelineItemWrapper(postElement).removeAttribute(hiddenAttribute);
     }
   });
-};
 
-const onButtonClicked = async function ({ currentTarget }) {
+const onButtonClicked = ({ currentTarget }) => {
   const { id, rebloggedRootId } = currentTarget.__timelineObjectData;
   const rootID = rebloggedRootId || id;
 
@@ -52,11 +51,14 @@ const blockPost = async rootID => {
 
 export const onStorageChanged = async function (changes, areaName) {
   if (Object.keys(changes).includes(storageKey)) {
+    ({ newValue: blockedPostRootIDs = [] } = changes[storageKey]);
     pageModifications.trigger(processPosts);
   }
 };
 
 export const main = async function () {
+  ({ [storageKey]: blockedPostRootIDs = [] } = await browser.storage.local.get(storageKey));
+
   registerMeatballItem({ id: meatballButtonId, label: meatballButtonLabel, onclick: onButtonClicked });
 
   onNewPosts.addListener(processPosts);

From 76411a6fb2fde3bbd267cbe639a3e624ac4a60e6 Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Sat, 13 Jul 2024 12:29:59 -0700
Subject: [PATCH 15/50] Inject util: Stop processing disconnected elements
 (#1518)

---
 src/main_world/index.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main_world/index.js b/src/main_world/index.js
index 2d015a182..63f12c1a2 100644
--- a/src/main_world/index.js
+++ b/src/main_world/index.js
@@ -8,6 +8,8 @@ document.documentElement.addEventListener('xkitinjectionrequest', async event =>
     moduleCache[path] ??= await import(path);
     const func = moduleCache[path].default;
 
+    if (target.isConnected === false) return;
+
     const result = await func.apply(target, args);
     target.dispatchEvent(
       new CustomEvent('xkitinjectionresponse', { detail: JSON.stringify({ id, result }) })

From 2d1c98933329f4868b23988c98a2ce7cbf8f7c66 Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Sat, 13 Jul 2024 13:01:33 -0700
Subject: [PATCH 16/50] Implement Scroll to Bottom on Timeline V2 (#1493)

Co-authored-by: April Sylph <28949509+AprilSylph@users.noreply.github.com>
---
 src/features/scroll_to_bottom.js | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/features/scroll_to_bottom.js b/src/features/scroll_to_bottom.js
index e6713c6ff..640abc3e0 100644
--- a/src/features/scroll_to_bottom.js
+++ b/src/features/scroll_to_bottom.js
@@ -8,8 +8,8 @@ $(`[id="${scrollToBottomButtonId}"]`).remove();
 const activeClass = 'xkit-scroll-to-bottom-active';
 
 const loaderSelector = `
-${keyToCss('timeline', 'blogRows')} > :last-child,
-${keyToCss('notifications')} + ${keyToCss('loader')}
+${keyToCss('timeline', 'blogRows')} > :is(${keyToCss('scrollContainer')}, .sortableContainer) + div,
+${keyToCss('notifications')} + div
 `;
 const knightRiderLoaderSelector = `:is(${loaderSelector}) > ${keyToCss('knightRiderLoader')}`;
 
@@ -22,13 +22,23 @@ const styleElement = buildStyle(`
 }
 `);
 
+let timeoutID;
+
+const onLoadersAdded = loaders => {
+  if (active) {
+    clearTimeout(timeoutID);
+  }
+};
+
 const scrollToBottom = () => {
+  clearTimeout(timeoutID);
   window.scrollTo({ top: document.documentElement.scrollHeight });
-  const loaders = [...document.querySelectorAll(knightRiderLoaderSelector)];
 
-  if (loaders.length === 0) {
-    stopScrolling();
-  }
+  timeoutID = setTimeout(() => {
+    if (!document.querySelector(knightRiderLoaderSelector)) {
+      stopScrolling();
+    }
+  }, 500);
 };
 const observer = new ResizeObserver(scrollToBottom);
 
@@ -40,6 +50,7 @@ const startScrolling = () => {
 };
 
 const stopScrolling = () => {
+  clearTimeout(timeoutID);
   observer.disconnect();
   active = false;
   scrollToBottomButton?.classList.remove(activeClass);
@@ -79,12 +90,14 @@ const addButtonToPage = async function ([scrollToTopButton]) {
 
 export const main = async function () {
   pageModifications.register(`button[aria-label="${translate('Scroll to top')}"]`, addButtonToPage);
+  pageModifications.register(knightRiderLoaderSelector, onLoadersAdded);
   document.documentElement.append(styleElement);
 };
 
 export const clean = async function () {
   pageModifications.unregister(addButtonToPage);
   pageModifications.unregister(checkForButtonRemoved);
+  pageModifications.unregister(onLoadersAdded);
   stopScrolling();
   scrollToBottomButton?.remove();
   styleElement.remove();

From 526466be5b63dd7783204f13df1cca1c12a62374 Mon Sep 17 00:00:00 2001
From: April Sylph <28949509+AprilSylph@users.noreply.github.com>
Date: Sun, 14 Jul 2024 19:52:57 +0100
Subject: [PATCH 17/50] bump version to 1.0.1

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

diff --git a/src/manifest.json b/src/manifest.json
index 8d85a15cf..aa6b68274 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "XKit Rewritten",
-  "version": "1.0.0",
+  "version": "1.0.1",
 
   "short_name": "XKit",
   "author": "April Sylph",

From 9383a0000181cf4c7e3db1e63899358cd893c4a2 Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Thu, 18 Jul 2024 05:21:26 -0700
Subject: [PATCH 18/50] Fix extension restarts in Firefox (#1551)

---
 src/content_scripts/main.js |  1 -
 src/main_world/index.js     | 60 ++++++++++++++++++++-----------------
 2 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/src/content_scripts/main.js b/src/content_scripts/main.js
index 50a30f844..ce9b29633 100644
--- a/src/content_scripts/main.js
+++ b/src/content_scripts/main.js
@@ -81,7 +81,6 @@
 
     const { nonce } = [...document.scripts].find(script => script.getAttributeNames().includes('nonce'));
     const script = document.createElement('script');
-    script.type = 'module';
     script.nonce = nonce;
     script.src = browser.runtime.getURL('/main_world/index.js');
     document.documentElement.append(script);
diff --git a/src/main_world/index.js b/src/main_world/index.js
index 63f12c1a2..5d7bc1d12 100644
--- a/src/main_world/index.js
+++ b/src/main_world/index.js
@@ -1,34 +1,38 @@
-const moduleCache = {};
+'use strict';
 
-document.documentElement.addEventListener('xkitinjectionrequest', async event => {
-  const { detail, target } = event;
-  const { id, path, args } = JSON.parse(detail);
+{
+  const moduleCache = {};
 
-  try {
-    moduleCache[path] ??= await import(path);
-    const func = moduleCache[path].default;
+  document.documentElement.addEventListener('xkitinjectionrequest', async event => {
+    const { detail, target } = event;
+    const { id, path, args } = JSON.parse(detail);
 
-    if (target.isConnected === false) return;
+    try {
+      moduleCache[path] ??= await import(path);
+      const func = moduleCache[path].default;
 
-    const result = await func.apply(target, args);
-    target.dispatchEvent(
-      new CustomEvent('xkitinjectionresponse', { detail: JSON.stringify({ id, result }) })
-    );
-  } catch (exception) {
-    target.dispatchEvent(
-      new CustomEvent('xkitinjectionresponse', {
-        detail: JSON.stringify({
-          id,
-          exception: {
-            message: exception.message,
-            name: exception.name,
-            stack: exception.stack,
-            ...exception
-          }
+      if (target.isConnected === false) return;
+
+      const result = await func.apply(target, args);
+      target.dispatchEvent(
+        new CustomEvent('xkitinjectionresponse', { detail: JSON.stringify({ id, result }) })
+      );
+    } catch (exception) {
+      target.dispatchEvent(
+        new CustomEvent('xkitinjectionresponse', {
+          detail: JSON.stringify({
+            id,
+            exception: {
+              message: exception.message,
+              name: exception.name,
+              stack: exception.stack,
+              ...exception
+            }
+          })
         })
-      })
-    );
-  }
-});
+      );
+    }
+  });
 
-document.documentElement.dispatchEvent(new CustomEvent('xkitinjectionready'));
+  document.documentElement.dispatchEvent(new CustomEvent('xkitinjectionready'));
+}

From ac7e4b3bce841b3b6b6e18e60c4457c4109be2f4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 1 Aug 2024 14:00:20 +0100
Subject: [PATCH 19/50] Update dev dependencies (#1557)

---
 package-lock.json | 404 +++++++++-------------------------------------
 package.json      |   6 +-
 2 files changed, 79 insertions(+), 331 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index be52e5e54..572c3e5ac 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,14 +14,14 @@
         "webextension-polyfill": "^0.12.0"
       },
       "devDependencies": {
-        "chrome-webstore-upload-cli": "^3.3.0",
+        "chrome-webstore-upload-cli": "^3.3.1",
         "eslint": "^8.57.0",
         "eslint-config-semistandard": "^17.0.0",
         "eslint-config-standard": "^17.1.0",
         "eslint-plugin-import": "^2.29.1",
-        "eslint-plugin-jsdoc": "^48.5.0",
+        "eslint-plugin-jsdoc": "^48.10.2",
         "eslint-plugin-n": "^15.7.0",
-        "eslint-plugin-promise": "^6.4.0",
+        "eslint-plugin-promise": "^6.6.0",
         "web-ext": "^7.12.0"
       }
     },
@@ -264,17 +264,14 @@
       }
     },
     "node_modules/@es-joy/jsdoccomment": {
-      "version": "0.43.1",
-      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.43.1.tgz",
-      "integrity": "sha512-I238eDtOolvCuvtxrnqtlBaw0BwdQuYqK7eA6XIonicMdOOOb75mqdIzkGDUbS04+1Di007rgm9snFRNeVrOog==",
+      "version": "0.46.0",
+      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.46.0.tgz",
+      "integrity": "sha512-C3Axuq1xd/9VqFZpW4YAzOx5O9q/LP46uIQy/iNDpHG3fmPa6TBtvfglMCs3RBiBxAIi0Go97r8+jvTt55XMyQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/eslint": "^8.56.5",
-        "@types/estree": "^1.0.5",
-        "@typescript-eslint/types": "^7.2.0",
         "comment-parser": "1.4.1",
-        "esquery": "^1.5.0",
+        "esquery": "^1.6.0",
         "jsdoc-type-pratt-parser": "~4.0.0"
       },
       "engines": {
@@ -568,34 +565,12 @@
         "node": ">=14.16"
       }
     },
-    "node_modules/@types/eslint": {
-      "version": "8.56.10",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.10.tgz",
-      "integrity": "sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/estree": "*",
-        "@types/json-schema": "*"
-      }
-    },
-    "node_modules/@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
-      "dev": true
-    },
     "node_modules/@types/http-cache-semantics": {
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz",
       "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==",
       "dev": true
     },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.15",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
-      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
-      "dev": true
-    },
     "node_modules/@types/json5": {
       "version": "0.0.29",
       "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
@@ -627,20 +602,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@typescript-eslint/types": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.11.0.tgz",
-      "integrity": "sha512-MPEsDRZTyCiXkD4vd3zywDCifi7tatc4K37KqTprCvaXptP7Xlpdw0NR2hRJTetG5TxbWDB79Ys4kLmHliEo/w==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "node_modules/@ungap/structured-clone": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
@@ -661,10 +622,11 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.11.3",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
-      "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
+      "version": "8.12.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
+      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -1288,17 +1250,6 @@
         "tweetnacl": "^0.14.3"
       }
     },
-    "node_modules/bl": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-5.1.0.tgz",
-      "integrity": "sha512-tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ==",
-      "dev": true,
-      "dependencies": {
-        "buffer": "^6.0.3",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      }
-    },
     "node_modules/bluebird": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
@@ -1682,16 +1633,15 @@
       }
     },
     "node_modules/chrome-webstore-upload-cli": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/chrome-webstore-upload-cli/-/chrome-webstore-upload-cli-3.3.0.tgz",
-      "integrity": "sha512-8KMq/hqqgy4PZ/PD8ElDphJPSn5szTxcc8frkQQ7yJgFAoV0Z5cpTeTY0wh6QcU08AqNiVM/lp62iFw0G6yJ8w==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/chrome-webstore-upload-cli/-/chrome-webstore-upload-cli-3.3.1.tgz",
+      "integrity": "sha512-9QHK6/yQAPttUK68Vzrj93nQUWKo0UMYJwG2KTkcUQke31QuzsYB1XGqmNd+XrQj7rxDTyGZa1QJznIgIXkmRw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "chrome-webstore-upload": "^3.1.0",
         "junk": "^4.0.1",
         "meow": "^12.1.1",
-        "ora": "^7.0.1",
         "recursive-readdir": "^2.2.3",
         "yazl": "^2.5.1"
       },
@@ -1732,33 +1682,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/cli-cursor": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz",
-      "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==",
-      "dev": true,
-      "dependencies": {
-        "restore-cursor": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cli-spinners": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz",
-      "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/cliui": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
@@ -2095,10 +2018,11 @@
       "dev": true
     },
     "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
+      "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -2374,12 +2298,6 @@
         "safe-buffer": "^5.0.1"
       }
     },
-    "node_modules/emoji-regex": {
-      "version": "10.3.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz",
-      "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==",
-      "dev": true
-    },
     "node_modules/end-of-stream": {
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
@@ -2797,22 +2715,23 @@
       }
     },
     "node_modules/eslint-plugin-jsdoc": {
-      "version": "48.5.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-48.5.0.tgz",
-      "integrity": "sha512-ukXPNpGby3KjCveCizIS8t1EbuJEHYEu/tBg8GCbn/YbHcXwphyvYCdvRZ/oMRfTscGSSzfsWoZ+ZkAP0/6YMQ==",
+      "version": "48.10.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-48.10.2.tgz",
+      "integrity": "sha512-xTkf/MmEeVrTbezc6kDqCJmK9RcseIKo8X4oyoDCMvV4LY8dqrQi8kmfRrv9n0gNBkCclevaOh2Lkmu6Fs8SLg==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
-        "@es-joy/jsdoccomment": "~0.43.1",
+        "@es-joy/jsdoccomment": "~0.46.0",
         "are-docs-informative": "^0.0.2",
         "comment-parser": "1.4.1",
-        "debug": "^4.3.4",
+        "debug": "^4.3.5",
         "escape-string-regexp": "^4.0.0",
-        "esquery": "^1.5.0",
-        "parse-imports": "^2.1.0",
-        "semver": "^7.6.2",
+        "espree": "^10.1.0",
+        "esquery": "^1.6.0",
+        "parse-imports": "^2.1.1",
+        "semver": "^7.6.3",
         "spdx-expression-parse": "^4.0.0",
-        "synckit": "^0.9.0"
+        "synckit": "^0.9.1"
       },
       "engines": {
         "node": ">=18"
@@ -2821,10 +2740,41 @@
         "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0"
       }
     },
+    "node_modules/eslint-plugin-jsdoc/node_modules/eslint-visitor-keys": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz",
+      "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-plugin-jsdoc/node_modules/espree": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.1.0.tgz",
+      "integrity": "sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "acorn": "^8.12.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^4.0.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
     "node_modules/eslint-plugin-jsdoc/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -2896,9 +2846,9 @@
       }
     },
     "node_modules/eslint-plugin-promise": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.4.0.tgz",
-      "integrity": "sha512-/KWWRaD3fGkVCZsdR0RU53PSthFmoHVhZl+y9+6DqeDLSikLdlUVpVEAmI6iCRR5QyOjBYBqHZV/bdv4DJ4Gtw==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.6.0.tgz",
+      "integrity": "sha512-57Zzfw8G6+Gq7axm2Pdo3gW/Rx3h9Yywgn61uE/3elTCOePEHVrn2i5CdfBwA1BLK0Q0WqctICIUSqXZW/VprQ==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -3006,10 +2956,11 @@
       }
     },
     "node_modules/esquery": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
-      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "estraverse": "^5.1.0"
       },
@@ -4170,18 +4121,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/is-interactive": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-2.0.0.tgz",
-      "integrity": "sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/is-mergeable-object": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/is-mergeable-object/-/is-mergeable-object-1.1.1.tgz",
@@ -4345,18 +4284,6 @@
       "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
       "dev": true
     },
-    "node_modules/is-unicode-supported": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.3.0.tgz",
-      "integrity": "sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/is-utf8": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
@@ -4814,34 +4741,6 @@
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "node_modules/log-symbols": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-5.1.0.tgz",
-      "integrity": "sha512-l0x2DvrW294C9uDCoQe1VSU4gf529FkSZ6leBl4TiqZH/e+0R7hSfHQBNut2mNygDgHwvYHfFLn6Oxb3VWj2rA==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^5.0.0",
-        "is-unicode-supported": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/log-symbols/node_modules/chalk": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
-      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
-      "dev": true,
-      "engines": {
-        "node": "^12.17.0 || ^14.13 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
     "node_modules/lowercase-keys": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz",
@@ -5425,68 +5324,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/ora": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-7.0.1.tgz",
-      "integrity": "sha512-0TUxTiFJWv+JnjWm4o9yvuskpEJLXTcng8MJuKd+SzAzp2o+OP3HWqNhB4OdJRt1Vsd9/mR0oyaEYlOnL7XIRw==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^5.3.0",
-        "cli-cursor": "^4.0.0",
-        "cli-spinners": "^2.9.0",
-        "is-interactive": "^2.0.0",
-        "is-unicode-supported": "^1.3.0",
-        "log-symbols": "^5.1.0",
-        "stdin-discarder": "^0.1.0",
-        "string-width": "^6.1.0",
-        "strip-ansi": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ora/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
-    "node_modules/ora/node_modules/chalk": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
-      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
-      "dev": true,
-      "engines": {
-        "node": "^12.17.0 || ^14.13 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/ora/node_modules/strip-ansi": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
     "node_modules/os-locale": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-5.0.0.tgz",
@@ -5634,11 +5471,11 @@
       }
     },
     "node_modules/parse-imports": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/parse-imports/-/parse-imports-2.1.0.tgz",
-      "integrity": "sha512-JQWgmK2o4w8leUkZeZPatWdAny6vXGU/3siIUvMF6J2rDCud9aTt8h/px9oZJ6U3EcfhngBJ635uPFI0q0VAeA==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/parse-imports/-/parse-imports-2.1.1.tgz",
+      "integrity": "sha512-TDT4HqzUiTMO1wJRwg/t/hYk8Wdp3iF/ToMIlAoVQfL1Xs/sTxq1dKWSMjMbQmIarfWKymOyly40+zmPHXMqCA==",
       "dev": true,
-      "license": "Apache 2.0",
+      "license": "Apache-2.0",
       "dependencies": {
         "es-module-lexer": "^1.5.3",
         "slashes": "^3.0.12"
@@ -5988,20 +5825,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/real-require": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/real-require/-/real-require-0.2.0.tgz",
@@ -6292,22 +6115,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/restore-cursor": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz",
-      "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==",
-      "dev": true,
-      "dependencies": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/reusify": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -6728,21 +6535,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/stdin-discarder": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/stdin-discarder/-/stdin-discarder-0.1.0.tgz",
-      "integrity": "sha512-xhV7w8S+bUwlPTb4bAOUQhv8/cSS5offJuX8GQGq32ONF0ZtDWKfkdomM3HMRA+LhX6um/FZ0COqlwsjD53LeQ==",
-      "dev": true,
-      "dependencies": {
-        "bl": "^5.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/stream-to-array": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/stream-to-array/-/stream-to-array-2.3.0.tgz",
@@ -6775,23 +6567,6 @@
         "safe-buffer": "~5.2.0"
       }
     },
-    "node_modules/string-width": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-6.1.0.tgz",
-      "integrity": "sha512-k01swCJAgQmuADB0YIc+7TuatfNvTBVOoaUWJjTB9R4VJzR5vNWzf5t42ESVZFPS8xTySF7CAdV4t/aaIm3UnQ==",
-      "dev": true,
-      "dependencies": {
-        "eastasianwidth": "^0.2.0",
-        "emoji-regex": "^10.2.1",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/string-width-cjs": {
       "name": "string-width",
       "version": "4.2.3",
@@ -6815,33 +6590,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/string-width/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
-    "node_modules/string-width/node_modules/strip-ansi": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
     "node_modules/string.prototype.trim": {
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz",
@@ -6995,9 +6743,9 @@
       }
     },
     "node_modules/synckit": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.0.tgz",
-      "integrity": "sha512-7RnqIMq572L8PeEzKeBINYEJDDxpcH8JEgLwUqBd3TkofhFRbkq4QLR0u+36avGAhCRbk2nnmjcW9SE531hPDg==",
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.1.tgz",
+      "integrity": "sha512-7gr8p9TQP6RAHusBOSLs46F4564ZrjV8xFmw5zCmgmhGUcw2hxsShhJ6CEiHQMgPDwAQ1fWHPM0ypc4RMAig4A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 4421eac45..3d9c9cfe3 100644
--- a/package.json
+++ b/package.json
@@ -8,14 +8,14 @@
     "build": "web-ext build"
   },
   "devDependencies": {
-    "chrome-webstore-upload-cli": "^3.3.0",
+    "chrome-webstore-upload-cli": "^3.3.1",
     "eslint": "^8.57.0",
     "eslint-config-semistandard": "^17.0.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jsdoc": "^48.5.0",
+    "eslint-plugin-jsdoc": "^48.10.2",
     "eslint-plugin-n": "^15.7.0",
-    "eslint-plugin-promise": "^6.4.0",
+    "eslint-plugin-promise": "^6.6.0",
     "web-ext": "^7.12.0"
   },
   "dependencies": {

From b20d7f156905924658d3973b092880a933cf207c Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Sun, 18 Aug 2024 13:31:59 -0700
Subject: [PATCH 20/50] Cleanfeed, Quick Reblog: Include submitting blogs/group
 blog authors (#1440)

---
 src/features/cleanfeed.js    | 8 +++++---
 src/features/quick_reblog.js | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/features/cleanfeed.js b/src/features/cleanfeed.js
index d6b9f1763..0479ffaa9 100644
--- a/src/features/cleanfeed.js
+++ b/src/features/cleanfeed.js
@@ -21,11 +21,13 @@ const processPosts = postElements => filterPostElements(postElements).forEach(as
     return;
   }
 
-  const { blog: { name, isAdult }, communityLabels, trail, tags } = await timelineObject(postElement);
+  const { blog, authorBlog, communityLabels, trail, tags } = await timelineObject(postElement);
 
-  if (isAdult ||
+  if (blog.isAdult ||
+      authorBlog?.isAdult ||
       communityLabels.hasCommunityLabel ||
-      localFlaggedBlogs.includes(name) ||
+      localFlaggedBlogs.includes(blog.name) ||
+      localFlaggedBlogs.includes(authorBlog?.name) ||
       localFlaggedTags.some(t => tags.map(tag => tag.toLowerCase()).includes(t))) {
     postElement.classList.add(hiddenClass);
     return;
diff --git a/src/features/quick_reblog.js b/src/features/quick_reblog.js
index d48ae26f7..872b0e3d3 100644
--- a/src/features/quick_reblog.js
+++ b/src/features/quick_reblog.js
@@ -144,9 +144,10 @@ const showPopupOnHover = ({ currentTarget }) => {
     commentInput.value = '';
     [...quickTagsList.children].forEach(({ dataset }) => delete dataset.checked);
     tagsInput.value = '';
-    timelineObject(thisPost).then(({ tags, trail, content, layout, blogName, rebloggedRootName }) => {
+    timelineObject(thisPost).then(({ tags, trail, content, layout, blogName, postAuthor, rebloggedRootName }) => {
       suggestableTags = tags;
       if (blogName) suggestableTags.push(blogName);
+      if (postAuthor) suggestableTags.push(postAuthor);
       if (rebloggedRootName) suggestableTags.push(rebloggedRootName);
       suggestableTags.push(postType({ trail, content, layout }));
       renderTagSuggestions();

From bc4c315d343d8b6b6cdfb687a83dc1baee086dad Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Sun, 18 Aug 2024 13:33:34 -0700
Subject: [PATCH 21/50] Quick Tags, Quick Reblog: Fix popup horizontal cutoff
 (#1536)

Co-authored-by: April Sylph <28949509+AprilSylph@users.noreply.github.com>
---
 src/features/quick_reblog.css | 54 +++++++----------------------------
 src/features/quick_reblog.js  |  7 ++---
 src/features/quick_tags.css   | 27 ++++--------------
 src/features/quick_tags.js    | 14 ++-------
 src/utils/interface.js        | 29 +++++++++++++++++++
 5 files changed, 51 insertions(+), 80 deletions(-)

diff --git a/src/features/quick_reblog.css b/src/features/quick_reblog.css
index 5e0c9df0b..2db158ca8 100644
--- a/src/features/quick_reblog.css
+++ b/src/features/quick_reblog.css
@@ -20,56 +20,22 @@
   display: none !important;
 }
 
-@media (max-width: 650px) {
-  #quick-reblog {
-    top: 50%;
-    right: 100%;
-    transform: translateY(-50%);
-  }
+#quick-reblog {
+  --icon-spacing: 12px;
 }
-
-@media (min-width: 650px) {
+@media (max-width: 990px) {
   #quick-reblog {
-    transform: translateX(50%);
-  }
-
-  #quick-reblog.above {
-    bottom: 100%;
-    right: 50%;
-  }
-
-  #quick-reblog.below {
-    top: 100%;
-    right: 50%;
+    --icon-spacing: 0px;
   }
 }
 
-@media (min-width: 990px) {
-  #quick-reblog.above {
-    transform: translate(50%, -12px)
-  }
-
-  #quick-reblog.below {
-    transform: translate(50%, 12px);
-  }
+#quick-reblog.below {
+  inset: 100% 50% auto auto;
+  transform: translate(calc(50% + var(--horizontal-offset, 0%)), var(--icon-spacing));
 }
-
-@media (max-width: 990px) {
-  [role="dialog"] #quick-reblog {
-    top: 50%;
-    bottom: unset;
-    right: 100%;
-    transform: translateY(-50%);
-  }
-}
-
-@media (min-width: 990px) and (max-width: 1145px) {
-  [role="dialog"] #quick-reblog {
-    top: 50%;
-    bottom: unset;
-    right: 100%;
-    transform: translate(-20px, -50%);
-  }
+#quick-reblog.above {
+  inset: auto 50% 100% auto;
+  transform: translate(calc(50% + var(--horizontal-offset, 0%)), calc(0px - var(--icon-spacing)));
 }
 
 div:first-child + span + #quick-reblog,
diff --git a/src/features/quick_reblog.js b/src/features/quick_reblog.js
index 872b0e3d3..a92361315 100644
--- a/src/features/quick_reblog.js
+++ b/src/features/quick_reblog.js
@@ -1,7 +1,7 @@
 import { sha256 } from '../utils/crypto.js';
 import { timelineObject } from '../utils/react_props.js';
 import { apiFetch } from '../utils/tumblr_helpers.js';
-import { postSelector, filterPostElements, postType } from '../utils/interface.js';
+import { postSelector, filterPostElements, postType, appendWithoutOverflow } from '../utils/interface.js';
 import { userBlogs } from '../utils/user.js';
 import { getPreferences } from '../utils/preferences.js';
 import { onNewPosts } from '../utils/mutations.js';
@@ -9,6 +9,7 @@ import { notify } from '../utils/notifications.js';
 import { translate } from '../utils/language_data.js';
 import { dom } from '../utils/dom.js';
 import { showErrorModal } from '../utils/modals.js';
+import { keyToCss } from '../utils/css_map.js';
 
 const popupElement = dom('div', { id: 'quick-reblog' });
 const blogSelector = dom('select');
@@ -131,7 +132,7 @@ tagsInput.addEventListener('input', checkLength);
 const showPopupOnHover = ({ currentTarget }) => {
   clearTimeout(timeoutID);
 
-  currentTarget.closest('div').appendChild(popupElement);
+  appendWithoutOverflow(popupElement, currentTarget.closest(keyToCss('controlIcon')), popupPosition);
   popupElement.parentNode.addEventListener('mouseleave', removePopupOnLeave);
 
   const thisPost = currentTarget.closest(postSelector);
@@ -330,8 +331,6 @@ export const main = async function () {
     alreadyRebloggedLimit
   } = await getPreferences('quick_reblog'));
 
-  popupElement.className = popupPosition;
-
   blogSelector.replaceChildren(
     ...userBlogs.map(({ name, uuid }) => dom('option', { value: uuid }, null, [name]))
   );
diff --git a/src/features/quick_tags.css b/src/features/quick_tags.css
index 6ce55c4ab..73007cb21 100644
--- a/src/features/quick_tags.css
+++ b/src/features/quick_tags.css
@@ -42,28 +42,13 @@
   }
 }
 
-@media (min-width: 650px) {
-  #quick-tags.below {
-    inset: 100% 50% auto auto;
-    transform: translate(50%, var(--icon-spacing));
-  }
-  #quick-tags.above {
-    inset: auto 50% 100% auto;
-    transform: translate(50%, calc(0px - var(--icon-spacing)));
-  }
+#quick-tags.below {
+  inset: 100% 50% auto auto;
+  transform: translate(calc(50% + var(--horizontal-offset, 0%)), var(--icon-spacing));
 }
-
-@media (max-width: 650px) {
-  #quick-tags {
-    inset: 50% 100% auto auto;
-    transform: translate(calc(0px - var(--icon-spacing)), -50%);
-  }
-}
-@media (max-width: 1145px) {
-  [role="dialog"] #quick-tags {
-    inset: 50% 100% auto auto;
-    transform: translate(calc(0px - var(--icon-spacing)), -50%);
-  }
+#quick-tags.above {
+  inset: auto 50% 100% auto;
+  transform: translate(calc(50% + var(--horizontal-offset, 0%)), calc(0px - var(--icon-spacing)));
 }
 
 #quick-tags:empty::before,
diff --git a/src/features/quick_tags.js b/src/features/quick_tags.js
index ec4f1f109..689c95ae1 100644
--- a/src/features/quick_tags.js
+++ b/src/features/quick_tags.js
@@ -1,7 +1,7 @@
 import { cloneControlButton, createControlButtonTemplate } from '../utils/control_buttons.js';
 import { keyToCss } from '../utils/css_map.js';
 import { dom } from '../utils/dom.js';
-import { filterPostElements, getTimelineItemWrapper, postSelector } from '../utils/interface.js';
+import { appendWithoutOverflow, filterPostElements, getTimelineItemWrapper, postSelector } from '../utils/interface.js';
 import { megaEdit } from '../utils/mega_editor.js';
 import { modalCancelButton, modalCompleteButton, showErrorModal, showModal } from '../utils/modals.js';
 import { onNewPosts, pageModifications } from '../utils/mutations.js';
@@ -115,14 +115,6 @@ export const onStorageChanged = async function (changes, areaName) {
   }
 };
 
-const appendWithoutViewportOverflow = (element, target) => {
-  element.className = 'below';
-  target.appendChild(element);
-  if (element.getBoundingClientRect().bottom > document.documentElement.clientHeight) {
-    element.className = 'above';
-  }
-};
-
 const togglePopupDisplay = async function ({ target, currentTarget: controlButton }) {
   if (target === popupElement || popupElement.contains(target)) { return; }
 
@@ -131,7 +123,7 @@ const togglePopupDisplay = async function ({ target, currentTarget: controlButto
   if (buttonContainer.contains(popupElement)) {
     buttonContainer.removeChild(popupElement);
   } else {
-    appendWithoutViewportOverflow(popupElement, buttonContainer);
+    appendWithoutOverflow(popupElement, buttonContainer);
   }
 };
 
@@ -141,7 +133,7 @@ const togglePostOptionPopupDisplay = async function ({ target, currentTarget })
   if (currentTarget.contains(postOptionPopupElement)) {
     currentTarget.removeChild(postOptionPopupElement);
   } else {
-    appendWithoutViewportOverflow(postOptionPopupElement, currentTarget);
+    appendWithoutOverflow(postOptionPopupElement, currentTarget);
   }
 };
 
diff --git a/src/utils/interface.js b/src/utils/interface.js
index 3eb252ca5..86b67680b 100644
--- a/src/utils/interface.js
+++ b/src/utils/interface.js
@@ -115,3 +115,32 @@ export const postType = ({ trail = [], content = [], layout = [] }) => {
   else if (content.some(({ type }) => type === 'link')) return 'link';
   else return 'text';
 };
+
+const getClosestWithOverflow = element => {
+  const parent = element.parentElement;
+  if (!parent) {
+    return element;
+  } else if (getComputedStyle(parent).overflowX !== 'visible') {
+    return parent;
+  } else {
+    return getClosestWithOverflow(parent);
+  }
+};
+
+export const appendWithoutOverflow = (element, target, defaultPosition = 'below') => {
+  element.className = defaultPosition;
+  element.style.removeProperty('--horizontal-offset');
+
+  target.appendChild(element);
+
+  const preventOverflowTarget = getClosestWithOverflow(target);
+  const preventOverflowTargetRect = preventOverflowTarget.getBoundingClientRect();
+  const elementRect = element.getBoundingClientRect();
+
+  if (elementRect.bottom > document.documentElement.clientHeight) {
+    element.className = 'above';
+  }
+  if (elementRect.right > preventOverflowTargetRect.right - 15) {
+    element.style.setProperty('--horizontal-offset', `${preventOverflowTargetRect.right - 15 - elementRect.right}px`);
+  }
+};

From 619be5fa30bd26b19365c51512b4939ca9e9e717 Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Sun, 18 Aug 2024 13:33:57 -0700
Subject: [PATCH 22/50] Collapsed Queue: Remove outdated erroneous CSS (#1548)

---
 src/features/collapsed_queue.css | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/features/collapsed_queue.css b/src/features/collapsed_queue.css
index c2c84adfa..a7626bbea 100644
--- a/src/features/collapsed_queue.css
+++ b/src/features/collapsed_queue.css
@@ -1,12 +1,3 @@
-.sortableContainer header {
-  padding-top: 10px;
-  padding-left: calc(var(--post-padding) - 10px);
-  margin-bottom: 10px;
-}
-.sortableContainer footer {
-  margin-top: 5px;
-  padding-bottom: 5px;
-}
 .xkit-collapsed-queue-wrapper {
   position: relative;
 }

From 498a8a2871b201f10c0992d5c7f1473224c74e45 Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Sun, 18 Aug 2024 13:34:16 -0700
Subject: [PATCH 23/50] Seen Posts: Fix soft refresh (#1545)

Co-authored-by: April Sylph <28949509+AprilSylph@users.noreply.github.com>
---
 src/features/seen_posts.js | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/features/seen_posts.js b/src/features/seen_posts.js
index 8b16ecedc..d75dbdf70 100644
--- a/src/features/seen_posts.js
+++ b/src/features/seen_posts.js
@@ -1,8 +1,8 @@
 import { filterPostElements, getTimelineItemWrapper, postSelector } from '../utils/interface.js';
 import { getPreferences } from '../utils/preferences.js';
-import { onNewPosts } from '../utils/mutations.js';
+import { onNewPosts, pageModifications } from '../utils/mutations.js';
 import { keyToCss } from '../utils/css_map.js';
-import { followingTimelineFilter, followingTimelineSelector } from '../utils/timeline_id.js';
+import { followingTimelineFilter, followingTimelineSelector, timelineSelector } from '../utils/timeline_id.js';
 
 const excludeAttribute = 'data-seen-posts-done';
 const timeline = followingTimelineFilter;
@@ -13,6 +13,8 @@ const onlyDimAvatarsClass = 'xkit-seen-posts-only-dim-avatar';
 const hideClass = 'xkit-seen-posts-hide';
 const lengthenedClass = 'xkit-seen-posts-lengthened';
 
+const softRefreshLoaderSelector = `${followingTimelineSelector} ${keyToCss('container')}:has(~ div ${postSelector}) > ${keyToCss('knightRiderLoader')}`;
+
 const storageKey = 'seen_posts.seenPosts';
 let seenPosts = [];
 
@@ -52,7 +54,7 @@ const lengthenTimelines = () =>
     }
   });
 
-const dimPosts = function (postElements) {
+const dimPosts = function (postElements, reprocessPosts = false) {
   lengthenTimelines();
 
   for (const postElement of filterPostElements(postElements, { timeline, includeFiltered })) {
@@ -64,12 +66,19 @@ const dimPosts = function (postElements) {
 
     if (seenPosts.includes(id) === false) {
       observer.observe(postElement.querySelector('article header + *'));
-    } else if (isFirstRender) {
+    } else if (isFirstRender || reprocessPosts) {
       timelineItem.setAttribute(dimAttribute, '');
     }
   }
 };
 
+const onSoftRefresh = loaderElements => {
+  const refreshedPostElements = loaderElements.flatMap(
+    element => [...element.closest(timelineSelector).querySelectorAll(postSelector)]
+  );
+  dimPosts(refreshedPostElements, true);
+};
+
 export const onStorageChanged = async function (changes, areaName) {
   const {
     'seen_posts.preferences.hideSeenPosts': hideSeenPostsChanges,
@@ -106,10 +115,12 @@ export const main = async function () {
   }
 
   onNewPosts.addListener(dimPosts);
+  pageModifications.register(softRefreshLoaderSelector, onSoftRefresh);
 };
 
 export const clean = async function () {
   onNewPosts.removeListener(dimPosts);
+  pageModifications.unregister(onSoftRefresh);
 
   observer.disconnect();
   timers.forEach((timerId) => clearTimeout(timerId));

From 579aa4e356e8a14bb9f99146e401dd23633b5a97 Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Sun, 18 Aug 2024 13:34:28 -0700
Subject: [PATCH 24/50] Tag Tracking+: minor `onStorageChanged` refactor
 (#1554)

---
 src/features/tag_tracking_plus.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/features/tag_tracking_plus.js b/src/features/tag_tracking_plus.js
index 2e838c2ac..9a75bb620 100644
--- a/src/features/tag_tracking_plus.js
+++ b/src/features/tag_tracking_plus.js
@@ -128,12 +128,16 @@ const processPosts = async function (postElements) {
 };
 
 export const onStorageChanged = async (changes, areaName) => {
-  if (Object.keys(changes).includes(storageKey)) {
-    timestamps = changes[storageKey].newValue;
+  const {
+    [storageKey]: timestampsChanges,
+    'tag_tracking_plus.preferences.onlyShowNew': onlyShowNewChanges
+  } = changes;
+
+  if (timestampsChanges) {
+    timestamps = timestampsChanges.newValue;
   }
-  if (Object.keys(changes).some(key => key.startsWith('tag_tracking_plus.preferences'))) {
-    const { onlyShowNew } = await getPreferences('tag_tracking_plus');
-    sidebarItem.dataset.onlyShowNew = onlyShowNew;
+  if (onlyShowNewChanges) {
+    sidebarItem.dataset.onlyShowNew = onlyShowNewChanges.newValue;
   }
 };
 

From 0349151f03e744d2223601212a899af7c1ad829e Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Sun, 18 Aug 2024 13:34:59 -0700
Subject: [PATCH 25/50] Quote Replies: Fix feature on threaded replies (#1561)

Co-authored-by: April Sylph <28949509+AprilSylph@users.noreply.github.com>
---
 src/features/quote_replies.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/features/quote_replies.js b/src/features/quote_replies.js
index 88c13badd..a29fc940d 100644
--- a/src/features/quote_replies.js
+++ b/src/features/quote_replies.js
@@ -31,7 +31,7 @@ const processNotifications = notifications => notifications.forEach(async notifi
     notification
   );
 
-  if (!['reply', 'note_mention'].includes(notificationProps.type)) return;
+  if (!['reply', 'reply_to_comment', 'note_mention'].includes(notificationProps.type)) return;
 
   const activityElement = notification.querySelector(activitySelector);
   if (!activityElement) return;
@@ -58,7 +58,6 @@ const quoteReply = async (tumblelogName, notificationProps) => {
   const uuid = userBlogs.find(({ name }) => name === tumblelogName).uuid;
   const { type, targetPostId, targetPostSummary, targetTumblelogName, targetTumblelogUuid, timestamp } = notificationProps;
 
-  const isReply = type === 'reply';
   const { response } = await apiFetch(
     `/v2/blog/${targetTumblelogUuid}/post/${targetPostId}/notes/timeline`,
     { queryParams: { mode: 'replies', before_timestamp: `${timestamp + 1}000000` } }
@@ -69,9 +68,12 @@ const quoteReply = async (tumblelogName, notificationProps) => {
   if (!reply) throw new Error('No replies found on target post.');
   if (Math.floor(reply.timestamp) !== timestamp) throw new Error('Reply not found.');
 
-  const text = isReply
-    ? `@${reply.blog.name} replied to your post \u201C${targetPostSummary.replace(/\n/g, ' ')}\u201D:`
-    : `@${reply.blog.name} mentioned you on a post \u201C${targetPostSummary.replace(/\n/g, ' ')}\u201D:`;
+  const verbiage = {
+    reply: 'replied to your post',
+    reply_to_comment: 'replied to you in a post',
+    note_mention: 'mentioned you on a post'
+  }[type];
+  const text = `@${reply.blog.name} ${verbiage} \u201C${targetPostSummary.replace(/\n/g, ' ')}\u201D:`;
   const formatting = [
     { start: 0, end: reply.blog.name.length + 1, type: 'mention', blog: { uuid: reply.blog.uuid } },
     { start: text.indexOf('\u201C'), end: text.length - 1, type: 'link', url: `https://${targetTumblelogName}.tumblr.com/post/${targetPostId}` }

From f6329c78919d7c6ba6284e9a49ffe2d52b86985e Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Sun, 18 Aug 2024 13:35:11 -0700
Subject: [PATCH 26/50] Sidebar util: Prevent erroneous sidebar in communities
 settings (#1569)

---
 src/utils/sidebar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/sidebar.js b/src/utils/sidebar.js
index 6ada9a1e7..cfd1f3bc8 100644
--- a/src/utils/sidebar.js
+++ b/src/utils/sidebar.js
@@ -96,7 +96,7 @@ const updateSidebarItemVisibility = () => [...sidebarItems.children]
   .forEach(sidebarItem => { sidebarItem.hidden = !conditions.get(sidebarItem)(); });
 
 const addSidebarToPage = (siblingCandidates) => {
-  if (/^\/settings/.test(location.pathname)) { return; }
+  if (/^\/settings/.test(location.pathname) || /^\/communities.*\/settings$/.test(location.pathname)) { return; }
 
   updateSidebarItemVisibility();
 

From 244109c8c7034186ce96a8d8ae3e7c2892ffee04 Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Sun, 18 Aug 2024 13:35:46 -0700
Subject: [PATCH 27/50] Tweaks: Fix subtle following/mutuals tweak in
 communities (#1568)

---
 src/features/tweaks/subtle_activity_mutuals.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/features/tweaks/subtle_activity_mutuals.js b/src/features/tweaks/subtle_activity_mutuals.js
index e7bd0a736..b18bd13ea 100644
--- a/src/features/tweaks/subtle_activity_mutuals.js
+++ b/src/features/tweaks/subtle_activity_mutuals.js
@@ -3,7 +3,7 @@ import { keyToCss } from '../../utils/css_map.js';
 import { buildStyle } from '../../utils/interface.js';
 import { dom } from '../../utils/dom.js';
 
-const labelSelector = keyToCss('followingBadgeContainer', 'mutualsBadgeContainer');
+const labelSelector = `${keyToCss('followingBadgeContainer', 'mutualsBadgeContainer')}:has(> svg)`;
 
 const spanClass = 'xkit-tweaks-subtle-activity-span';
 

From b50f456cca9d9307bb1d997d274e0c87da266c1b Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Sun, 18 Aug 2024 13:44:19 -0700
Subject: [PATCH 28/50] Automatic `styleElement` addition/removal (#1464)

---
 docs/Chapter 4.2 - Feature modules.md         | 14 ++++++++---
 src/content_scripts/main.js                   | 25 +++++++++++++------
 src/features/accesskit.css                    |  4 ---
 src/features/accesskit.js                     | 18 ++++++++++---
 src/features/accesskit/blue_links.js          |  5 +---
 src/features/accesskit/disable_animations.js  |  5 +---
 src/features/accesskit/disable_gifs.js        |  5 +---
 src/features/accesskit/no_user_colours.js     |  9 ++++---
 src/features/accesskit/no_user_fonts.js       | 10 ++++----
 src/features/accesskit/visible_alt_text.js    |  5 +---
 src/features/anti_capitalism.js               |  5 ++--
 src/features/cleanfeed.js                     |  5 ++--
 src/features/hide_avatars.js                  |  8 +-----
 src/features/no_recommended.js                | 18 ++++++++++---
 .../no_recommended/hide_answertime.js         |  7 +++---
 .../no_recommended/hide_blog_carousels.js     |  5 ++--
 .../no_recommended/hide_lightbox_related.js   |  5 +---
 src/features/no_recommended/hide_radar.js     |  5 ++--
 .../no_recommended/hide_recommended_blogs.js  |  5 +---
 .../hide_recommended_blogs_modal.js           |  5 +---
 .../no_recommended/hide_recommended_posts.js  |  5 ++--
 .../no_recommended/hide_tag_carousels.js      |  5 ++--
 src/features/notificationblock.js             |  5 ++--
 src/features/scroll_to_bottom.js              |  4 +--
 src/features/shorten_posts.js                 |  6 ++---
 src/features/themed_posts.js                  |  8 +++---
 src/features/tweaks.js                        | 18 ++++++++++---
 src/features/tweaks/caught_up_line.js         |  5 ++--
 src/features/tweaks/hide_activity_mutuals.js  |  5 +---
 .../hide_activity_notification_badge.js       |  5 +---
 src/features/tweaks/hide_blaze_tip_labels.js  |  5 +---
 src/features/tweaks/hide_filtered_posts.js    |  5 ++--
 src/features/tweaks/hide_follower_counts.js   |  5 +---
 .../hide_following_notification_badge.js      |  5 ++--
 src/features/tweaks/hide_footer_tooltips.js   |  5 +---
 src/features/tweaks/hide_liked_posts.js       |  5 ++--
 src/features/tweaks/hide_mini_follow.js       |  7 +++---
 src/features/tweaks/hide_my_posts.js          |  5 ++--
 .../tweaks/highlight_contributed_content.js   |  9 ++++---
 src/features/tweaks/no_focus_shadow.js        |  5 +---
 src/features/tweaks/no_where_were_we.js       |  7 +++---
 src/features/tweaks/show_all_tags.js          | 10 +-------
 src/features/tweaks/slim_filtered_screens.js  |  5 +---
 .../tweaks/subtle_activity_mutuals.js         |  4 +--
 src/features/tweaks/unsticky_tab_bar.js       |  5 +---
 45 files changed, 142 insertions(+), 179 deletions(-)

diff --git a/docs/Chapter 4.2 - Feature modules.md b/docs/Chapter 4.2 - Feature modules.md
index 94f2f17c0..94d092626 100644
--- a/docs/Chapter 4.2 - Feature modules.md	
+++ b/docs/Chapter 4.2 - Feature modules.md	
@@ -1,16 +1,16 @@
 # Feature modules
 
-Each module is required to export at least two async functions.
+Modules may export any of the following:
 
 ## `main()`
 - Type: Async Function
-- Required: Yes
+- Required: No
 
 The main function of the feature. Will be called whenever the user enables the feature, even if the tab(s) XKit is running in is/are not focused. Will also be called upon pageload if the script is enabled.
 
 ## `clean()`
 - Type: Async Function
-- Required: Yes
+- Required: No
 
 The cleanup function of the feature. Called whenever the user disables the feature, also regardless of tab focus.
 
@@ -24,4 +24,10 @@ The preference-handling code of the feature. Added as a `browser.storage.onChang
 - Type: Boolean
 - Required: No
 
-Whether the feature has a stylesheet. If true, there should be a `.css` file of matching name in the same directory level. The stylesheet is automatically added and removed during the feature's lifecycle.
+Whether the feature has a static stylesheet. If true, there should be a `.css` file of matching name in the same directory level. The stylesheet is automatically added and removed during the feature's lifecycle.
+
+## `styleElement`
+- Type: HTMLStyleElement
+- Required: No
+
+An HTML `<style>` element containing computed and/or dynamic styles, as created by the `buildStyle` utility function. The element is automatically added to the document root and removed during the feature's lifecycle.
diff --git a/src/content_scripts/main.js b/src/content_scripts/main.js
index ce9b29633..1c3b965c3 100644
--- a/src/content_scripts/main.js
+++ b/src/content_scripts/main.js
@@ -8,10 +8,11 @@
 
   const runScript = async function (name) {
     const scriptPath = browser.runtime.getURL(`/features/${name}.js`);
-    const { main, clean, stylesheet, onStorageChanged } = await import(scriptPath);
-
-    main().catch(console.error);
+    const { main, clean, stylesheet, styleElement, onStorageChanged } = await import(scriptPath);
 
+    if (main) {
+      main().catch(console.error);
+    }
     if (stylesheet) {
       const link = Object.assign(document.createElement('link'), {
         rel: 'stylesheet',
@@ -19,8 +20,11 @@
       });
       document.documentElement.appendChild(link);
     }
+    if (styleElement) {
+      document.documentElement.append(styleElement);
+    }
 
-    restartListeners[name] = function (changes, areaName) {
+    restartListeners[name] = async (changes, areaName) => {
       if (areaName !== 'local') return;
 
       const { enabledScripts } = changes;
@@ -29,7 +33,8 @@
       if (onStorageChanged instanceof Function) {
         onStorageChanged(changes, areaName);
       } else if (Object.keys(changes).some(key => key.startsWith(`${name}.preferences`) && changes[key].oldValue !== undefined)) {
-        clean().then(main);
+        await clean?.();
+        await main?.();
       }
     };
 
@@ -38,13 +43,17 @@
 
   const destroyScript = async function (name) {
     const scriptPath = browser.runtime.getURL(`/features/${name}.js`);
-    const { clean, stylesheet } = await import(scriptPath);
-
-    clean().catch(console.error);
+    const { clean, stylesheet, styleElement } = await import(scriptPath);
 
+    if (clean) {
+      clean().catch(console.error);
+    }
     if (stylesheet) {
       document.querySelector(`link[href="${browser.runtime.getURL(`/features/${name}.css`)}"]`)?.remove();
     }
+    if (styleElement) {
+      styleElement.remove();
+    }
 
     browser.storage.onChanged.removeListener(restartListeners[name]);
     delete restartListeners[name];
diff --git a/src/features/accesskit.css b/src/features/accesskit.css
index d4344bc51..d4b4ffed1 100644
--- a/src/features/accesskit.css
+++ b/src/features/accesskit.css
@@ -1,7 +1,3 @@
-body.accesskit-no-user-colours article span[style^="color"] {
-  color: inherit !important;
-}
-
 .accesskit-normal-width-scrollbar:is(html, body),
 body:where(.accesskit-normal-width-scrollbar) div {
   scrollbar-width: auto;
diff --git a/src/features/accesskit.js b/src/features/accesskit.js
index 881b3f680..49c3f05f7 100644
--- a/src/features/accesskit.js
+++ b/src/features/accesskit.js
@@ -3,13 +3,23 @@ import { getPreferences } from '../utils/preferences.js';
 let enabledOptions;
 
 const runOption = async function (name) {
-  const { main: run } = await import(`./accesskit/${name}.js`);
-  run().catch(console.error);
+  const { main: run, styleElement } = await import(`./accesskit/${name}.js`);
+  if (run) {
+    run().catch(console.error);
+  }
+  if (styleElement) {
+    document.documentElement.append(styleElement);
+  }
 };
 
 const destroyOption = async function (name) {
-  const { clean: destroy } = await import(`./accesskit/${name}.js`);
-  destroy().catch(console.error);
+  const { clean: destroy, styleElement } = await import(`./accesskit/${name}.js`);
+  if (destroy) {
+    destroy().catch(console.error);
+  }
+  if (styleElement) {
+    styleElement.remove();
+  }
 };
 
 export const onStorageChanged = async function (changes, areaName) {
diff --git a/src/features/accesskit/blue_links.js b/src/features/accesskit/blue_links.js
index 8daaad000..c941b075a 100644
--- a/src/features/accesskit/blue_links.js
+++ b/src/features/accesskit/blue_links.js
@@ -1,11 +1,8 @@
 import { keyToCss } from '../../utils/css_map.js';
 import { buildStyle } from '../../utils/interface.js';
 
-const styleElement = buildStyle(`
+export const styleElement = buildStyle(`
 article ${keyToCss('textBlock')} a[target="_blank"] {
   color: rgba(var(--blue));
 }
 `);
-
-export const main = async () => document.documentElement.append(styleElement);
-export const clean = async () => styleElement.remove();
diff --git a/src/features/accesskit/disable_animations.js b/src/features/accesskit/disable_animations.js
index 6cdd352f0..eb6fc6987 100644
--- a/src/features/accesskit/disable_animations.js
+++ b/src/features/accesskit/disable_animations.js
@@ -3,7 +3,7 @@ import { buildStyle } from '../../utils/interface.js';
 
 const playPauseSelector = `${keyToCss('overlayPoof')} ${keyToCss('overlay')} svg`;
 
-const styleElement = buildStyle(`
+export const styleElement = buildStyle(`
 :not(${playPauseSelector}):not(${keyToCss('blockEditorContainer')} *) {
   animation: none !important;
   transition: none !important;
@@ -21,6 +21,3 @@ canvas#fire-everywhere, [style*="--fire-container-height"] {
   display: none;
 }
 `);
-
-export const main = async () => document.documentElement.append(styleElement);
-export const clean = async () => styleElement.remove();
diff --git a/src/features/accesskit/disable_gifs.js b/src/features/accesskit/disable_gifs.js
index b9ac97c12..002603fc2 100644
--- a/src/features/accesskit/disable_gifs.js
+++ b/src/features/accesskit/disable_gifs.js
@@ -8,7 +8,7 @@ const labelClass = 'xkit-paused-gif-label';
 const containerClass = 'xkit-paused-gif-container';
 const backgroundGifClass = 'xkit-paused-background-gif';
 
-const styleElement = buildStyle(`
+export const styleElement = buildStyle(`
 .${labelClass} {
   position: absolute;
   top: 1ch;
@@ -129,8 +129,6 @@ const processRows = function (rowsElements) {
 };
 
 export const main = async function () {
-  document.documentElement.append(styleElement);
-
   const gifImage = `
     :is(figure, ${keyToCss('tagImage', 'takeoverBanner')}) img[srcset*=".gif"]:not(${keyToCss('poster')})
   `;
@@ -156,7 +154,6 @@ export const clean = async function () {
     wrapper.replaceWith(...wrapper.children)
   );
 
-  styleElement.remove();
   $(`.${canvasClass}, .${labelClass}`).remove();
   $(`.${backgroundGifClass}`).removeClass(backgroundGifClass);
 };
diff --git a/src/features/accesskit/no_user_colours.js b/src/features/accesskit/no_user_colours.js
index 864f0377c..634192053 100644
--- a/src/features/accesskit/no_user_colours.js
+++ b/src/features/accesskit/no_user_colours.js
@@ -1,4 +1,7 @@
-const className = 'accesskit-no-user-colours';
+import { buildStyle } from '../../utils/interface.js';
 
-export const main = async () => document.body.classList.add(className);
-export const clean = async () => document.body.classList.remove(className);
+export const styleElement = buildStyle(`
+article span[style^="color"] {
+  color: inherit !important;
+}
+`);
diff --git a/src/features/accesskit/no_user_fonts.js b/src/features/accesskit/no_user_fonts.js
index 89821b4f1..87c69313d 100644
--- a/src/features/accesskit/no_user_fonts.js
+++ b/src/features/accesskit/no_user_fonts.js
@@ -1,8 +1,8 @@
 import { keyToCss } from '../../utils/css_map.js';
 import { buildStyle } from '../../utils/interface.js';
 
-const selector = `${keyToCss('textBlock')} ${keyToCss('quote', 'chat', 'quirky')}`;
-const styleElement = buildStyle(`${selector} { font-family: var(--font-family); }`);
-
-export const main = async () => document.documentElement.append(styleElement);
-export const clean = async () => styleElement.remove();
+export const styleElement = buildStyle(`
+${keyToCss('textBlock')} ${keyToCss('quote', 'chat', 'quirky')} {
+  font-family: var(--font-family);
+}
+`);
diff --git a/src/features/accesskit/visible_alt_text.js b/src/features/accesskit/visible_alt_text.js
index 3fafd4525..9ed2a2666 100644
--- a/src/features/accesskit/visible_alt_text.js
+++ b/src/features/accesskit/visible_alt_text.js
@@ -12,7 +12,7 @@ const imageBlockSelector = keyToCss('imageBlock');
 const imageBlockLinkSelector = keyToCss('imageBlockLink');
 const imageBlockButtonInnerSelector = `${keyToCss('imageBlockButton')} ${keyToCss('buttonInner')}`;
 
-const styleElement = buildStyle(`
+export const styleElement = buildStyle(`
 ${imageBlockLinkSelector}, ${imageBlockButtonInnerSelector} {
   height: 100%;
 }
@@ -62,7 +62,6 @@ const onStorageChanged = async function (changes, areaName) {
 export const main = async function () {
   ({ visible_alt_text_mode: mode } = await getPreferences('accesskit'));
 
-  document.documentElement.append(styleElement);
   pageModifications.register(`article ${imageBlockSelector} img[alt]`, processImages);
   browser.storage.onChanged.addListener(onStorageChanged);
 };
@@ -71,8 +70,6 @@ export const clean = async function () {
   pageModifications.unregister(processImages);
   browser.storage.onChanged.removeListener(onStorageChanged);
 
-  styleElement.remove();
-
   $(`.${processedClass} figcaption`).remove();
   $(`.${processedClass}`).removeClass(processedClass);
 };
diff --git a/src/features/anti_capitalism.js b/src/features/anti_capitalism.js
index 6b59c1db6..578e7ed72 100644
--- a/src/features/anti_capitalism.js
+++ b/src/features/anti_capitalism.js
@@ -6,7 +6,7 @@ const hiddenAttribute = 'data-anti-capitalism-hidden';
 
 const listTimelineObjectInnerSelector = keyToCss('listTimelineObjectInner');
 
-const styleElement = buildStyle(`
+export const styleElement = buildStyle(`
 [${hiddenAttribute}] > div,
 ${keyToCss('adTimelineObject', 'instreamAd', 'mrecContainer', 'nativeIponWebAd', 'takeoverBanner')} {
   display: none !important;
@@ -19,7 +19,6 @@ const processVideoCTAs = videoCTAs => videoCTAs
   .forEach(timelineItem => timelineItem.setAttribute(hiddenAttribute, ''));
 
 export const main = async () => {
-  document.documentElement.append(styleElement);
   pageModifications.register(
     `
       ${listTimelineObjectInnerSelector}:first-child ${keyToCss('videoCTA', 'videoImageCTA')},
@@ -31,6 +30,6 @@ export const main = async () => {
 
 export const clean = async () => {
   pageModifications.unregister(processVideoCTAs);
-  styleElement.remove();
+
   $(`[${hiddenAttribute}]`).removeAttr(hiddenAttribute);
 };
diff --git a/src/features/cleanfeed.js b/src/features/cleanfeed.js
index 0479ffaa9..588e1c6e1 100644
--- a/src/features/cleanfeed.js
+++ b/src/features/cleanfeed.js
@@ -5,8 +5,9 @@ import { translate } from '../utils/language_data.js';
 import { timelineObject } from '../utils/react_props.js';
 import { getPreferences } from '../utils/preferences.js';
 
+export const styleElement = buildStyle();
+
 const hiddenClass = 'xkit-cleanfeed-filtered';
-const styleElement = buildStyle();
 const reblogSelector = keyToCss('reblog');
 
 let blockingMode;
@@ -84,13 +85,11 @@ export const main = async function () {
   }
   `;
 
-  document.documentElement.append(styleElement);
   onNewPosts.addListener(processPosts);
 };
 
 export const clean = async function () {
   onNewPosts.removeListener(processPosts);
-  styleElement.remove();
 
   $(`.${hiddenClass}`).removeClass(hiddenClass);
 };
diff --git a/src/features/hide_avatars.js b/src/features/hide_avatars.js
index 0bc1eec19..c3961e9ec 100644
--- a/src/features/hide_avatars.js
+++ b/src/features/hide_avatars.js
@@ -2,7 +2,7 @@ import { getPreferences } from '../utils/preferences.js';
 import { translate } from '../utils/language_data.js';
 import { buildStyle } from '../utils/interface.js';
 
-const styleElement = buildStyle();
+export const styleElement = buildStyle();
 
 export const main = async function () {
   const { hiddenAvatars } = await getPreferences('hide_avatars');
@@ -11,10 +11,4 @@ export const main = async function () {
     .split(',')
     .map(username => `[title="${username.trim()}"] img[alt="${translate('Avatar')}"] { display: none; }`)
     .join('\n');
-
-  document.documentElement.append(styleElement);
-};
-
-export const clean = async function () {
-  styleElement.remove();
 };
diff --git a/src/features/no_recommended.js b/src/features/no_recommended.js
index 29c5345fe..671b9c5b0 100644
--- a/src/features/no_recommended.js
+++ b/src/features/no_recommended.js
@@ -3,13 +3,23 @@ import { getPreferences } from '../utils/preferences.js';
 let enabledOptions;
 
 const runOption = async function (name) {
-  const { main: run } = await import(`./no_recommended/${name}.js`);
-  run().catch(console.error);
+  const { main: run, styleElement } = await import(`./no_recommended/${name}.js`);
+  if (run) {
+    run().catch(console.error);
+  }
+  if (styleElement) {
+    document.documentElement.append(styleElement);
+  }
 };
 
 const destroyOption = async function (name) {
-  const { clean: destroy } = await import(`./no_recommended/${name}.js`);
-  destroy().catch(console.error);
+  const { clean: destroy, styleElement } = await import(`./no_recommended/${name}.js`);
+  if (destroy) {
+    destroy().catch(console.error);
+  }
+  if (styleElement) {
+    styleElement.remove();
+  }
 };
 
 export const onStorageChanged = async function (changes, areaName) {
diff --git a/src/features/no_recommended/hide_answertime.js b/src/features/no_recommended/hide_answertime.js
index c13939393..6314c4c5d 100644
--- a/src/features/no_recommended/hide_answertime.js
+++ b/src/features/no_recommended/hide_answertime.js
@@ -1,7 +1,6 @@
 import { keyToCss } from '../../utils/css_map.js';
 import { buildStyle } from '../../utils/interface.js';
 
-const styleElement = buildStyle(`${keyToCss('answerTimeBanner')} { display: none; }`);
-
-export const main = async () => document.documentElement.append(styleElement);
-export const clean = async () => styleElement.remove();
+export const styleElement = buildStyle(`
+${keyToCss('answerTimeBanner')} { display: none; }
+`);
diff --git a/src/features/no_recommended/hide_blog_carousels.js b/src/features/no_recommended/hide_blog_carousels.js
index 0cd1c3128..f7d5e9777 100644
--- a/src/features/no_recommended/hide_blog_carousels.js
+++ b/src/features/no_recommended/hide_blog_carousels.js
@@ -5,7 +5,7 @@ import { timelineObject } from '../../utils/react_props.js';
 
 const hiddenAttribute = 'data-no-recommended-blog-carousels-hidden';
 
-const styleElement = buildStyle(`
+export const styleElement = buildStyle(`
   [${hiddenAttribute}] { position: relative; }
   [${hiddenAttribute}] > div { visibility: hidden; position: absolute; max-width: 100%; }
   [${hiddenAttribute}] > div :is(img, video, canvas) { display: none }
@@ -26,12 +26,11 @@ const hideBlogCarousels = carousels =>
   });
 
 export const main = async function () {
-  document.documentElement.append(styleElement);
   pageModifications.register(carouselSelector, hideBlogCarousels);
 };
 
 export const clean = async function () {
   pageModifications.unregister(hideBlogCarousels);
-  styleElement.remove();
+
   $(`[${hiddenAttribute}]`).removeAttr(hiddenAttribute);
 };
diff --git a/src/features/no_recommended/hide_lightbox_related.js b/src/features/no_recommended/hide_lightbox_related.js
index b9d2d396a..d639566e1 100644
--- a/src/features/no_recommended/hide_lightbox_related.js
+++ b/src/features/no_recommended/hide_lightbox_related.js
@@ -5,11 +5,8 @@ const flexLayoutSelector = `${keyToCss('glass')} ${keyToCss('flexLayout')}`;
 const mainSectionSelector = `${flexLayoutSelector} > ${keyToCss('mainSection')}`;
 const relatedPostsSectionSelector = `${flexLayoutSelector} > ${keyToCss('relatedPostsSection')}`;
 
-const styleElement = buildStyle(`
+export const styleElement = buildStyle(`
 ${flexLayoutSelector} { align-items: center; justify-content: center; margin-top: 0; }
 ${mainSectionSelector} { height: unset; margin: auto; }
 ${relatedPostsSectionSelector} { display: none; }
 `);
-
-export const main = async () => document.documentElement.append(styleElement);
-export const clean = async () => styleElement.remove();
diff --git a/src/features/no_recommended/hide_radar.js b/src/features/no_recommended/hide_radar.js
index bc2840ad6..e66662037 100644
--- a/src/features/no_recommended/hide_radar.js
+++ b/src/features/no_recommended/hide_radar.js
@@ -4,7 +4,7 @@ import { buildStyle } from '../../utils/interface.js';
 
 const hiddenAttribute = 'data-no-recommended-radar-hidden';
 
-const styleElement = buildStyle(`[${hiddenAttribute}] { display: none; }`);
+export const styleElement = buildStyle(`[${hiddenAttribute}] { display: none; }`);
 
 const checkForRadar = function (sidebarTitles) {
   sidebarTitles
@@ -14,11 +14,10 @@ const checkForRadar = function (sidebarTitles) {
 
 export const main = async function () {
   pageModifications.register('aside h1', checkForRadar);
-  document.documentElement.append(styleElement);
 };
 
 export const clean = async function () {
   pageModifications.unregister(checkForRadar);
-  styleElement.remove();
+
   $(`[${hiddenAttribute}]`).removeAttr(hiddenAttribute);
 };
diff --git a/src/features/no_recommended/hide_recommended_blogs.js b/src/features/no_recommended/hide_recommended_blogs.js
index 8196eed22..85ee230b2 100644
--- a/src/features/no_recommended/hide_recommended_blogs.js
+++ b/src/features/no_recommended/hide_recommended_blogs.js
@@ -5,7 +5,7 @@ import { blogViewSelector, buildStyle } from '../../utils/interface.js';
 
 const hiddenAttribute = 'data-no-recommended-blogs-hidden';
 
-const styleElement = buildStyle(`[${hiddenAttribute}] { display: none; }`);
+export const styleElement = buildStyle(`[${hiddenAttribute}] { display: none; }`);
 
 const hideDashboardRecommended = function (sidebarTitles) {
   sidebarTitles
@@ -23,13 +23,10 @@ export const main = async function () {
 
   const blogsListSelector = `${keyToCss('desktopContainer')} > ${keyToCss('recommendedBlogs')}`;
   pageModifications.register(blogsListSelector, hideTagPageRecommended);
-
-  document.documentElement.append(styleElement);
 };
 
 export const clean = async function () {
   pageModifications.unregister(hideDashboardRecommended);
   pageModifications.unregister(hideTagPageRecommended);
-  styleElement.remove();
   $(`[${hiddenAttribute}]`).removeAttr(hiddenAttribute);
 };
diff --git a/src/features/no_recommended/hide_recommended_blogs_modal.js b/src/features/no_recommended/hide_recommended_blogs_modal.js
index b23120faa..5525a4053 100644
--- a/src/features/no_recommended/hide_recommended_blogs_modal.js
+++ b/src/features/no_recommended/hide_recommended_blogs_modal.js
@@ -4,7 +4,7 @@ import { blogViewSelector, buildStyle } from '../../utils/interface.js';
 
 const hiddenAttribute = 'data-no-recommended-blogs-modal-hidden';
 
-const styleElement = buildStyle(`[${hiddenAttribute}] { display: none; }`);
+export const styleElement = buildStyle(`[${hiddenAttribute}] { display: none; }`);
 
 const hideModalRecommended = blogsLists =>
   blogsLists
@@ -14,12 +14,9 @@ const hideModalRecommended = blogsLists =>
 export const main = async function () {
   const blogsListSelector = `${keyToCss('desktopContainer')} > ${keyToCss('recommendedBlogs')}`;
   pageModifications.register(blogsListSelector, hideModalRecommended);
-
-  document.documentElement.append(styleElement);
 };
 
 export const clean = async function () {
   pageModifications.unregister(hideModalRecommended);
-  styleElement.remove();
   $(`[${hiddenAttribute}]`).removeAttr(hiddenAttribute);
 };
diff --git a/src/features/no_recommended/hide_recommended_posts.js b/src/features/no_recommended/hide_recommended_posts.js
index 4db701d31..5456e238b 100644
--- a/src/features/no_recommended/hide_recommended_posts.js
+++ b/src/features/no_recommended/hide_recommended_posts.js
@@ -9,7 +9,7 @@ const unHiddenAttribute = 'data-no-recommended-posts-many';
 const timeline = followingTimelineFilter;
 const includeFiltered = true;
 
-const styleElement = buildStyle(`
+export const styleElement = buildStyle(`
 [${hiddenAttribute}]:not([${unHiddenAttribute}]) article {
   display: none;
 }
@@ -66,13 +66,12 @@ const processPosts = async function (postElements) {
 
 export const main = async function () {
   onNewPosts.addListener(processPosts);
-  document.documentElement.append(styleElement);
 };
 
 export const clean = async function () {
   onNewPosts.removeListener(processPosts);
+
   $(`.${excludeClass}`).removeClass(excludeClass);
   $(`[${hiddenAttribute}]`).removeAttr(hiddenAttribute);
   $(`[${unHiddenAttribute}]`).removeAttr(unHiddenAttribute);
-  styleElement.remove();
 };
diff --git a/src/features/no_recommended/hide_tag_carousels.js b/src/features/no_recommended/hide_tag_carousels.js
index fcddca402..866730e06 100644
--- a/src/features/no_recommended/hide_tag_carousels.js
+++ b/src/features/no_recommended/hide_tag_carousels.js
@@ -4,7 +4,7 @@ import { pageModifications } from '../../utils/mutations.js';
 
 const hiddenAttribute = 'data-no-recommended-tag-carousels-hidden';
 
-const styleElement = buildStyle(`
+export const styleElement = buildStyle(`
   [${hiddenAttribute}] { position: relative; }
   [${hiddenAttribute}] > div { visibility: hidden; position: absolute; max-width: 100%; }
   [${hiddenAttribute}] > div img, [${hiddenAttribute}] > div canvas { visibility: hidden; }
@@ -23,12 +23,11 @@ const hideTagCarousels = carouselWrappers => carouselWrappers
   });
 
 export const main = async function () {
-  document.documentElement.append(styleElement);
   pageModifications.register(carouselWrapperSelector, hideTagCarousels);
 };
 
 export const clean = async function () {
   pageModifications.unregister(hideTagCarousels);
-  styleElement.remove();
+
   $(`[${hiddenAttribute}]`).removeAttr(hiddenAttribute);
 };
diff --git a/src/features/notificationblock.js b/src/features/notificationblock.js
index 1a7d1426d..cc588b69f 100644
--- a/src/features/notificationblock.js
+++ b/src/features/notificationblock.js
@@ -15,7 +15,8 @@ const meatballButtonUnblockLabel = 'Unblock notifications';
 
 let blockedPostTargetIDs;
 
-const styleElement = buildStyle();
+export const styleElement = buildStyle();
+
 const buildCss = () => `:is(${blockedPostTargetIDs.map(rootId => `[data-target-root-post-id="${rootId}"]`).join(', ')
   }) { display: none !important; }`;
 
@@ -103,7 +104,6 @@ export const onStorageChanged = (changes, areaName) => {
 export const main = async function () {
   ({ [storageKey]: blockedPostTargetIDs = [] } = await browser.storage.local.get(storageKey));
   styleElement.textContent = buildCss();
-  document.documentElement.append(styleElement);
   onNewNotifications.addListener(processNotifications);
 
   registerMeatballItem({ id: meatballButtonBlockId, label: meatballButtonBlockLabel, onclick: onButtonClicked, postFilter: blockPostFilter });
@@ -111,7 +111,6 @@ export const main = async function () {
 };
 
 export const clean = async function () {
-  styleElement.remove();
   onNewNotifications.removeListener(processNotifications);
   unregisterMeatballItem(meatballButtonBlockId);
   unregisterMeatballItem(meatballButtonUnblockId);
diff --git a/src/features/scroll_to_bottom.js b/src/features/scroll_to_bottom.js
index 640abc3e0..aff2223d7 100644
--- a/src/features/scroll_to_bottom.js
+++ b/src/features/scroll_to_bottom.js
@@ -16,7 +16,7 @@ const knightRiderLoaderSelector = `:is(${loaderSelector}) > ${keyToCss('knightRi
 let scrollToBottomButton;
 let active = false;
 
-const styleElement = buildStyle(`
+export const styleElement = buildStyle(`
 .${activeClass} svg use {
   --icon-color-primary: rgb(var(--yellow));
 }
@@ -91,7 +91,6 @@ const addButtonToPage = async function ([scrollToTopButton]) {
 export const main = async function () {
   pageModifications.register(`button[aria-label="${translate('Scroll to top')}"]`, addButtonToPage);
   pageModifications.register(knightRiderLoaderSelector, onLoadersAdded);
-  document.documentElement.append(styleElement);
 };
 
 export const clean = async function () {
@@ -100,5 +99,4 @@ export const clean = async function () {
   pageModifications.unregister(onLoadersAdded);
   stopScrolling();
   scrollToBottomButton?.remove();
-  styleElement.remove();
 };
diff --git a/src/features/shorten_posts.js b/src/features/shorten_posts.js
index f2f486bb6..e455ecaf6 100644
--- a/src/features/shorten_posts.js
+++ b/src/features/shorten_posts.js
@@ -16,7 +16,8 @@ const shortenClass = 'xkit-shorten-posts-shortened';
 const tagsClass = 'xkit-shorten-posts-tags';
 const buttonClass = 'xkit-shorten-posts-expand';
 
-const styleElement = buildStyle();
+export const styleElement = buildStyle();
+
 const expandButton = dom('button', { class: buttonClass }, null, ['Expand']);
 
 const unshortenOnClick = ({ currentTarget }) => {
@@ -59,7 +60,6 @@ export const main = async function () {
   ({ showTags, maxHeight } = await getPreferences('shorten_posts'));
 
   styleElement.textContent = `body { --xkit-shorten-posts-max-height: ${maxHeight}; }`;
-  document.documentElement.append(styleElement);
 
   onNewPosts.addListener(shortenPosts);
 };
@@ -67,8 +67,6 @@ export const main = async function () {
 export const clean = async function () {
   onNewPosts.removeListener(shortenPosts);
 
-  styleElement.remove();
-
   $(`.${excludeClass}`).removeClass(excludeClass);
   $(`.${shortenClass}`).removeClass(shortenClass);
   $(`.${tagsClass}, .${buttonClass}`).remove();
diff --git a/src/features/themed_posts.js b/src/features/themed_posts.js
index 6887a048a..b934463ea 100644
--- a/src/features/themed_posts.js
+++ b/src/features/themed_posts.js
@@ -4,7 +4,8 @@ import { onNewPosts } from '../utils/mutations.js';
 import { timelineObject } from '../utils/react_props.js';
 import { keyToCss } from '../utils/css_map.js';
 
-const styleElement = buildStyle();
+export const styleElement = buildStyle();
+
 const blogs = new Set();
 const groupsFromHex = /^#(?<red>[A-Fa-f0-9]{1,2})(?<green>[A-Fa-f0-9]{1,2})(?<blue>[A-Fa-f0-9]{1,2})$/;
 const reblogSelector = keyToCss('reblog');
@@ -110,17 +111,14 @@ export const main = async function () {
     }
   }
 
-  document.documentElement.append(styleElement);
   onNewPosts.addListener(processPosts);
 };
 
 export const clean = async function () {
   onNewPosts.removeListener(processPosts);
 
-  styleElement.remove();
-  styleElement.textContent = '';
-
   $('[data-xkit-themed]').removeAttr('data-xkit-themed');
 
+  styleElement.textContent = '';
   blogs.clear();
 };
diff --git a/src/features/tweaks.js b/src/features/tweaks.js
index 3ac9541ae..6b835a7cd 100644
--- a/src/features/tweaks.js
+++ b/src/features/tweaks.js
@@ -3,13 +3,23 @@ import { getPreferences } from '../utils/preferences.js';
 let enabledTweaks;
 
 const runTweak = async function (name) {
-  const { main: run } = await import(`./tweaks/${name}.js`);
-  run().catch(console.error);
+  const { main: run, styleElement } = await import(`./tweaks/${name}.js`);
+  if (run) {
+    run().catch(console.error);
+  }
+  if (styleElement) {
+    document.documentElement.append(styleElement);
+  }
 };
 
 const destroyTweak = async function (name) {
-  const { clean: destroy } = await import(`./tweaks/${name}.js`);
-  destroy().catch(console.error);
+  const { clean: destroy, styleElement } = await import(`./tweaks/${name}.js`);
+  if (destroy) {
+    destroy().catch(console.error);
+  }
+  if (styleElement) {
+    styleElement.remove();
+  }
 };
 
 export const onStorageChanged = async function (changes, areaName) {
diff --git a/src/features/tweaks/caught_up_line.js b/src/features/tweaks/caught_up_line.js
index b0ab92ee7..76ed0cd3e 100644
--- a/src/features/tweaks/caught_up_line.js
+++ b/src/features/tweaks/caught_up_line.js
@@ -6,7 +6,7 @@ import { followingTimelineSelector } from '../../utils/timeline_id.js';
 const hiddenAttribute = 'data-tweaks-caught-up-line-title';
 const borderAttribute = 'data-tweaks-caught-up-line-border';
 
-const styleElement = buildStyle(`
+export const styleElement = buildStyle(`
   [${hiddenAttribute}] > div { display: none; }
   [${borderAttribute}] > div {
     box-sizing: content-box;
@@ -35,13 +35,12 @@ const createCaughtUpLine = tagChicletCarouselItems => tagChicletCarouselItems
   });
 
 export const main = async function () {
-  document.documentElement.append(styleElement);
   pageModifications.register(tagChicletCarouselLinkSelector, createCaughtUpLine);
 };
 
 export const clean = async function () {
   pageModifications.unregister(createCaughtUpLine);
-  styleElement.remove();
+
   $(`[${hiddenAttribute}]`).removeAttr(hiddenAttribute);
   $(`[${borderAttribute}]`).removeAttr(borderAttribute);
 };
diff --git a/src/features/tweaks/hide_activity_mutuals.js b/src/features/tweaks/hide_activity_mutuals.js
index aad58432f..6566bde42 100644
--- a/src/features/tweaks/hide_activity_mutuals.js
+++ b/src/features/tweaks/hide_activity_mutuals.js
@@ -1,11 +1,8 @@
 import { keyToCss } from '../../utils/css_map.js';
 import { buildStyle } from '../../utils/interface.js';
 
-const styleElement = buildStyle(`
+export const styleElement = buildStyle(`
 ${keyToCss('activity')} ${keyToCss('followingBadgeContainer', 'mutualsBadgeContainer')} {
   display: none;
 }
 `);
-
-export const main = async () => document.documentElement.append(styleElement);
-export const clean = async () => styleElement.remove();
diff --git a/src/features/tweaks/hide_activity_notification_badge.js b/src/features/tweaks/hide_activity_notification_badge.js
index 7a112b4bf..d6a6e5337 100644
--- a/src/features/tweaks/hide_activity_notification_badge.js
+++ b/src/features/tweaks/hide_activity_notification_badge.js
@@ -5,11 +5,8 @@ import { translate } from '../../utils/language_data.js';
 const activityButton = `button[aria-label="${translate('Activity')}"]`;
 const mobileMenuButton = `button[aria-label="${translate('Menu')}"]`;
 
-const styleElement = buildStyle(`
+export const styleElement = buildStyle(`
 :is(${activityButton}, ${mobileMenuButton}) ${keyToCss('notificationBadge')} {
   display: none;
 }
 `);
-
-export const main = async () => document.documentElement.append(styleElement);
-export const clean = async () => styleElement.remove();
diff --git a/src/features/tweaks/hide_blaze_tip_labels.js b/src/features/tweaks/hide_blaze_tip_labels.js
index 480a54150..37b293278 100644
--- a/src/features/tweaks/hide_blaze_tip_labels.js
+++ b/src/features/tweaks/hide_blaze_tip_labels.js
@@ -1,11 +1,8 @@
 import { keyToCss } from '../../utils/css_map.js';
 import { buildStyle } from '../../utils/interface.js';
 
-const styleElement = buildStyle(`
+export const styleElement = buildStyle(`
 article ${keyToCss('igniteButton', 'tippingButton')} > svg:not([style*="#ff8a00"]) ~ ${keyToCss('label')} {
   display: none;
 }
 `);
-
-export const main = async () => document.documentElement.append(styleElement);
-export const clean = async () => styleElement.remove();
diff --git a/src/features/tweaks/hide_filtered_posts.js b/src/features/tweaks/hide_filtered_posts.js
index ad93c1dfb..1dc5d276b 100644
--- a/src/features/tweaks/hide_filtered_posts.js
+++ b/src/features/tweaks/hide_filtered_posts.js
@@ -3,7 +3,8 @@ import { keyToCss } from '../../utils/css_map.js';
 import { buildStyle, getTimelineItemWrapper } from '../../utils/interface.js';
 
 const hiddenAttribute = 'data-tweaks-hide-filtered-posts-hidden';
-const styleElement = buildStyle(`[${hiddenAttribute}] article { display: none; }`);
+
+export const styleElement = buildStyle(`[${hiddenAttribute}] article { display: none; }`);
 
 const hideFilteredPosts = filteredScreens => filteredScreens
   .map(getTimelineItemWrapper)
@@ -12,12 +13,10 @@ const hideFilteredPosts = filteredScreens => filteredScreens
 export const main = async function () {
   const filteredScreenSelector = `article ${keyToCss('filteredScreen')}`;
   pageModifications.register(filteredScreenSelector, hideFilteredPosts);
-  document.documentElement.append(styleElement);
 };
 
 export const clean = async function () {
   pageModifications.unregister(hideFilteredPosts);
-  styleElement.remove();
 
   $(`[${hiddenAttribute}]`).removeAttr(hiddenAttribute);
 };
diff --git a/src/features/tweaks/hide_follower_counts.js b/src/features/tweaks/hide_follower_counts.js
index 5bec2de4f..34dfade86 100644
--- a/src/features/tweaks/hide_follower_counts.js
+++ b/src/features/tweaks/hide_follower_counts.js
@@ -1,13 +1,10 @@
 import { keyToCss } from '../../utils/css_map.js';
 import { buildStyle } from '../../utils/interface.js';
 
-const styleElement = buildStyle(`
+export const styleElement = buildStyle(`
 a[href$="/followers"] ${keyToCss('count')} {
   visibility: hidden;
 }
 a[href$="/activity/total"] {
   display: none;
 }`);
-
-export const main = async () => document.documentElement.append(styleElement);
-export const clean = async () => styleElement.remove();
diff --git a/src/features/tweaks/hide_following_notification_badge.js b/src/features/tweaks/hide_following_notification_badge.js
index 9f3cd9e54..673115a65 100644
--- a/src/features/tweaks/hide_following_notification_badge.js
+++ b/src/features/tweaks/hide_following_notification_badge.js
@@ -8,7 +8,8 @@ const followingHomeButton = `:is(li[title="${translate('Home')}"], button[aria-l
 const mobileMenuButton = `button[aria-label="${translate('Menu')}"]`;
 
 const customTitleElement = dom('title', { 'data-xkit': true });
-const styleElement = buildStyle(`
+
+export const styleElement = buildStyle(`
 :is(${followingHomeButton}, ${mobileMenuButton}) ${keyToCss('notificationBadge')} {
   display: none;
 }
@@ -23,10 +24,8 @@ const onTitleChanged = ([titleElement]) => {
 export const main = async () => {
   pageModifications.register('head title:not([data-xkit])', onTitleChanged);
   document.head.prepend(customTitleElement);
-  document.documentElement.append(styleElement);
 };
 
 export const clean = async () => {
   customTitleElement.remove();
-  styleElement.remove();
 };
diff --git a/src/features/tweaks/hide_footer_tooltips.js b/src/features/tweaks/hide_footer_tooltips.js
index 52ad32839..a7fbe37f3 100644
--- a/src/features/tweaks/hide_footer_tooltips.js
+++ b/src/features/tweaks/hide_footer_tooltips.js
@@ -1,12 +1,9 @@
 import { keyToCss } from '../../utils/css_map.js';
 import { buildStyle } from '../../utils/interface.js';
 
-const styleElement = buildStyle(`
+export const styleElement = buildStyle(`
 article footer ${keyToCss('controlIcon')} ${keyToCss('tooltip')},
 article footer ${keyToCss('controlIcon')} ${keyToCss('tooltip')} ~ * {
   display: none;
 }
 `);
-
-export const main = async () => document.documentElement.append(styleElement);
-export const clean = async () => styleElement.remove();
diff --git a/src/features/tweaks/hide_liked_posts.js b/src/features/tweaks/hide_liked_posts.js
index 65f43d23f..132ae1208 100644
--- a/src/features/tweaks/hide_liked_posts.js
+++ b/src/features/tweaks/hide_liked_posts.js
@@ -6,7 +6,8 @@ import { followingTimelineFilter } from '../../utils/timeline_id.js';
 const timeline = followingTimelineFilter;
 
 const hiddenAttribute = 'data-tweaks-hide-liked-posts-hidden';
-const styleElement = buildStyle(`[${hiddenAttribute}] article { display: none; }`);
+
+export const styleElement = buildStyle(`[${hiddenAttribute}] article { display: none; }`);
 
 const processPosts = async function (postElements) {
   filterPostElements(postElements, { timeline }).forEach(async postElement => {
@@ -19,12 +20,10 @@ const processPosts = async function (postElements) {
 
 export const main = async function () {
   onNewPosts.addListener(processPosts);
-  document.documentElement.append(styleElement);
 };
 
 export const clean = async function () {
   onNewPosts.removeListener(processPosts);
-  styleElement.remove();
 
   $(`[${hiddenAttribute}]`).removeAttr(hiddenAttribute);
 };
diff --git a/src/features/tweaks/hide_mini_follow.js b/src/features/tweaks/hide_mini_follow.js
index 5da32e937..21964545f 100644
--- a/src/features/tweaks/hide_mini_follow.js
+++ b/src/features/tweaks/hide_mini_follow.js
@@ -1,7 +1,6 @@
 import { keyToCss } from '../../utils/css_map.js';
 import { buildStyle } from '../../utils/interface.js';
 
-const styleElement = buildStyle(`article ${keyToCss('followButton')} { display: none; }`);
-
-export const main = async () => document.documentElement.append(styleElement);
-export const clean = async () => styleElement.remove();
+export const styleElement = buildStyle(`
+article ${keyToCss('followButton')} { display: none; }
+`);
diff --git a/src/features/tweaks/hide_my_posts.js b/src/features/tweaks/hide_my_posts.js
index 6b10b4923..e4a7801e5 100644
--- a/src/features/tweaks/hide_my_posts.js
+++ b/src/features/tweaks/hide_my_posts.js
@@ -7,7 +7,8 @@ const excludeClass = 'xkit-tweaks-hide-my-posts-done';
 const timeline = followingTimelineFilter;
 
 const hiddenAttribute = 'data-tweaks-hide-my-posts-hidden';
-const styleElement = buildStyle(`[${hiddenAttribute}] article { display: none; }`);
+
+export const styleElement = buildStyle(`[${hiddenAttribute}] article { display: none; }`);
 
 const processPosts = async function (postElements) {
   filterPostElements(postElements, { excludeClass, timeline }).forEach(async postElement => {
@@ -21,12 +22,10 @@ const processPosts = async function (postElements) {
 
 export const main = async function () {
   onNewPosts.addListener(processPosts);
-  document.documentElement.append(styleElement);
 };
 
 export const clean = async function () {
   onNewPosts.removeListener(processPosts);
-  styleElement.remove();
 
   $(`.${excludeClass}`).removeClass(excludeClass);
   $(`[${hiddenAttribute}]`).removeAttr(hiddenAttribute);
diff --git a/src/features/tweaks/highlight_contributed_content.js b/src/features/tweaks/highlight_contributed_content.js
index 121c7fd1b..48e4b49cf 100644
--- a/src/features/tweaks/highlight_contributed_content.js
+++ b/src/features/tweaks/highlight_contributed_content.js
@@ -1,6 +1,7 @@
 import { buildStyle } from '../../utils/interface.js';
 
-const styleElement = buildStyle('[data-is-contributed-content="true"] { display: flow-root; background-color: rgb(var(--follow)); }');
-
-export const main = async () => document.documentElement.append(styleElement);
-export const clean = async () => styleElement.remove();
+export const styleElement = buildStyle(`
+[data-is-contributed-content="true"] {
+  display: flow-root; background-color: rgb(var(--follow));
+}
+`);
diff --git a/src/features/tweaks/no_focus_shadow.js b/src/features/tweaks/no_focus_shadow.js
index de51a3135..08643db99 100644
--- a/src/features/tweaks/no_focus_shadow.js
+++ b/src/features/tweaks/no_focus_shadow.js
@@ -1,10 +1,7 @@
 import { keyToCss } from '../../utils/css_map.js';
 import { buildStyle } from '../../utils/interface.js';
 
-const styleElement = buildStyle(`
+export const styleElement = buildStyle(`
 ${keyToCss('listTimelineObject')}:focus > div {
   box-shadow: none !important;
 }`);
-
-export const main = async () => document.documentElement.append(styleElement);
-export const clean = async () => styleElement.remove();
diff --git a/src/features/tweaks/no_where_were_we.js b/src/features/tweaks/no_where_were_we.js
index 6991f42ab..a0d2ce887 100644
--- a/src/features/tweaks/no_where_were_we.js
+++ b/src/features/tweaks/no_where_were_we.js
@@ -1,7 +1,6 @@
 import { keyToCss } from '../../utils/css_map.js';
 import { buildStyle } from '../../utils/interface.js';
 
-const styleElement = buildStyle(`${keyToCss('wrapper')} ${keyToCss('newPostIndicator')} { display: none; }`);
-
-export const main = async () => document.documentElement.append(styleElement);
-export const clean = async () => styleElement.remove();
+export const styleElement = buildStyle(`
+${keyToCss('wrapper')} ${keyToCss('newPostIndicator')} { display: none; }
+`);
diff --git a/src/features/tweaks/show_all_tags.js b/src/features/tweaks/show_all_tags.js
index 230561561..d31b5f521 100644
--- a/src/features/tweaks/show_all_tags.js
+++ b/src/features/tweaks/show_all_tags.js
@@ -1,7 +1,7 @@
 import { keyToCss } from '../../utils/css_map.js';
 import { buildStyle } from '../../utils/interface.js';
 
-const styleElement = buildStyle(`
+export const styleElement = buildStyle(`
 ${keyToCss('tags')}${keyToCss('collapsed')} {
   max-height: none !important;
 }
@@ -9,11 +9,3 @@ ${keyToCss('seeAll')} {
   display: none;
 }
 `);
-
-export const main = async function () {
-  document.documentElement.append(styleElement);
-};
-
-export const clean = async function () {
-  styleElement.remove();
-};
diff --git a/src/features/tweaks/slim_filtered_screens.js b/src/features/tweaks/slim_filtered_screens.js
index f8009eda4..2797fe869 100644
--- a/src/features/tweaks/slim_filtered_screens.js
+++ b/src/features/tweaks/slim_filtered_screens.js
@@ -3,7 +3,7 @@ import { postSelector, buildStyle } from '../../utils/interface.js';
 
 const filteredScreenSelector = `${postSelector}:not(${keyToCss('masonryTimelineObject')}) ${keyToCss('filteredScreen')}`;
 
-const styleElement = buildStyle(`
+export const styleElement = buildStyle(`
 ${filteredScreenSelector} {
   flex-direction: row;
   justify-content: space-between;
@@ -30,6 +30,3 @@ ${filteredScreenSelector} ${keyToCss('viewPostLinkWrapper')} {
   margin-left: 1ch;
 }
 `);
-
-export const main = async () => document.documentElement.append(styleElement);
-export const clean = async () => styleElement.remove();
diff --git a/src/features/tweaks/subtle_activity_mutuals.js b/src/features/tweaks/subtle_activity_mutuals.js
index b18bd13ea..b3b08893c 100644
--- a/src/features/tweaks/subtle_activity_mutuals.js
+++ b/src/features/tweaks/subtle_activity_mutuals.js
@@ -7,7 +7,7 @@ const labelSelector = `${keyToCss('followingBadgeContainer', 'mutualsBadgeContai
 
 const spanClass = 'xkit-tweaks-subtle-activity-span';
 
-const styleElement = buildStyle(`
+export const styleElement = buildStyle(`
 .${spanClass} {
   display: inline-block;
   overflow-x: clip;
@@ -51,13 +51,11 @@ const waitForRender = () =>
 export const main = async function () {
   pageModifications.register(labelSelector, processLabels);
 
-  document.documentElement.append(styleElement);
   waitForRender().then(() => document.documentElement.append(transitionStyleElement));
 };
 
 export const clean = async function () {
   pageModifications.unregister(processLabels);
-  styleElement.remove();
   transitionStyleElement.remove();
 
   [...document.querySelectorAll(`.${spanClass}`)].forEach(span => {
diff --git a/src/features/tweaks/unsticky_tab_bar.js b/src/features/tweaks/unsticky_tab_bar.js
index 9a1b21e3c..bd5026faf 100644
--- a/src/features/tweaks/unsticky_tab_bar.js
+++ b/src/features/tweaks/unsticky_tab_bar.js
@@ -1,13 +1,10 @@
 import { keyToCss } from '../../utils/css_map.js';
 import { buildStyle } from '../../utils/interface.js';
 
-const styleElement = buildStyle(`
+export const styleElement = buildStyle(`
   ${keyToCss('tabsHeader')} {
     position: relative !important;
     top: 0 !important;
     transition: none !important;
   }
 `);
-
-export const main = async () => document.documentElement.append(styleElement);
-export const clean = async () => styleElement.remove();

From 82aeab7728900330187d494e5cc1aa8322ad689d Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Sun, 18 Aug 2024 13:50:48 -0700
Subject: [PATCH 29/50] Quote Replies: Don't break on communities activity
 (#1575)

---
 src/features/quote_replies.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/features/quote_replies.js b/src/features/quote_replies.js
index a29fc940d..ae0403101 100644
--- a/src/features/quote_replies.js
+++ b/src/features/quote_replies.js
@@ -32,6 +32,7 @@ const processNotifications = notifications => notifications.forEach(async notifi
   );
 
   if (!['reply', 'reply_to_comment', 'note_mention'].includes(notificationProps.type)) return;
+  if (notificationProps.community) return;
 
   const activityElement = notification.querySelector(activitySelector);
   if (!activityElement) return;

From 46f0b0d7847cb485abaa4f2e1b087aaa9d89c7eb Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Sun, 18 Aug 2024 14:02:23 -0700
Subject: [PATCH 30/50] Label style elements in dev tools (#1511)

---
 src/content_scripts/main.js    | 1 +
 src/features/accesskit.js      | 1 +
 src/features/no_recommended.js | 1 +
 src/features/tweaks.js         | 1 +
 4 files changed, 4 insertions(+)

diff --git a/src/content_scripts/main.js b/src/content_scripts/main.js
index 1c3b965c3..c34a94d5f 100644
--- a/src/content_scripts/main.js
+++ b/src/content_scripts/main.js
@@ -21,6 +21,7 @@
       document.documentElement.appendChild(link);
     }
     if (styleElement) {
+      styleElement.dataset.xkitFeature = name;
       document.documentElement.append(styleElement);
     }
 
diff --git a/src/features/accesskit.js b/src/features/accesskit.js
index 49c3f05f7..e0a3bbd06 100644
--- a/src/features/accesskit.js
+++ b/src/features/accesskit.js
@@ -8,6 +8,7 @@ const runOption = async function (name) {
     run().catch(console.error);
   }
   if (styleElement) {
+    styleElement.dataset.xkitFeature = `accesskit_${name}`;
     document.documentElement.append(styleElement);
   }
 };
diff --git a/src/features/no_recommended.js b/src/features/no_recommended.js
index 671b9c5b0..c1c4240ad 100644
--- a/src/features/no_recommended.js
+++ b/src/features/no_recommended.js
@@ -8,6 +8,7 @@ const runOption = async function (name) {
     run().catch(console.error);
   }
   if (styleElement) {
+    styleElement.dataset.xkitFeature = `no_recommended_${name}`;
     document.documentElement.append(styleElement);
   }
 };
diff --git a/src/features/tweaks.js b/src/features/tweaks.js
index 6b835a7cd..6fbd98d07 100644
--- a/src/features/tweaks.js
+++ b/src/features/tweaks.js
@@ -8,6 +8,7 @@ const runTweak = async function (name) {
     run().catch(console.error);
   }
   if (styleElement) {
+    styleElement.dataset.xkitFeature = `tweaks_${name}`;
     document.documentElement.append(styleElement);
   }
 };

From 27d2f7fc1a1f09d792bb9f83650902915e3c35ed Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Sun, 18 Aug 2024 14:02:53 -0700
Subject: [PATCH 31/50] Themed Posts: Function in Communities (#1496)

Co-authored-by: April Sylph <28949509+AprilSylph@users.noreply.github.com>
---
 src/features/themed_posts.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/features/themed_posts.js b/src/features/themed_posts.js
index b934463ea..7dacf4a85 100644
--- a/src/features/themed_posts.js
+++ b/src/features/themed_posts.js
@@ -31,10 +31,11 @@ const processPosts = async function (postElements) {
   filterPostElements(postElements, { includeFiltered: true }).forEach(async postElement => {
     if (postElement.matches(blogViewSelector) && !enableOnPeepr) return;
 
-    const { blog, trail = [], content } = await timelineObject(postElement);
+    const { blog, authorBlog, trail = [], content, community } = await timelineObject(postElement);
+    const visibleBlog = community ? authorBlog : blog;
 
     const blogData = [
-      blog,
+      visibleBlog,
       ...reblogTrailTheming ? trail.map(item => item.blog).filter(item => item !== undefined) : []
     ];
 
@@ -65,12 +66,12 @@ const processPosts = async function (postElements) {
       }
     });
 
-    postElement.dataset.xkitThemed = blog.name ?? '';
+    postElement.dataset.xkitThemed = visibleBlog.name ?? '';
 
     if (reblogTrailTheming) {
       const blogNameTrail = trail.map(item => item?.blog?.name);
       if (content.length > 0) {
-        blogNameTrail.push(blog?.name);
+        blogNameTrail.push(visibleBlog?.name);
       }
       [...postElement.querySelectorAll(reblogSelector)].forEach((reblog, i) => {
         reblog.dataset.xkitThemed = blogNameTrail[i] ?? '';

From 2b3137c117446f4996b6907dba2b43ddc76795be Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Mon, 19 Aug 2024 03:50:01 -0700
Subject: [PATCH 32/50] Cleanfeed: Add "content label" to metadata (#1580)

---
 src/features/cleanfeed.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/features/cleanfeed.json b/src/features/cleanfeed.json
index f83a5f0cb..f1db4cbf1 100644
--- a/src/features/cleanfeed.json
+++ b/src/features/cleanfeed.json
@@ -7,7 +7,7 @@
     "background_color": "#ff567e"
   },
   "help": "https://github.com/AprilSylph/XKit-Rewritten/wiki/Features#cleanfeed",
-  "relatedTerms": [ "NSFW", "Mature", "Adult", "Sensitive", "Community Label" ],
+  "relatedTerms": [ "NSFW", "Mature", "Adult", "Sensitive", "Community Label", "Content Label" ],
   "preferences": {
     "blockingMode": {
       "label": "Hide media from:",

From 8641bf6ec001c2f66afa9a286fece665d5d91339 Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Mon, 19 Aug 2024 12:40:30 -0700
Subject: [PATCH 33/50] NotificationBlock: Enable in communities (#1571)

---
 src/features/notificationblock.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/features/notificationblock.js b/src/features/notificationblock.js
index cc588b69f..e3ec8b09d 100644
--- a/src/features/notificationblock.js
+++ b/src/features/notificationblock.js
@@ -80,11 +80,12 @@ const onButtonClicked = async function ({ currentTarget }) {
   });
 };
 
-const blockPostFilter = async ({ blogName, rebloggedRootName, rebloggedFromName, id, rebloggedRootId }) => {
+const blockPostFilter = async ({ blogName, rebloggedRootName, rebloggedFromName, id, rebloggedRootId, community, postAuthor }) => {
   const rootId = rebloggedRootId || id;
   const canReceiveActivity = userBlogNames.includes(blogName) ||
     userBlogNames.includes(rebloggedFromName) ||
-    userBlogNames.includes(rebloggedRootName);
+    userBlogNames.includes(rebloggedRootName) ||
+    (community && userBlogNames.includes(postAuthor));
 
   return canReceiveActivity && blockedPostTargetIDs.includes(rootId) === false;
 };

From 740a0422c486e2060020091728bbc3b578a2ffda Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Mon, 19 Aug 2024 12:40:49 -0700
Subject: [PATCH 34/50] Tweaks: Add communities badge hide tweak (#1547)

Co-authored-by: April Sylph <28949509+AprilSylph@users.noreply.github.com>
---
 src/features/tweaks.json                             |  5 +++++
 .../tweaks/hide_communities_notification_badge.js    | 12 ++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 src/features/tweaks/hide_communities_notification_badge.js

diff --git a/src/features/tweaks.json b/src/features/tweaks.json
index 146994f6c..9278e2426 100644
--- a/src/features/tweaks.json
+++ b/src/features/tweaks.json
@@ -98,6 +98,11 @@
       "label": "Hide the Home/Following unread count",
       "default": false
     },
+    "hide_communities_notification_badge": {
+      "type": "checkbox",
+      "label": "Hide the Communities notification badge",
+      "default": false
+    },
     "hide_activity_notification_badge": {
       "type": "checkbox",
       "label": "Hide the Activity notification badge",
diff --git a/src/features/tweaks/hide_communities_notification_badge.js b/src/features/tweaks/hide_communities_notification_badge.js
new file mode 100644
index 000000000..8da68c3d4
--- /dev/null
+++ b/src/features/tweaks/hide_communities_notification_badge.js
@@ -0,0 +1,12 @@
+import { keyToCss } from '../../utils/css_map.js';
+import { buildStyle } from '../../utils/interface.js';
+import { translate } from '../../utils/language_data.js';
+
+const communitiesButton = `button[aria-label="${translate('Communities')}"]`;
+const mobileMenuButton = `button[aria-label="${translate('Menu')}"]`;
+
+export const styleElement = buildStyle(`
+:is(${communitiesButton}, ${mobileMenuButton}) ${keyToCss('notificationBadge')} {
+  display: none;
+}
+`);

From 45f939dbf27d8c6167a27efd4691ff49df50d3b8 Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Mon, 19 Aug 2024 12:48:27 -0700
Subject: [PATCH 35/50] Trim Reblogs: Fix gap in control buttons after trimming
 (#1579)

---
 src/features/trim_reblogs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/features/trim_reblogs.js b/src/features/trim_reblogs.js
index 8d6509c05..74f69584a 100644
--- a/src/features/trim_reblogs.js
+++ b/src/features/trim_reblogs.js
@@ -124,7 +124,7 @@ const onButtonClicked = async function ({ currentTarget: controlButton }) {
       });
       notify(displayText);
 
-      controlButton.remove();
+      controlButton.closest('.xkit-control-button-container').remove();
 
       const reblogs = [...postElement.querySelectorAll(reblogSelector)];
       excludeTrailItems

From d6f9c7bb5816aa4a6a3e5f8c7e10d9bcb109e2e3 Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Mon, 19 Aug 2024 13:46:17 -0700
Subject: [PATCH 36/50] Show Originals: Enable in communities (#1546)

---
 src/features/show_originals.js | 18 ++++++++++++++----
 src/utils/react_props.js       |  5 ++++-
 src/utils/timeline_id.js       |  6 ++++++
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/features/show_originals.js b/src/features/show_originals.js
index 39f29eefb..6a813298c 100644
--- a/src/features/show_originals.js
+++ b/src/features/show_originals.js
@@ -5,7 +5,15 @@ import { onNewPosts } from '../utils/mutations.js';
 import { keyToCss } from '../utils/css_map.js';
 import { translate } from '../utils/language_data.js';
 import { userBlogs } from '../utils/user.js';
-import { followingTimelineFilter, anyBlogTimelineFilter, blogTimelineFilter, blogSubsTimelineFilter, timelineSelector } from '../utils/timeline_id.js';
+import {
+  followingTimelineFilter,
+  anyBlogTimelineFilter,
+  blogTimelineFilter,
+  blogSubsTimelineFilter,
+  timelineSelector,
+  anyCommunityTimelineFilter,
+  communitiesTimelineFilter
+} from '../utils/timeline_id.js';
 
 const hiddenAttribute = 'data-show-originals-hidden';
 const lengthenedClass = 'xkit-show-originals-lengthened';
@@ -72,7 +80,8 @@ const getLocation = timelineElement => {
     dashboard: followingTimelineFilter(timelineElement),
     disabled: isBlog && disabledBlogs.some(name => blogTimelineFilter(name)(timelineElement)),
     peepr: isBlog,
-    blogSubscriptions: blogSubsTimelineFilter(timelineElement)
+    blogSubscriptions: blogSubsTimelineFilter(timelineElement),
+    community: anyCommunityTimelineFilter(timelineElement) || communitiesTimelineFilter(timelineElement)
   };
   return Object.keys(on).find(location => on[location]);
 };
@@ -96,14 +105,15 @@ const processPosts = async function (postElements) {
 
   filterPostElements(postElements, { includeFiltered })
     .forEach(async postElement => {
-      const { rebloggedRootId, content, blogName, rebloggedFromFollowing } = await timelineObject(postElement);
+      const { rebloggedRootId, content, blogName, community, postAuthor, rebloggedFromFollowing } = await timelineObject(postElement);
       const myPost = await isMyPost(postElement);
 
       if (!rebloggedRootId) { return; }
       if (showOwnReblogs && myPost) { return; }
       if (showReblogsWithContributedContent && content.length > 0) { return; }
       if (showReblogsOfNotFollowing && !rebloggedFromFollowing) { return; }
-      if (whitelist.includes(blogName)) { return; }
+      const visibleBlogName = community ? postAuthor : blogName;
+      if (whitelist.includes(visibleBlogName)) { return; }
 
       getTimelineItemWrapper(postElement).setAttribute(hiddenAttribute, '');
     });
diff --git a/src/utils/react_props.js b/src/utils/react_props.js
index 6fc2c0138..62c1dc20d 100644
--- a/src/utils/react_props.js
+++ b/src/utils/react_props.js
@@ -39,7 +39,7 @@ export const notificationObject = function (notificationElement) {
 export const blogData = async (meatballMenu) => inject('/main_world/unbury_blog.js', [], meatballMenu);
 
 export const isMyPost = async (postElement) => {
-  const { blog, isSubmission, postAuthor } = await timelineObject(postElement);
+  const { blog, isSubmission, postAuthor, community } = await timelineObject(postElement);
   const userIsMember = userBlogNames.includes(blog.name);
   const userIsAdmin = adminBlogNames.includes(blog.name);
 
@@ -52,6 +52,9 @@ export const isMyPost = async (postElement) => {
   // Post was created by the user on a group blog
   if (postAuthor === primaryBlogName && !isSubmission) return true;
 
+  // Post was created by the user in a community
+  if (community && userBlogNames.includes(postAuthor)) return true;
+
   // Submission belongs to group blog which the user is admin of
   if (isSubmission && userIsAdmin) return true;
 
diff --git a/src/utils/timeline_id.js b/src/utils/timeline_id.js
index f91755d3e..c59aa4566 100644
--- a/src/utils/timeline_id.js
+++ b/src/utils/timeline_id.js
@@ -51,3 +51,9 @@ export const tagTimelineFilter = tag =>
     timeline === `/v2/hubs/${encodeURIComponent(tag)}/timeline` ||
     timelineId?.startsWith(`hubsTimeline-${tag}-recent-`) ||
     timelineId?.match(exactly(`tag-${uuidV4}-${tag}-recent`));
+
+export const anyCommunityTimelineFilter = ({ dataset: { timeline, timelineId } }) =>
+  timelineId?.match(exactly(`communities-${anyBlog}-recent`));
+
+export const communitiesTimelineFilter = ({ dataset: { timeline, timelineId } }) =>
+  timelineId === 'communities-for_you';

From 2767e14894f730bf4590d738afcaf9fbeac350a5 Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Wed, 21 Aug 2024 15:46:49 -0700
Subject: [PATCH 37/50] Quick Reblog: Enable reblogging posts into communities
 (#1574)

Co-authored-by: April Sylph <28949509+AprilSylph@users.noreply.github.com>
---
 src/features/quick_reblog.css |  2 ++
 src/features/quick_reblog.js  | 39 +++++++++++++++++++++--------------
 src/utils/user.js             | 15 ++++++++++++++
 3 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/src/features/quick_reblog.css b/src/features/quick_reblog.css
index 2db158ca8..0d1bb0fb7 100644
--- a/src/features/quick_reblog.css
+++ b/src/features/quick_reblog.css
@@ -187,6 +187,8 @@ div:first-child + span + #quick-reblog,
 #quick-reblog button[data-state="queue"] { color: rgb(var(--pink)); }
 #quick-reblog button[data-state="draft"] { color: rgb(var(--orange)); }
 
+#quick-reblog .action-buttons.community-selected button:not([data-state="published"]) { display: none; }
+
 .published :is(a[role="button"], button[class=""]) svg[style*="--black"] use { --icon-color-primary: rgb(var(--green)); }
 .queue :is(a[role="button"], button[class=""]) svg[style*="--black"] use { --icon-color-primary: rgb(var(--purple)); }
 .draft :is(a[role="button"], button[class=""]) svg[style*="--black"] use { --icon-color-primary: rgb(var(--red)); }
diff --git a/src/features/quick_reblog.js b/src/features/quick_reblog.js
index a92361315..a43a16541 100644
--- a/src/features/quick_reblog.js
+++ b/src/features/quick_reblog.js
@@ -2,7 +2,7 @@ import { sha256 } from '../utils/crypto.js';
 import { timelineObject } from '../utils/react_props.js';
 import { apiFetch } from '../utils/tumblr_helpers.js';
 import { postSelector, filterPostElements, postType, appendWithoutOverflow } from '../utils/interface.js';
-import { userBlogs } from '../utils/user.js';
+import { joinedCommunities, joinedCommunityUuids, userBlogs } from '../utils/user.js';
 import { getPreferences } from '../utils/preferences.js';
 import { onNewPosts } from '../utils/mutations.js';
 import { notify } from '../utils/notifications.js';
@@ -66,20 +66,19 @@ let alreadyRebloggedLimit;
 const alreadyRebloggedStorageKey = 'quick_reblog.alreadyRebloggedList';
 const rememberedBlogStorageKey = 'quick_reblog.rememberedBlogs';
 const quickTagsStorageKey = 'quick_tags.preferences.tagBundles';
-const blogHashes = {};
+const blogHashes = new Map();
+const avatarUrls = new Map();
 
 const reblogButtonSelector = `
 ${postSelector} footer a[href*="/reblog/"],
 ${postSelector} footer button[aria-label="${translate('Reblog')}"]:not([role])
 `;
 
-const renderBlogAvatar = async () => {
-  const { value: selectedUuid } = blogSelector;
-  const { avatar } = userBlogs.find(({ uuid }) => uuid === selectedUuid);
-  const { url } = avatar.at(-1);
-  blogAvatar.style.backgroundImage = `url(${url})`;
+const onBlogSelectorChange = () => {
+  blogAvatar.style.backgroundImage = `url(${avatarUrls.get(blogSelector.value)})`;
+  actionButtons.classList[joinedCommunityUuids.includes(blogSelector.value) ? 'add' : 'remove']('community-selected');
 };
-blogSelector.addEventListener('change', renderBlogAvatar);
+blogSelector.addEventListener('change', onBlogSelectorChange);
 
 const renderTagSuggestions = () => {
   tagSuggestions.textContent = '';
@@ -140,7 +139,7 @@ const showPopupOnHover = ({ currentTarget }) => {
   if (thisPostID !== lastPostID) {
     if (!rememberLastBlog) {
       blogSelector.value = blogSelector.options[0].value;
-      renderBlogAvatar();
+      onBlogSelectorChange();
     }
     commentInput.value = '';
     [...quickTagsList.children].forEach(({ dataset }) => delete dataset.checked);
@@ -294,7 +293,7 @@ const updateRememberedBlog = async ({ currentTarget: { value: selectedBlog } })
     [rememberedBlogStorageKey]: rememberedBlogs = {}
   } = await browser.storage.local.get(rememberedBlogStorageKey);
 
-  const selectedBlogHash = blogHashes[selectedBlog];
+  const selectedBlogHash = blogHashes.get(selectedBlog);
 
   rememberedBlogs[accountKey] = selectedBlogHash;
   browser.storage.local.set({ [rememberedBlogStorageKey]: rememberedBlogs });
@@ -332,28 +331,36 @@ export const main = async function () {
   } = await getPreferences('quick_reblog'));
 
   blogSelector.replaceChildren(
-    ...userBlogs.map(({ name, uuid }) => dom('option', { value: uuid }, null, [name]))
+    ...userBlogs.map(({ name, uuid }) => dom('option', { value: uuid }, null, [name])),
+    ...joinedCommunities.length ? [dom('hr')] : [],
+    ...joinedCommunities.map(({ title, uuid, blog: { name } }) => dom('option', { value: uuid }, null, [`${title} (${name})`]))
   );
 
+  [...userBlogs, ...joinedCommunities].forEach((data) => {
+    const avatar = data.avatarImage ?? data.avatar;
+    const { url } = avatar.at(-1);
+    avatarUrls.set(data.uuid, url);
+  });
+
   if (rememberLastBlog) {
-    for (const { uuid } of userBlogs) {
-      blogHashes[uuid] = await sha256(uuid);
+    for (const { uuid } of [...userBlogs, ...joinedCommunities]) {
+      blogHashes.set(uuid, await sha256(uuid));
     }
 
     const { uuid: primaryUuid } = userBlogs.find(({ primary }) => primary === true);
-    accountKey = blogHashes[primaryUuid];
+    accountKey = blogHashes.get(primaryUuid);
 
     const {
       [rememberedBlogStorageKey]: rememberedBlogs = {}
     } = await browser.storage.local.get(rememberedBlogStorageKey);
 
     const savedBlogHash = rememberedBlogs[accountKey];
-    const savedBlogUuid = Object.keys(blogHashes).find(uuid => blogHashes[uuid] === savedBlogHash);
+    const savedBlogUuid = [...blogHashes.keys()].find(uuid => blogHashes.get(uuid) === savedBlogHash);
     if (savedBlogUuid) blogSelector.value = savedBlogUuid;
 
     blogSelector.addEventListener('change', updateRememberedBlog);
   }
-  renderBlogAvatar();
+  onBlogSelectorChange();
 
   blogSelectorContainer.hidden = !showBlogSelector;
   commentInput.hidden = !showCommentInput;
diff --git a/src/utils/user.js b/src/utils/user.js
index 2db9e61c2..722e4df73 100644
--- a/src/utils/user.js
+++ b/src/utils/user.js
@@ -5,6 +5,11 @@ const fetchedUserInfo = await apiFetch('/v2/user/info').catch((error) => {
   return { response: {} };
 });
 
+const fetchedCommunitiesInfo = await apiFetch('/v2/communities').catch((error) => {
+  console.error(error);
+  return { response: [] };
+});
+
 /**
  * {object?} userInfo - The contents of the /v2/user/info API endpoint
  */
@@ -39,3 +44,13 @@ export const adminBlogs = userInfo?.blogs?.filter(blog => blog.admin) ?? [];
  * {string[]} adminBlogNames - An array of blog names the current user is admin of
  */
 export const adminBlogNames = adminBlogs.map(blog => blog.name);
+
+/**
+ * {object?} joinedCommunities - An array of community objects the current user has joined
+ */
+export const joinedCommunities = fetchedCommunitiesInfo.response;
+
+/**
+ * {string[]} joinedCommunityUuids - An array of community uuids the current user has joined
+ */
+export const joinedCommunityUuids = joinedCommunities.map(community => community.uuid);

From 2e377842785993b7ce89a8cdd2ac9ced0d8ec2c9 Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Fri, 23 Aug 2024 13:42:05 -0700
Subject: [PATCH 38/50] No Recommended: Fix fallback behavior when hiding the
 entire dash (#1589)

---
 src/features/no_recommended/hide_recommended_posts.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/features/no_recommended/hide_recommended_posts.js b/src/features/no_recommended/hide_recommended_posts.js
index 5456e238b..ce6135a54 100644
--- a/src/features/no_recommended/hide_recommended_posts.js
+++ b/src/features/no_recommended/hide_recommended_posts.js
@@ -34,10 +34,10 @@ export const styleElement = buildStyle(`
 const precedingHiddenPosts = ({ previousElementSibling: previousElement }, count = 0) => {
   // If there is no previous sibling, stop counting
   if (!previousElement) return count;
-  // If the previous sibling is not a post, skip over it
-  if (!previousElement.matches(postSelector) || !previousElement.querySelector(postSelector)) return precedingHiddenPosts(previousElement, count);
   // If the previous sibling is hidden, count it and continue
   if (previousElement.matches(`[${hiddenAttribute}]`)) return precedingHiddenPosts(previousElement, count + 1);
+  // If the previous sibling is not a post, skip over it
+  if (!previousElement.matches(postSelector) || !previousElement.querySelector(postSelector)) return precedingHiddenPosts(previousElement, count);
   // Otherwise, we've hit a non-hidden post; stop counting
   return count;
 };
@@ -59,7 +59,7 @@ const processPosts = async function (postElements) {
     timelineItem.setAttribute(hiddenAttribute, '');
 
     if (precedingHiddenPosts(timelineItem) >= 10) {
-      timelineItem.setAttribute(hiddenAttribute, '');
+      timelineItem.setAttribute(unHiddenAttribute, '');
     }
   });
 };

From a4b71929a8f66c5c930ecc46f41b86928d3ea899 Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Sun, 25 Aug 2024 13:25:56 -0700
Subject: [PATCH 39/50] User util: Improve extension load speed (#1594)

---
 src/utils/user.js | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/utils/user.js b/src/utils/user.js
index 722e4df73..d35d847ed 100644
--- a/src/utils/user.js
+++ b/src/utils/user.js
@@ -1,14 +1,18 @@
 import { apiFetch } from './tumblr_helpers.js';
 
-const fetchedUserInfo = await apiFetch('/v2/user/info').catch((error) => {
-  console.error(error);
-  return { response: {} };
-});
-
-const fetchedCommunitiesInfo = await apiFetch('/v2/communities').catch((error) => {
-  console.error(error);
-  return { response: [] };
-});
+const [
+  fetchedUserInfo,
+  fetchedCommunitiesInfo
+] = await Promise.all([
+  apiFetch('/v2/user/info').catch((error) => {
+    console.error(error);
+    return { response: {} };
+  }),
+  apiFetch('/v2/communities').catch((error) => {
+    console.error(error);
+    return { response: [] };
+  })
+]);
 
 /**
  * {object?} userInfo - The contents of the /v2/user/info API endpoint

From dc8d566f1ce845b4af567b0ae50c627d24f421de Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 25 Aug 2024 21:43:12 +0100
Subject: [PATCH 40/50] Update dependency web-ext to v8 (#1533)

Co-authored-by: April Sylph <28949509+AprilSylph@users.noreply.github.com>
---
 .github/workflows/publish.yml |    2 +-
 package-lock.json             | 1516 ++++++++++++++-------------------
 package.json                  |    2 +-
 3 files changed, 620 insertions(+), 900 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 3761ed140..e1b7cdedd 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -25,10 +25,10 @@ jobs:
 
       - name: Sign WebExtension
         run: npx web-ext sign
-        continue-on-error: true
         env:
           WEB_EXT_API_KEY: ${{ secrets.WEB_EXT_API_KEY }}
           WEB_EXT_API_SECRET: ${{ secrets.WEB_EXT_API_SECRET }}
+          WEB_EXT_CHANNEL: listed
   chrome:
     name: Chrome
     runs-on: ubuntu-latest
diff --git a/package-lock.json b/package-lock.json
index 572c3e5ac..3da136ace 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,7 +22,7 @@
         "eslint-plugin-jsdoc": "^48.10.2",
         "eslint-plugin-n": "^15.7.0",
         "eslint-plugin-promise": "^6.6.0",
-        "web-ext": "^7.12.0"
+        "web-ext": "^8.2.0"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
@@ -213,25 +213,27 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.0.tgz",
-      "integrity": "sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.7.tgz",
+      "integrity": "sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "regenerator-runtime": "^0.13.11"
+        "regenerator-runtime": "^0.14.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@devicefarmer/adbkit": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/@devicefarmer/adbkit/-/adbkit-3.2.3.tgz",
-      "integrity": "sha512-wK9rVrabs4QU0oK8Jnwi+HRBEm+s1x/o63kgthUe0y7K1bfcYmgLuQf41/adsj/5enddlSxzkJavl2EwOu+r1g==",
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/@devicefarmer/adbkit/-/adbkit-3.2.6.tgz",
+      "integrity": "sha512-8lO1hSeTgtxcOHhp4tTWq/JaOysp5KNbbyFoxNEBnwkCDZu/Bji3ZfOaG++Riv9jN6c9bgdLBOZqJTC5VJPRKQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "@devicefarmer/adbkit-logcat": "^2.1.2",
-        "@devicefarmer/adbkit-monkey": "~1.2.0",
+        "@devicefarmer/adbkit-monkey": "~1.2.1",
         "bluebird": "~3.7",
         "commander": "^9.1.0",
         "debug": "~4.3.1",
@@ -399,31 +401,6 @@
         "url": "https://github.com/chalk/ansi-regex?sponsor=1"
       }
     },
-    "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@isaacs/cliui/node_modules/string-width": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
-      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "eastasianwidth": "^0.2.0",
-        "emoji-regex": "^9.2.2",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
@@ -441,9 +418,9 @@
       }
     },
     "node_modules/@mdn/browser-compat-data": {
-      "version": "5.5.29",
-      "resolved": "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-5.5.29.tgz",
-      "integrity": "sha512-NHdG3QOiAsxh8ygBSKMa/WaNJwpNt87uVqW+S2RlnSqgeRdk+L3foNWTX6qd0I3NHSlCFb47rgopeNCJtRDY5A==",
+      "version": "5.5.34",
+      "resolved": "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-5.5.34.tgz",
+      "integrity": "sha512-e8k7+8r3jiJuP7FMH6AL1OnmfQqLyABhTM+NmRDvFeAbMgtFcNQLHpmT7uza5cBnxI01+CAU3aSsIgcKGRdEBQ==",
       "dev": true,
       "license": "CC0-1.0"
     },
@@ -644,17 +621,17 @@
       }
     },
     "node_modules/addons-linter": {
-      "version": "6.28.0",
-      "resolved": "https://registry.npmjs.org/addons-linter/-/addons-linter-6.28.0.tgz",
-      "integrity": "sha512-fCTjXL/yG4hwq74JG8tQdrvEu0OvGrEN9yU+Df0020RDtHl3g/tTCyMeC4G1uyk8IuyMzp4myCBNnOGC7MWSQQ==",
+      "version": "6.31.1",
+      "resolved": "https://registry.npmjs.org/addons-linter/-/addons-linter-6.31.1.tgz",
+      "integrity": "sha512-R9FCyVzqU/h5A2aB1t+jD8t4QKLuLxYqc1FjmjJ0nZrn1qNCna1jFOajt5R1T8pwt0H4WXgT+uwWSD2BdkBzqQ==",
       "dev": true,
       "license": "MPL-2.0",
       "dependencies": {
         "@fluent/syntax": "0.19.0",
-        "@mdn/browser-compat-data": "5.5.29",
+        "@mdn/browser-compat-data": "5.5.34",
         "addons-moz-compare": "1.3.0",
-        "addons-scanner-utils": "9.10.1",
-        "ajv": "8.13.0",
+        "addons-scanner-utils": "9.11.0",
+        "ajv": "8.16.0",
         "chalk": "4.1.2",
         "cheerio": "1.0.0-rc.12",
         "columnify": "1.6.0",
@@ -666,7 +643,7 @@
         "espree": "10.0.1",
         "esprima": "4.0.1",
         "fast-json-patch": "3.1.1",
-        "glob": "10.4.1",
+        "glob": "10.4.2",
         "image-size": "1.1.1",
         "is-mergeable-object": "1.1.1",
         "jed": "1.1.1",
@@ -690,9 +667,9 @@
       }
     },
     "node_modules/addons-linter/node_modules/addons-scanner-utils": {
-      "version": "9.10.1",
-      "resolved": "https://registry.npmjs.org/addons-scanner-utils/-/addons-scanner-utils-9.10.1.tgz",
-      "integrity": "sha512-Tz9OUQx9Ja0TyQ+H2GakB9KlJ50myI6ESBGRlA8N80nHBzMjjPRFGm0APADSaCd5NP74SrFtEvL4TRpDwZXETA==",
+      "version": "9.11.0",
+      "resolved": "https://registry.npmjs.org/addons-scanner-utils/-/addons-scanner-utils-9.11.0.tgz",
+      "integrity": "sha512-X95V8ymnue9EHmOLz3zJTGHvHDFlWKiavlH+kJKOlv2sJDWFvD3TWeJMHJgxS9GKOqT/545mOXvX3vuuGGum+g==",
       "dev": true,
       "license": "MPL-2.0",
       "dependencies": {
@@ -705,7 +682,7 @@
       },
       "peerDependencies": {
         "body-parser": "1.20.2",
-        "express": "4.18.3",
+        "express": "4.19.2",
         "node-fetch": "2.6.11",
         "safe-compare": "1.1.4"
       },
@@ -725,9 +702,9 @@
       }
     },
     "node_modules/addons-linter/node_modules/ajv": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.13.0.tgz",
-      "integrity": "sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==",
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.16.0.tgz",
+      "integrity": "sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -751,12 +728,6 @@
         "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/addons-linter/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
     "node_modules/addons-linter/node_modules/eslint-visitor-keys": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz",
@@ -789,9 +760,9 @@
       }
     },
     "node_modules/addons-linter/node_modules/glob": {
-      "version": "10.4.1",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.1.tgz",
-      "integrity": "sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==",
+      "version": "10.4.2",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.2.tgz",
+      "integrity": "sha512-GwMlUF6PkPo3Gk21UxkCohOv0PLcIXVtKyLlpEI28R/cO/4eNOdmLk3CMW1wROV/WR/EsZOWAfBbBOqYvs88/w==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -799,6 +770,7 @@
         "jackspeak": "^3.1.2",
         "minimatch": "^9.0.4",
         "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
         "path-scurry": "^1.11.1"
       },
       "bin": {
@@ -819,9 +791,9 @@
       "license": "MIT"
     },
     "node_modules/addons-linter/node_modules/minimatch": {
-      "version": "9.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
-      "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -870,38 +842,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/addons-linter/node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/addons-linter/node_modules/yargs": {
-      "version": "17.7.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^8.0.1",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.3",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^21.1.1"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/addons-moz-compare": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/addons-moz-compare/-/addons-moz-compare-1.3.0.tgz",
@@ -917,6 +857,19 @@
         "node": ">=6.0"
       }
     },
+    "node_modules/agent-base": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/ajv": {
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -1139,36 +1092,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/asn1": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
-      "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "node_modules/assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/async": {
       "version": "3.2.5",
       "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
       "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==",
       "dev": true
     },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "dev": true
-    },
     "node_modules/at-least-node": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
@@ -1200,21 +1129,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/aws4": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz",
-      "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==",
-      "dev": true
-    },
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -1241,13 +1155,14 @@
         }
       ]
     },
-    "node_modules/bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
+    "node_modules/big-integer": {
+      "version": "1.6.52",
+      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.52.tgz",
+      "integrity": "sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==",
       "dev": true,
-      "dependencies": {
-        "tweetnacl": "^0.14.3"
+      "license": "Unlicense",
+      "engines": {
+        "node": ">=0.6"
       }
     },
     "node_modules/bluebird": {
@@ -1284,18 +1199,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/boxen/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
     "node_modules/boxen/node_modules/chalk": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
@@ -1308,54 +1211,29 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/boxen/node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true
-    },
-    "node_modules/boxen/node_modules/string-width": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
-      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+    "node_modules/boxen/node_modules/type-fest": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
       "dev": true,
-      "dependencies": {
-        "eastasianwidth": "^0.2.0",
-        "emoji-regex": "^9.2.2",
-        "strip-ansi": "^7.0.1"
-      },
       "engines": {
-        "node": ">=12"
+        "node": ">=12.20"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/boxen/node_modules/strip-ansi": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+    "node_modules/bplist-parser": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz",
+      "integrity": "sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "ansi-regex": "^6.0.1"
+        "big-integer": "^1.6.44"
       },
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
-    "node_modules/boxen/node_modules/type-fest": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
-      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.20"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">= 5.10.0"
       }
     },
     "node_modules/brace-expansion": {
@@ -1401,12 +1279,6 @@
         "node": "*"
       }
     },
-    "node_modules/buffer-equal-constant-time": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-      "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==",
-      "dev": true
-    },
     "node_modules/buffer-from": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
@@ -1449,6 +1321,22 @@
         "node": ">=10"
       }
     },
+    "node_modules/bundle-name": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-3.0.0.tgz",
+      "integrity": "sha512-PKA4BeSvBpQKQ8iPOGCSiell+N8P+Tf1DlwqmYhpe2gAhKPHn8EYOxVT+ShuGmhg8lN8XiSlS80yiExKXrURlw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "run-applescript": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/bunyan": {
       "version": "1.8.15",
       "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.8.15.tgz",
@@ -1541,12 +1429,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
-      "dev": true
-    },
     "node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -1773,18 +1655,6 @@
         "node": ">=8.0.0"
       }
     },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
-      "dependencies": {
-        "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/commander": {
       "version": "9.5.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz",
@@ -1904,17 +1774,6 @@
         "url": "https://github.com/yeoman/configstore?sponsor=1"
       }
     },
-    "node_modules/core-js": {
-      "version": "3.29.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.29.0.tgz",
-      "integrity": "sha512-VG23vuEisJNkGl6XQmFJd3rEG/so/CNatqeE+7uZAwTSwFeB/qaO0be8xZYUNWprJ/GIwL8aMt9cj1kvbpTZhg==",
-      "dev": true,
-      "hasInstallScript": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
     "node_modules/core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
@@ -1990,18 +1849,6 @@
         "url": "https://github.com/sponsors/fb55"
       }
     },
-    "node_modules/dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
-      "dev": true,
-      "dependencies": {
-        "assert-plus": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
     "node_modules/data-uri-to-buffer": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
@@ -2089,15 +1936,6 @@
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
-    "node_modules/deepcopy": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/deepcopy/-/deepcopy-2.1.0.tgz",
-      "integrity": "sha512-8cZeTb1ZKC3bdSCP6XOM1IsTczIO73fdqtwa2B0N15eAz7gmyhQo+mc5gnFuulsgN3vIQYmTgbmQVKalH1dKvQ==",
-      "dev": true,
-      "dependencies": {
-        "type-detect": "^4.0.8"
-      }
-    },
     "node_modules/deepmerge": {
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
@@ -2107,82 +1945,244 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/defaults": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
-      "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
+    "node_modules/default-browser": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-4.0.0.tgz",
+      "integrity": "sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "clone": "^1.0.2"
+        "bundle-name": "^3.0.0",
+        "default-browser-id": "^3.0.0",
+        "execa": "^7.1.1",
+        "titleize": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=14.16"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/defer-to-connect": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
-      "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/define-data-property": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
-      "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
+    "node_modules/default-browser-id": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-3.0.0.tgz",
+      "integrity": "sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.2.1",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0"
+        "bplist-parser": "^0.2.0",
+        "untildify": "^4.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/define-lazy-prop": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+    "node_modules/default-browser/node_modules/execa": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz",
+      "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.1",
+        "human-signals": "^4.3.0",
+        "is-stream": "^3.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^5.1.0",
+        "onetime": "^6.0.0",
+        "signal-exit": "^3.0.7",
+        "strip-final-newline": "^3.0.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": "^14.18.0 || ^16.14.0 || >=18.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
-    "node_modules/define-properties": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
-      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+    "node_modules/default-browser/node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
       "dev": true,
-      "dependencies": {
-        "define-data-property": "^1.0.1",
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+    "node_modules/default-browser/node_modules/human-signals": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz",
+      "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=0.4.0"
+        "node": ">=14.18.0"
       }
     },
-    "node_modules/doctrine": {
+    "node_modules/default-browser/node_modules/is-stream": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
+      "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
       "dev": true,
-      "dependencies": {
+      "license": "MIT",
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/default-browser/node_modules/mimic-fn": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
+      "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/default-browser/node_modules/npm-run-path": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz",
+      "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/default-browser/node_modules/onetime": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
+      "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mimic-fn": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/default-browser/node_modules/path-key": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
+      "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/default-browser/node_modules/strip-final-newline": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
+      "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/defaults": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
+      "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
+      "dev": true,
+      "dependencies": {
+        "clone": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/defer-to-connect": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
+      "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/define-data-property": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
+      "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.1",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/define-lazy-prop": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
+      "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/define-properties": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+      "dev": true,
+      "dependencies": {
+        "define-data-property": "^1.0.1",
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "dependencies": {
         "esutils": "^2.0.2"
       },
       "engines": {
@@ -2279,24 +2279,12 @@
       "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
       "dev": true
     },
-    "node_modules/ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
-      "dev": true,
-      "dependencies": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
-    "node_modules/ecdsa-sig-formatter": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
-      "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+    "node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
       "dev": true,
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
-      }
+      "license": "MIT"
     },
     "node_modules/end-of-stream": {
       "version": "1.4.4",
@@ -2434,15 +2422,6 @@
       "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
       "dev": true
     },
-    "node_modules/es6-promisify": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-7.0.0.tgz",
-      "integrity": "sha512-ginqzK3J90Rd4/Yz7qRrqUeIpe3TwSXTPPZtPne7tGBPeAaQiU8qt4fpKApnxHcq1AwtUdHVg5P77x/yrggG8Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/escalade": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
@@ -3040,21 +3019,6 @@
         "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
-    "node_modules/extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
-    },
-    "node_modules/extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
-      "dev": true,
-      "engines": [
-        "node >=0.6.0"
-      ]
-    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -3160,10 +3124,11 @@
       }
     },
     "node_modules/firefox-profile": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/firefox-profile/-/firefox-profile-4.3.2.tgz",
-      "integrity": "sha512-/C+Eqa0YgIsQT2p66p7Ygzqe7NlE/GNTbhw2SBCm5V3OsWDPITNdTPEcH2Q2fe7eMpYYNPKdUcuVioZBZiR6kA==",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/firefox-profile/-/firefox-profile-4.6.0.tgz",
+      "integrity": "sha512-I9rAm1w8U3CdhgO4EzTJsCvgcbvynZn9lOySkZf78wUdUIQH2w9QOKf3pAX+THt2XMSSR3kJSuM8P7bYux9j8g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "adm-zip": "~0.5.x",
         "fs-extra": "~9.0.1",
@@ -3239,9 +3204,9 @@
       }
     },
     "node_modules/foreground-child": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
-      "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz",
+      "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -3268,29 +3233,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "dev": true,
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 0.12"
-      }
-    },
     "node_modules/form-data-encoder": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.4.tgz",
@@ -3313,10 +3255,11 @@
       }
     },
     "node_modules/fs-extra": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.0.tgz",
-      "integrity": "sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==",
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.0",
         "jsonfile": "^6.0.1",
@@ -3471,15 +3414,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
-      "dev": true,
-      "dependencies": {
-        "assert-plus": "^1.0.0"
-      }
-    },
     "node_modules/glob": {
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -3636,29 +3570,6 @@
       "integrity": "sha512-+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw==",
       "dev": true
     },
-    "node_modules/har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/har-validator": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
-      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
-      "deprecated": "this library is no longer supported",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.12.3",
-        "har-schema": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/has-bigints": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
@@ -3777,21 +3688,6 @@
       "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
       "dev": true
     },
-    "node_modules/http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
-      "dev": true,
-      "dependencies": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      },
-      "engines": {
-        "node": ">=0.8",
-        "npm": ">=1.3.7"
-      }
-    },
     "node_modules/http2-wrapper": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.1.tgz",
@@ -3805,6 +3701,20 @@
         "node": ">=10.19.0"
       }
     },
+    "node_modules/https-proxy-agent": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/human-signals": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
@@ -4105,6 +4015,41 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-inside-container": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz",
+      "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-docker": "^3.0.0"
+      },
+      "bin": {
+        "is-inside-container": "cli.js"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-inside-container/node_modules/is-docker": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
+      "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/is-installed-globally": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
@@ -4336,24 +4281,15 @@
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
-    "node_modules/isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
-      "dev": true
-    },
     "node_modules/jackspeak": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.1.2.tgz",
-      "integrity": "sha512-kWmLKn2tRtfYMF/BakihVVRzBKOxz4gJMiL2Rj91WnAB5TPZumSH99R/Yf1qE1u4uRimvCSJfm6hnxohXeEXjQ==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "dependencies": {
         "@isaacs/cliui": "^8.0.2"
       },
-      "engines": {
-        "node": ">=14"
-      },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       },
@@ -4368,10 +4304,11 @@
       "dev": true
     },
     "node_modules/jose": {
-      "version": "4.13.1",
-      "resolved": "https://registry.npmjs.org/jose/-/jose-4.13.1.tgz",
-      "integrity": "sha512-MSJQC5vXco5Br38mzaQKiq9mwt7lwj2eXpgpRyQYNHYt2lq1PjkWa7DLXX0WVcQLE9HhMh3jPiufS7fhJf+CLQ==",
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/jose/-/jose-5.4.1.tgz",
+      "integrity": "sha512-U6QajmpV/nhL9SyfAewo000fkiRQ+Yd2H0lBxJJ9apjpOgkOcBQJWOrMo917lxLptdS/n/o/xPzMkXhF46K8hQ==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/panva"
       }
@@ -4399,12 +4336,6 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
-      "dev": true
-    },
     "node_modules/jsdoc-type-pratt-parser": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz",
@@ -4430,16 +4361,14 @@
       }
     },
     "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
-    },
-    "node_modules/json-schema": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
-      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
-      "dev": true
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz",
+      "integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
     },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
@@ -4453,12 +4382,6 @@
       "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
       "dev": true
     },
-    "node_modules/json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
-      "dev": true
-    },
     "node_modules/json5": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
@@ -4483,64 +4406,6 @@
         "graceful-fs": "^4.1.6"
       }
     },
-    "node_modules/jsonwebtoken": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz",
-      "integrity": "sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==",
-      "dev": true,
-      "dependencies": {
-        "jws": "^3.2.2",
-        "lodash": "^4.17.21",
-        "ms": "^2.1.1",
-        "semver": "^7.3.8"
-      },
-      "engines": {
-        "node": ">=12",
-        "npm": ">=6"
-      }
-    },
-    "node_modules/jsonwebtoken/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/jsonwebtoken/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/jsprim": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
-      "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
-      "dev": true,
-      "dependencies": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.4.0",
-        "verror": "1.10.0"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
     "node_modules/jszip": {
       "version": "3.10.1",
       "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz",
@@ -4601,27 +4466,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/jwa": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
-      "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==",
-      "dev": true,
-      "dependencies": {
-        "buffer-equal-constant-time": "1.0.1",
-        "ecdsa-sig-formatter": "1.0.11",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/jws": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
-      "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
-      "dev": true,
-      "dependencies": {
-        "jwa": "^1.4.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
     "node_modules/keyv": {
       "version": "4.5.4",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
@@ -4729,12 +4573,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
@@ -4754,14 +4592,11 @@
       }
     },
     "node_modules/lru-cache": {
-      "version": "10.2.2",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz",
-      "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==",
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
       "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": "14 || >=16.14"
-      }
+      "license": "ISC"
     },
     "node_modules/make-error": {
       "version": "1.3.6",
@@ -4819,27 +4654,6 @@
       "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
       "dev": true
     },
-    "node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dev": true,
-      "dependencies": {
-        "mime-db": "1.52.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/mimic-fn": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
@@ -4893,15 +4707,19 @@
       }
     },
     "node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
+      "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
-        "mkdirp": "bin/cmd.js"
+        "mkdirp": "dist/cjs/src/bin.js"
       },
       "engines": {
         "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/moment": {
@@ -5048,10 +4866,11 @@
       }
     },
     "node_modules/node-fetch": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.1.tgz",
-      "integrity": "sha512-cRVc/kyto/7E5shrWca1Wsea4y6tL9iYJE5FBCius3JQfb/4P4I295PfhgbJQBLTx6lATE4z+wK0rPM4VS2uow==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
+      "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "data-uri-to-buffer": "^4.0.0",
         "fetch-blob": "^3.1.4",
@@ -5156,15 +4975,6 @@
         "url": "https://github.com/fb55/nth-check?sponsor=1"
       }
     },
-    "node_modules/oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -5291,17 +5101,19 @@
       }
     },
     "node_modules/open": {
-      "version": "8.4.2",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
-      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-9.1.0.tgz",
+      "integrity": "sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "define-lazy-prop": "^2.0.0",
-        "is-docker": "^2.1.1",
+        "default-browser": "^4.0.0",
+        "define-lazy-prop": "^3.0.0",
+        "is-inside-container": "^1.0.0",
         "is-wsl": "^2.2.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=14.16"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -5425,6 +5237,13 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
+      "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==",
+      "dev": true,
+      "license": "BlueOak-1.0.0"
+    },
     "node_modules/package-json/node_modules/lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -5485,18 +5304,33 @@
       }
     },
     "node_modules/parse-json": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-6.0.2.tgz",
-      "integrity": "sha512-SA5aMiaIjXkAiBrW/yPgLgQAQg42f7K3ACO+2l/zOvtQBwX58DMUsFJXelW2fx3yMBmWOVkR6j1MGsdSbCA4UA==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-7.1.1.tgz",
+      "integrity": "sha512-SgOTCX/EZXtZxBE5eJ97P4yGM5n37BwRU+YMsH4vNzFqJV/oWFXXCmwFlgWUM4PrakybVOueJJ6pwHqSVhTFDw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.16.0",
+        "@babel/code-frame": "^7.21.4",
         "error-ex": "^1.3.2",
-        "json-parse-even-better-errors": "^2.3.1",
-        "lines-and-columns": "^2.0.2"
+        "json-parse-even-better-errors": "^3.0.0",
+        "lines-and-columns": "^2.0.3",
+        "type-fest": "^3.8.0"
       },
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/parse-json/node_modules/type-fest": {
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz",
+      "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=14.16"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -5584,12 +5418,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
-      "dev": true
-    },
     "node_modules/pino": {
       "version": "8.20.0",
       "resolved": "https://registry.npmjs.org/pino/-/pino-8.20.0.tgz",
@@ -5698,12 +5526,6 @@
       "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==",
       "dev": true
     },
-    "node_modules/psl": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
-      "dev": true
-    },
     "node_modules/pump": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
@@ -5738,15 +5560,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/qs": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
-      "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
     "node_modules/queue": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/queue/-/queue-6.0.2.tgz",
@@ -5848,10 +5661,11 @@
       }
     },
     "node_modules/regenerator-runtime": {
-      "version": "0.13.11",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
-      "dev": true
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/regexp.prototype.flags": {
       "version": "1.5.1",
@@ -6007,48 +5821,6 @@
       "resolved": "https://registry.npmjs.org/remixicon/-/remixicon-4.2.0.tgz",
       "integrity": "sha512-MF5wApNveRh3n0iMVM+lr2nSWrj/rBbSD2eWapuD9ReYRGs5naAUR1BqVBCHGqm286FIS6zwwmUf96QjHQ9l4w=="
     },
-    "node_modules/request": {
-      "version": "2.88.2",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
-      "dev": true,
-      "dependencies": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.3",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/request/node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
-      "dev": true,
-      "bin": {
-        "uuid": "bin/uuid"
-      }
-    },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -6140,6 +5912,69 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/run-applescript": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-5.0.0.tgz",
+      "integrity": "sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "execa": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/run-applescript/node_modules/execa": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/run-applescript/node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/run-applescript/node_modules/human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=10.17.0"
+      }
+    },
     "node_modules/run-parallel": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -6232,12 +6067,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
     "node_modules/sax": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz",
@@ -6390,24 +6219,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/sign-addon": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/sign-addon/-/sign-addon-5.3.0.tgz",
-      "integrity": "sha512-7nHlCzhQgVMLBNiXVEgbG/raq48awOW0lYMN5uo1BaB3mp0+k8M8pvDwbfTlr3apcxZJsk9HQsAW1POwoJugpQ==",
-      "dev": true,
-      "dependencies": {
-        "common-tags": "1.8.2",
-        "core-js": "3.29.0",
-        "deepcopy": "2.1.0",
-        "es6-error": "4.1.1",
-        "es6-promisify": "7.0.0",
-        "jsonwebtoken": "9.0.0",
-        "mz": "2.7.0",
-        "request": "2.88.2",
-        "source-map-support": "0.5.21",
-        "stream-to-promise": "3.0.0"
-      }
-    },
     "node_modules/signal-exit": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
@@ -6510,61 +6321,31 @@
         "node": ">= 10.x"
       }
     },
-    "node_modules/sshpk": {
-      "version": "1.18.0",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
-      "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
-      "dev": true,
-      "dependencies": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
-      },
-      "bin": {
-        "sshpk-conv": "bin/sshpk-conv",
-        "sshpk-sign": "bin/sshpk-sign",
-        "sshpk-verify": "bin/sshpk-verify"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/stream-to-array": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/stream-to-array/-/stream-to-array-2.3.0.tgz",
-      "integrity": "sha512-UsZtOYEn4tWU2RGLOXr/o/xjRBftZRlG3dEWoaHr8j4GuypJ3isitGbVyjQKAuMu+xbiop8q224TjiZWc4XTZA==",
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
       "dev": true,
       "dependencies": {
-        "any-promise": "^1.1.0"
+        "safe-buffer": "~5.2.0"
       }
     },
-    "node_modules/stream-to-promise": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/stream-to-promise/-/stream-to-promise-3.0.0.tgz",
-      "integrity": "sha512-h+7wLeFiYegOdgTfTxjRsrT7/Op7grnKEIHWgaO1RTHwcwk7xRreMr3S8XpDfDMesSxzgM2V4CxNCFAGo6ssnA==",
+    "node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "any-promise": "~1.3.0",
-        "end-of-stream": "~1.4.1",
-        "stream-to-array": "~2.3.0"
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
       },
       "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.2.0"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/string-width-cjs": {
@@ -6590,6 +6371,35 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/string-width/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/string-width/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
     "node_modules/string.prototype.trim": {
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz",
@@ -6802,16 +6612,27 @@
       "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
       "dev": true
     },
-    "node_modules/tmp": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
+    "node_modules/titleize": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/titleize/-/titleize-3.0.0.tgz",
+      "integrity": "sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==",
       "dev": true,
-      "dependencies": {
-        "rimraf": "^3.0.0"
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
       },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/tmp": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
+      "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=8.17.0"
+        "node": ">=14.14"
       }
     },
     "node_modules/tosource": {
@@ -6823,19 +6644,6 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-      "dev": true,
-      "dependencies": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/tr46": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
@@ -6864,24 +6672,6 @@
       "dev": true,
       "license": "0BSD"
     },
-    "node_modules/tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
-      "dev": true
-    },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -6894,15 +6684,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/type-fest": {
       "version": "0.20.2",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
@@ -7040,6 +6821,16 @@
         "node": ">= 10.0.0"
       }
     },
+    "node_modules/untildify": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
+      "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/upath": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/upath/-/upath-2.0.1.tgz",
@@ -7142,25 +6933,12 @@
         "uuid": "dist/bin/uuid"
       }
     },
-    "node_modules/verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
-      "dev": true,
-      "engines": [
-        "node >=0.6.0"
-      ],
-      "dependencies": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
     "node_modules/watchpack": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
-      "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.1.tgz",
+      "integrity": "sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.1.2"
@@ -7179,51 +6957,64 @@
       }
     },
     "node_modules/web-ext": {
-      "version": "7.12.0",
-      "resolved": "https://registry.npmjs.org/web-ext/-/web-ext-7.12.0.tgz",
-      "integrity": "sha512-h+uWOYBlHlPKy5CqxuZKocgOdL8J7I4ctMw/rAGbQl7jq7tr+NmY/Lhh2FPMSlJ1Y0T2VeUqwBVighK0MM1+zA==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/web-ext/-/web-ext-8.2.0.tgz",
+      "integrity": "sha512-krU7rmxaG96b3Q9Enbry9/pmE/5FUGkvajCGfJCD+J79rt7JFjhVpw1Dszz4BqQkTd3y8cG5wJ3p1uC6uyAwcA==",
       "dev": true,
       "license": "MPL-2.0",
       "dependencies": {
-        "@babel/runtime": "7.21.0",
-        "@devicefarmer/adbkit": "3.2.3",
-        "addons-linter": "6.28.0",
+        "@babel/runtime": "7.24.7",
+        "@devicefarmer/adbkit": "3.2.6",
+        "addons-linter": "6.31.1",
         "bunyan": "1.8.15",
-        "camelcase": "7.0.1",
+        "camelcase": "8.0.0",
         "chrome-launcher": "0.15.1",
         "debounce": "1.2.1",
         "decamelize": "6.0.0",
         "es6-error": "4.1.1",
-        "firefox-profile": "4.3.2",
-        "fs-extra": "11.1.0",
+        "firefox-profile": "4.6.0",
+        "fs-extra": "11.2.0",
         "fx-runner": "1.4.0",
-        "import-fresh": "3.3.0",
-        "jose": "4.13.1",
-        "mkdirp": "1.0.4",
+        "https-proxy-agent": "^7.0.0",
+        "jose": "5.4.1",
+        "jszip": "3.10.1",
+        "mkdirp": "3.0.1",
         "multimatch": "6.0.0",
         "mz": "2.7.0",
-        "node-fetch": "3.3.1",
+        "node-fetch": "3.3.2",
         "node-notifier": "10.0.1",
-        "open": "8.4.2",
-        "parse-json": "6.0.2",
+        "open": "9.1.0",
+        "parse-json": "7.1.1",
         "promise-toolbox": "0.21.0",
-        "sign-addon": "5.3.0",
         "source-map-support": "0.5.21",
         "strip-bom": "5.0.0",
-        "strip-json-comments": "5.0.0",
-        "tmp": "0.2.1",
+        "strip-json-comments": "5.0.1",
+        "tmp": "0.2.3",
         "update-notifier": "6.0.2",
-        "watchpack": "2.4.0",
-        "ws": "8.13.0",
-        "yargs": "17.7.1",
+        "watchpack": "2.4.1",
+        "ws": "8.17.1",
+        "yargs": "17.7.2",
         "zip-dir": "2.0.0"
       },
       "bin": {
         "web-ext": "bin/web-ext.js"
       },
       "engines": {
-        "node": ">=14.0.0",
-        "npm": ">=6.9.0"
+        "node": ">=18.0.0",
+        "npm": ">=8.0.0"
+      }
+    },
+    "node_modules/web-ext/node_modules/camelcase": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-8.0.0.tgz",
+      "integrity": "sha512-8WB3Jcas3swSvjIeA2yvCJ+Miyz5l1ZmB6HFb9R1317dt9LCQoswg/BGrmAmkWVEszSrrg4RwmO46qIm2OEnSA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/web-ext/node_modules/strip-bom": {
@@ -7240,9 +7031,9 @@
       }
     },
     "node_modules/web-ext/node_modules/strip-json-comments": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.0.tgz",
-      "integrity": "sha512-V1LGY4UUo0jgwC+ELQ2BNWfPa17TIuwBLg+j1AA/9RPzKINl1lhxVEu2r+ZTTO8aetIsUzE5Qj6LMSBkoGYKKw==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.1.tgz",
+      "integrity": "sha512-0fk9zBqO67Nq5M/m45qHCJxylV/DhBlIOVExqgOMiCCrzrhU6tCibRXNqE3jwJLftzE9SNuZtYbpzcO+i9FiKw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7360,56 +7151,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/widest-line/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
-    "node_modules/widest-line/node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true
-    },
-    "node_modules/widest-line/node_modules/string-width": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
-      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
-      "dev": true,
-      "dependencies": {
-        "eastasianwidth": "^0.2.0",
-        "emoji-regex": "^9.2.2",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/widest-line/node_modules/strip-ansi": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
     "node_modules/winreg": {
       "version": "0.0.12",
       "resolved": "https://registry.npmjs.org/winreg/-/winreg-0.0.12.tgz",
@@ -7498,29 +7239,6 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/wrap-ansi/node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true
-    },
-    "node_modules/wrap-ansi/node_modules/string-width": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
-      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
-      "dev": true,
-      "dependencies": {
-        "eastasianwidth": "^0.2.0",
-        "emoji-regex": "^9.2.2",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/wrap-ansi/node_modules/strip-ansi": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
@@ -7555,10 +7273,11 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
-      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -7625,10 +7344,11 @@
       "dev": true
     },
     "node_modules/yargs": {
-      "version": "17.7.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
-      "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cliui": "^8.0.1",
         "escalade": "^3.1.1",
diff --git a/package.json b/package.json
index 3d9c9cfe3..1453d5e21 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "eslint-plugin-jsdoc": "^48.10.2",
     "eslint-plugin-n": "^15.7.0",
     "eslint-plugin-promise": "^6.6.0",
-    "web-ext": "^7.12.0"
+    "web-ext": "^8.2.0"
   },
   "dependencies": {
     "jquery": "^3.7.1",

From 20b3bb5ff77621a6e2f335b68cd34fbbb1c55380 Mon Sep 17 00:00:00 2001
From: April Sylph <28949509+AprilSylph@users.noreply.github.com>
Date: Sun, 25 Aug 2024 21:44:22 +0100
Subject: [PATCH 41/50] bump version to 1.0.2

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

diff --git a/src/manifest.json b/src/manifest.json
index aa6b68274..055e4c291 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "XKit Rewritten",
-  "version": "1.0.1",
+  "version": "1.0.2",
 
   "short_name": "XKit",
   "author": "April Sylph",

From b2c80ad16ea6d96b6c7d6337ceadbee67089905e Mon Sep 17 00:00:00 2001
From: April Sylph <28949509+AprilSylph@users.noreply.github.com>
Date: Sun, 25 Aug 2024 22:00:10 +0100
Subject: [PATCH 42/50] Publish workflow: don't wait for approval from AMO

i wasn't expecting this to be the default behaviour...
---
 .github/workflows/publish.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index e1b7cdedd..0f0be85f3 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -28,6 +28,7 @@ jobs:
         env:
           WEB_EXT_API_KEY: ${{ secrets.WEB_EXT_API_KEY }}
           WEB_EXT_API_SECRET: ${{ secrets.WEB_EXT_API_SECRET }}
+          WEB_EXT_API_APPROVAL_TIMEOUT: 0
           WEB_EXT_CHANNEL: listed
   chrome:
     name: Chrome

From ae2ff3a4589d1de3a3b9fc92b26737c7dedde85d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 1 Sep 2024 21:25:36 +0100
Subject: [PATCH 43/50] Update dependency eslint-plugin-jsdoc to ^48.11.0
 (#1604)

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

diff --git a/package-lock.json b/package-lock.json
index 3da136ace..6e8373ce1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,7 @@
         "eslint-config-semistandard": "^17.0.0",
         "eslint-config-standard": "^17.1.0",
         "eslint-plugin-import": "^2.29.1",
-        "eslint-plugin-jsdoc": "^48.10.2",
+        "eslint-plugin-jsdoc": "^48.11.0",
         "eslint-plugin-n": "^15.7.0",
         "eslint-plugin-promise": "^6.6.0",
         "web-ext": "^8.2.0"
@@ -2694,9 +2694,9 @@
       }
     },
     "node_modules/eslint-plugin-jsdoc": {
-      "version": "48.10.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-48.10.2.tgz",
-      "integrity": "sha512-xTkf/MmEeVrTbezc6kDqCJmK9RcseIKo8X4oyoDCMvV4LY8dqrQi8kmfRrv9n0gNBkCclevaOh2Lkmu6Fs8SLg==",
+      "version": "48.11.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-48.11.0.tgz",
+      "integrity": "sha512-d12JHJDPNo7IFwTOAItCeJY1hcqoIxE0lHA8infQByLilQ9xkqrRa6laWCnsuCrf+8rUnvxXY1XuTbibRBNylA==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
diff --git a/package.json b/package.json
index 1453d5e21..810e849cc 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "eslint-config-semistandard": "^17.0.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jsdoc": "^48.10.2",
+    "eslint-plugin-jsdoc": "^48.11.0",
     "eslint-plugin-n": "^15.7.0",
     "eslint-plugin-promise": "^6.6.0",
     "web-ext": "^8.2.0"

From 18298b6ad8127ced464852b4d5be539ae9b163d4 Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Sun, 1 Sep 2024 17:32:04 -0700
Subject: [PATCH 44/50] Mass Privater: Improve fetch efficiency (#1602)

---
 src/features/mass_privater.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/features/mass_privater.js b/src/features/mass_privater.js
index 32173e499..69ca20b6c 100644
--- a/src/features/mass_privater.js
+++ b/src/features/mass_privater.js
@@ -220,10 +220,10 @@ const privatePosts = async ({ uuid, name, tags, before }) => {
 
   if (tags.length) {
     for (const tag of tags) {
-      await collect(`/v2/blog/${uuid}/posts?${$.param({ tag, limit: 50 })}`);
+      await collect(`/v2/blog/${uuid}/posts?${$.param({ tag, before, limit: 50 })}`);
     }
   } else {
-    await collect(`/v2/blog/${uuid}/posts`);
+    await collect(`/v2/blog/${uuid}/posts?${$.param({ before, limit: 50 })}`);
   }
   const filteredPostIds = [...filteredPostIdsSet];
 

From 822326b9b334aecd343b1bbba71639f72e785d27 Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Sun, 1 Sep 2024 17:33:38 -0700
Subject: [PATCH 45/50] Fix Quick Reblog double reblogs after extension
 update/restart (alternative 4) (#1601)

---
 src/content_scripts/main.js |  2 +-
 src/main_world/index.js     | 15 ++++++++++-----
 src/utils/inject.js         |  6 +++---
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/content_scripts/main.js b/src/content_scripts/main.js
index c34a94d5f..30d72d930 100644
--- a/src/content_scripts/main.js
+++ b/src/content_scripts/main.js
@@ -87,7 +87,7 @@
   };
 
   const initMainWorld = () => new Promise(resolve => {
-    document.documentElement.addEventListener('xkitinjectionready', resolve, { once: true });
+    document.documentElement.addEventListener('xkit-injection-ready', resolve, { once: true });
 
     const { nonce } = [...document.scripts].find(script => script.getAttributeNames().includes('nonce'));
     const script = document.createElement('script');
diff --git a/src/main_world/index.js b/src/main_world/index.js
index 5d7bc1d12..46c94fd6b 100644
--- a/src/main_world/index.js
+++ b/src/main_world/index.js
@@ -3,7 +3,12 @@
 {
   const moduleCache = {};
 
-  document.documentElement.addEventListener('xkitinjectionrequest', async event => {
+  window.removeXKitListener?.();
+
+  const controller = new AbortController();
+  window.removeXKitListener = () => controller.abort();
+
+  document.documentElement.addEventListener('xkit-injection-request', async event => {
     const { detail, target } = event;
     const { id, path, args } = JSON.parse(detail);
 
@@ -15,11 +20,11 @@
 
       const result = await func.apply(target, args);
       target.dispatchEvent(
-        new CustomEvent('xkitinjectionresponse', { detail: JSON.stringify({ id, result }) })
+        new CustomEvent('xkit-injection-response', { detail: JSON.stringify({ id, result }) })
       );
     } catch (exception) {
       target.dispatchEvent(
-        new CustomEvent('xkitinjectionresponse', {
+        new CustomEvent('xkit-injection-response', {
           detail: JSON.stringify({
             id,
             exception: {
@@ -32,7 +37,7 @@
         })
       );
     }
-  });
+  }, { signal: controller.signal });
 
-  document.documentElement.dispatchEvent(new CustomEvent('xkitinjectionready'));
+  document.documentElement.dispatchEvent(new CustomEvent('xkit-injection-ready'));
 }
diff --git a/src/utils/inject.js b/src/utils/inject.js
index 6bf9ec994..290e5d79c 100644
--- a/src/utils/inject.js
+++ b/src/utils/inject.js
@@ -17,12 +17,12 @@ export const inject = (path, args = [], target = document.documentElement) =>
       const { id, result, exception } = JSON.parse(detail);
       if (id !== requestId) return;
 
-      target.removeEventListener('xkitinjectionresponse', responseHandler);
+      target.removeEventListener('xkit-injection-response', responseHandler);
       exception ? reject(exception) : resolve(result);
     };
-    target.addEventListener('xkitinjectionresponse', responseHandler);
+    target.addEventListener('xkit-injection-response', responseHandler);
 
     target.dispatchEvent(
-      new CustomEvent('xkitinjectionrequest', { detail: JSON.stringify(data), bubbles: true })
+      new CustomEvent('xkit-injection-request', { detail: JSON.stringify(data), bubbles: true })
     );
   });

From 3c1707fc4def37627d2207167fd230b445eeda46 Mon Sep 17 00:00:00 2001
From: marcustyphoon <marcustyphoon@gmail.com>
Date: Mon, 2 Sep 2024 11:12:57 -0700
Subject: [PATCH 46/50] bump version to 1.0.3 (#1606)

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

diff --git a/src/manifest.json b/src/manifest.json
index 055e4c291..df5e859d3 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "XKit Rewritten",
-  "version": "1.0.2",
+  "version": "1.0.3",
 
   "short_name": "XKit",
   "author": "April Sylph",

From 7ecf465346da5ac647695cdd2d231764763b2449 Mon Sep 17 00:00:00 2001
From: April Sylph <28949509+AprilSylph@users.noreply.github.com>
Date: Mon, 2 Sep 2024 21:54:32 +0100
Subject: [PATCH 47/50] tooling: expect error on `web-ext sign` again

see web-ext#3238
---
 .github/workflows/publish.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 0f0be85f3..133ac2f3d 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -25,6 +25,7 @@ jobs:
 
       - name: Sign WebExtension
         run: npx web-ext sign
+        continue-on-error: true
         env:
           WEB_EXT_API_KEY: ${{ secrets.WEB_EXT_API_KEY }}
           WEB_EXT_API_SECRET: ${{ secrets.WEB_EXT_API_SECRET }}

From db19915edf2a648dc7f385e6c23d484b8b640c2f Mon Sep 17 00:00:00 2001
From: April Sylph <28949509+AprilSylph@users.noreply.github.com>
Date: Tue, 3 Sep 2024 16:25:20 +0100
Subject: [PATCH 48/50] tooling: use `--approval-timeout=0` directly

---
 .github/workflows/publish.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 133ac2f3d..813866123 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -24,8 +24,7 @@ jobs:
         run: npm test --ignore-scripts
 
       - name: Sign WebExtension
-        run: npx web-ext sign
-        continue-on-error: true
+        run: npx web-ext sign --approval-timeout=0
         env:
           WEB_EXT_API_KEY: ${{ secrets.WEB_EXT_API_KEY }}
           WEB_EXT_API_SECRET: ${{ secrets.WEB_EXT_API_SECRET }}

From 3cdd7e3ab29a2a00ba23e727cbe529c2d0babe19 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 13 Sep 2024 12:02:52 +0100
Subject: [PATCH 49/50] Update dependency eslint-plugin-jsdoc to v50 (#1605)

---
 package-lock.json | 27 ++++++++++++++-------------
 package.json      |  2 +-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6e8373ce1..68fc12a01 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,7 @@
         "eslint-config-semistandard": "^17.0.0",
         "eslint-config-standard": "^17.1.0",
         "eslint-plugin-import": "^2.29.1",
-        "eslint-plugin-jsdoc": "^48.11.0",
+        "eslint-plugin-jsdoc": "^50.2.3",
         "eslint-plugin-n": "^15.7.0",
         "eslint-plugin-promise": "^6.6.0",
         "web-ext": "^8.2.0"
@@ -266,15 +266,15 @@
       }
     },
     "node_modules/@es-joy/jsdoccomment": {
-      "version": "0.46.0",
-      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.46.0.tgz",
-      "integrity": "sha512-C3Axuq1xd/9VqFZpW4YAzOx5O9q/LP46uIQy/iNDpHG3fmPa6TBtvfglMCs3RBiBxAIi0Go97r8+jvTt55XMyQ==",
+      "version": "0.48.0",
+      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.48.0.tgz",
+      "integrity": "sha512-G6QUWIcC+KvSwXNsJyDTHvqUdNoAVJPPgkc3+Uk4WBKqZvoXhlvazOgm9aL0HwihJLQf0l+tOE2UFzXBqCqgDw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "comment-parser": "1.4.1",
         "esquery": "^1.6.0",
-        "jsdoc-type-pratt-parser": "~4.0.0"
+        "jsdoc-type-pratt-parser": "~4.1.0"
       },
       "engines": {
         "node": ">=16"
@@ -2694,16 +2694,16 @@
       }
     },
     "node_modules/eslint-plugin-jsdoc": {
-      "version": "48.11.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-48.11.0.tgz",
-      "integrity": "sha512-d12JHJDPNo7IFwTOAItCeJY1hcqoIxE0lHA8infQByLilQ9xkqrRa6laWCnsuCrf+8rUnvxXY1XuTbibRBNylA==",
+      "version": "50.2.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-50.2.3.tgz",
+      "integrity": "sha512-aNh/dz3wSkyo53y2KWDCrA8fDuXDMtMVflcbesd8AFPgcF8ugOv9mJxC7qKB95R96nzCB91iEwU7MMznh/7okQ==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
-        "@es-joy/jsdoccomment": "~0.46.0",
+        "@es-joy/jsdoccomment": "~0.48.0",
         "are-docs-informative": "^0.0.2",
         "comment-parser": "1.4.1",
-        "debug": "^4.3.5",
+        "debug": "^4.3.6",
         "escape-string-regexp": "^4.0.0",
         "espree": "^10.1.0",
         "esquery": "^1.6.0",
@@ -4337,10 +4337,11 @@
       }
     },
     "node_modules/jsdoc-type-pratt-parser": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz",
-      "integrity": "sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.1.0.tgz",
+      "integrity": "sha512-Hicd6JK5Njt2QB6XYFS7ok9e37O8AYk3jTcppG4YVQnYjOemymvTcmc7OWsmq/Qqj5TdRFO5/x/tIPmBeRtGHg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12.0.0"
       }
diff --git a/package.json b/package.json
index 810e849cc..9ffb02ff0 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "eslint-config-semistandard": "^17.0.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jsdoc": "^48.11.0",
+    "eslint-plugin-jsdoc": "^50.2.3",
     "eslint-plugin-n": "^15.7.0",
     "eslint-plugin-promise": "^6.6.0",
     "web-ext": "^8.2.0"

From 27c92544790ceb99c0742393410443211b800e54 Mon Sep 17 00:00:00 2001
From: April Sylph <28949509+AprilSylph@users.noreply.github.com>
Date: Fri, 13 Sep 2024 17:45:39 +0100
Subject: [PATCH 50/50] tooling: use `WEB_EXT_APPROVAL_TIMEOUT` in Publish
 workflow

---
 .github/workflows/publish.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 813866123..7a85a4a2a 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -24,11 +24,11 @@ jobs:
         run: npm test --ignore-scripts
 
       - name: Sign WebExtension
-        run: npx web-ext sign --approval-timeout=0
+        run: npx web-ext sign
         env:
           WEB_EXT_API_KEY: ${{ secrets.WEB_EXT_API_KEY }}
           WEB_EXT_API_SECRET: ${{ secrets.WEB_EXT_API_SECRET }}
-          WEB_EXT_API_APPROVAL_TIMEOUT: 0
+          WEB_EXT_APPROVAL_TIMEOUT: 0
           WEB_EXT_CHANNEL: listed
   chrome:
     name: Chrome