Merge remote-tracking branch 'origin/develop' into shigusegubu-themes3

package.json

@@ -17,15 +17,15 @@
     "lint-fix": "eslint --fix src test/unit/specs test/e2e/specs"
   },
   "dependencies": {
-    "@babel/runtime": "7.28.2",
+    "@babel/runtime": "7.28.3",
     "@chenfengyuan/vue-qrcode": "2.0.0",
     "@fortawesome/fontawesome-svg-core": "6.7.2",
     "@fortawesome/free-regular-svg-icons": "6.7.2",
     "@fortawesome/free-solid-svg-icons": "6.7.2",
-    "@fortawesome/vue-fontawesome": "3.0.8",
+    "@fortawesome/vue-fontawesome": "3.1.1",
     "@kazvmoe-infra/pinch-zoom-element": "1.3.0",
     "@kazvmoe-infra/unicode-emoji-json": "0.4.0",
-    "@ruffle-rs/ruffle": "0.1.0-nightly.2025.1.13",
+    "@ruffle-rs/ruffle": "0.1.0-nightly.2025.6.22",
     "@vuelidate/core": "2.0.3",
     "@vuelidate/validators": "2.0.4",
     "@web3-storage/parse-link-header": "^3.1.0",
@@ -39,7 +39,7 @@
     "js-cookie": "3.0.5",
     "localforage": "1.10.0",
     "parse-link-header": "2.0.0",
-    "phoenix": "1.7.21",
+    "phoenix": "1.8.0",
     "pinia": "^3.0.0",
     "punycode.js": "2.3.1",
     "qrcode": "1.5.4",
@@ -47,52 +47,52 @@
     "url": "0.11.4",
     "utf8": "3.0.0",
     "uuid": "11.1.0",
-    "vue": "3.5.18",
+    "vue": "3.5.19",
     "vue-i18n": "11",
     "vue-router": "4.5.1",
     "vue-virtual-scroller": "^2.0.0-beta.7",
     "vuex": "4.1.0"
   },
   "devDependencies": {
-    "@babel/core": "7.28.0",
+    "@babel/core": "7.28.3",
     "@babel/eslint-parser": "7.28.0",
-    "@babel/plugin-transform-runtime": "7.28.0",
+    "@babel/plugin-transform-runtime": "7.28.3",
-    "@babel/preset-env": "7.28.0",
+    "@babel/preset-env": "7.28.3",
-    "@babel/register": "7.27.1",
+    "@babel/register": "7.28.3",
     "@ungap/event-target": "0.2.4",
     "@vitejs/plugin-vue": "^5.2.1",
     "@vitejs/plugin-vue-jsx": "^4.1.1",
     "@vitest/browser": "^3.0.7",
     "@vitest/ui": "^3.0.7",
     "@vue/babel-helper-vue-jsx-merge-props": "1.4.0",
-    "@vue/babel-plugin-jsx": "1.4.0",
+    "@vue/babel-plugin-jsx": "1.5.0",
-    "@vue/compiler-sfc": "3.5.18",
+    "@vue/compiler-sfc": "3.5.19",
     "@vue/test-utils": "2.4.6",
     "autoprefixer": "10.4.21",
     "babel-plugin-lodash": "3.3.4",
-    "chai": "5.2.1",
+    "chai": "5.3.2",
-    "chalk": "5.4.1",
+    "chalk": "5.6.0",
     "chromedriver": "135.0.4",
     "connect-history-api-fallback": "2.0.0",
     "cross-spawn": "7.0.6",
     "custom-event-polyfill": "1.0.7",
     "eslint": "9.33.0",
-    "vue-eslint-parser": "10.1.3",
+    "vue-eslint-parser": "10.2.0",
     "eslint-config-standard": "17.1.0",
     "eslint-formatter-friendly": "7.0.0",
-    "eslint-plugin-import": "2.31.0",
+    "eslint-plugin-import": "2.32.0",
-    "eslint-plugin-n": "17.18.0",
+    "eslint-plugin-n": "17.21.3",
     "eslint-plugin-promise": "7.2.1",
-    "eslint-plugin-vue": "10.1.0",
+    "eslint-plugin-vue": "10.4.0",
     "eventsource-polyfill": "0.9.6",
     "express": "5.1.0",
     "function-bind": "1.1.2",
     "http-proxy-middleware": "3.0.5",
     "iso-639-1": "3.1.5",
     "lodash": "4.17.21",
-    "msw": "2.10.4",
+    "msw": "2.10.5",
     "nightwatch": "3.12.2",
-    "playwright": "1.52.0",
+    "playwright": "1.55.0",
     "postcss": "8.5.6",
     "postcss-html": "^1.5.0",
     "postcss-scss": "^4.0.6",

src/components/notification/notification.vue

@@ -11,10 +11,10 @@
     />
   </article>
   <article
+    v-else
+    ref="root"
     class="NotificationParent"
     :class="{ '-expandable': expandable }"
-    ref="root"
-    v-else
   >
     <div
       v-if="needMute && !unmuted"

src/components/rich_content/rich_content.jsx

@@ -87,17 +87,23 @@ export default {
       type: Boolean,
       default: false
     },
-    // Assume is local to be true if unspecified, so the button isn't show where it probably should not be
-    isLocal: {
-      required: false,
-      type: Boolean,
-      default: true
-    },
     // Collapse newlines
     collapse: {
       required: false,
       type: Boolean,
       default: false
+    },
+    /* Content comes from current instance
+     *
+     * This is used for emoji stealing popover.
+     * By default we assume it is, so that steal
+     * emoji button isn't shown where it probably
+     * should not be.
+     */
+    isLocal: {
+      required: false,
+      type: Boolean,
+      default: true
     }
   },
   // NEVER EVER TOUCH DATA INSIDE RENDER

src/components/rich_content/rich_content.scss

@@ -64,6 +64,11 @@
 
   .img {
     display: inline-block;
+
+    // fix vertical alignment of stealable emoji
+    button {
+      display: inline-flex;
+    }
   }
 
   .emoji {

src/components/settings_modal/helpers/emoji_editing_popover.vue

@@ -27,7 +27,10 @@
         class="emoji"
       />
 
-      <div v-if="newUpload" class="emoji-tab-popover-new-upload">
+      <div
+        v-if="newUpload"
+        class="emoji-tab-popover-new-upload"
+      >
         <h4>{{ $t('admin_dash.emoji.emoji_source') }}</h4>
 
         <div class="emoji-tab-popover-input">

src/components/settings_modal/tabs/theme_tab/theme_preview.vue

@@ -21,7 +21,10 @@
       </div>
       <div class="panel-body theme-preview-content">
         <div class="post">
-          <div class="avatar still-image" aria-hidden="true">
+          <div
+            class="avatar still-image"
+            aria-hidden="true"
+          >
             ( ͡° ͜ʖ ͡°)
           </div>
           <div class="content">
@@ -71,7 +74,10 @@
         </div>
 
         <div class="after-post">
-          <div class="avatar-alt" aria-hidden="true">
+          <div
+            class="avatar-alt"
+            aria-hidden="true"
+          >
             :^)
           </div>
           <div class="content">

src/components/status/status.scss

@@ -235,9 +235,9 @@
 
   .repeater-avatar {
     border-radius: var(--roundness);
-    margin-left: 28px;
+    margin-left: 2em; // 3.5 (poster avatar size) - 1.5 (repeater avatar size)
-    width: 20px;
+    width: 1.5em;
-    height: 20px;
+    height: 1.5em;
   }
 
   .repeater-name {

src/components/status_content/status_content.vue

@@ -24,7 +24,10 @@
         />
       </div>
 
-      <div class="poll-icon" v-else-if="status.poll && status.poll.options && compact">
+      <div
+        v-else-if="status.poll && status.poll.options && compact"
+        class="poll-icon"
+      >
         <FAIcon
           icon="poll-h"
           size="2x"

src/components/still-image/still-image-emoji-popover.vue

@@ -25,8 +25,8 @@
           <button
             class="button button-default btn emoji-popover-button"
             type="button"
-            @click="copyToLocalPack"
             :disabled="packName == ''"
+            @click="copyToLocalPack"
           >
             {{ $t('admin_dash.emoji.copy_to_pack') }}
           </button>

src/components/user_reporting_modal/user_reporting_modal.vue

@@ -10,7 +10,10 @@
           keypath="user_reporting.title"
           class="title"
         >
-          <UserLink class="user-link" :user="user" />
+          <UserLink
+            class="user-link"
+            :user="user"
+          />
         </i18n-t>
       </div>
       <div class="panel-body">