From cf78c9a3b004738e180afa98ce70588bcae52d0d Mon Sep 17 00:00:00 2001 From: programutox Date: Sat, 13 Apr 2024 15:30:16 +0000 Subject: [PATCH 01/16] Translated using Weblate (Esperanto) Currently translated at 9.9% (81 of 818 strings) Translation: FreeTube/Translations Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/eo/ --- static/locales/eo.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/static/locales/eo.yaml b/static/locales/eo.yaml index 461dcf747df60..e3e94836f9100 100644 --- a/static/locales/eo.yaml +++ b/static/locales/eo.yaml @@ -113,3 +113,7 @@ Search Bar: Clear Input: Klarigi enigon Are you sure you want to open this link?: Ĉu vi certe volas malfermi ĉi-ligilon? Open New Window: Malfermi novan fenestron +Reload: Reŝarĝi +Preferences: Agordoj +New Window: Nova Fenestro +Go to page: Iri al {page} From 372bc1bdd104f18d8c80ff6853603f40f1cec026 Mon Sep 17 00:00:00 2001 From: Milo Ivir Date: Sat, 13 Apr 2024 18:34:30 +0000 Subject: [PATCH 02/16] Translated using Weblate (Croatian) Currently translated at 100.0% (818 of 818 strings) Translation: FreeTube/Translations Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/hr/ --- static/locales/hr.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/static/locales/hr.yaml b/static/locales/hr.yaml index 1bcb4c36bd6f4..960aa293f2d68 100644 --- a/static/locales/hr.yaml +++ b/static/locales/hr.yaml @@ -1184,3 +1184,5 @@ Age Restricted: This channel is age restricted: Ovaj je dobno ograničeni kanal This video is age restricted: Ovaj je dobno ograničeni video Close Banner: Zatvori natpis +Display Label: '{label}: {value}' +checkmark: ✓ From bb7d90be0585ce12894cf246319863eeef2a2c5b Mon Sep 17 00:00:00 2001 From: absidue <48293849+absidue@users.noreply.github.com> Date: Sun, 14 Apr 2024 15:16:55 +0200 Subject: [PATCH 03/16] Fix imports of the "electron" module that are missing an Electron guard (#4935) --- _scripts/webpack.web.config.js | 1 - .../download-settings/download-settings.js | 20 +-- .../proxy-settings/proxy-settings.js | 11 +- .../theme-settings/theme-settings.js | 14 +- src/renderer/store/modules/settings.js | 153 +++++++++--------- src/renderer/store/modules/utils.js | 6 +- 6 files changed, 108 insertions(+), 97 deletions(-) diff --git a/_scripts/webpack.web.config.js b/_scripts/webpack.web.config.js index 0badc63a748d9..c06679910433c 100644 --- a/_scripts/webpack.web.config.js +++ b/_scripts/webpack.web.config.js @@ -25,7 +25,6 @@ const config = { filename: '[name].js', }, externals: { - electron: '{}', 'youtubei.js': '{}' }, module: { diff --git a/src/renderer/components/download-settings/download-settings.js b/src/renderer/components/download-settings/download-settings.js index de00756b4be8b..a0ad9efa067da 100644 --- a/src/renderer/components/download-settings/download-settings.js +++ b/src/renderer/components/download-settings/download-settings.js @@ -6,7 +6,6 @@ import FtSelect from '../ft-select/ft-select.vue' import FtButton from '../ft-button/ft-button.vue' import FtInput from '../ft-input/ft-input.vue' import { mapActions } from 'vuex' -import { ipcRenderer } from 'electron' import { IpcChannels } from '../../../constants' export default defineComponent({ @@ -48,16 +47,19 @@ export default defineComponent({ handleDownloadingSettingChange: function (value) { this.updateDownloadAskPath(value) }, - chooseDownloadingFolder: async function() { - // only use with electron - const folder = await ipcRenderer.invoke( - IpcChannels.SHOW_OPEN_DIALOG, - { properties: ['openDirectory'] } - ) + chooseDownloadingFolder: async function () { + if (process.env.IS_ELECTRON) { + const { ipcRenderer } = require('electron') - if (folder.canceled) return + const folder = await ipcRenderer.invoke( + IpcChannels.SHOW_OPEN_DIALOG, + { properties: ['openDirectory'] } + ) - this.updateDownloadFolderPath(folder.filePaths[0]) + if (folder.canceled) return + + this.updateDownloadFolderPath(folder.filePaths[0]) + } }, ...mapActions([ 'updateDownloadAskPath', diff --git a/src/renderer/components/proxy-settings/proxy-settings.js b/src/renderer/components/proxy-settings/proxy-settings.js index c9a0139b953c3..b985c39d60d29 100644 --- a/src/renderer/components/proxy-settings/proxy-settings.js +++ b/src/renderer/components/proxy-settings/proxy-settings.js @@ -8,7 +8,6 @@ import FtInput from '../ft-input/ft-input.vue' import FtLoader from '../ft-loader/ft-loader.vue' import FtFlexBox from '../ft-flex-box/ft-flex-box.vue' -import { ipcRenderer } from 'electron' import debounce from 'lodash.debounce' import { IpcChannels } from '../../../constants' @@ -125,11 +124,17 @@ export default defineComponent({ }, enableProxy: function () { - ipcRenderer.send(IpcChannels.ENABLE_PROXY, this.proxyUrl) + if (process.env.IS_ELECTRON) { + const { ipcRenderer } = require('electron') + ipcRenderer.send(IpcChannels.ENABLE_PROXY, this.proxyUrl) + } }, disableProxy: function () { - ipcRenderer.send(IpcChannels.DISABLE_PROXY) + if (process.env.IS_ELECTRON) { + const { ipcRenderer } = require('electron') + ipcRenderer.send(IpcChannels.DISABLE_PROXY) + } this.dataAvailable = false this.proxyIp = '' diff --git a/src/renderer/components/theme-settings/theme-settings.js b/src/renderer/components/theme-settings/theme-settings.js index d53bf2f92784a..5e9d268b60e4e 100644 --- a/src/renderer/components/theme-settings/theme-settings.js +++ b/src/renderer/components/theme-settings/theme-settings.js @@ -146,12 +146,14 @@ export default defineComponent({ return } - this.updateDisableSmoothScrolling( - this.disableSmoothScrollingToggleValue - ).then(() => { - const { ipcRenderer } = require('electron') - ipcRenderer.send('relaunchRequest') - }) + if (process.env.IS_ELECTRON) { + this.updateDisableSmoothScrolling( + this.disableSmoothScrollingToggleValue + ).then(() => { + const { ipcRenderer } = require('electron') + ipcRenderer.send('relaunchRequest') + }) + } }, ...mapActions([ diff --git a/src/renderer/store/modules/settings.js b/src/renderer/store/modules/settings.js index 7aa40616c2f12..cb07106db14d8 100644 --- a/src/renderer/store/modules/settings.js +++ b/src/renderer/store/modules/settings.js @@ -471,101 +471,102 @@ const customActions = { // Should be a root action, but we'll tolerate setupListenersToSyncWindows: ({ commit, dispatch, getters }) => { - // Already known to be Electron, no need to check - const { ipcRenderer } = require('electron') - - ipcRenderer.on(IpcChannels.SYNC_SETTINGS, (_, { event, data }) => { - switch (event) { - case SyncEvents.GENERAL.UPSERT: - if (getters.settingHasSideEffects(data._id)) { - dispatch(defaultSideEffectsTriggerId(data._id), data.value) - } + if (process.env.IS_ELECTRON) { + const { ipcRenderer } = require('electron') - commit(defaultMutationId(data._id), data.value) - break + ipcRenderer.on(IpcChannels.SYNC_SETTINGS, (_, { event, data }) => { + switch (event) { + case SyncEvents.GENERAL.UPSERT: + if (getters.settingHasSideEffects(data._id)) { + dispatch(defaultSideEffectsTriggerId(data._id), data.value) + } - default: - console.error('settings: invalid sync event received') - } - }) + commit(defaultMutationId(data._id), data.value) + break - ipcRenderer.on(IpcChannels.SYNC_HISTORY, (_, { event, data }) => { - switch (event) { - case SyncEvents.GENERAL.UPSERT: - commit('upsertToHistoryCache', data) - break + default: + console.error('settings: invalid sync event received') + } + }) - case SyncEvents.HISTORY.UPDATE_WATCH_PROGRESS: - commit('updateRecordWatchProgressInHistoryCache', data) - break + ipcRenderer.on(IpcChannels.SYNC_HISTORY, (_, { event, data }) => { + switch (event) { + case SyncEvents.GENERAL.UPSERT: + commit('upsertToHistoryCache', data) + break - case SyncEvents.HISTORY.UPDATE_PLAYLIST: - commit('updateRecordLastViewedPlaylistIdInHistoryCache', data) - break + case SyncEvents.HISTORY.UPDATE_WATCH_PROGRESS: + commit('updateRecordWatchProgressInHistoryCache', data) + break - case SyncEvents.GENERAL.DELETE: - commit('removeFromHistoryCacheById', data) - break + case SyncEvents.HISTORY.UPDATE_PLAYLIST: + commit('updateRecordLastViewedPlaylistIdInHistoryCache', data) + break - case SyncEvents.GENERAL.DELETE_ALL: - commit('setHistoryCacheSorted', []) - commit('setHistoryCacheById', {}) - break + case SyncEvents.GENERAL.DELETE: + commit('removeFromHistoryCacheById', data) + break - default: - console.error('history: invalid sync event received') - } - }) + case SyncEvents.GENERAL.DELETE_ALL: + commit('setHistoryCacheSorted', []) + commit('setHistoryCacheById', {}) + break - ipcRenderer.on(IpcChannels.SYNC_PROFILES, (_, { event, data }) => { - switch (event) { - case SyncEvents.GENERAL.CREATE: - commit('addProfileToList', data) - break + default: + console.error('history: invalid sync event received') + } + }) - case SyncEvents.GENERAL.UPSERT: - commit('upsertProfileToList', data) - break + ipcRenderer.on(IpcChannels.SYNC_PROFILES, (_, { event, data }) => { + switch (event) { + case SyncEvents.GENERAL.CREATE: + commit('addProfileToList', data) + break - case SyncEvents.GENERAL.DELETE: - commit('removeProfileFromList', data) - break + case SyncEvents.GENERAL.UPSERT: + commit('upsertProfileToList', data) + break - default: - console.error('profiles: invalid sync event received') - } - }) + case SyncEvents.GENERAL.DELETE: + commit('removeProfileFromList', data) + break - ipcRenderer.on(IpcChannels.SYNC_PLAYLISTS, (_, { event, data }) => { - switch (event) { - case SyncEvents.GENERAL.CREATE: - commit('addPlaylists', data) - break + default: + console.error('profiles: invalid sync event received') + } + }) - case SyncEvents.GENERAL.DELETE: - commit('removePlaylist', data) - break + ipcRenderer.on(IpcChannels.SYNC_PLAYLISTS, (_, { event, data }) => { + switch (event) { + case SyncEvents.GENERAL.CREATE: + commit('addPlaylists', data) + break - case SyncEvents.GENERAL.UPSERT: - commit('upsertPlaylistToList', data) - break + case SyncEvents.GENERAL.DELETE: + commit('removePlaylist', data) + break - case SyncEvents.PLAYLISTS.UPSERT_VIDEO: - commit('addVideo', data) - break + case SyncEvents.GENERAL.UPSERT: + commit('upsertPlaylistToList', data) + break - case SyncEvents.PLAYLISTS.UPSERT_VIDEOS: - commit('addVideos', data) - break + case SyncEvents.PLAYLISTS.UPSERT_VIDEO: + commit('addVideo', data) + break - case SyncEvents.PLAYLISTS.DELETE_VIDEO: - commit('removeVideo', data) - break + case SyncEvents.PLAYLISTS.UPSERT_VIDEOS: + commit('addVideos', data) + break - default: - console.error('playlists: invalid sync event received') - } - }) + case SyncEvents.PLAYLISTS.DELETE_VIDEO: + commit('removeVideo', data) + break + + default: + console.error('playlists: invalid sync event received') + } + }) + } } } diff --git a/src/renderer/store/modules/utils.js b/src/renderer/store/modules/utils.js index 0a52ca7c44aef..c99290f20f0d3 100644 --- a/src/renderer/store/modules/utils.js +++ b/src/renderer/store/modules/utils.js @@ -728,8 +728,10 @@ const actions = { showToast(i18n.t('Video.External Player.OpeningTemplate', { videoOrPlaylist, externalPlayer })) - const { ipcRenderer } = require('electron') - ipcRenderer.send(IpcChannels.OPEN_IN_EXTERNAL_PLAYER, { executable, args }) + if (process.env.IS_ELECTRON) { + const { ipcRenderer } = require('electron') + ipcRenderer.send(IpcChannels.OPEN_IN_EXTERNAL_PLAYER, { executable, args }) + } } } From dfdab0dd5dc03b7eab3146f6c58d1fe2ee57b8f6 Mon Sep 17 00:00:00 2001 From: absidue <48293849+absidue@users.noreply.github.com> Date: Sun, 14 Apr 2024 15:23:32 +0200 Subject: [PATCH 04/16] Local API: Fix extracting the published date and view count in playlists (#4936) --- src/renderer/helpers/api/local.js | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js index 7b9947441fff5..342d6c9d9c595 100644 --- a/src/renderer/helpers/api/local.js +++ b/src/renderer/helpers/api/local.js @@ -697,14 +697,16 @@ export function parseLocalPlaylistVideo(video) { // the accessiblity label contains the full view count // the video info only contains the short view count if (video_.accessibility_label) { - const match = video_.accessibility_label.match(/([\d,.]+|no) views?$/i) + // the `.*\s+` at the start of the regex, ensures we match the last occurence + // just in case the video title also contains that pattern + const match = video_.accessibility_label.match(/.*\s+([\d,.]+|no)\s+views?/) if (match) { const count = match[1] // as it's rare that a video has no views, // checking the length allows us to avoid running toLowerCase unless we have to - if (count.length === 2 && count.toLowerCase() === 'no') { + if (count.length === 2 && count === 'no') { viewCount = 0 } else { const views = extractNumberFromString(count) @@ -718,11 +720,19 @@ export function parseLocalPlaylistVideo(video) { let publishedText // normal videos have 3 text runs with the last one containing the published date + // OR no runs and just text with the published date (if the view count is missing) // live videos have 2 text runs with the number of people watching // upcoming either videos don't have any info text or the number of people waiting, // but we have the premiere date for those, so we don't need the published date - if (video_.video_info.runs && video_.video_info.runs.length === 3) { - publishedText = video_.video_info.runs[2].text + + if (!video_.is_upcoming && !video_.is_live) { + const hasRuns = !!video_.video_info.runs + + if (hasRuns && video_.video_info.runs.length === 3) { + publishedText = video_.video_info.runs[2].text + } else if (!hasRuns && video_.video_info.text) { + publishedText = video_.video_info.text + } } const published = calculatePublishedDate( From e087008707691413abc1659b8ab3ef0e77429e7f Mon Sep 17 00:00:00 2001 From: ynnsuis <110542210+sossost@users.noreply.github.com> Date: Mon, 15 Apr 2024 00:15:23 +0900 Subject: [PATCH 05/16] Fix/ Improve accessibility of playlist icon buttons (#4943) * Add aria-pressed attribute to playlist icon button * Improve accessibility by adjusting stroke thickness of playlist icon * Fix to keep the inactive hover state the same * Update playlist icon active hover style * Update playlist icon active hover color to --accent-color-hover --- .../watch-video-playlist.css | 16 +++++++++++++++- .../watch-video-playlist.vue | 4 ++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/renderer/components/watch-video-playlist/watch-video-playlist.css b/src/renderer/components/watch-video-playlist/watch-video-playlist.css index 53a8753a8f1ae..d327b87756ab1 100644 --- a/src/renderer/components/watch-video-playlist/watch-video-playlist.css +++ b/src/renderer/components/watch-video-playlist/watch-video-playlist.css @@ -51,16 +51,30 @@ border-radius: 50%; color: var(--tertiary-text-color); transition: background 0.2s ease-out; + stroke-width: 20; + stroke: var(--bg-color); } .playlistIcon:hover { background-color: var(--side-nav-hover-color); color: var(--side-nav-hover-text-color); + stroke-width: 20; + stroke: var(--side-nav-hover-color); + transition: background 0.2s ease-in; +} + +.playlistIconActive:hover { + background-color: var(--side-nav-hover-color); + color: var(--accent-color-hover); + stroke-width: 10; + stroke: var(--accent-color-hover); transition: background 0.2s ease-in; } .playlistIconActive { - color: var(--accent-color) + color: var(--accent-color); + stroke-width: 10; + stroke: var(--accent-color); } .playlistItems { diff --git a/src/renderer/components/watch-video-playlist/watch-video-playlist.vue b/src/renderer/components/watch-video-playlist/watch-video-playlist.vue index 2fd2f60f5035d..552b24729dfb4 100644 --- a/src/renderer/components/watch-video-playlist/watch-video-playlist.vue +++ b/src/renderer/components/watch-video-playlist/watch-video-playlist.vue @@ -56,6 +56,7 @@ :title="$t('Video.Loop Playlist')" role="button" tabindex="0" + :aria-pressed="loopEnabled" @click="toggleLoop" @keydown.enter.prevent="toggleLoop" @keydown.space.prevent="toggleLoop" @@ -67,6 +68,7 @@ :title="$t('Video.Shuffle Playlist')" role="button" tabindex="0" + :aria-pressed="shuffleEnabled" @click="toggleShuffle" @keydown.enter.prevent="toggleShuffle" @keydown.space.prevent="toggleShuffle" @@ -78,6 +80,7 @@ :title="$t('Video.Reverse Playlist')" role="button" tabindex="0" + :aria-pressed="reversePlaylist" @click="toggleReversePlaylist" @keydown.enter.prevent="toggleReversePlaylist" @keydown.space.prevent="toggleReversePlaylist" @@ -109,6 +112,7 @@ :title="$t('Video.Pause on Current Video')" role="button" tabindex="0" + :aria-pressed="pauseOnCurrentVideo" @click="togglePauseOnCurrentVideo" @keydown.enter.prevent="togglePauseOnCurrentVideo" @keydown.space.prevent="togglePauseOnCurrentVideo" From 2f96d664d08c6e18b4e8452e94b86f81003ac4f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 11:30:49 +0200 Subject: [PATCH 06/16] Bump css-loader from 7.0.0 to 7.1.1 (#4959) Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 7.0.0 to 7.1.1. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/css-loader/compare/v7.0.0...v7.1.1) --- updated-dependencies: - dependency-name: css-loader dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 052bd7086ea09..6bd08687127ee 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "@intlify/eslint-plugin-vue-i18n": "^2.0.0", "babel-loader": "^9.1.3", "copy-webpack-plugin": "^12.0.2", - "css-loader": "^7.0.0", + "css-loader": "^7.1.1", "css-minimizer-webpack-plugin": "^6.0.0", "electron": "^29.2.0", "electron-builder": "^24.13.3", diff --git a/yarn.lock b/yarn.lock index 37d3da3c2671f..4d89ab694ad65 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3066,10 +3066,10 @@ css-functions-list@^3.2.1: resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.2.1.tgz#2eb205d8ce9f9ce74c5c1d7490b66b77c45ce3ea" integrity sha512-Nj5YcaGgBtuUmn1D7oHqPW0c9iui7xsTsj5lIX8ZgevdfhmjFfKB3r8moHJtNJnctnYXJyYX5I1pp90HM4TPgQ== -css-loader@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-7.0.0.tgz#3456a621ce51f9dfd12b9674bfc7527c5e1821db" - integrity sha512-WrO4FVoamxt5zY9CauZjoJgXRi/LZKIk+Ta7YvpSGr5r/eMYPNp5/T9ODlMe4/1rF5DYlycG1avhV4g3A/tiAw== +css-loader@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-7.1.1.tgz#de4163c0cb765c03d7957eb9e0a49c7f354948c7" + integrity sha512-OxIR5P2mjO1PSXk44bWuQ8XtMK4dpEqpIyERCx3ewOo3I8EmbcxMPUc5ScLtQfgXtOojoMv57So4V/C02HQLsw== dependencies: icss-utils "^5.1.0" postcss "^8.4.33" From bc16f67ef416813ecc40c584b72575320f10e1c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 11:31:39 +0200 Subject: [PATCH 07/16] Bump sass-loader from 14.1.1 to 14.2.0 (#4958) Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 14.1.1 to 14.2.0. - [Release notes](https://github.com/webpack-contrib/sass-loader/releases) - [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/sass-loader/compare/v14.1.1...v14.2.0) --- updated-dependencies: - dependency-name: sass-loader dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 6bd08687127ee..33f91ae315e3b 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,7 @@ "prettier": "^2.8.8", "rimraf": "^5.0.5", "sass": "^1.74.1", - "sass-loader": "^14.1.1", + "sass-loader": "^14.2.0", "stylelint": "^16.3.1", "stylelint-config-sass-guidelines": "^11.1.0", "stylelint-config-standard": "^36.0.0", diff --git a/yarn.lock b/yarn.lock index 4d89ab694ad65..b9331f861c98f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7500,10 +7500,10 @@ sanitize-filename@^1.6.3: dependencies: truncate-utf8-bytes "^1.0.0" -sass-loader@^14.1.1: - version "14.1.1" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-14.1.1.tgz#2c9d2277c5b1c5fe789cd0570c046d8ad23cb7ca" - integrity sha512-QX8AasDg75monlybel38BZ49JP5Z+uSKfKwF2rO7S74BywaRmGQMUBw9dtkS+ekyM/QnP+NOrRYq8ABMZ9G8jw== +sass-loader@^14.2.0: + version "14.2.0" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-14.2.0.tgz#0d4440170fd9c9d93684e274a5ef73dbf55f414b" + integrity sha512-jxmjDXD9OYNDb2bp9JvopdE6QjecQY9beTWik/6sEHrsMxyo90Gyc471A4NUz60NLs4WsAh6yVtIvhLwEZcXeg== dependencies: neo-async "^2.6.2" From 179b3e0fa34bc3aed99f41befa8626e4bd25c207 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 11:32:50 +0200 Subject: [PATCH 08/16] Bump youtubei.js from 9.2.0 to 9.3.0 (#4957) Bumps [youtubei.js](https://github.com/LuanRT/YouTube.js) from 9.2.0 to 9.3.0. - [Release notes](https://github.com/LuanRT/YouTube.js/releases) - [Changelog](https://github.com/LuanRT/YouTube.js/blob/main/CHANGELOG.md) - [Commits](https://github.com/LuanRT/YouTube.js/compare/v9.2.0...v9.3.0) --- updated-dependencies: - dependency-name: youtubei.js dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 33f91ae315e3b..34ded4f1c94f9 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "vue-observe-visibility": "^1.0.0", "vue-router": "^3.6.5", "vuex": "^3.6.2", - "youtubei.js": "^9.2.0" + "youtubei.js": "^9.3.0" }, "devDependencies": { "@babel/core": "^7.24.4", diff --git a/yarn.lock b/yarn.lock index b9331f861c98f..08fb859b9f89d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9089,10 +9089,10 @@ yocto-queue@^1.0.0: resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251" integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g== -youtubei.js@^9.2.0: - version "9.2.0" - resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-9.2.0.tgz#26d521a0803ddd3ab5059a7b7eb5970514d883a4" - integrity sha512-Q157iNPlyB32477xU+1/+Pyz/Bxy9zLJ1sXLjn96qhBZ03wWHVwh2azeyz7jk13UvcrxZXtIYv9HHn2dFngGnQ== +youtubei.js@^9.3.0: + version "9.3.0" + resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-9.3.0.tgz#abaaa585f4fa5ba9672c226fbf639929c11063ea" + integrity sha512-hWTDyxNakwURkCpTh1YfGxKWp1JxU94uwtmwqUq6zSwLfyIJRTsyVZqBd3/bm+5d+lyetl+jEO5ajOsRXshefg== dependencies: jintr "^1.1.0" tslib "^2.5.0" From 1275fad4a57c79356aa71f632bbc9efd4e9ef553 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 11:38:38 +0200 Subject: [PATCH 09/16] Bump swiper from 11.1.0 to 11.1.1 (#4954) Bumps [swiper](https://github.com/nolimits4web/Swiper) from 11.1.0 to 11.1.1. - [Release notes](https://github.com/nolimits4web/Swiper/releases) - [Changelog](https://github.com/nolimits4web/swiper/blob/master/CHANGELOG.md) - [Commits](https://github.com/nolimits4web/Swiper/compare/v11.1.0...v11.1.1) --- updated-dependencies: - dependency-name: swiper dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 34ded4f1c94f9..ef7b96dbd7969 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "marked": "^12.0.1", "path-browserify": "^1.0.1", "process": "^0.11.10", - "swiper": "^11.1.0", + "swiper": "^11.1.1", "video.js": "7.21.5", "videojs-contrib-quality-levels": "^3.0.0", "videojs-http-source-selector": "^1.1.6", diff --git a/yarn.lock b/yarn.lock index 08fb859b9f89d..cd2402c4ef032 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8167,10 +8167,10 @@ svgo@^3.2.0: csso "^5.0.5" picocolors "^1.0.0" -swiper@^11.1.0: - version "11.1.0" - resolved "https://registry.yarnpkg.com/swiper/-/swiper-11.1.0.tgz#3497b60d65d1320e427cdf11dfaad5c555283826" - integrity sha512-Pm78CgU7Wvg+w/MgIL/1NwMSLgx0XqFof25EnVyX8iZFCYJv5CppH7LHkBj43qW2k5Cp3Iz7FcdBxrox7XX2AQ== +swiper@^11.1.1: + version "11.1.1" + resolved "https://registry.yarnpkg.com/swiper/-/swiper-11.1.1.tgz#5efaa222d4a47a3ac75090cfc2fda6e53e564982" + integrity sha512-jGmEA/fNz1lACIcY4/40ggm1Gcyv+EUivmgV/Jd2WFPsEJhbWXnRAwzZR8OPjkBLtDxmzcoYG/iiAMWfRs0YKQ== synckit@^0.6.0: version "0.6.2" From 5d896ec18f58ef7400860f18362f98f03221c857 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 11:39:32 +0200 Subject: [PATCH 10/16] Bump lefthook from 1.6.8 to 1.6.10 (#4953) Bumps [lefthook](https://github.com/evilmartians/lefthook) from 1.6.8 to 1.6.10. - [Release notes](https://github.com/evilmartians/lefthook/releases) - [Changelog](https://github.com/evilmartians/lefthook/blob/master/CHANGELOG.md) - [Commits](https://github.com/evilmartians/lefthook/compare/v1.6.8...v1.6.10) --- updated-dependencies: - dependency-name: lefthook dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 104 +++++++++++++++++++++++++-------------------------- 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/package.json b/package.json index ef7b96dbd7969..f592588d34ec3 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,7 @@ "html-webpack-plugin": "^5.6.0", "js-yaml": "^4.1.0", "json-minimizer-webpack-plugin": "^5.0.0", - "lefthook": "^1.6.8", + "lefthook": "^1.6.10", "mini-css-extract-plugin": "^2.8.1", "npm-run-all": "^4.1.5", "postcss": "^8.4.38", diff --git a/yarn.lock b/yarn.lock index cd2402c4ef032..d0eedba706dd9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5717,59 +5717,59 @@ lazy-val@^1.0.4, lazy-val@^1.0.5: resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d" integrity sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q== -lefthook-darwin-arm64@1.6.8: - version "1.6.8" - resolved "https://registry.yarnpkg.com/lefthook-darwin-arm64/-/lefthook-darwin-arm64-1.6.8.tgz#ce7225a8589fb17f1ec130cb7097b26e2cd2b40a" - integrity sha512-L7iZVANp92MsYHRlpOlItXWGS6QL0w1E6T5GO00SGVoVPClA+Tkt26BFPhLZKa3pMbSHEhGTHeBMWJZ2Un/TnQ== - -lefthook-darwin-x64@1.6.8: - version "1.6.8" - resolved "https://registry.yarnpkg.com/lefthook-darwin-x64/-/lefthook-darwin-x64-1.6.8.tgz#534cc97c0eaa1febca9fb5be6e6793da5d10a20f" - integrity sha512-BhYwl1CBi0eKKfsD9Bd6a6wmmaLHaZEBS5PlGc0h8hRWxC+CmBZyR0VDqXli9yxmgraI6psehM+w1v7RkP5pSg== - -lefthook-freebsd-arm64@1.6.8: - version "1.6.8" - resolved "https://registry.yarnpkg.com/lefthook-freebsd-arm64/-/lefthook-freebsd-arm64-1.6.8.tgz#bd32db03d72fb4df197c93e2759d4ef9a902255a" - integrity sha512-pr86NVKUOiK0MwW2UZRLiDlYLV8XaqxKWRltVut4W78Ywb0PNTb3k4LVeMwfXiNqEgD8gug9vE8aZY1U3D2HMA== - -lefthook-freebsd-x64@1.6.8: - version "1.6.8" - resolved "https://registry.yarnpkg.com/lefthook-freebsd-x64/-/lefthook-freebsd-x64-1.6.8.tgz#171c1c829cde0f7f27943cb483254b078b50b632" - integrity sha512-pyzYRCHf6jSWoZJG22kE7KFbHQ1B6sHcxXP9o/Y5H8T/sHUxO03GEtdrGwyijMP0EJYb1vMfVWYY5WbWfg6SPg== - -lefthook-linux-arm64@1.6.8: - version "1.6.8" - resolved "https://registry.yarnpkg.com/lefthook-linux-arm64/-/lefthook-linux-arm64-1.6.8.tgz#91441885e12d8da096bffa14ef3eaccc5dde0c36" - integrity sha512-1VsEnfxWhs8YLMUnlYdbLBLldJrqJi/G2Isrvx0KBBu/nILxMmNa5GIQo8uqeeufmi/WVc8g3xgJtPxSp3NXnw== - -lefthook-linux-x64@1.6.8: - version "1.6.8" - resolved "https://registry.yarnpkg.com/lefthook-linux-x64/-/lefthook-linux-x64-1.6.8.tgz#aa3baa4581251dc508a109ebe470888f3a3e0b32" - integrity sha512-0e4GSPBhJkngO4qAX5bqJLYTftrBfulLiwbsWX6hx4SWFY3kFpCLtAYD8zfvfQaAfwb9Ieut2XnqcE9mNfI9+Q== - -lefthook-windows-arm64@1.6.8: - version "1.6.8" - resolved "https://registry.yarnpkg.com/lefthook-windows-arm64/-/lefthook-windows-arm64-1.6.8.tgz#6d3b98570bb93c3742d5fa42fc5ba04417eddb99" - integrity sha512-bVYRF4mBcT2T5/uN5pJpk9jqvik8JLtgRL+BxTKPshuVFO2nJczgdX1lWRnveGyz84DHwYgu+GwYl7PLjGU28A== - -lefthook-windows-x64@1.6.8: - version "1.6.8" - resolved "https://registry.yarnpkg.com/lefthook-windows-x64/-/lefthook-windows-x64-1.6.8.tgz#7f484559becb43237d8be8d83ea87f53cbaaebfa" - integrity sha512-cT3ZopXAFyEsfkRf+wRwINBPWUMYi2Wba59BqN8JU/Tfuuv7Of2e51u+VTsHMR+8+JdEt3A8Kl20xw24E8ccAg== - -lefthook@^1.6.8: - version "1.6.8" - resolved "https://registry.yarnpkg.com/lefthook/-/lefthook-1.6.8.tgz#d0f3a76c626d8945179dcb201c0756ec66be5e69" - integrity sha512-h+5S3FLhErIrVTz+uLaysS0kATlzCW8Wa1DUqpu0rYsimsEk/TrP9cMnTVd0UKq3Ks2ooq5pCUmnipJy5zl1VQ== +lefthook-darwin-arm64@1.6.10: + version "1.6.10" + resolved "https://registry.yarnpkg.com/lefthook-darwin-arm64/-/lefthook-darwin-arm64-1.6.10.tgz#31c6ba2f0e5c24a938b468f77bdff3b829bb528d" + integrity sha512-Hh11OkoKG7FEOByS1dcgNV7ETq45VmwBbw0VPTiBznyfOG4k+pi0fIdc1qbmbxvYqNE0r420QR/Q3bimaa4Kxg== + +lefthook-darwin-x64@1.6.10: + version "1.6.10" + resolved "https://registry.yarnpkg.com/lefthook-darwin-x64/-/lefthook-darwin-x64-1.6.10.tgz#4d49622dccb0f3ff7a6a2c4d4a9af0c098e2595c" + integrity sha512-FiOB0t5OBcQ8OnG/LSdfUYj736SJdlLjWuOZ4wTlJ7EUrHditieap6VNAxwMmFVyQN0X2ZwKWytwY35y+Hflhw== + +lefthook-freebsd-arm64@1.6.10: + version "1.6.10" + resolved "https://registry.yarnpkg.com/lefthook-freebsd-arm64/-/lefthook-freebsd-arm64-1.6.10.tgz#b3594d47582a2b90025c585ec6ec85a10b515294" + integrity sha512-IxGgS3RrNwk3Kr83o5SQhGxqppQi7fu2t//nsp6ocgnJeStrTtXZJOrel2VohzrFxpzQdJVXBGgUGLXtY8t8qw== + +lefthook-freebsd-x64@1.6.10: + version "1.6.10" + resolved "https://registry.yarnpkg.com/lefthook-freebsd-x64/-/lefthook-freebsd-x64-1.6.10.tgz#3eba68b410d4913038672404ed535b8fa5248eb1" + integrity sha512-sFSe+dGLa4iBblWAhAGTP9moarcbFtFAH6aaCeyqSX51O6p9VPdGjqNtcE8aGbGAk4lO6v1ScRjk5ogMSinJwQ== + +lefthook-linux-arm64@1.6.10: + version "1.6.10" + resolved "https://registry.yarnpkg.com/lefthook-linux-arm64/-/lefthook-linux-arm64-1.6.10.tgz#4a39cc574ea05d742fc7765a03ccae66a01a634a" + integrity sha512-fXnKiNdRIW+FRvc1keVrvWX5EqIhVFfPjcy+PbsKdxiWRXgjtidi6LPmQ8eosH0DC9PxZ0mpdCMf40FHEZLbQA== + +lefthook-linux-x64@1.6.10: + version "1.6.10" + resolved "https://registry.yarnpkg.com/lefthook-linux-x64/-/lefthook-linux-x64-1.6.10.tgz#546e134afea574cb72ea9b0dd2829f45ae6fb309" + integrity sha512-bm6l2GOFnmYreZxmHb47QeOiFAItttOOxvCEX1okIRD7JbUC+lGC9evW5GJv/ltjZBoTDYEtQAUa+BpHTGuY2A== + +lefthook-windows-arm64@1.6.10: + version "1.6.10" + resolved "https://registry.yarnpkg.com/lefthook-windows-arm64/-/lefthook-windows-arm64-1.6.10.tgz#4a3feeb23cf2118de5025f65b5c239ca05ed54d8" + integrity sha512-pFxT8KbOMzGxj6cz4glHYwQSNC7XCuy9RDqIO0AxPlpATsCpapkF4ngDxBT1iFv2VhdeweMa7RXUDsMAGQA4Qw== + +lefthook-windows-x64@1.6.10: + version "1.6.10" + resolved "https://registry.yarnpkg.com/lefthook-windows-x64/-/lefthook-windows-x64-1.6.10.tgz#fb775fbc14d6122cec5fb041c442951175dd8fc2" + integrity sha512-fcDnUSTv95AdLvm0NIrn3jBWXuRq8SlbDDjkkB5OHLiSmjz4eOr6wyD7xceDp33zZgZmWFzHebJngxxcIaUuHw== + +lefthook@^1.6.10: + version "1.6.10" + resolved "https://registry.yarnpkg.com/lefthook/-/lefthook-1.6.10.tgz#f0175c1042635d54a15687e6f2f7109fc6c40ce3" + integrity sha512-HeVjsDCrHLe9htQHbLuQJu2YdLK6Tl5bh36fOpmXqckEXTI0BDR0Y5JYc7G5Inj4YXQsc51a9dUDZMeniSnSag== optionalDependencies: - lefthook-darwin-arm64 "1.6.8" - lefthook-darwin-x64 "1.6.8" - lefthook-freebsd-arm64 "1.6.8" - lefthook-freebsd-x64 "1.6.8" - lefthook-linux-arm64 "1.6.8" - lefthook-linux-x64 "1.6.8" - lefthook-windows-arm64 "1.6.8" - lefthook-windows-x64 "1.6.8" + lefthook-darwin-arm64 "1.6.10" + lefthook-darwin-x64 "1.6.10" + lefthook-freebsd-arm64 "1.6.10" + lefthook-freebsd-x64 "1.6.10" + lefthook-linux-arm64 "1.6.10" + lefthook-linux-x64 "1.6.10" + lefthook-windows-arm64 "1.6.10" + lefthook-windows-x64 "1.6.10" levn@^0.4.1: version "0.4.1" From 09187241819811465d130c5ca0fded3e66821a97 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 09:43:32 +0000 Subject: [PATCH 11/16] Bump electron from 29.2.0 to 29.3.0 (#4952) Bumps [electron](https://github.com/electron/electron) from 29.2.0 to 29.3.0. - [Release notes](https://github.com/electron/electron/releases) - [Changelog](https://github.com/electron/electron/blob/main/docs/breaking-changes.md) - [Commits](https://github.com/electron/electron/compare/v29.2.0...v29.3.0) --- updated-dependencies: - dependency-name: electron dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f592588d34ec3..b2fff1bde5e8b 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "copy-webpack-plugin": "^12.0.2", "css-loader": "^7.1.1", "css-minimizer-webpack-plugin": "^6.0.0", - "electron": "^29.2.0", + "electron": "^29.3.0", "electron-builder": "^24.13.3", "eslint": "^8.57.0", "eslint-config-prettier": "^9.1.0", diff --git a/yarn.lock b/yarn.lock index d0eedba706dd9..e257e1c7716bb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3580,10 +3580,10 @@ electron-to-chromium@^1.4.668: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.715.tgz#bb16bcf2a3537962fccfa746b5c98c5f7404ff46" integrity sha512-XzWNH4ZSa9BwVUQSDorPWAUQ5WGuYz7zJUNpNif40zFCiCl20t8zgylmreNmn26h5kiyw2lg7RfTmeMBsDklqg== -electron@^29.2.0: - version "29.2.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-29.2.0.tgz#98e9d45dcebda124fb0bd1ff20fc509ec692101c" - integrity sha512-ALKrCN52RG4g9prx4DriXSPnY5WoiyRUCNp7zEVQuoiNOpHTNqMMpRidQAHzntV4hajF1LMWHVoBkwqIs1jHhg== +electron@^29.3.0: + version "29.3.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-29.3.0.tgz#8e65cb08e9c0952c66d3196e1b5c811c43b8c5b0" + integrity sha512-ZxFKm0/v48GSoBuO3DdnMlCYXefEUKUHLMsKxyXY4nZGgzbBKpF/X8haZa2paNj23CLfsCKBOtfc2vsEQiOOsA== dependencies: "@electron/get" "^2.0.0" "@types/node" "^20.9.0" From b8a790637140363510d4ae893705fddd403c5481 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 18:15:39 +0800 Subject: [PATCH 12/16] Bump sass from 1.74.1 to 1.75.0 (#4956) Bumps [sass](https://github.com/sass/dart-sass) from 1.74.1 to 1.75.0. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.74.1...1.75.0) --- updated-dependencies: - dependency-name: sass dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index b2fff1bde5e8b..c8a36eca8b919 100644 --- a/package.json +++ b/package.json @@ -114,7 +114,7 @@ "postcss-scss": "^4.0.9", "prettier": "^2.8.8", "rimraf": "^5.0.5", - "sass": "^1.74.1", + "sass": "^1.75.0", "sass-loader": "^14.2.0", "stylelint": "^16.3.1", "stylelint-config-sass-guidelines": "^11.1.0", diff --git a/yarn.lock b/yarn.lock index e257e1c7716bb..16563b547f5e7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7507,10 +7507,10 @@ sass-loader@^14.2.0: dependencies: neo-async "^2.6.2" -sass@^1.74.1: - version "1.74.1" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.74.1.tgz#686fc227d3707dd25cb2925e1db8e4562be29319" - integrity sha512-w0Z9p/rWZWelb88ISOLyvqTWGmtmu2QJICqDBGyNnfG4OUnPX9BBjjYIXUpXCMOOg5MQWNpqzt876la1fsTvUA== +sass@^1.75.0: + version "1.75.0" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.75.0.tgz#91bbe87fb02dfcc34e052ddd6ab80f60d392be6c" + integrity sha512-ShMYi3WkrDWxExyxSZPst4/okE9ts46xZmJDSawJQrnte7M1V9fScVB+uNXOVKRBt0PggHOwoZcn8mYX4trnBw== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" From 856479fbce1542d2f84994f12702c2d58f1070bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 13:48:44 +0000 Subject: [PATCH 13/16] Bump the eslint group with 5 updates (#4963) Bumps the eslint group with 5 updates: | Package | From | To | | --- | --- | --- | | [eslint-plugin-jsonc](https://github.com/ota-meshi/eslint-plugin-jsonc) | `2.14.1` | `2.15.1` | | [eslint-plugin-n](https://github.com/eslint-community/eslint-plugin-n) | `16.6.2` | `17.2.1` | | [eslint-plugin-unicorn](https://github.com/sindresorhus/eslint-plugin-unicorn) | `51.0.1` | `52.0.0` | | [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) | `9.24.0` | `9.25.0` | | [eslint-plugin-yml](https://github.com/ota-meshi/eslint-plugin-yml) | `1.13.2` | `1.14.0` | Updates `eslint-plugin-jsonc` from 2.14.1 to 2.15.1 - [Release notes](https://github.com/ota-meshi/eslint-plugin-jsonc/releases) - [Changelog](https://github.com/ota-meshi/eslint-plugin-jsonc/blob/master/CHANGELOG.md) - [Commits](https://github.com/ota-meshi/eslint-plugin-jsonc/compare/v2.14.1...v2.15.1) Updates `eslint-plugin-n` from 16.6.2 to 17.2.1 - [Release notes](https://github.com/eslint-community/eslint-plugin-n/releases) - [Changelog](https://github.com/eslint-community/eslint-plugin-n/blob/master/CHANGELOG.md) - [Commits](https://github.com/eslint-community/eslint-plugin-n/compare/16.6.2...v17.2.1) Updates `eslint-plugin-unicorn` from 51.0.1 to 52.0.0 - [Release notes](https://github.com/sindresorhus/eslint-plugin-unicorn/releases) - [Commits](https://github.com/sindresorhus/eslint-plugin-unicorn/compare/v51.0.1...v52.0.0) Updates `eslint-plugin-vue` from 9.24.0 to 9.25.0 - [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases) - [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v9.24.0...v9.25.0) Updates `eslint-plugin-yml` from 1.13.2 to 1.14.0 - [Release notes](https://github.com/ota-meshi/eslint-plugin-yml/releases) - [Changelog](https://github.com/ota-meshi/eslint-plugin-yml/blob/master/CHANGELOG.md) - [Commits](https://github.com/ota-meshi/eslint-plugin-yml/compare/v1.13.2...v1.14.0) --- updated-dependencies: - dependency-name: eslint-plugin-jsonc dependency-type: direct:development update-type: version-update:semver-minor dependency-group: eslint - dependency-name: eslint-plugin-n dependency-type: direct:development update-type: version-update:semver-major dependency-group: eslint - dependency-name: eslint-plugin-unicorn dependency-type: direct:development update-type: version-update:semver-major dependency-group: eslint - dependency-name: eslint-plugin-vue dependency-type: direct:development update-type: version-update:semver-minor dependency-group: eslint - dependency-name: eslint-plugin-yml dependency-type: direct:development update-type: version-update:semver-minor dependency-group: eslint ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 10 +++--- yarn.lock | 89 ++++++++++++++++++++++------------------------------ 2 files changed, 42 insertions(+), 57 deletions(-) diff --git a/package.json b/package.json index c8a36eca8b919..a9ae18cc225a1 100644 --- a/package.json +++ b/package.json @@ -96,14 +96,14 @@ "eslint-config-prettier": "^9.1.0", "eslint-config-standard": "^17.1.0", "eslint-plugin-import": "^2.29.1", - "eslint-plugin-jsonc": "^2.14.1", - "eslint-plugin-n": "^16.6.2", + "eslint-plugin-jsonc": "^2.15.1", + "eslint-plugin-n": "^17.2.1", "eslint-plugin-prettier": "^5.1.3", "eslint-plugin-promise": "^6.1.1", - "eslint-plugin-unicorn": "^51.0.1", - "eslint-plugin-vue": "^9.24.0", + "eslint-plugin-unicorn": "^52.0.0", + "eslint-plugin-vue": "^9.25.0", "eslint-plugin-vuejs-accessibility": "^2.2.1", - "eslint-plugin-yml": "^1.13.2", + "eslint-plugin-yml": "^1.14.0", "html-webpack-plugin": "^5.6.0", "js-yaml": "^4.1.0", "json-minimizer-webpack-plugin": "^5.0.0", diff --git a/yarn.lock b/yarn.lock index 16563b547f5e7..52a248799483c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2624,13 +2624,6 @@ builtin-modules@^3.3.0: resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6" integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw== -builtins@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.0.1.tgz#87f6db9ab0458be728564fa81d876d8d74552fa9" - integrity sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ== - dependencies: - semver "^7.0.0" - bundle-name@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/bundle-name/-/bundle-name-3.0.0.tgz#ba59bcc9ac785fb67ccdbf104a2bf60c099f0e1a" @@ -3621,7 +3614,7 @@ end-of-stream@^1.1.0: dependencies: once "^1.4.0" -enhanced-resolve@^5.16.0: +enhanced-resolve@^5.15.0, enhanced-resolve@^5.16.0: version "5.16.0" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.16.0.tgz#65ec88778083056cb32487faa9aef82ed0864787" integrity sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA== @@ -3900,10 +3893,10 @@ eslint-plugin-import@^2.29.1: semver "^6.3.1" tsconfig-paths "^3.15.0" -eslint-plugin-jsonc@^2.14.1: - version "2.14.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.14.1.tgz#1ad123c9b28e91b76b5b5fefaa71c46bd6a1d981" - integrity sha512-Tei6G4N7pZulP5MHi0EIdtseiCqUPkDMd0O8Zrw4muMIlsjJ5/B9X+U3Pfo6B7l0mTL9LN9FwuWT70dRJ6z7tg== +eslint-plugin-jsonc@^2.15.1: + version "2.15.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.15.1.tgz#97a5b24e9b14fe2163fd4988fa66d428785d7e7e" + integrity sha512-PVFrqIJa8BbM/e828RSn0SwB/Z5ye+2LDuy2XqG6AymNgPsfApRRcznsbxP7VrjdLEU4Nb+g9n/d6opyp0jp9A== dependencies: "@eslint-community/eslint-utils" "^4.2.0" eslint-compat-utils "^0.5.0" @@ -3913,21 +3906,18 @@ eslint-plugin-jsonc@^2.14.1: natural-compare "^1.4.0" synckit "^0.6.0" -eslint-plugin-n@^16.6.2: - version "16.6.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-n/-/eslint-plugin-n-16.6.2.tgz#6a60a1a376870064c906742272074d5d0b412b0b" - integrity sha512-6TyDmZ1HXoFQXnhCTUjVFULReoBPOAjpuiKELMkeP40yffI/1ZRO+d9ug/VC6fqISo2WkuIBk3cvuRPALaWlOQ== +eslint-plugin-n@^17.2.1: + version "17.2.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-n/-/eslint-plugin-n-17.2.1.tgz#20aa5008dce05af9041b70abb659a2308416d977" + integrity sha512-uW1+df2bo06kR7ix6nB614RUlvjRPrYxlaX832O6e1MCJp4V7YozEdvMgCYuvn4ltnjPu1FVYhQ2KRrmTNoJfg== dependencies: "@eslint-community/eslint-utils" "^4.4.0" - builtins "^5.0.1" + enhanced-resolve "^5.15.0" eslint-plugin-es-x "^7.5.0" get-tsconfig "^4.7.0" - globals "^13.24.0" + globals "^14.0.0" ignore "^5.2.4" - is-builtin-module "^3.2.1" - is-core-module "^2.12.1" - minimatch "^3.1.2" - resolve "^1.22.2" + minimatch "^9.0.0" semver "^7.5.3" eslint-plugin-prettier@^5.1.3: @@ -3943,10 +3933,10 @@ eslint-plugin-promise@^6.1.1: resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz#269a3e2772f62875661220631bd4dafcb4083816" integrity sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig== -eslint-plugin-unicorn@^51.0.1: - version "51.0.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-51.0.1.tgz#3641c5e110324c3739d6cb98fc1b99ada39f477b" - integrity sha512-MuR/+9VuB0fydoI0nIn2RDA5WISRn4AsJyNSaNKLVwie9/ONvQhxOBbkfSICBPnzKrB77Fh6CZZXjgTt/4Latw== +eslint-plugin-unicorn@^52.0.0: + version "52.0.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-52.0.0.tgz#c7a559edd52e3932cf2b3a05c3b0efc604c1eeb8" + integrity sha512-1Yzm7/m+0R4djH0tjDjfVei/ju2w3AzUGjG6q8JnuNIL5xIwsflyCooW5sfBvQp2pMYQFSWWCFONsjCax1EHng== dependencies: "@babel/helper-validator-identifier" "^7.22.20" "@eslint-community/eslint-utils" "^4.4.0" @@ -3965,10 +3955,10 @@ eslint-plugin-unicorn@^51.0.1: semver "^7.5.4" strip-indent "^3.0.0" -eslint-plugin-vue@^9.24.0: - version "9.24.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.24.0.tgz#71209f4652ee767f18c0bf56f25991b7cdc5aa46" - integrity sha512-9SkJMvF8NGMT9aQCwFc5rj8Wo1XWSMSHk36i7ZwdI614BU7sIOR28ZjuFPKp8YGymZN12BSEbiSwa7qikp+PBw== +eslint-plugin-vue@^9.25.0: + version "9.25.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.25.0.tgz#615cb7bb6d0e2140d21840b9aa51dce69e803e7a" + integrity sha512-tDWlx14bVe6Bs+Nnh3IGrD+hb11kf2nukfm6jLsmJIhmiRQ1SUaksvwY9U5MvPB0pcrg0QK0xapQkfITs3RKOA== dependencies: "@eslint-community/eslint-utils" "^4.4.0" globals "^13.24.0" @@ -3988,10 +3978,10 @@ eslint-plugin-vuejs-accessibility@^2.2.1: emoji-regex "^10.0.0" vue-eslint-parser "^9.0.1" -eslint-plugin-yml@^1.13.2: - version "1.13.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-yml/-/eslint-plugin-yml-1.13.2.tgz#e4ef9a3316da3fc1cb35919c43ca9d1fe12e220a" - integrity sha512-1i71VhmsG5UxE41rIJmJjhlTTxYy7upAY5Hqj8AdBc7rfJzRIZr3a2spuOS8+N7ZDCWsHAWY3J6lzQNQHDv6Uw== +eslint-plugin-yml@^1.14.0: + version "1.14.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-yml/-/eslint-plugin-yml-1.14.0.tgz#98a019dfe4eb6837f881fb80d564df79cb05d8d9" + integrity sha512-ESUpgYPOcAYQO9czugcX5OqRvn/ydDVwGCPXY4YjPqc09rHaUVUA6IE6HLQys4rXk/S+qx3EwTd1wHCwam/OWQ== dependencies: debug "^4.3.2" eslint-compat-utils "^0.5.0" @@ -4703,6 +4693,11 @@ globals@^13.19.0, globals@^13.24.0: dependencies: type-fest "^0.20.2" +globals@^14.0.0: + version "14.0.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-14.0.0.tgz#898d7413c29babcf6bafe56fcadded858ada724e" + integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ== + globalthis@^1.0.1, globalthis@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf" @@ -5231,7 +5226,7 @@ is-ci@^3.0.0: dependencies: ci-info "^3.2.0" -is-core-module@^2.12.1, is-core-module@^2.13.0, is-core-module@^2.13.1: +is-core-module@^2.13.0, is-core-module@^2.13.1: version "2.13.1" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384" integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw== @@ -5624,7 +5619,7 @@ json5@^2.1.3, json5@^2.2.0, json5@^2.2.3: resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== -jsonc-eslint-parser@^2.0.0: +jsonc-eslint-parser@^2.0.0, jsonc-eslint-parser@^2.0.4: version "2.4.0" resolved "https://registry.yarnpkg.com/jsonc-eslint-parser/-/jsonc-eslint-parser-2.4.0.tgz#74ded53f9d716e8d0671bd167bf5391f452d5461" integrity sha512-WYDyuc/uFcGp6YtM2H0uKmUwieOuzeE/5YocFJLnLfclZ4inf3mRn8ZVy1s7Hxji7Jxm6Ss8gqpexD/GlKoGgg== @@ -5634,16 +5629,6 @@ jsonc-eslint-parser@^2.0.0: espree "^9.0.0" semver "^7.3.5" -jsonc-eslint-parser@^2.0.4: - version "2.1.0" - resolved "https://registry.yarnpkg.com/jsonc-eslint-parser/-/jsonc-eslint-parser-2.1.0.tgz#4c126b530aa583d85308d0b3041ff81ce402bbb2" - integrity sha512-qCRJWlbP2v6HbmKW7R3lFbeiVWHo+oMJ0j+MizwvauqnCV/EvtAeEeuCgoc/ErtsuoKgYB8U4Ih8AxJbXoE6/g== - dependencies: - acorn "^8.5.0" - eslint-visitor-keys "^3.0.0" - espree "^9.0.0" - semver "^7.3.5" - jsonfile@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" @@ -6091,10 +6076,10 @@ minimatch@^5.0.1, minimatch@^5.1.1: dependencies: brace-expansion "^2.0.1" -minimatch@^9.0.1: - version "9.0.1" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.1.tgz#8a555f541cf976c622daf078bb28f29fb927c253" - integrity sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w== +minimatch@^9.0.0, minimatch@^9.0.1: + version "9.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51" + integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw== dependencies: brace-expansion "^2.0.1" @@ -7369,7 +7354,7 @@ resolve-pkg-maps@^1.0.0: resolved "https://registry.yarnpkg.com/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz#616b3dc2c57056b5588c31cdf4b3d64db133720f" integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw== -resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.2, resolve@^1.22.4: +resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.4: version "1.22.8" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== @@ -7568,7 +7553,7 @@ semver@^6.2.0, semver@^6.3.0, semver@^6.3.1: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.0.0, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.6, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0: +semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.6, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0: version "7.6.0" resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d" integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg== From 9e151b74bbcd6ee609a2e3f586dbab85a7dd1d42 Mon Sep 17 00:00:00 2001 From: efb4f5ff-1298-471a-8973-3d47447115dc <73130443+efb4f5ff-1298-471a-8973-3d47447115dc@users.noreply.github.com> Date: Tue, 16 Apr 2024 15:46:26 +0000 Subject: [PATCH 14/16] Fix type check failed for prop `searchQueryText` (#4962) --- src/renderer/views/Playlist/Playlist.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/views/Playlist/Playlist.js b/src/renderer/views/Playlist/Playlist.js index 2dde53d0c5c61..5dad9b89bac30 100644 --- a/src/renderer/views/Playlist/Playlist.js +++ b/src/renderer/views/Playlist/Playlist.js @@ -117,7 +117,7 @@ export default defineComponent({ return this.isUserPlaylistRequested }, searchQueryTextRequested() { - return this.$route.query.searchQueryText + return this.$route.query.searchQueryText ?? '' }, searchQueryTextPresent() { const searchQueryText = this.searchQueryTextRequested From 981e8e4530c5b0214481410ed8146ab661fa9fc5 Mon Sep 17 00:00:00 2001 From: Jason <84899178+jasonhenriquez@users.noreply.github.com> Date: Tue, 16 Apr 2024 15:46:43 +0000 Subject: [PATCH 15/16] Fix user playlist reversal failing after user playlist information is updated (#4947) --- .../watch-video-playlist/watch-video-playlist.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/renderer/components/watch-video-playlist/watch-video-playlist.js b/src/renderer/components/watch-video-playlist/watch-video-playlist.js index 2689326bf9f36..97a30b2574ed5 100644 --- a/src/renderer/components/watch-video-playlist/watch-video-playlist.js +++ b/src/renderer/components/watch-video-playlist/watch-video-playlist.js @@ -166,13 +166,6 @@ export default defineComponent({ // Re-fetch from local store when current user playlist updated this.parseUserPlaylist(this.selectedUserPlaylist, { allowPlayingVideoRemoval: true }) }, - playlistItemId (newId, _oldId) { - // Playing online video - if (newId == null) { return } - - // Re-fetch from local store when different item played - this.parseUserPlaylist(this.selectedUserPlaylist, { allowPlayingVideoRemoval: true }) - }, videoId: function (newId, oldId) { // Check if next video is from the shuffled list or if the user clicked a different video if (this.shuffleEnabled) { @@ -284,7 +277,7 @@ export default defineComponent({ this.reversePlaylist = !this.reversePlaylist // Create a new array to avoid changing array in data store state // it could be user playlist or cache playlist - this.playlistItems = [].concat(this.playlistItems).reverse() + this.playlistItems = this.playlistItems.toReversed() setTimeout(() => { this.isLoading = false }, 1) @@ -488,6 +481,10 @@ export default defineComponent({ } } + if (this.reversePlaylist) { + this.playlistItems = this.playlistItems.toReversed() + } + this.isLoading = false }, From 5359d8468ee55511c2b5f2e4d5fd46028a784baa Mon Sep 17 00:00:00 2001 From: Jason <84899178+jasonhenriquez@users.noreply.github.com> Date: Tue, 16 Apr 2024 15:47:40 +0000 Subject: [PATCH 16/16] Improve video playlist search UX (#4929) * Enable playlist video search mode by default; add Ctrl+F binding * Fix subject-verb agreement on two search labels * Remove playlist video search bar when only one video is in the playlist * Add check for search video mode allowed that is requisite for keybinding * Remove unnecessary 'async function' in mounted * Fix styling issue --- .../components/playlist-info/playlist-info.js | 34 +++++++++---------- .../playlist-info/playlist-info.scss | 6 ---- .../playlist-info/playlist-info.vue | 17 +--------- .../subscriptions-tab-ui.js | 2 +- src/renderer/views/Playlist/Playlist.js | 9 ++--- src/renderer/views/Playlist/Playlist.vue | 4 +-- static/locales/en-US.yaml | 4 +-- 7 files changed, 25 insertions(+), 51 deletions(-) diff --git a/src/renderer/components/playlist-info/playlist-info.js b/src/renderer/components/playlist-info/playlist-info.js index eb47b19db6daa..082462405ee57 100644 --- a/src/renderer/components/playlist-info/playlist-info.js +++ b/src/renderer/components/playlist-info/playlist-info.js @@ -259,6 +259,12 @@ export default defineComponent({ this.updateQueryDebounce = debounce(this.updateQuery, 500) }, + mounted: function () { + document.addEventListener('keydown', this.keyboardShortcutHandler) + }, + beforeDestroy: function () { + document.removeEventListener('keydown', this.keyboardShortcutHandler) + }, methods: { toggleCopyVideosPrompt: function (force = false) { if (this.moreVideoDataAvailable && !this.isUserPlaylist && !force) { @@ -403,24 +409,18 @@ export default defineComponent({ this.query = query this.$emit('search-video-query-change', query) }, - enableVideoSearchMode() { - this.searchVideoMode = true - this.$emit('search-video-mode-on') - nextTick(() => { - // Some elements only present after rendering update - this.$refs.searchInput.focus() - }) - }, - disableVideoSearchMode() { - this.searchVideoMode = false - this.updateQuery('') - this.$emit('search-video-mode-off') - - nextTick(() => { - // Some elements only present after rendering update - this.$refs.enableSearchModeButton?.focus() - }) + keyboardShortcutHandler(event) { + switch (event.key) { + case 'F': + case 'f': + if (this.searchVideoModeAllowed && ((process.platform !== 'darwin' && event.ctrlKey) || (process.platform === 'darwin' && event.metaKey))) { + nextTick(() => { + // Some elements only present after rendering update + this.$refs.searchInput.focus() + }) + } + } }, ...mapActions([ diff --git a/src/renderer/components/playlist-info/playlist-info.scss b/src/renderer/components/playlist-info/playlist-info.scss index 8bf11cf0882e4..da6adcef16245 100644 --- a/src/renderer/components/playlist-info/playlist-info.scss +++ b/src/renderer/components/playlist-info/playlist-info.scss @@ -75,12 +75,6 @@ .searchInputsRow { margin-block-start: 8px; - - display: grid; - - /* 2 columns */ - grid-template-columns: 1fr auto; - column-gap: 8px; } @media only screen and (max-width: 1250px) { diff --git a/src/renderer/components/playlist-info/playlist-info.vue b/src/renderer/components/playlist-info/playlist-info.vue index 56a76742a5aca..f6f2683cd1a2b 100644 --- a/src/renderer/components/playlist-info/playlist-info.vue +++ b/src/renderer/components/playlist-info/playlist-info.vue @@ -76,7 +76,6 @@
-
-
diff --git a/src/renderer/components/subscriptions-tab-ui/subscriptions-tab-ui.js b/src/renderer/components/subscriptions-tab-ui/subscriptions-tab-ui.js index 958c03539324c..293fd6f8f02f5 100644 --- a/src/renderer/components/subscriptions-tab-ui/subscriptions-tab-ui.js +++ b/src/renderer/components/subscriptions-tab-ui/subscriptions-tab-ui.js @@ -80,7 +80,7 @@ export default defineComponent({ this.dataLimit = this.initialDataLimit } }, - mounted: async function () { + mounted: function () { document.addEventListener('keydown', this.keyboardShortcutHandler) }, beforeDestroy: function () { diff --git a/src/renderer/views/Playlist/Playlist.js b/src/renderer/views/Playlist/Playlist.js index 5dad9b89bac30..054bbd8508b19 100644 --- a/src/renderer/views/Playlist/Playlist.js +++ b/src/renderer/views/Playlist/Playlist.js @@ -60,7 +60,6 @@ export default defineComponent({ getPlaylistInfoDebounce: function() {}, playlistInEditMode: false, - playlistInVideoSearchMode: false, videoSearchQuery: '', promptOpen: false, @@ -112,9 +111,8 @@ export default defineComponent({ return this.continuationData !== null } }, - - searchVideoModeAllowed() { - return this.isUserPlaylistRequested + playlistInVideoSearchMode() { + return this.processedVideoSearchQuery !== '' }, searchQueryTextRequested() { return this.$route.query.searchQueryText ?? '' @@ -199,8 +197,7 @@ export default defineComponent({ created: function () { this.getPlaylistInfoDebounce = debounce(this.getPlaylistInfo, 100) - if (this.searchVideoModeAllowed && this.searchQueryTextPresent) { - this.playlistInVideoSearchMode = true + if (this.isUserPlaylistRequested && this.searchQueryTextPresent) { this.videoSearchQuery = this.searchQueryTextRequested } }, diff --git a/src/renderer/views/Playlist/Playlist.vue b/src/renderer/views/Playlist/Playlist.vue index f4e3c183ba67c..6d999686ba955 100644 --- a/src/renderer/views/Playlist/Playlist.vue +++ b/src/renderer/views/Playlist/Playlist.vue @@ -22,7 +22,7 @@ :view-count="viewCount" :info-source="infoSource" :more-video-data-available="moreVideoDataAvailable" - :search-video-mode-allowed="searchVideoModeAllowed" + :search-video-mode-allowed="isUserPlaylistRequested && videoCount > 1" :search-video-mode-enabled="playlistInVideoSearchMode" :search-query-text="searchQueryTextRequested" class="playlistInfo" @@ -31,8 +31,6 @@ }" @enter-edit-mode="playlistInEditMode = true" @exit-edit-mode="playlistInEditMode = false" - @search-video-mode-on="playlistInVideoSearchMode = true" - @search-video-mode-off="playlistInVideoSearchMode = false" @search-video-query-change="(v) => videoSearchQuery = v" @prompt-open="promptOpen = true" @prompt-close="promptOpen = false" diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml index 75eef565a624b..8aaedcda6b6a9 100644 --- a/static/locales/en-US.yaml +++ b/static/locales/en-US.yaml @@ -141,7 +141,7 @@ User Playlists: Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Your saved videos are empty. Click on the save button on the corner of a video to have it listed here You have no playlists. Click on the create new playlist button to create a new one.: You have no playlists. Click on the create new playlist button to create a new one. - Empty Search Message: There are no videos in this playlist that matches your search + Empty Search Message: There are no videos in this playlist that match your search Search bar placeholder: Search for Playlists Playlists with Matching Videos: Playlists with Matching Videos @@ -235,7 +235,7 @@ History: History: History Watch History: Watch History Your history list is currently empty.: Your history list is currently empty. - Empty Search Message: There are no videos in your history that matches your search + Empty Search Message: There are no videos in your history that match your search Search bar placeholder: "Search in History" Settings: # On Settings Page