- It will also abandon your {getLinkCopy(count)} in {getForkedRepo()!} and you’ll no longer be able to edit {count === 1 ? 'it' : 'them'}.
+ It will also abandon your {getLinkCopy(count)} in {getForkedRepo()!}{' '}
+ and you’ll no longer be able to edit {count === 1 ? 'it' : 'them'}.
,
);
}
diff --git a/source/features/show-whitespace.tsx b/source/features/show-whitespace.tsx
index fba2e59e7944..04b56e3049d4 100644
--- a/source/features/show-whitespace.tsx
+++ b/source/features/show-whitespace.tsx
@@ -1,17 +1,19 @@
import './show-whitespace.css';
-import * as pageDetect from 'github-url-detection';
import {onAbort} from 'abort-utils';
+import * as pageDetect from 'github-url-detection';
+import {$closestOptional} from 'select-dom';
import features from '../feature-manager.js';
import {codeElementsSelector} from '../github-helpers/dom-formatters.js';
-import showWhiteSpacesOnLine from '../helpers/show-whitespace-on-line.js';
+import {is} from '../helpers/css-selectors.js';
import observe from '../helpers/selector-observer.js';
+import showWhiteSpacesOnLine from '../helpers/show-whitespace-on-line.js';
const viewportObserver = new IntersectionObserver(changes => {
for (const {target: line, isIntersecting} of changes) {
if (isIntersecting) {
- const shouldAvoidSurroundingSpaces = Boolean(line.closest('.blob-wrapper-embedded')); // #2285
+ const shouldAvoidSurroundingSpaces = Boolean($closestOptional('.blob-wrapper-embedded', line)); // #2285
showWhiteSpacesOnLine(line, shouldAvoidSurroundingSpaces);
viewportObserver.unobserve(line);
}
@@ -23,7 +25,7 @@ function showWhitespaceWhenInViewport(line: HTMLElement): void {
}
function init(signal: AbortSignal): void {
- observe(`:is(${codeElementsSelector.join(',')}):not(.blob-code-hunk)`, showWhitespaceWhenInViewport, {signal});
+ observe(is(codeElementsSelector) + ':not(.blob-code-hunk)', showWhitespaceWhenInViewport, {signal});
onAbort(signal, viewportObserver);
}
diff --git a/source/features/sidebar-focus-file.tsx b/source/features/sidebar-focus-file.tsx
index 9c854e0d150a..4ecda1341332 100644
--- a/source/features/sidebar-focus-file.tsx
+++ b/source/features/sidebar-focus-file.tsx
@@ -1,9 +1,9 @@
import * as pageDetect from 'github-url-detection';
-import delay from '../helpers/delay.js';
import features from '../feature-manager.js';
import GitHubFileUrl from '../github-helpers/github-file-url.js';
import {scrollIntoViewIfNeeded} from '../github-helpers/index.js';
+import delay from '../helpers/delay.js';
async function init(): Promise {
const {filePath} = new GitHubFileUrl(location.href);
diff --git a/source/features/small-user-avatars.tsx b/source/features/small-user-avatars.tsx
index 09c0fb883402..892e14bd35a5 100644
--- a/source/features/small-user-avatars.tsx
+++ b/source/features/small-user-avatars.tsx
@@ -1,9 +1,10 @@
import React from 'dom-chef';
-import onetime from '../helpers/onetime.js';
import features from '../feature-manager.js';
-import observe from '../helpers/selector-observer.js';
import getUserAvatarURL from '../github-helpers/get-user-avatar.js';
+import {is, not} from '../helpers/css-selectors.js';
+import onetime from '../helpers/onetime.js';
+import observe from '../helpers/selector-observer.js';
import './small-user-avatars.css';
function addAvatar(link: HTMLElement): void {
@@ -36,15 +37,18 @@ function initOnce(): void {
observe([
'.js-issue-row [data-hovercard-type="user"]', // `isPRList` + old `isIssueList`
'.notification-thread-subscription [data-hovercard-type="user"]', // https://github.com/notifications/subscriptions
- `:is(
- [data-testid="created-at"],
- [data-testid="closed-at"]
- ) a[data-hovercard-url*="/users"]`, // `isIssueList`
+ is(
+ '[data-testid="created-at"]',
+ '[data-testid="closed-at"]',
+ ) + ' a[data-hovercard-url*="/users"]', // `isIssueList`
], addAvatar);
- observe(`.user-mention:not(${[
- '.opened-by > *', // Merge queue
- '.commit-author',
- ].join(',')})`, addMentionAvatar);
+ observe(
+ '.user-mention' + not(
+ '.opened-by > *', // Merge queue
+ '.commit-author',
+ ),
+ addMentionAvatar,
+ );
}
void features.add(import.meta.url, {
diff --git a/source/features/sort-conversations-by-update-time.tsx b/source/features/sort-conversations-by-update-time.tsx
index b004f60daa90..33517d9eb31f 100644
--- a/source/features/sort-conversations-by-update-time.tsx
+++ b/source/features/sort-conversations-by-update-time.tsx
@@ -1,12 +1,12 @@
-import {$optional} from 'select-dom/strict.js';
-import * as pageDetect from 'github-url-detection';
import elementReady from 'element-ready';
+import * as pageDetect from 'github-url-detection';
import oneEvent from 'one-event';
+import {$optional} from 'select-dom';
import features from '../feature-manager.js';
import SearchQuery from '../github-helpers/search-query.js';
-import observe from '../helpers/selector-observer.js';
import {linksToConversationLists} from '../github-helpers/selectors.js';
+import observe from '../helpers/selector-observer.js';
/** Keep the original URL on the element so that `shorten-links` can use it reliably #5890 */
export function saveOriginalHref(link: HTMLAnchorElement): void {
diff --git a/source/features/status-subscription.tsx b/source/features/status-subscription.tsx
index 9fff4144552f..194d0b033161 100644
--- a/source/features/status-subscription.tsx
+++ b/source/features/status-subscription.tsx
@@ -2,14 +2,14 @@ import './status-subscription.css';
import React from 'dom-chef';
import * as pageDetect from 'github-url-detection';
-import {$optional} from 'select-dom/strict.js';
import BellIcon from 'octicons-plain-react/Bell';
import BellSlashIcon from 'octicons-plain-react/BellSlash';
import IssueReopenedIcon from 'octicons-plain-react/IssueReopened';
+import {$, $closest, $optional} from 'select-dom';
import features from '../feature-manager.js';
-import observe from '../helpers/selector-observer.js';
import {getConversationNumber, getRepo, multilineAriaLabel} from '../github-helpers/index.js';
+import observe from '../helpers/selector-observer.js';
type SubscriptionStatus = 'none' | 'all' | 'status';
@@ -33,9 +33,7 @@ function SubButton(): JSX.Element {
}
function getReasonElement(subscriptionButton: HTMLButtonElement): HTMLParagraphElement {
- return subscriptionButton
- .closest('.thread-subscription-status')!
- .querySelector('p.reason')!;
+ return $('p.reason', $closest('.thread-subscription-status', subscriptionButton));
}
function getCurrentStatus(subscriptionButton: HTMLButtonElement): SubscriptionStatus {
@@ -91,7 +89,6 @@ function addButton(subscriptionButton: HTMLButtonElement): void {
Status
,
-
// Always submitted, but ignored unless the value is `subscribe_to_custom_notifications`
// Keep outside BtnGroup
,
@@ -112,7 +109,8 @@ function addButton(subscriptionButton: HTMLButtonElement): void {
const githubApiBaseHeaders = new Headers({
accept: 'application/json',
'github-verified-fetch': 'true',
- 'x-github-client-version': 'Refined GitHub. Please address https://github.com/orgs/community/discussions/132506#discussioncomment-11294985',
+ 'x-github-client-version':
+ 'Refined GitHub. Please address https://github.com/orgs/community/discussions/132506#discussioncomment-11294985',
credentials: 'include',
});
@@ -157,13 +155,11 @@ async function updateIssueSubscriptionStatus(targetStatus: SubscriptionStatus, i
},
};
- const response = await fetch('/_graphql',
- {
- headers: githubApiBaseHeaders,
- method: 'POST',
- body: JSON.stringify(body),
- },
- );
+ const response = await fetch('/_graphql', {
+ headers: githubApiBaseHeaders,
+ method: 'POST',
+ body: JSON.stringify(body),
+ });
if (!response.ok) {
throw new Error('Failed to update the issue subscription status');
}
diff --git a/source/features/sticky-comment-header.css b/source/features/sticky-comment-header.css
index 789cddf7c1d9..c08a5cf68c26 100644
--- a/source/features/sticky-comment-header.css
+++ b/source/features/sticky-comment-header.css
@@ -6,7 +6,7 @@ html:not([rgh-OFF-sticky-comment-header]).rgh-show-names {
react-app[app-name='issues-react'],
/* TODO: Remove after July 2026 */
- .pull-request-tab-content {
+ .pull-request-tab-content {
--rgh-issue-or-pr-sticky-header-height: 56px;
}
react-app[app-name='pull-requests'] {
@@ -26,7 +26,7 @@ html:not([rgh-OFF-sticky-comment-header]).rgh-show-names {
z-index: 3;
top: calc(
var(--base-sticky-header-height, 0px) +
- var(--rgh-issue-or-pr-sticky-header-height, 0px)
+ var(--rgh-issue-or-pr-sticky-header-height, 0px)
);
}
diff --git a/source/features/sticky-notifications-actions.css b/source/features/sticky-notifications-actions.css
index 3b0763e7a608..8afe8f03ff99 100644
--- a/source/features/sticky-notifications-actions.css
+++ b/source/features/sticky-notifications-actions.css
@@ -29,8 +29,7 @@
.js-notifications-banners-target {
margin-bottom: calc(
- max(var(--shadow-blur-radius) * 0.6, 0px) +
- var(--shadow-spread-radius)
+ max(var(--shadow-blur-radius) * 0.6, 0px) + var(--shadow-spread-radius)
);
}
}
diff --git a/source/features/sticky-sidebar.css b/source/features/sticky-sidebar.css
index 4e8ab17bea98..813b17d16361 100644
--- a/source/features/sticky-sidebar.css
+++ b/source/features/sticky-sidebar.css
@@ -7,14 +7,14 @@ Exclusively use simple sums and use `0px` instead of `0`
--rgh-sticky-header-height: 70px; /* 60px plus some padding */
--rgh-sticky-sidebar-offset: calc(
var(--rgh-sticky-header-height, 0px) +
- var(--rgh-sticky-notification-header-height, 0px)
+ var(--rgh-sticky-notification-header-height, 0px)
);
}
/* `isRepoRoot` */
div[class^='prc-PageLayout-Pane']:has(
- > rails-partial[data-partial-name='codeViewRepoRoute.Sidebar']
- ),
+ > rails-partial[data-partial-name='codeViewRepoRoute.Sidebar']
+),
/* Old `isRepoRoot` - Remove after August 2026 */
.Layout-sidebar .BorderGrid {
--rgh-sticky-sidebar-offset: 0;
diff --git a/source/features/sticky-sidebar.tsx b/source/features/sticky-sidebar.tsx
index 89cd8742a7dc..ce42c34e4912 100644
--- a/source/features/sticky-sidebar.tsx
+++ b/source/features/sticky-sidebar.tsx
@@ -1,12 +1,12 @@
import './sticky-sidebar.css';
+import {onAbort} from 'abort-utils';
import debounce from 'debounce-fn';
import * as pageDetect from 'github-url-detection';
-import {onAbort} from 'abort-utils';
import features from '../feature-manager.js';
-import observe from '../helpers/selector-observer.js';
import calculateCssCalcString from '../helpers/calculate-css-calc-string.js';
+import observe from '../helpers/selector-observer.js';
const minimumViewportWidthForSidebar = 768; // Less than this, the layout is single-column
diff --git a/source/features/suggest-commit-title-limit.css b/source/features/suggest-commit-title-limit.css
index 66bfb62cae0e..85958706e9f6 100644
--- a/source/features/suggest-commit-title-limit.css
+++ b/source/features/suggest-commit-title-limit.css
@@ -4,17 +4,18 @@
/* Limit width of commit title to 72 characters */
.rgh-suggest-commit-title-limit
-:is(
- [data-testid='mergebox-partial'] input[type='text'],
- #commit-message-input,
- /* TODO: Remove after July 2026 */
+ :is(
+ [data-testid='mergebox-partial'] input[type='text'],
+ #commit-message-input,
+ /* TODO: Remove after July 2026 */
#commit-summary-input
-) {
+ ) {
box-sizing: content-box; /* Exclude padding/border from `width`; No need to mess with `calc` */
width: 72ch;
/* Like 100%, except it works with content-box and it feels like -webkit-1999 */
max-width: -webkit-fill-available;
+ /* biome-ignore lint/suspicious/noDuplicateProperties: TODO: Remove in 2027 if supported */
max-width: -moz-available;
max-width: intrinsic;
}
@@ -22,7 +23,8 @@
/* TODO: Remove after August 2026 */
#pull_request_title,
/* TODO: Remove after July 2026 */
- #commit-summary-input,
+#commit-summary-input,
+/* TODO: Remove after legacy PR files view is removed */
#issue_title {
&.rgh-title-over-limit {
border-color: var(--rgh-limit-color);
diff --git a/source/features/suggest-commit-title-limit.tsx b/source/features/suggest-commit-title-limit.tsx
index 05e75e6fbe8a..ae2297345bba 100644
--- a/source/features/suggest-commit-title-limit.tsx
+++ b/source/features/suggest-commit-title-limit.tsx
@@ -5,12 +5,12 @@ import * as pageDetect from 'github-url-detection';
import features from '../feature-manager.js';
import onCommitTitleUpdate from '../github-events/on-commit-title-update.js';
+import waitForPrMerge from '../github-events/on-pr-merge.js';
import getNextConversationNumber from '../github-helpers/get-next-conversation-number.js';
import {getConversationNumber} from '../github-helpers/index.js';
-import {formatPrCommitTitle} from './sync-pr-commit-title.js';
-import waitForPrMerge from '../github-events/on-pr-merge.js';
import abortableClassName from '../helpers/abortable-classname.js';
import observe from '../helpers/selector-observer.js';
+import {formatPrCommitTitle} from './sync-pr-commit-title.js';
// https://github.com/refined-github/refined-github/issues/2178#issuecomment-505940703
const limit = 72;
@@ -38,11 +38,16 @@ async function init(signal: AbortSignal): Promise {
onCommitTitleUpdate(validateCommitTitle, signal);
- delegate([
- ...currentPrTitleSelectors,
- 'input#pull_request_title', // Old `isCompare` - TODO: Remove after August 2026
- 'input#issue_title', // Old `isPR` view - TODO: Remove after July 2026
- ], 'input', async ({delegateTarget}) => validatePrTitle(delegateTarget as HTMLInputElement), {signal, passive: true});
+ delegate(
+ [
+ ...currentPrTitleSelectors,
+ 'input#pull_request_title', // Old `isCompare` - TODO: Remove after August 2026
+ 'input#issue_title', // Old `isPR` view - TODO: Remove after legacy PR files view is removed
+ ],
+ 'input',
+ async ({delegateTarget}) => validatePrTitle(delegateTarget as HTMLInputElement),
+ {signal, passive: true},
+ );
// `isPR` - input is added to the DOM when user enters editing mode and removed when they exit it
// `isCompare` - input is re-rendered when previously entered title is restored
observe(currentPrTitleSelectors, validatePrTitle, {signal});
diff --git a/source/features/swap-branches-on-compare.tsx b/source/features/swap-branches-on-compare.tsx
index c3fc15474121..b3b3201ce64d 100644
--- a/source/features/swap-branches-on-compare.tsx
+++ b/source/features/swap-branches-on-compare.tsx
@@ -1,6 +1,6 @@
import React from 'dom-chef';
-import {$} from 'select-dom/strict.js';
import * as pageDetect from 'github-url-detection';
+import {$} from 'select-dom';
import features from '../feature-manager.js';
import {buildRepoUrl, getRepo} from '../github-helpers/index.js';
diff --git a/source/features/sync-pr-commit-title.tsx b/source/features/sync-pr-commit-title.tsx
index 1bafdebe0b6f..ba69e7386559 100644
--- a/source/features/sync-pr-commit-title.tsx
+++ b/source/features/sync-pr-commit-title.tsx
@@ -1,17 +1,17 @@
-import React from 'dom-chef';
-import {$, $optional} from 'select-dom/strict.js';
import delegate from 'delegate-it';
+import React from 'dom-chef';
import * as pageDetect from 'github-url-detection';
+import {$, $optional} from 'select-dom';
-import api from '../github-helpers/api.js';
import features from '../feature-manager.js';
-import {getConversationNumber, userCanLikelyMergePr} from '../github-helpers/index.js';
import onCommitTitleUpdate from '../github-events/on-commit-title-update.js';
-import observe from '../helpers/selector-observer.js';
+import api from '../github-helpers/api.js';
+import {getConversationNumber, userCanLikelyMergePr} from '../github-helpers/index.js';
+import parseRenderedText from '../github-helpers/parse-rendered-text.js';
+import {confirmMergeButton} from '../github-helpers/selectors.js';
import cleanPrCommitTitle from '../helpers/pr-commit-cleaner.js';
+import observe from '../helpers/selector-observer.js';
import setReactInputValue from '../helpers/set-react-input-value.js';
-import {confirmMergeButton} from '../github-helpers/selectors.js';
-import parseRenderedText from '../github-helpers/parse-rendered-text.js';
const commitTitleFieldSelector = '[data-testid="mergebox-partial"] input[type="text"]';
@@ -41,11 +41,13 @@ function createCommitTitle(): string {
function needsSubmission(): boolean {
const mergeButton = $optional(confirmMergeButton);
const textContent = mergeButton?.textContent?.trim();
- if (!textContent || ![
- 'Confirm squash and merge',
- 'Confirm auto-merge (squash)',
- 'Confirm bypass rules and merge (squash)',
- ].includes(textContent)) {
+ if (
+ !textContent || ![
+ 'Confirm squash and merge',
+ 'Confirm auto-merge (squash)',
+ 'Confirm bypass rules and merge (squash)',
+ ].includes(textContent)
+ ) {
return false;
}
@@ -54,7 +56,9 @@ function needsSubmission(): boolean {
}
function getUi(): HTMLElement {
- const cancelButton = ;
+ const cancelButton = ;
return $optional('.rgh-sync-pr-commit-title-note') ?? (
The title of this PR will be updated to match this title. {cancelButton}
@@ -101,10 +105,14 @@ function disableSubmission(): void {
function init(signal: AbortSignal): void {
// PR title -> Commit title field
observe(commitTitleFieldSelector, updateCommitTitle, {signal}); // On panel open
- observe([
- 'h1[class^="prc-PageHeader-Title"]',
- '.gh-header-title', // Old view - TODO: Remove after July 2026
- ], updateCommitTitle, {signal}); // On PR title change
+ observe(
+ [
+ 'h1[class^="prc-PageHeader-Title"]',
+ '.gh-header-title', // Old view - TODO: Remove after July 2026
+ ],
+ updateCommitTitle,
+ {signal},
+ ); // On PR title change
// Commit title field -> toggle checkbox visibility
onCommitTitleUpdate(updateUi, signal);
diff --git a/source/features/tab-to-indent.tsx b/source/features/tab-to-indent.tsx
index da5d508ff919..d9c9211cde41 100644
--- a/source/features/tab-to-indent.tsx
+++ b/source/features/tab-to-indent.tsx
@@ -1,5 +1,5 @@
-import {eventHandler} from 'indent-textarea';
import * as pageDetect from 'github-url-detection';
+import {eventHandler} from 'indent-textarea';
import features from '../feature-manager.js';
import {onCommentFieldKeydown} from '../github-events/on-field-keydown.js';
diff --git a/source/features/table-input.css b/source/features/table-input.css
index 863665dd2214..f4346975c204 100644
--- a/source/features/table-input.css
+++ b/source/features/table-input.css
@@ -13,7 +13,8 @@
margin: auto;
}
-.ActionBar-item-container:has(.rgh-table-input) {
+.ActionBar-item-container:has(.rgh-table-input),
+[class*='ActionBar-Nav']:has(.rgh-table-input) {
overflow: visible;
}
@@ -38,23 +39,23 @@
.rgh-tic:hover::before,
/* Hovering the 1st column */
- .rgh-tic:is(:nth-of-type(5n + 1)):has(
- ~ .rgh-tic:hover:nth-of-type(5n + 1)
- )::before,
+.rgh-tic:is(:nth-of-type(5n+1)):has(
+ ~ .rgh-tic:hover:nth-of-type(5n+1)
+)::before,
/* Hovering the 2nd column */
- .rgh-tic:is(:nth-of-type(5n + 1), :nth-of-type(5n + 2)):has(
- ~ .rgh-tic:hover:nth-of-type(5n + 2)
- )::before,
+.rgh-tic:is(:nth-of-type(5n+1), :nth-of-type(5n+2)):has(
+ ~ .rgh-tic:hover:nth-of-type(5n+2)
+)::before,
/* Hovering the 3rd column */
- .rgh-tic:not(:nth-of-type(5n + 4), :nth-of-type(5n + 5)):has(
- ~ .rgh-tic:hover:nth-of-type(5n + 3)
- )::before,
+.rgh-tic:not(:nth-of-type(5n+4), :nth-of-type(5n+5)):has(
+ ~ .rgh-tic:hover:nth-of-type(5n+3)
+)::before,
/* Hovering the 4th column */
- .rgh-tic:not(:nth-of-type(5n + 5)):has(
- ~ .rgh-tic:hover:nth-of-type(5n + 4)
- )::before,
+.rgh-tic:not(:nth-of-type(5n+5)):has(
+ ~ .rgh-tic:hover:nth-of-type(5n+4)
+)::before,
/* Hovering the 5th column */
- .rgh-tic:has(~ .rgh-tic:hover:nth-of-type(5n + 5))::before {
+.rgh-tic:has(~ .rgh-tic:hover:nth-of-type(5n+5))::before {
border-color: var(--borderColor-accent-muted, fuchsia);
background-color: var(--bgColor-accent-muted, fuchsia);
}
diff --git a/source/features/table-input.tsx b/source/features/table-input.tsx
index 70a1ab8acc99..bf522189d489 100644
--- a/source/features/table-input.tsx
+++ b/source/features/table-input.tsx
@@ -1,19 +1,19 @@
import './table-input.css';
+import delegate, {type DelegateEvent} from 'delegate-it';
import React from 'dom-chef';
-import TableIcon from 'octicons-plain-react/Table';
import * as pageDetect from 'github-url-detection';
+import TableIcon from 'octicons-plain-react/Table';
+import {$, $closestOptional} from 'select-dom';
import {insertTextIntoField} from 'text-field-edit';
-import delegate, {type DelegateEvent} from 'delegate-it';
-import {$} from 'select-dom/strict.js';
import features from '../feature-manager.js';
-import smartBlockWrap from '../helpers/smart-block-wrap.js';
-import observe from '../helpers/selector-observer.js';
import {actionBarSelectors} from '../github-helpers/selectors.js';
+import observe from '../helpers/selector-observer.js';
+import smartBlockWrap from '../helpers/smart-block-wrap.js';
function addTable({delegateTarget: square}: DelegateEvent): void {
- const container = square.closest('fieldset') // Issue
+ const container = $closestOptional('fieldset', square) // Issue
?? square.form!.querySelector('.CommentBox-container')!; // PR
const field = $('textarea', container);
const cursorPosition = field.selectionStart;
@@ -23,7 +23,6 @@ function addTable({delegateTarget: square}: DelegateEvent
\n'
-
//
on its own line
// "1 space" indents without causing unwanted Markdown code blocks that 4 spaces would cause
: '
\n' + '
\n'.repeat(columns);
diff --git a/source/features/tag-changes-link.css b/source/features/tag-changes-link.css
index 7a814cece265..b7f1e9ac3fc1 100644
--- a/source/features/tag-changes-link.css
+++ b/source/features/tag-changes-link.css
@@ -1,7 +1,8 @@
/* Don't break layout on mobile (https://primer.style/css/support/breakpoints) */
@media (width >= 768px) {
/* Reserve some space above the "Compare" dropdown (the selector will be disabled as soon as the "Changelog" link is inserted) */
- .rgh-tag-changes-link .repository-content
+ .rgh-tag-changes-link
+ .repository-content
.my-5
> :first-child
> :nth-child(5):not(.rgh-changelog-link) {
diff --git a/source/features/tag-changes-link.tsx b/source/features/tag-changes-link.tsx
index 6e0f94c6c5f4..c7e80ea28974 100644
--- a/source/features/tag-changes-link.tsx
+++ b/source/features/tag-changes-link.tsx
@@ -1,16 +1,17 @@
import './tag-changes-link.css';
import React from 'dom-chef';
-import {$$, elementExists} from 'select-dom';
-import {$, $optional} from 'select-dom/strict.js';
import domLoaded from 'dom-loaded';
-import DiffIcon from 'octicons-plain-react/Diff';
import * as pageDetect from 'github-url-detection';
+import DiffIcon from 'octicons-plain-react/Diff';
+import {
+ $, $$, $optional, elementExists,
+} from 'select-dom';
import tinyVersionCompare from 'tiny-version-compare';
import features from '../feature-manager.js';
-import fetchDom from '../helpers/fetch-dom.js';
import {buildRepoUrl, getRepo, parseTag} from '../github-helpers/index.js';
+import fetchDom from '../helpers/fetch-dom.js';
type TagDetails = {
element: HTMLElement;
@@ -115,7 +116,11 @@ async function init(): Promise {
);
// The page of a tag without a release still uses the old layout #5037
- if (pageDetect.isEnterprise() || pageDetect.isTags() || (pageDetect.isSingleReleaseOrTag() && elementExists('.release'))) {
+ if (
+ pageDetect.isEnterprise()
+ || pageDetect.isTags()
+ || (pageDetect.isSingleReleaseOrTag() && elementExists('.release'))
+ ) {
lastLink.after(
{compareLink}
diff --git a/source/features/tags-on-commits-list.tsx b/source/features/tags-on-commits-list.tsx
index 65b789db05de..3f8f8a3001a6 100644
--- a/source/features/tags-on-commits-list.tsx
+++ b/source/features/tags-on-commits-list.tsx
@@ -1,17 +1,17 @@
import React from 'dom-chef';
+import {$, $$, $$optional} from 'select-dom';
import cache from 'webext-storage-cache/legacy.js';
-import {$, $$, $$optional} from 'select-dom/strict.js';
-import TagIcon from 'octicons-plain-react/Tag';
import * as pageDetect from 'github-url-detection';
+import TagIcon from 'octicons-plain-react/Tag';
import features from '../feature-manager.js';
import api from '../github-helpers/api.js';
-import {getCommitHash} from './mark-merge-commits-in-list.js';
-import {buildRepoUrl, getRepo} from '../github-helpers/index.js';
-import GetTagsOnCommit from './tags-on-commits-list.gql';
import {expectToken} from '../github-helpers/github-token.js';
+import {buildRepoUrl, getRepo} from '../github-helpers/index.js';
import delay from '../helpers/delay.js';
+import {getCommitHash} from './mark-merge-commits-in-list.js';
+import GetTagsOnCommit from './tags-on-commits-list.gql';
type CommitTags = Record;
@@ -79,7 +79,8 @@ async function getTags(lastCommit: string, after?: string): Promise
}
const lastTag = nodes.at(-1)!.target;
- const lastTagIsYounger = new Date(repository.object.committedDate) < new Date(isTagTarget(lastTag) ? lastTag.tagger.date : lastTag.committedDate);
+ const lastTagIsYounger = new Date(repository.object.committedDate)
+ < new Date(isTagTarget(lastTag) ? lastTag.tagger.date : lastTag.committedDate);
// If the last tag is newer than last commit on the page, then not all commits are accounted for, keep looking
if (lastTagIsYounger && repository.refs.pageInfo.hasNextPage) {
diff --git a/source/features/toggle-everything-with-alt.tsx b/source/features/toggle-everything-with-alt.tsx
index 431addae0c57..f618a64e8c30 100644
--- a/source/features/toggle-everything-with-alt.tsx
+++ b/source/features/toggle-everything-with-alt.tsx
@@ -1,8 +1,10 @@
import delegate from 'delegate-it';
import * as pageDetect from 'github-url-detection';
+import {$closest} from 'select-dom';
import features from '../feature-manager.js';
import clickAll from '../helpers/click-all.js';
+import {is} from '../helpers/css-selectors.js';
function minimizedCommentsSelector(clickedItem: HTMLElement): string {
const open = (clickedItem.parentElement as HTMLDetailsElement).open ? '[open]' : ':not([open])';
@@ -15,16 +17,24 @@ function resolvedCommentsSelector(clickedItem: HTMLElement): string {
return `.js-resolvable-thread-toggler[aria-expanded="${clickedItem.getAttribute('aria-expanded')!}"]:not(.d-none)`;
}
+function resolveConversationsSelector(clickedItem: HTMLElement): string {
+ const isResolving = clickedItem.textContent.includes('Resolve');
+ return `form[action$="/${isResolving ? 'resolve' : 'unresolve'}"] button[type="submit"]`;
+}
+
const expandSelector = '.js-file .js-expand-full';
const collapseSelector = '.js-file .js-collapse-diff';
const commitMessageSelector = 'button[data-testid="commit-row-show-description-button"]';
-const addSuggestionToBatchSelector = ':is(.js-apply-changes button[data-variant="primary"], .js-batched-suggested-changes-add)';
+const addSuggestionToBatchSelector = is(
+ '.js-apply-changes button[data-variant="primary"]',
+ '.js-batched-suggested-changes-add',
+);
function markdownCommentSelector(clickedItem: HTMLElement): string {
- const {id} = clickedItem.closest('.TimelineItem-body[id]')!;
+ const {id} = $closest('.TimelineItem-body[id]', clickedItem);
return `#${id} .markdown-body details > summary`;
}
@@ -38,6 +48,14 @@ function init(signal: AbortSignal): void {
// Review comments in PR
delegate('.js-file .js-resolvable-thread-toggler', 'click', clickAll(resolvedCommentsSelector), {signal});
+ // "Resolve conversation" / "Unresolve conversation" buttons in PR conversations
+ delegate(
+ '.js-resolvable-timeline-thread-form button[type="submit"]',
+ 'click',
+ clickAll(resolveConversationsSelector),
+ {signal},
+ );
+
// "Expand all" and "Collapse expanded lines" buttons in commit files
delegate(expandSelector, 'click', clickAll(expandSelector), {signal});
delegate(collapseSelector, 'click', clickAll(collapseSelector), {signal});
@@ -46,7 +64,9 @@ function init(signal: AbortSignal): void {
delegate(commitMessageSelector, 'click', clickAll(commitMessageSelector), {signal});
// elements in issue/PR comment Markdown content
- delegate('.TimelineItem-body[id] .markdown-body details > summary', 'click', clickAll(markdownCommentSelector), {signal});
+ delegate('.TimelineItem-body[id] .markdown-body details > summary', 'click', clickAll(markdownCommentSelector), {
+ signal,
+ });
// "Add suggestion to batch" buttons in PR files
delegate(addSuggestionToBatchSelector, 'click', clickAll(addSuggestionToBatchSelector), {signal, capture: true});
@@ -84,4 +104,6 @@ Commit messages:
- PR comment: https://github.com/OpenLightingProject/open-fixture-library/pull/2453#issuecomment-1055672394
Add suggestion to batch: https://github.com/refined-github/sandbox/pull/121/changes
+
+Resolve conversation in PR: https://github.com/refined-github/yolo/pull/8
*/
diff --git a/source/features/unclip-checks.tsx b/source/features/unclip-checks.tsx
index e3b65d552ae0..7546839cee7c 100644
--- a/source/features/unclip-checks.tsx
+++ b/source/features/unclip-checks.tsx
@@ -1,6 +1,7 @@
import './unclip-checks.css';
-import * as pageDetect from 'github-url-detection';
import delegate, {type DelegateEvent} from 'delegate-it';
+import * as pageDetect from 'github-url-detection';
+import {$closest} from 'select-dom';
import features from '../feature-manager.js';
@@ -9,7 +10,7 @@ function init(signal: AbortSignal): void {
'button[aria-label="Expand checks"]',
'click',
({delegateTarget}: DelegateEvent) => {
- delegateTarget.closest('section[aria-label="Checks"]')!.classList.add('rgh-unclip-checks');
+ $closest('section[aria-label="Checks"]', delegateTarget).classList.add('rgh-unclip-checks');
},
{signal, capture: true},
);
diff --git a/source/features/unfinished-comments.tsx b/source/features/unfinished-comments.tsx
index d25ad1559084..bf1344a819d4 100644
--- a/source/features/unfinished-comments.tsx
+++ b/source/features/unfinished-comments.tsx
@@ -1,6 +1,6 @@
-import {$$} from 'select-dom';
import delegate from 'delegate-it';
import * as pageDetect from 'github-url-detection';
+import {$$optional} from 'select-dom';
import features from '../feature-manager.js';
@@ -16,7 +16,7 @@ function isFieldDirty(field: HTMLTextAreaElement): boolean {
function hasDraftComments(): boolean {
// `[id^="convert-to-issue-body"]` excludes the hidden pre-filled textareas created when opening the dropdown menu of review comments
- return $$('textarea:not([id^="convert-to-issue-body"])').some(f => isFieldDirty(f));
+ return $$optional('textarea:not([id^="convert-to-issue-body"])').some(f => isFieldDirty(f));
}
function disableOnSubmit(): void {
diff --git a/source/features/unread-anywhere.css b/source/features/unread-anywhere.css
new file mode 100644
index 000000000000..b5e2c89cbf7b
--- /dev/null
+++ b/source/features/unread-anywhere.css
@@ -0,0 +1,5 @@
+/* Done in CSS because React removes classes when updating the unread status */
+.rgh-unread-anywhere-wrapper a {
+ border-top-right-radius: 0 !important;
+ border-bottom-right-radius: 0 !important;
+}
diff --git a/source/features/unread-anywhere.tsx b/source/features/unread-anywhere.tsx
index 590a049f8147..4cd1dfd83c46 100644
--- a/source/features/unread-anywhere.tsx
+++ b/source/features/unread-anywhere.tsx
@@ -1,21 +1,33 @@
-import {$$optional, $optional} from 'select-dom/strict.js';
-import {messageRuntime} from 'webext-msg';
+import './unread-anywhere.css';
+
import React from 'dom-chef';
import * as pageDetect from 'github-url-detection';
import ArrowUpRightIcon from 'octicons-plain-react/ArrowUpRight';
+import {$, $$optional} from 'select-dom';
+import {messageRuntime} from 'webext-msg';
import features from '../feature-manager.js';
import {registerHotkey} from '../github-helpers/hotkey.js';
-import onetime from '../helpers/onetime.js';
import showToast from '../github-helpers/toast.js';
+import {getClasses, isSmallDevice, wrap} from '../helpers/dom-utils.js';
import {fetchDomUncached} from '../helpers/fetch-dom.js';
+import onetime from '../helpers/onetime.js';
import pluralize from '../helpers/pluralize.js';
-import {removeLinkToPrFilesTab} from './pr-notification-link.js';
import observe from '../helpers/selector-observer.js';
-import {getClasses, isSmallDevice} from '../helpers/dom-utils.js';
+import {removeLinkToPrFilesTab} from './pr-notification-link.js';
const limit = 5;
+const buttonWithNotificationsSelector = 'a[class*="notificationIndicator"]';
+
+function removeNotificationIndicator(element: HTMLElement): void {
+ for (const className of element.classList) {
+ if (className.includes('notificationIndicator')) {
+ element.classList.remove(className);
+ }
+ }
+}
+
async function openUnreadNotifications(event?: React.MouseEvent): Promise {
if (event?.target instanceof HTMLButtonElement) {
// Hide the tooltip
@@ -46,8 +58,8 @@ async function openUnreadNotifications(event?: React.MouseEvent): Promise
updateToast(`Opened the last ${limit} unread notifications`);
} else {
updateToast(pluralize(urls.length, '$$ notification') + ' opened');
- // Update the UI too. Optional because the UI is often out of date
- $optional('.AppHeader-button--hasIndicator')?.classList.remove('AppHeader-button--hasIndicator');
+ // Update the UI too
+ removeNotificationIndicator($(buttonWithNotificationsSelector));
}
}, {
message: 'Loading notifications…',
@@ -59,39 +71,43 @@ async function openUnreadNotifications(event?: React.MouseEvent): Promise
});
}
-function addButton(nativeLink: HTMLAnchorElement): void {
+async function addButton(nativeLink: HTMLAnchorElement): Promise {
const classes = getClasses(nativeLink);
- classes.delete('AppHeader-button--hasIndicator');
- // Reverse order so that the new button is painted below the "unread indicator"
- nativeLink.parentElement!.classList.add('d-flex', 'flex-row-reverse');
- nativeLink.classList.add('AppHeader-buttonLeft');
const button = (
);
+
+ // Reverse order so that the new button is painted below the "unread indicator"
+ // Also has an rgh- class so that it can be targeted via CSS and deduplicated
+ wrap(nativeLink, );
+
nativeLink.before(button);
+ button.setAttribute('data-variant', 'invisible'); // Enables hover style
button.classList.add(
...classes,
- 'AppHeader-buttonRight',
'tooltipped',
'tooltipped-sw',
+ 'rounded-left-0',
+ 'border-left-0',
);
+
+ removeNotificationIndicator(button);
}
// No signal, created once per load
function initOnce(): void {
registerHotkey('g u', openUnreadNotifications);
document.documentElement.classList.add('rgh-unread-anywhere');
- observe('a#AppHeader-notifications-button.AppHeader-button--hasIndicator', addButton);
+ observe(buttonWithNotificationsSelector + ':not(.rgh-unread-anywhere-wrapper *)', addButton);
}
void features.add(import.meta.url, {
diff --git a/source/features/unreleased-commits.tsx b/source/features/unreleased-commits.tsx
index 199c0e7bfe8c..83187cecd540 100644
--- a/source/features/unreleased-commits.tsx
+++ b/source/features/unreleased-commits.tsx
@@ -1,30 +1,26 @@
import React from 'dom-chef';
-import {CachedFunction} from 'webext-storage-cache';
import * as pageDetect from 'github-url-detection';
import PlusIcon from 'octicons-plain-react/Plus';
import TagIcon from 'octicons-plain-react/Tag';
-import {elementExists} from 'select-dom';
-import {$optional} from 'select-dom/strict.js';
+import {$optional, elementExists} from 'select-dom';
+import {CachedFunction} from 'webext-storage-cache';
import features from '../feature-manager.js';
-import observe from '../helpers/selector-observer.js';
import api from '../github-helpers/api.js';
+import getDefaultBranch from '../github-helpers/get-default-branch.js';
+import {userHasPushAccess} from '../github-helpers/get-user-permission.js';
+import {expectToken} from '../github-helpers/github-token.js';
+import {groupButtons} from '../github-helpers/group-buttons.js';
import {
- buildRepoUrl,
- cacheByRepo,
- getLatestVersionTag,
- getRepo,
+ buildRepoUrl, cacheByRepo, getLatestVersionTag, getRepo,
} from '../github-helpers/index.js';
import isDefaultBranch from '../github-helpers/is-default-branch.js';
-import pluralize from '../helpers/pluralize.js';
import {branchSelector} from '../github-helpers/selectors.js';
-import getPublishRepoState from './unreleased-commits.gql';
-import getDefaultBranch from '../github-helpers/get-default-branch.js';
import abbreviateString from '../helpers/abbreviate-string.js';
import {wrapAll} from '../helpers/dom-utils.js';
-import {groupButtons} from '../github-helpers/group-buttons.js';
-import {expectToken} from '../github-helpers/github-token.js';
-import {userHasPushAccess} from '../github-helpers/get-user-permission.js';
+import pluralize from '../helpers/pluralize.js';
+import observe from '../helpers/selector-observer.js';
+import getPublishRepoState from './unreleased-commits.gql';
type RepoPublishState = {
latestTag: string | false;
@@ -63,7 +59,9 @@ const repoPublishState = new CachedFunction('tag-ahead-by', {
// https://github.com/refined-github/refined-github/issues/6094
const latestTag = getLatestVersionTag([...tags.keys()]);
const latestTagOid = tags.get(latestTag)!;
- const aheadBy = repository.defaultBranchRef.target.history.nodes.findIndex((node: AnyObject) => node.oid === latestTagOid);
+ const aheadBy = repository.defaultBranchRef.target.history.nodes.findIndex((node: AnyObject) =>
+ node.oid === latestTagOid,
+ );
return {
latestTag,
@@ -79,10 +77,9 @@ async function createLink(
latestTag: string,
aheadBy: number,
): Promise {
- const commitCount
- = aheadBy === undeterminableAheadBy
- ? 'More than 20 unreleased commits'
- : pluralize(aheadBy, '$$ unreleased commit');
+ const commitCount = aheadBy === undeterminableAheadBy
+ ? 'More than 20 unreleased commits'
+ : pluralize(aheadBy, '$$ unreleased commit');
const label = `${commitCount}\nsince ${abbreviateString(latestTag, 30)}`;
return (
@@ -92,7 +89,8 @@ async function createLink(
aria-label={label}
>
- {aheadBy === undeterminableAheadBy || +{aheadBy}}
+ {' '}
+ {aheadBy === undeterminableAheadBy || +{aheadBy}}
);
}
diff --git a/source/features/unwrap-unnecessary-dropdowns.tsx b/source/features/unwrap-unnecessary-dropdowns.tsx
index 067bfabb1c55..ceaa39ea298b 100644
--- a/source/features/unwrap-unnecessary-dropdowns.tsx
+++ b/source/features/unwrap-unnecessary-dropdowns.tsx
@@ -1,5 +1,5 @@
-import {$, $$optional} from 'select-dom/strict.js';
import * as pageDetect from 'github-url-detection';
+import {$, $$optional, $closest} from 'select-dom';
import features from '../feature-manager.js';
import observe from '../helpers/selector-observer.js';
@@ -22,7 +22,7 @@ function replaceNotificationsDropdown(): void {
throw new Error('GitHub added new view types. This feature is obsolete.');
}
- const dropdown = forms[0].closest('action-menu')!;
+ const dropdown = $closest('action-menu', forms[0]);
const currentView = $('.Button-label span:last-child', dropdown).textContent.trim();
const desiredForm = currentView === 'Date' ? forms[0] : forms[1];
diff --git a/source/features/update-pr-from-base-branch.tsx b/source/features/update-pr-from-base-branch.tsx
index 6ef8fda66e71..7f14845532c9 100644
--- a/source/features/update-pr-from-base-branch.tsx
+++ b/source/features/update-pr-from-base-branch.tsx
@@ -1,20 +1,22 @@
+import delegate, {type DelegateEvent} from 'delegate-it';
import React from 'dom-chef';
-import {elementExists} from 'select-dom';
-import {$, $optional} from 'select-dom/strict.js';
import * as pageDetect from 'github-url-detection';
-import delegate, {type DelegateEvent} from 'delegate-it';
+import {
+ $, $closest, $optional, elementExists,
+} from 'select-dom';
import {CachedFunction} from 'webext-storage-cache';
import features from '../feature-manager.js';
-import observe from '../helpers/selector-observer.js';
import api from '../github-helpers/api.js';
-import {getBranches} from '../github-helpers/pr-branches.js';
import getPrInfo from '../github-helpers/get-pr-info.js';
-import showToast from '../github-helpers/toast.js';
-import {getRepo} from '../github-helpers/index.js';
-import updatePullRequestBranch from './update-pr-from-base-branch.gql';
import {expectToken} from '../github-helpers/github-token.js';
+import {getRepo} from '../github-helpers/index.js';
+import {getBranches} from '../github-helpers/pr-branches.js';
import {deletedHeadRepository, prMergeabilityBoxHeader} from '../github-helpers/selectors.js';
+import showToast from '../github-helpers/toast.js';
+import {getIdentifiers} from '../helpers/feature-helpers.js';
+import observe from '../helpers/selector-observer.js';
+import updatePullRequestBranch from './update-pr-from-base-branch.gql';
// TODO: Use CachedMap after https://github.com/fregante/webext-storage-cache/issues/51
const nativeRepos = new CachedFunction('native-update-button', {
@@ -86,7 +88,6 @@ async function handler({delegateTarget: button}: DelegateEvent error);
if (response instanceof Error) {
- // eslint-disable-next-line unicorn/prefer-type-error -- This is a generic error
throw new Error(`Error updating the branch: ${response.message}`, {cause: response});
}
}, {
@@ -94,53 +95,53 @@ async function handler({delegateTarget: button}: DelegateEvent
- {
- Object.entries(updateMethods).map(([method, label]) => {
- const buttonId = crypto.randomUUID();
- const tooltipId = crypto.randomUUID();
- return (
-
-
);
}
-const nativeUpdateButtonSelector = '[aria-label="Conflicts"] [class^="MergeBoxSectionHeader-module__wrapper"] [data-component="buttonContent"]';
+const nativeUpdateButtonSelector
+ = '[aria-label="Conflicts"] [class^="MergeBoxSectionHeader-module__wrapper"] [data-component="buttonContent"]';
function canNativelyUpdate(): boolean {
const nativeButton = $optional(nativeUpdateButtonSelector);
@@ -178,7 +179,7 @@ async function init(signal: AbortSignal): Promise {
return false;
}
- delegate(`.${updateButtonClass}`, 'click', handler, {signal});
+ delegate(feature.selector, 'click', handler, {signal});
observe(prMergeabilityBoxHeader, addButton, {signal});
observe(nativeUpdateButtonSelector, disableFeatureOnRepo, {signal});
}
diff --git a/source/features/useful-not-found-page.tsx b/source/features/useful-not-found-page.tsx
index 799e3ebfd476..482e70a2c979 100644
--- a/source/features/useful-not-found-page.tsx
+++ b/source/features/useful-not-found-page.tsx
@@ -1,17 +1,17 @@
import React from 'dom-chef';
-import {$} from 'select-dom/strict.js';
import elementReady from 'element-ready';
import * as pageDetect from 'github-url-detection';
+import {$} from 'select-dom';
-import onetime from '../helpers/onetime.js';
import features from '../feature-manager.js';
import api from '../github-helpers/api.js';
-import GitHubFileUrl from '../github-helpers/github-file-url.js';
import getDefaultBranch from '../github-helpers/get-default-branch.js';
+import GitHubFileUrl from '../github-helpers/github-file-url.js';
+import {expectToken} from '../github-helpers/github-token.js';
import {getCleanPathname, isUrlReachable} from '../github-helpers/index.js';
+import onetime from '../helpers/onetime.js';
import observe from '../helpers/selector-observer.js';
import GetLatestCommitToFile from './useful-not-found-page.gql';
-import {expectToken} from '../github-helpers/github-token.js';
type File = {
previous_filename?: string;
@@ -200,14 +200,16 @@ async function initPrCommitOnce(): Promise {
const blankSlateParagraph = await elementReady('.blankslate:has(> .octicon-telescope) p', {waitForChildren: false});
blankSlateParagraph!.after(
-
,
);
}
async function initRepoFile(signal: AbortSignal): Promise {
await expectToken();
observe('#repos-header-breadcrumb-wide-heading + ol a', crossIfNonExistent, {signal});
- observe('main div[data-testid="eror-404-description"]', showGitObjectHistoryOnRepo, {signal}); // "eror" as misspelled by GitHub
+ observe('main div[data-testid="eror-404-description"]', showGitObjectHistoryOnRepo, {signal}); // "eror" as misspelled by GitHub
}
void features.add(import.meta.url, {
diff --git a/source/features/user-profile-follower-badge.tsx b/source/features/user-profile-follower-badge.tsx
index f0891a1b05df..8c788dd04d4e 100644
--- a/source/features/user-profile-follower-badge.tsx
+++ b/source/features/user-profile-follower-badge.tsx
@@ -1,11 +1,11 @@
import React from 'dom-chef';
-import {CachedFunction} from 'webext-storage-cache';
import elementReady from 'element-ready';
import * as pageDetect from 'github-url-detection';
+import {CachedFunction} from 'webext-storage-cache';
import features from '../feature-manager.js';
import api from '../github-helpers/api.js';
-import {getLoggedInUser, getCleanPathname} from '../github-helpers/index.js';
+import {getCleanPathname, getLoggedInUser} from '../github-helpers/index.js';
import attachElement from '../helpers/attach-element.js';
const doesUserFollow = new CachedFunction('user-follows', {
diff --git a/source/features/vertical-front-matter.tsx b/source/features/vertical-front-matter.tsx
index 2c8e9984f2fd..7664a4a01403 100644
--- a/source/features/vertical-front-matter.tsx
+++ b/source/features/vertical-front-matter.tsx
@@ -1,18 +1,19 @@
import './vertical-front-matter.css';
import React from 'dom-chef';
-import {$$} from 'select-dom';
import * as pageDetect from 'github-url-detection';
+import {$$optional} from 'select-dom';
import features from '../feature-manager.js';
import observe from '../helpers/selector-observer.js';
// https://github.com/github/markup/blob/cd01f9ec87c86ce5a7c70188a74ef40fc4669c5b/lib/github/markup/markdown.rb#L34
-const hasFrontMatter = (): boolean => pageDetect.isSingleFile() && /\.(?:mdx?|mkdn?|mdwn|mdown|markdown|litcoffee)$/.test(location.pathname);
+const hasFrontMatter = (): boolean =>
+ pageDetect.isSingleFile() && /\.(?:mdx?|mkdn?|mdwn|mdown|markdown|litcoffee)$/.test(location.pathname);
function transpose(table: HTMLElement): void {
- const rows = $$(':scope > tbody > tr', table);
- const headers = $$(':scope > thead th', table);
+ const rows = $$optional(':scope > tbody > tr', table);
+ const headers = $$optional(':scope > thead th', table);
if (headers.length <= 4 || rows.length !== 1 || headers.length !== rows[0].childElementCount) {
return;
}
diff --git a/source/features/view-last-pr-deployment.tsx b/source/features/view-last-pr-deployment.tsx
index 0d1ee7518f2d..8c126a4404f8 100644
--- a/source/features/view-last-pr-deployment.tsx
+++ b/source/features/view-last-pr-deployment.tsx
@@ -1,32 +1,36 @@
import React from 'dom-chef';
-import {lastElement} from 'select-dom';
import * as pageDetect from 'github-url-detection';
import RocketIcon from 'octicons-plain-react/Rocket';
+import {lastElementOptional} from 'select-dom';
import features from '../feature-manager.js';
import observe from '../helpers/selector-observer.js';
function addLink(header: HTMLElement): void {
- const lastDeployment = lastElement('.js-timeline-item a[title="Deployment has completed"]');
+ const lastDeployment = lastElementOptional('.js-timeline-item a[title="Deployment has completed"]');
if (!lastDeployment) {
return;
}
- header.prepend(
+ // Use "parentElement" because open PRs have a "PR status" button before the "Code" button
+ header.parentElement!.prepend(
-
- Latest deployment
+ ,
);
}
function init(signal: AbortSignal): void {
- observe('.gh-header-actions', addLink, {signal});
+ observe([
+ 'button[class*="PullRequestCodeButton"]',
+ '.gh-header-actions > :first-child', // TODO: Drop in September 2026
+ ], addLink, {signal});
}
void features.add(import.meta.url, {
diff --git a/source/features/visit-tag.tsx b/source/features/visit-tag.tsx
index 72afe56054c8..a67d8ea4e5fa 100644
--- a/source/features/visit-tag.tsx
+++ b/source/features/visit-tag.tsx
@@ -1,23 +1,25 @@
-import React from 'react';
-import {elementExists} from 'select-dom';
+import * as pageDetect from 'github-url-detection';
import ArrowUpRightIcon from 'octicons-plain-react/ArrowUpRight';
import CodeIcon from 'octicons-plain-react/Code';
-import * as pageDetect from 'github-url-detection';
+import React from 'react';
+import {elementExists} from 'select-dom';
-import {branchSelector} from '../github-helpers/selectors.js';
import features from '../feature-manager.js';
-import observe from '../helpers/selector-observer.js';
-import {wrapAll} from '../helpers/dom-utils.js';
import {buildRepoUrl} from '../github-helpers/index.js';
+import {branchSelector} from '../github-helpers/selectors.js';
+import {wrapAll} from '../helpers/dom-utils.js';
+import observe from '../helpers/selector-observer.js';
async function addLink(branchSelector: HTMLButtonElement): Promise {
- if (elementExists([
- // If the branch picker is open, do nothing #7491
- '#selectPanel',
+ if (
+ elementExists([
+ // If the branch picker is open, do nothing #7491
+ '#selectPanel',
- // React view deduplication https://github.com/refined-github/refined-github/issues/7601
- '.rgh-visit-tag',
- ])) {
+ // React view deduplication https://github.com/refined-github/refined-github/issues/7601
+ '.rgh-visit-tag',
+ ])
+ ) {
return;
}
diff --git a/source/features/warn-pr-from-master.tsx b/source/features/warn-pr-from-master.tsx
index a62cf42c60d7..81b626336c00 100644
--- a/source/features/warn-pr-from-master.tsx
+++ b/source/features/warn-pr-from-master.tsx
@@ -1,15 +1,22 @@
import React from 'dom-chef';
import * as pageDetect from 'github-url-detection';
-import observe from '../helpers/selector-observer.js';
import features from '../feature-manager.js';
-import parseCompareUrl from '../github-helpers/parse-compare-url.js';
import {defaultBranchOfRepo} from '../github-helpers/get-default-branch.js';
+import parseCompareUrl from '../github-helpers/parse-compare-url.js';
+import observe from '../helpers/selector-observer.js';
async function addWarning(anchor: HTMLElement): Promise {
anchor.before(
- Note: Creating a PR from the default branch is an anti-pattern.
+ Note: Creating a PR from the default branch is an{' '}
+
+ anti-pattern
+ .
,
);
}
diff --git a/source/features/warning-for-disallow-edits.css b/source/features/warning-for-disallow-edits.css
index 688721f0fb20..9f31585d8337 100644
--- a/source/features/warning-for-disallow-edits.css
+++ b/source/features/warning-for-disallow-edits.css
@@ -6,15 +6,15 @@
}
:is(.discussion-sidebar-item, .js-collab-option):has(
- input[name='collab_privs']:not(:checked)
- )
+ input[name='collab_privs']:not(:checked)
+)
~ .rgh-warning-for-disallow-edits {
display: block;
}
:is(.discussion-sidebar-item, .js-collab-option):has(
- input[name='collab_privs']:checked
- )
+ input[name='collab_privs']:checked
+)
~ .rgh-warning-for-disallow-edits {
display: none;
}
diff --git a/source/features/warning-for-disallow-edits.tsx b/source/features/warning-for-disallow-edits.tsx
index 35156ed636bb..e7e96f63a3f8 100644
--- a/source/features/warning-for-disallow-edits.tsx
+++ b/source/features/warning-for-disallow-edits.tsx
@@ -1,15 +1,16 @@
import './warning-for-disallow-edits.css';
import React from 'dom-chef';
-import {$optional} from 'select-dom/strict.js';
import * as pageDetect from 'github-url-detection';
+import {$closest, $optional} from 'select-dom';
import features from '../feature-manager.js';
import attachElement from '../helpers/attach-element.js';
const getWarning = (): React.JSX.Element => (
- Note: Maintainers may require changes. It's easier and faster to allow them to make direct changes before merging.
+ Note:{' '}
+ Maintainers may require changes. It's easier and faster to allow them to make direct changes before merging.
);
@@ -21,11 +22,11 @@ function init(): void | false {
if (pageDetect.isPRConversation()) {
attachElement(
- checkbox.closest('.discussion-sidebar-item')!,
+ $closest('.discussion-sidebar-item', checkbox),
{after: getWarning},
);
} else {
- const option = checkbox.closest('.js-collab-option')!;
+ const option = $closest('.js-collab-option', checkbox);
// Prevent layout shifting when warning appears
option.classList.remove('flex-auto');
diff --git a/source/github-events/on-commit-title-update.ts b/source/github-events/on-commit-title-update.ts
index 920979c91254..ffa83ba9c782 100644
--- a/source/github-events/on-commit-title-update.ts
+++ b/source/github-events/on-commit-title-update.ts
@@ -9,7 +9,10 @@ const fieldSelector = [
'#commit-summary-input',
];
-export default function onCommitTitleUpdate(callback: DelegateEventHandler, signal: AbortSignal): void {
+export default function onCommitTitleUpdate(
+ callback: DelegateEventHandler,
+ signal: AbortSignal,
+): void {
// For immediate user input
delegate(fieldSelector, 'input', callback, {signal});
}
diff --git a/source/github-events/on-field-keydown.tsx b/source/github-events/on-field-keydown.tsx
index 8ebe2fd4e733..8d23e7a08fc4 100644
--- a/source/github-events/on-field-keydown.tsx
+++ b/source/github-events/on-field-keydown.tsx
@@ -1,10 +1,11 @@
-import {elementExists} from 'select-dom';
import delegate, {type DelegateEventHandler} from 'delegate-it';
+import {elementExists} from 'select-dom';
-type DelegateFieldEvent = DelegateEventHandler;
+type TextField = HTMLTextAreaElement | HTMLInputElement;
+type KeydownHandler = DelegateEventHandler;
-function onFieldKeydown(selector: string, callback: DelegateFieldEvent, signal: AbortSignal): void {
- delegate(selector as 'textarea', 'keydown', event => {
+function onFieldKeydown(selector: string | readonly string[], callback: KeydownHandler, signal: AbortSignal): void {
+ delegate(selector, 'keydown', event => {
const field = event.delegateTarget;
if (
@@ -25,14 +26,19 @@ function onFieldKeydown(selector: string, callback: DelegateFieldEvent, signal:
});
}
-export function onCommentFieldKeydown(callback: DelegateFieldEvent, signal: AbortSignal): void {
+export function onCommentFieldKeydown(callback: KeydownHandler, signal: AbortSignal): void {
onFieldKeydown('textarea', callback, signal);
}
-export function onConversationTitleFieldKeydown(callback: DelegateFieldEvent, signal: AbortSignal): void {
- onFieldKeydown('input[placeholder="Title"], #issue_title, #pull_request_title', callback, signal);
+export function onConversationTitleFieldKeydown(callback: KeydownHandler, signal: AbortSignal): void {
+ onFieldKeydown([
+ '[class^="prc-PageLayout-Header"] input', // PR
+ 'input[placeholder="Title"]', // Issue
+ '#issue_title', // Old PR view - TODO: Remove after legacy PR files view is removed
+ '#pull_request_title', // Old compare view - TODO: Remove after August 2026
+ ], callback, signal);
}
-export function onCommitTitleFieldKeydown(callback: DelegateFieldEvent, signal: AbortSignal): void {
+export function onCommitTitleFieldKeydown(callback: KeydownHandler, signal: AbortSignal): void {
onFieldKeydown('#commit-summary-input', callback, signal);
}
diff --git a/source/github-events/on-pr-merge.ts b/source/github-events/on-pr-merge.ts
index ea5a710e8562..f94b8c2a144b 100644
--- a/source/github-events/on-pr-merge.ts
+++ b/source/github-events/on-pr-merge.ts
@@ -1,7 +1,7 @@
import {oneEvent} from 'delegate-it';
-import observe from '../helpers/selector-observer.js';
import {confirmMergeButton} from '../github-helpers/selectors.js';
+import observe from '../helpers/selector-observer.js';
// This event ensures that the feature appears exclusively to the person that merged the PR and not anyone who was on the page at the time of the merge
export default async function waitForPrMerge(signal: AbortSignal): Promise {
diff --git a/source/github-helpers/api.tsx b/source/github-helpers/api.tsx
index 463cbec6d851..7a9b5031529d 100644
--- a/source/github-helpers/api.tsx
+++ b/source/github-helpers/api.tsx
@@ -26,16 +26,16 @@ so the call will not throw an error but it will return as usual.
*/
import React from 'dom-chef';
-import mem from 'memoize';
import * as pageDetect from 'github-url-detection';
-import type {JsonObject, AsyncReturnType} from 'type-fest';
+import mem from 'memoize';
+import type {AsyncReturnType, JsonObject} from 'type-fest';
import {uint8ArrayToBase64} from 'uint8array-extras';
+import {log} from '../helpers/feature-helpers.js';
import onetime from '../helpers/onetime.js';
-import {getRepo, getLoggedInUser} from './index.js';
import {getToken} from '../options-storage.js';
-import {log} from '../helpers/feature-helpers.js';
import {tokenUser} from './github-token.js';
+import {getLoggedInUser, getRepo} from './index.js';
type JsonError = {
message: string;
@@ -277,7 +277,7 @@ const v4uncached = async (
return data;
}
- throw await getError(apiResponse as JsonObject);
+ throw await getError(apiResponse);
};
const v4 = mem(v4uncached, {
@@ -322,7 +322,17 @@ async function getError(apiResponse: JsonObject): Promise
const error = new RefinedGitHubApiError(
'Your organization requires a specific type of token.',
);
- error.richMessage = <>Your organization requires a specific type of token. Fix…;
+ error.richMessage = <>
+ Your organization requires a specific type of token.{' '}
+
+ Fix…
+
+ ;
return error;
}
diff --git a/source/github-helpers/bugs-label.ts b/source/github-helpers/bugs-label.ts
index 56819ffb319a..649453c7da36 100644
--- a/source/github-helpers/bugs-label.ts
+++ b/source/github-helpers/bugs-label.ts
@@ -1,4 +1,5 @@
-const supportedLabels = /^(?:bug|bug-?fix|confirmed-bug|(?:category|type|kind|triage|issue)[:/-]bug|(?::[\w-]+:|\p{Emoji})bug)$/iu;
+const supportedLabels
+ = /^(?:bug|bug-?fix|confirmed-bug|(?:category|type|kind|triage|issue)[:/-]bug|(?::[\w-]+:|\p{Emoji})bug)$/iu;
export default function isBugLabel(label: string): boolean {
return supportedLabels.test(label.replaceAll(/\s/g, ''));
}
diff --git a/source/github-helpers/create-dropdown-item.tsx b/source/github-helpers/create-dropdown-item.tsx
index 9e198f9068ee..4f1be05b6805 100644
--- a/source/github-helpers/create-dropdown-item.tsx
+++ b/source/github-helpers/create-dropdown-item.tsx
@@ -38,7 +38,6 @@ export default function createDropdownItem({
{label}
-
);
}
diff --git a/source/github-helpers/dom-formatters.tsx b/source/github-helpers/dom-formatters.tsx
index ec2dffd7f6b7..6a3c74c992ed 100644
--- a/source/github-helpers/dom-formatters.tsx
+++ b/source/github-helpers/dom-formatters.tsx
@@ -1,14 +1,15 @@
import React from 'dom-chef';
-import {elementExists} from 'select-dom';
-import {$$} from 'select-dom/strict.js';
-import zipTextNodes from 'zip-text-nodes';
-import {applyToLink} from 'shorten-repo-url';
-import {linkifyUrlsToDom} from 'linkify-urls';
import {linkifyIssuesToDom, type Options as LinkifyIssuesOptions} from 'linkify-issues';
+import {linkifyUrlsToDom} from 'linkify-urls';
+import {
+ $$, $closest, $closestOptional, elementExists,
+} from 'select-dom';
+import {applyToLink} from 'shorten-repo-url';
+import zipTextNodes from 'zip-text-nodes';
import getTextNodes from '../helpers/get-text-nodes.js';
+import {buildRepoUrl, getConversationNumber} from './index.js';
import parseBackticksCore from './parse-backticks.js';
-import {buildRepoUrl} from './index.js';
// Shared class necessary to avoid also shortening the links
export const linkifiedUrlClass = 'rgh-linkified-code';
@@ -27,8 +28,20 @@ export function shortenLink(link: HTMLAnchorElement): void {
// Exclude the link if the closest element found is not `.markdown-body`
// This avoids shortening links in code and code suggestions, but still shortens them in review comments
// https://github.com/refined-github/refined-github/pull/4759#discussion_r702460890
- if (link.closest(String([...codeElementsSelector, '.markdown-body']))?.classList.contains('markdown-body')) {
+ if ($closestOptional([...codeElementsSelector, '.markdown-body'], link)?.classList.contains('markdown-body')) {
applyToLink(link, location.href);
+
+ // Customize same-thread links. Already handled by GitHub, but badly
+ // https://github.com/refined-github/refined-github/issues/6057
+ if (
+ link.textContent === `#${getConversationNumber()} (comment)`
+ ) {
+ link.textContent = '(earlier comment)';
+ } else if (
+ link.textContent === `#${getConversationNumber()} (review)`
+ ) {
+ link.textContent = '(earlier review)';
+ }
}
}
@@ -45,9 +58,9 @@ export function repositionAnchors(element: HTMLElement): void {
return;
}
- const container = element.closest('.react-code-file-contents')!.parentElement!;
+ const container = $closest('.react-code-file-contents', element).parentElement!;
- const codeLine = element.closest('[id]');
+ const codeLine = $closestOptional('[id]', element);
if (!codeLine) {
throw new Error('Could not find parent code line');
}
@@ -57,7 +70,6 @@ export function repositionAnchors(element: HTMLElement): void {
const anchor = `--rgh-${codeLine.id}-${index}`;
link.replaceWith({link.textContent});
link.className = 'react-code-text rgh-anchored-link';
- // @ts-expect-error -- Not widely available yet
link.style.positionAnchor = anchor;
container.prepend(link);
}
diff --git a/source/github-helpers/get-comment-author.ts b/source/github-helpers/get-comment-author.ts
index 7404c44cd108..bac0fa872e7c 100644
--- a/source/github-helpers/get-comment-author.ts
+++ b/source/github-helpers/get-comment-author.ts
@@ -1,3 +1,4 @@
+import {$closest, $closestOptional} from 'select-dom';
/**
Given any element in a comment, returns the comment’s author
@@ -18,14 +19,13 @@ Note: Bots are used as `name[bot]`, `app/name`, or `apps/name` depending on the
*/
export default function getCommentAuthor(anyElementInsideComment: Element): string {
- const avatar: HTMLImageElement = anyElementInsideComment
- .closest([
- '.TimelineItem', // PR comments (and pre-issue redesign issue comments)
- '.review-comment', // PR review comments
- '.react-issue-body', // First issue comment
- '.react-issue-comment', // Issue comments
- '[data-testid="comment-header"]', // Commit comments
- ])!
+ const avatar: HTMLImageElement = $closest([
+ '.TimelineItem', // PR comments (and pre-issue redesign issue comments)
+ '.review-comment', // PR review comments
+ '.react-issue-body', // First issue comment
+ '.react-issue-comment', // Issue comments
+ '[data-testid="comment-header"]', // Commit comments
+ ], anyElementInsideComment)
.querySelector([
'.TimelineItem-avatar img', // PR comments (and pre-issue redesign issue comments)
'img.avatar', // PR review comments
@@ -37,7 +37,7 @@ export default function getCommentAuthor(anyElementInsideComment: Element): stri
.alt // Occasionally ends with `[bot]`
.replace(/^@/, ''); // May or may not be present
- if (!name.endsWith('[bot]') && avatar.closest('[href^="https://github.com/apps/"]')) {
+ if (!name.endsWith('[bot]') && $closestOptional('[href^="https://github.com/apps/"]', avatar)) {
// Example: https://github.com/webpack/webpack/pull/15926#issuecomment-1170670173
return name + '[bot]';
}
diff --git a/source/github-helpers/get-current-git-ref.test.ts b/source/github-helpers/get-current-git-ref.test.ts
index 3f5ca37bb705..71e6e49771b8 100644
--- a/source/github-helpers/get-current-git-ref.test.ts
+++ b/source/github-helpers/get-current-git-ref.test.ts
@@ -7,91 +7,142 @@ import getCurrentGitRef, {getGitRef} from './get-current-git-ref.js';
// The titles supplied here listed here are real, not guessed, except the error tester
test('getGitRef', () => {
// Error testing
- assert.equal(getGitRef(
- '/',
- 'some page title',
- ), undefined, 'It should never throw with valid input');
- assert.throws(() => getGitRef(
- 'https://github.com',
- 'github.com',
- ));
+ assert.equal(
+ getGitRef(
+ '/',
+ 'some page title',
+ ),
+ undefined,
+ 'It should never throw with valid input',
+ );
+ assert.throws(() =>
+ getGitRef(
+ 'https://github.com',
+ 'github.com',
+ ),
+ );
// Root
- assert.equal(getGitRef(
- '/typescript-eslint/typescript-eslint',
- 'typescript-eslint/typescript-eslint: Monorepo for all the tooling which enables ESLint to support TypeScript',
- ), undefined);
- assert.equal(getGitRef(
- '/typescript-eslint/typescript-eslint/tree/chore/lerna-4',
- 'typescript-eslint/typescript-eslint at chore/lerna-4',
- ), 'chore/lerna-4');
+ assert.equal(
+ getGitRef(
+ '/typescript-eslint/typescript-eslint',
+ 'typescript-eslint/typescript-eslint: Monorepo for all the tooling which enables ESLint to support TypeScript',
+ ),
+ undefined,
+ );
+ assert.equal(
+ getGitRef(
+ '/typescript-eslint/typescript-eslint/tree/chore/lerna-4',
+ 'typescript-eslint/typescript-eslint at chore/lerna-4',
+ ),
+ 'chore/lerna-4',
+ );
// Sub folder
- assert.equal(getGitRef(
- '/typescript-eslint/typescript-eslint/tree/master/docs',
- 'typescript-eslint/docs at master · typescript-eslint/typescript-eslint',
- ), 'master');
- assert.equal(getGitRef(
- '/typescript-eslint/typescript-eslint/tree/chore/lerna-4/docs',
- 'typescript-eslint/docs at chore/lerna-4 · typescript-eslint/typescript-eslint',
- ), 'chore/lerna-4');
+ assert.equal(
+ getGitRef(
+ '/typescript-eslint/typescript-eslint/tree/master/docs',
+ 'typescript-eslint/docs at master · typescript-eslint/typescript-eslint',
+ ),
+ 'master',
+ );
+ assert.equal(
+ getGitRef(
+ '/typescript-eslint/typescript-eslint/tree/chore/lerna-4/docs',
+ 'typescript-eslint/docs at chore/lerna-4 · typescript-eslint/typescript-eslint',
+ ),
+ 'chore/lerna-4',
+ );
// Sub sub folder
- assert.equal(getGitRef(
- '/typescript-eslint/typescript-eslint/tree/master/docs/getting-started',
- 'typescript-eslint/docs/getting-started at master · typescript-eslint/typescript-eslint',
- ), 'master');
- assert.equal(getGitRef(
- '/typescript-eslint/typescript-eslint/tree/chore/lerna-4/docs/getting-started',
- 'typescript-eslint/docs/getting-started at chore/lerna-4 · typescript-eslint/typescript-eslint',
- ), 'chore/lerna-4');
+ assert.equal(
+ getGitRef(
+ '/typescript-eslint/typescript-eslint/tree/master/docs/getting-started',
+ 'typescript-eslint/docs/getting-started at master · typescript-eslint/typescript-eslint',
+ ),
+ 'master',
+ );
+ assert.equal(
+ getGitRef(
+ '/typescript-eslint/typescript-eslint/tree/chore/lerna-4/docs/getting-started',
+ 'typescript-eslint/docs/getting-started at chore/lerna-4 · typescript-eslint/typescript-eslint',
+ ),
+ 'chore/lerna-4',
+ );
// File
- assert.equal(getGitRef(
- '/typescript-eslint/typescript-eslint/blob/master/docs/getting-started/README.md',
- 'typescript-eslint/README.md at master · typescript-eslint/typescript-eslint',
- ), 'master');
- assert.equal(getGitRef(
- '/typescript-eslint/typescript-eslint/blob/chore/lerna-4/docs/getting-started/README.md',
- 'typescript-eslint/README.md at chore/lerna-4 · typescript-eslint/typescript-eslint',
- ), 'chore/lerna-4');
+ assert.equal(
+ getGitRef(
+ '/typescript-eslint/typescript-eslint/blob/master/docs/getting-started/README.md',
+ 'typescript-eslint/README.md at master · typescript-eslint/typescript-eslint',
+ ),
+ 'master',
+ );
+ assert.equal(
+ getGitRef(
+ '/typescript-eslint/typescript-eslint/blob/chore/lerna-4/docs/getting-started/README.md',
+ 'typescript-eslint/README.md at chore/lerna-4 · typescript-eslint/typescript-eslint',
+ ),
+ 'chore/lerna-4',
+ );
// Editing file
- assert.equal(getGitRef(
- '/typescript-eslint/typescript-eslint/edit/master/docs/getting-started/README.md',
- 'Editing typescript-eslint/README.md at master · typescript-eslint/typescript-eslint',
- ), 'master');
- assert.equal(getGitRef(
- '/typescript-eslint/typescript-eslint/edit/chore/lerna-4/docs/getting-started/README.md',
- 'Editing typescript-eslint/README.md at chore/lerna-4 · typescript-eslint/typescript-eslint',
- ), 'chore/lerna-4');
+ assert.equal(
+ getGitRef(
+ '/typescript-eslint/typescript-eslint/edit/master/docs/getting-started/README.md',
+ 'Editing typescript-eslint/README.md at master · typescript-eslint/typescript-eslint',
+ ),
+ 'master',
+ );
+ assert.equal(
+ getGitRef(
+ '/typescript-eslint/typescript-eslint/edit/chore/lerna-4/docs/getting-started/README.md',
+ 'Editing typescript-eslint/README.md at chore/lerna-4 · typescript-eslint/typescript-eslint',
+ ),
+ 'chore/lerna-4',
+ );
// Blame
- assert.equal(getGitRef(
- '/typescript-eslint/typescript-eslint/blame/master/docs/getting-started/README.md',
- 'typescript-eslint/docs/getting-started/README.md at master · typescript-eslint/typescript-eslint',
- ), 'master');
- assert.equal(getGitRef(
- '/typescript-eslint/typescript-eslint/blame/chore/lerna-4/docs/getting-started/README.md',
- 'typescript-eslint/docs/getting-started/README.md at chore/lerna-4 · typescript-eslint/typescript-eslint',
- ), 'chore/lerna-4');
+ assert.equal(
+ getGitRef(
+ '/typescript-eslint/typescript-eslint/blame/master/docs/getting-started/README.md',
+ 'typescript-eslint/docs/getting-started/README.md at master · typescript-eslint/typescript-eslint',
+ ),
+ 'master',
+ );
+ assert.equal(
+ getGitRef(
+ '/typescript-eslint/typescript-eslint/blame/chore/lerna-4/docs/getting-started/README.md',
+ 'typescript-eslint/docs/getting-started/README.md at chore/lerna-4 · typescript-eslint/typescript-eslint',
+ ),
+ 'chore/lerna-4',
+ );
// Single commit
- assert.equal(getGitRef(
- '/typescript-eslint/typescript-eslint/commit/795fd1c529ee58e97283c9ddf8463703517b50ab',
- 'chore: add markdownlint (#1889) · typescript-eslint/typescript-eslint@795fd1c',
- ), '795fd1c529ee58e97283c9ddf8463703517b50ab');
+ assert.equal(
+ getGitRef(
+ '/typescript-eslint/typescript-eslint/commit/795fd1c529ee58e97283c9ddf8463703517b50ab',
+ 'chore: add markdownlint (#1889) · typescript-eslint/typescript-eslint@795fd1c',
+ ),
+ '795fd1c529ee58e97283c9ddf8463703517b50ab',
+ );
// Branch includes period
- assert.equal(getGitRef(
- '/anggrayudi/SimpleStorage/tree/release/0.8.0',
- 'anggrayudi/SimpleStorage at release/0.8.0',
- ), 'release/0.8.0');
+ assert.equal(
+ getGitRef(
+ '/anggrayudi/SimpleStorage/tree/release/0.8.0',
+ 'anggrayudi/SimpleStorage at release/0.8.0',
+ ),
+ 'release/0.8.0',
+ );
- assert.equal(getGitRef(
- '/ksh-code/repository/tree/h.l.o.o',
- 'ksh-code/repository at h.l.o.o',
- ), 'h.l.o.o');
+ assert.equal(
+ getGitRef(
+ '/ksh-code/repository/tree/h.l.o.o',
+ 'ksh-code/repository at h.l.o.o',
+ ),
+ 'h.l.o.o',
+ );
});
// The titles supplied here listed here are real, not guessed, except the error tester
diff --git a/source/github-helpers/get-current-git-ref.ts b/source/github-helpers/get-current-git-ref.ts
index 8010c1940831..dcade843b9cd 100644
--- a/source/github-helpers/get-current-git-ref.ts
+++ b/source/github-helpers/get-current-git-ref.ts
@@ -1,5 +1,5 @@
import {isRepoCommitList} from 'github-url-detection';
-import {$optional} from 'select-dom/strict.js';
+import {$optional} from 'select-dom';
import {extractCurrentBranchFromBranchPicker} from './index.js';
import {branchSelector} from './selectors.js';
diff --git a/source/github-helpers/get-default-branch.ts b/source/github-helpers/get-default-branch.ts
index 20e2a9732dd4..8098772e81bb 100644
--- a/source/github-helpers/get-default-branch.ts
+++ b/source/github-helpers/get-default-branch.ts
@@ -1,11 +1,11 @@
-import {CachedFunction} from 'webext-storage-cache';
import elementReady from 'element-ready';
import type {NameWithOwner} from 'github-url-detection';
+import {CachedFunction} from 'webext-storage-cache';
import api from './api.js';
+import GetDefaultBranch from './get-default-branch.gql';
import {extractCurrentBranchFromBranchPicker, getRepo} from './index.js';
import {branchSelector} from './selectors.js';
-import GetDefaultBranch from './get-default-branch.gql';
const isCurrentRepo = (nameWithOwner: NameWithOwner): boolean => Boolean(getRepo()?.nameWithOwner === nameWithOwner);
diff --git a/source/github-helpers/get-tab-count.ts b/source/github-helpers/get-tab-count.ts
index 9ec5615f5958..3c2139b7163e 100644
--- a/source/github-helpers/get-tab-count.ts
+++ b/source/github-helpers/get-tab-count.ts
@@ -1,5 +1,5 @@
-import {$optional} from 'select-dom/strict.js';
import oneMutation from 'one-mutation';
+import {$optional} from 'select-dom';
export default async function getTabCount(tab: Element): Promise {
const counter = $optional('.Counter, .num', tab);
diff --git a/source/github-helpers/get-user-avatar.ts b/source/github-helpers/get-user-avatar.ts
index 2f1dbf839384..9ce6d4e32eae 100644
--- a/source/github-helpers/get-user-avatar.ts
+++ b/source/github-helpers/get-user-avatar.ts
@@ -1,5 +1,5 @@
-import {$optional} from 'select-dom/strict.js';
import * as pageDetect from 'github-url-detection';
+import {$optional} from 'select-dom';
export default function getUserAvatar(username: string, size: number): string | void {
let cleanName = username.replace('[bot]', '');
@@ -22,9 +22,12 @@ export default function getUserAvatar(username: string, size: number): string |
cleanName = 'in/1143301';
}
- const url = pageDetect.isEnterprise()
+ // Bots don't have a /$username.png URL
+ // Enterprise can only use /$username.png
+ const isBot = username.endsWith('[bot]') || cleanName.includes('/');
+ const url = pageDetect.isEnterprise() || !isBot
? `/${cleanName}.png`
: `https://avatars.githubusercontent.com/${cleanName}`;
- // Why use a 2x size: https://github.com/refined-github/refined-github/pull/4973#discussion_r735133613
+ // Why use a 2x size: https://github.com/refined-github/refined-github/pull/4973#discussion_r735133613
return url + `?size=${size * 2}`;
}
diff --git a/source/github-helpers/get-user-permission.ts b/source/github-helpers/get-user-permission.ts
index 759f896e9444..37a1f643862b 100644
--- a/source/github-helpers/get-user-permission.ts
+++ b/source/github-helpers/get-user-permission.ts
@@ -1,9 +1,9 @@
-import {CachedFunction} from 'webext-storage-cache';
import {elementExists} from 'select-dom';
+import {CachedFunction} from 'webext-storage-cache';
import {hasToken} from '../options-storage.js';
-import {getRepo} from './index.js';
import api from './api.js';
+import {getRepo} from './index.js';
/*
From https://docs.github.com/en/graphql/reference/enums#repositorypermission
@@ -68,7 +68,6 @@ export async function userIsModerator(): Promise {
'[title^="You are a member"]',
'[title^="You are a maintainer"]',
'[title^="You are a collaborator"]',
-
// Don't check for admin access here. If the user has admin access, the DOM check in `viewerPermission` will use the DOM and be cached anyway
]);
diff --git a/source/github-helpers/github-file-url.test.ts b/source/github-helpers/github-file-url.test.ts
index ab987c7c7bac..f0c627dbfac9 100644
--- a/source/github-helpers/github-file-url.test.ts
+++ b/source/github-helpers/github-file-url.test.ts
@@ -1,4 +1,4 @@
-import {test, assert} from 'vitest';
+import {assert, test} from 'vitest';
import GitHubFileUrl from './github-file-url.js';
@@ -67,14 +67,25 @@ test('change filePath', () => {
});
test('get filePath from search', () => {
- const url = new GitHubFileUrl('https://github.com/yakov116/refined-github/commits/f23b687b3b89aa95a76193722cdfeff740646670?after=f23b687b3b89aa95a76193722cdfeff740646670+34&path%5B%5D=source&path%5B%5D=features&path%5B%5D=release-download-count.tsx');
+ const url = new GitHubFileUrl(
+ 'https://github.com/yakov116/refined-github/commits/f23b687b3b89aa95a76193722cdfeff740646670?after=f23b687b3b89aa95a76193722cdfeff740646670+34&path%5B%5D=source&path%5B%5D=features&path%5B%5D=release-download-count.tsx',
+ );
assert.equal(url.user, 'yakov116');
assert.equal(url.repository, 'refined-github');
assert.equal(url.route, 'commits');
assert.equal(url.branch, 'f23b687b3b89aa95a76193722cdfeff740646670');
assert.equal(url.filePath, 'source/features/release-download-count.tsx');
- assert.equal(url.pathname, '/yakov116/refined-github/commits/f23b687b3b89aa95a76193722cdfeff740646670/source/features/release-download-count.tsx');
- assert.equal(url.href, 'https://github.com/yakov116/refined-github/commits/f23b687b3b89aa95a76193722cdfeff740646670/source/features/release-download-count.tsx?after=f23b687b3b89aa95a76193722cdfeff740646670+34');
+ assert.equal(
+ url.pathname,
+ '/yakov116/refined-github/commits/f23b687b3b89aa95a76193722cdfeff740646670/source/features/release-download-count.tsx',
+ );
+ assert.equal(
+ url.href,
+ 'https://github.com/yakov116/refined-github/commits/f23b687b3b89aa95a76193722cdfeff740646670/source/features/release-download-count.tsx?after=f23b687b3b89aa95a76193722cdfeff740646670+34',
+ );
assert.equal(url.search, '?after=f23b687b3b89aa95a76193722cdfeff740646670+34');
- assert.equal(String(url), 'https://github.com/yakov116/refined-github/commits/f23b687b3b89aa95a76193722cdfeff740646670/source/features/release-download-count.tsx?after=f23b687b3b89aa95a76193722cdfeff740646670+34');
+ assert.equal(
+ String(url),
+ 'https://github.com/yakov116/refined-github/commits/f23b687b3b89aa95a76193722cdfeff740646670/source/features/release-download-count.tsx?after=f23b687b3b89aa95a76193722cdfeff740646670+34',
+ );
});
diff --git a/source/github-helpers/github-file-url.ts b/source/github-helpers/github-file-url.ts
index 370d086986a2..65c9748fc323 100644
--- a/source/github-helpers/github-file-url.ts
+++ b/source/github-helpers/github-file-url.ts
@@ -55,7 +55,9 @@ export default class GitHubFileUrl {
for (const [index, section] of currentBranchSections.entries()) {
if (ambiguousReference[index] !== section) {
- console.warn(`The supplied path (${ambiguousReference.join('/')}) is ambiguous (current reference is \`${currentBranch}\`)`);
+ console.warn(
+ `The supplied path (${ambiguousReference.join('/')}) is ambiguous (current reference is \`${currentBranch}\`)`,
+ );
return {branch, filePath};
}
}
@@ -67,7 +69,10 @@ export default class GitHubFileUrl {
}
get pathname(): string {
- return `/${this.user}/${this.repository}/${this.route}/${this.branch}/${this.filePath}`.replaceAll(/(?:(?:undefined)?\/)+$/g, '');
+ return `/${this.user}/${this.repository}/${this.route}/${this.branch}/${this.filePath}`.replaceAll(
+ /(?:(?:undefined)?\/)+$/g,
+ '',
+ );
}
set pathname(pathname: string) {
diff --git a/source/github-helpers/github-token.ts b/source/github-helpers/github-token.ts
index a78597ba25de..fdcd2ea73d63 100644
--- a/source/github-helpers/github-token.ts
+++ b/source/github-helpers/github-token.ts
@@ -1,9 +1,9 @@
-import {CachedFunction} from 'webext-storage-cache';
import * as pageDetect from 'github-url-detection';
+import {CachedFunction} from 'webext-storage-cache';
// Avoid importing api.js here, there's too much logic/caching we don't need
-import {getToken} from '../options-storage.js';
import hashString from '../helpers/hash-string.js';
+import {getToken} from '../options-storage.js';
type BaseApiFetchOptions = {
apiBase: string;
@@ -121,6 +121,10 @@ export async function expectTokenScope(scope: string): Promise {
const {scopes: tokenScopes} = await getTokenInfo(api, token);
if (!tokenScopes.includes(scope)) {
- throw new Error('The token you provided does not have ' + (tokenScopes.length > 0 ? `the \`${scope}\` scope. It only includes \`${tokenScopes.join(', ')}\`.` : 'any scope. You can change the scope of your token at https://github.com/settings/tokens'));
+ throw new Error(
+ 'The token you provided does not have ' + (tokenScopes.length > 0
+ ? `the \`${scope}\` scope. It only includes \`${tokenScopes.join(', ')}\`.`
+ : 'any scope. You can change the scope of your token at https://github.com/settings/tokens'),
+ );
}
}
diff --git a/source/github-helpers/group-buttons.tsx b/source/github-helpers/group-buttons.tsx
index 9fc7404a4eef..d75cba327513 100644
--- a/source/github-helpers/group-buttons.tsx
+++ b/source/github-helpers/group-buttons.tsx
@@ -1,5 +1,5 @@
import React from 'dom-chef';
-import {$} from 'select-dom/strict.js';
+import {$, $closestOptional} from 'select-dom';
import {wrapAll} from '../helpers/dom-utils.js';
@@ -16,7 +16,7 @@ export function groupButtons(buttons: Element[], ...classes: string[]): HTMLElem
}
// They may already be part of a group
- let group = buttons[0].closest('.BtnGroup');
+ let group = $closestOptional('.BtnGroup', buttons[0]);
// If it doesn't exist, wrap them in a new group
if (!group) {
diff --git a/source/github-helpers/hotkey.tsx b/source/github-helpers/hotkey.tsx
index 27212ed7c522..572749acb8cb 100644
--- a/source/github-helpers/hotkey.tsx
+++ b/source/github-helpers/hotkey.tsx
@@ -2,7 +2,11 @@ import React from 'dom-chef';
import {isMac} from './index.js';
-export function registerHotkey(hotkey: string, functionOrUrl: VoidFunction | string, {signal}: SignalAsOptions = {}): void {
+export function registerHotkey(
+ hotkey: string,
+ functionOrUrl: VoidFunction | string,
+ {signal}: SignalAsOptions = {},
+): void {
const element = typeof functionOrUrl === 'string'
?
: ;
diff --git a/source/github-helpers/hotkeys.test.ts b/source/github-helpers/hotkeys.test.ts
index c7881b3307b6..ac1ea4536c76 100644
--- a/source/github-helpers/hotkeys.test.ts
+++ b/source/github-helpers/hotkeys.test.ts
@@ -1,8 +1,6 @@
-import {test, assert} from 'vitest';
+import {assert, test} from 'vitest';
-import {
- addHotkey,
-} from './hotkey.js';
+import {addHotkey} from './hotkey.js';
function testAddHotkey(existing: string | undefined, added: string, final: string): void {
const link = document.createElement('a');
@@ -14,21 +12,30 @@ function testAddHotkey(existing: string | undefined, added: string, final: strin
assert.equal(link.dataset.hotkey, final);
}
-test('addHotkey if one is specified', testAddHotkey.bind(
- undefined,
- 'T-REX',
- 'CHICKEN',
- 'T-REX,CHICKEN',
-));
-test('addHotkey if the same is already specified', testAddHotkey.bind(
- undefined,
- 'CHICKEN',
- 'CHICKEN',
- 'CHICKEN',
-));
-test('addHotkey when none are specified', testAddHotkey.bind(
- undefined,
- undefined,
- 'CHICKEN',
- 'CHICKEN',
-));
+test(
+ 'addHotkey if one is specified',
+ testAddHotkey.bind(
+ undefined,
+ 'T-REX',
+ 'CHICKEN',
+ 'T-REX,CHICKEN',
+ ),
+);
+test(
+ 'addHotkey if the same is already specified',
+ testAddHotkey.bind(
+ undefined,
+ 'CHICKEN',
+ 'CHICKEN',
+ 'CHICKEN',
+ ),
+);
+test(
+ 'addHotkey when none are specified',
+ testAddHotkey.bind(
+ undefined,
+ undefined,
+ 'CHICKEN',
+ 'CHICKEN',
+ ),
+);
diff --git a/source/github-helpers/index.test.ts b/source/github-helpers/index.test.ts
index 091a8ce42e06..629428f4e6d6 100644
--- a/source/github-helpers/index.test.ts
+++ b/source/github-helpers/index.test.ts
@@ -1,10 +1,7 @@
-import {test, assert} from 'vitest';
+import {assert, test} from 'vitest';
import {
- getConversationNumber,
- parseTag,
- isUsernameAlreadyFullName,
- getLatestVersionTag,
+ getConversationNumber, getLatestVersionTag, isUsernameAlreadyFullName, parseTag,
} from './index.js';
test('getConversationNumber', () => {
@@ -99,25 +96,37 @@ test('isUsernameAlreadyFullName', () => {
});
test('getLatestVersionTag', () => {
- assert.equal(getLatestVersionTag([
- '0.0.0',
- 'v1.1',
- 'r2.0',
+ assert.equal(
+ getLatestVersionTag([
+ '0.0.0',
+ 'v1.1',
+ 'r2.0',
+ '3.0',
+ ]),
'3.0',
- ]), '3.0', 'Tags should be sorted by version');
+ 'Tags should be sorted by version',
+ );
- assert.equal(getLatestVersionTag([
- 'v2.1-0',
+ assert.equal(
+ getLatestVersionTag([
+ 'v2.1-0',
+ 'v2.0',
+ 'r1.5.5',
+ 'r1.0',
+ 'v1.0-1',
+ ]),
'v2.0',
- 'r1.5.5',
- 'r1.0',
- 'v1.0-1',
- ]), 'v2.0', 'Prereleases should be ignored');
+ 'Prereleases should be ignored',
+ );
- assert.equal(getLatestVersionTag([
+ assert.equal(
+ getLatestVersionTag([
+ 'lol v0.0.0',
+ '2.0',
+ '2020-10-10',
+ 'v1.0-1',
+ ]),
'lol v0.0.0',
- '2.0',
- '2020-10-10',
- 'v1.0-1',
- ]), 'lol v0.0.0', 'Non-version tags should short-circuit the sorting and return the first tag');
+ 'Non-version tags should short-circuit the sorting and return the first tag',
+ );
});
diff --git a/source/github-helpers/index.ts b/source/github-helpers/index.ts
index 2e7c8bc77da3..1ec6969ac3fd 100644
--- a/source/github-helpers/index.ts
+++ b/source/github-helpers/index.ts
@@ -1,11 +1,13 @@
-import {$optional, $} from 'select-dom/strict.js';
-import {elementExists} from 'select-dom';
import elementReady from 'element-ready';
-import compareVersions from 'tiny-version-compare';
-import type {RequireAtLeastOne} from 'type-fest';
import * as pageDetect from 'github-url-detection';
import mem from 'memoize';
+import {
+ $, $closest, $closestOptional, $optional, elementExists,
+} from 'select-dom';
+import compareVersions from 'tiny-version-compare';
+import type {RequireAtLeastOne} from 'type-fest';
+import {is} from '../helpers/css-selectors.js';
import {branchSelector} from './selectors.js';
// Re-export for convenience
@@ -21,7 +23,9 @@ export const isMac = navigator.userAgent.includes('Macintosh');
type Not = Yes extends Not ? never : Yes;
type UnslashedString = Not;
-export function buildRepoUrl(...pathParts: RequireAtLeastOne | number>, 0>): string {
+export function buildRepoUrl(
+ ...pathParts: RequireAtLeastOne | number>, 0>
+): string {
for (const part of pathParts) {
if (typeof part === 'string' && /^\/|\/$/.test(part)) {
throw new TypeError('The path parts shouldn’t start or end with a slash: ' + part);
@@ -127,11 +131,11 @@ export async function isArchivedRepoAsync(): Promise {
export const userCanLikelyMergePr = (): boolean => elementExists('.discussion-sidebar-item .octicon-lock');
-const navigationBarSelector = `:is(${[
+const navigationBarSelector = is(
'.GlobalNav',
// Remove after June 2026
'.js-repo-nav',
-].join(',')})`;
+);
export function areIssuesEnabled(): boolean {
const repo = getRepo()!;
@@ -146,7 +150,8 @@ export function areDiscussionsEnabled(): boolean {
export const cacheByRepo = (): string => getRepo()!.nameWithOwner;
// Commit lists for files and folders lack a branch selector
-export const isRepoCommitListRoot = (): boolean => pageDetect.isRepoCommitList() && document.title.startsWith('Commits');
+export const isRepoCommitListRoot = (): boolean =>
+ pageDetect.isRepoCommitList() && document.title.startsWith('Commits');
export const isUrlReachable = mem(async (url: string): Promise => {
const {ok} = await fetch(url, {method: 'head'});
@@ -161,7 +166,7 @@ export function extractCurrentBranchFromBranchPicker(branchPicker: HTMLElement):
}
export function addAfterBranchSelector(branchSelectorParent: HTMLDetailsElement, sibling: HTMLElement): void {
- const row = branchSelectorParent.closest('.position-relative')!;
+ const row = $closest('.position-relative', branchSelectorParent);
row.classList.add('d-flex', 'flex-shrink-0', 'gap-2');
row.append(sibling);
}
@@ -170,16 +175,18 @@ export function addAfterBranchSelector(branchSelectorParent: HTMLDetailsElement,
// https://github.com/refined-github/refined-github/issues/2465#issuecomment-567173300
export function triggerConversationUpdate(): void {
const marker = $('.js-timeline-marker');
- marker.dispatchEvent(new CustomEvent('socket:message', {
- bubbles: true,
- detail: {data: {gid: marker.dataset.gid}},
- }));
+ marker.dispatchEvent(
+ new CustomEvent('socket:message', {
+ bubbles: true,
+ detail: {data: {gid: marker.dataset.gid}},
+ }),
+ );
}
// Fix z-index issue https://github.com/refined-github/refined-github/pull/7430
export function fixFileHeaderOverlap(child: Element): void {
// In the sidebar the container is not present and this fix is not needed
- child.closest('.container')?.classList.add('rgh-z-index-5');
+ $closestOptional('.container', child)?.classList.add('rgh-z-index-5');
}
/** Trigger a reflow to push the right-most tab into the overflow dropdown */
@@ -188,7 +195,7 @@ export function triggerRepoNavOverflow(): void {
}
export function triggerActionBarOverflow(child: Element): void {
- const parent = child.closest('action-bar')!;
+ const parent = $closest('action-bar', child);
const placeholder = document.createElement('div');
parent.replaceWith(placeholder);
placeholder.replaceWith(parent);
diff --git a/source/github-helpers/is-conversation-locked.ts b/source/github-helpers/is-conversation-locked.ts
index f686a14dd887..45ef59ce87e2 100644
--- a/source/github-helpers/is-conversation-locked.ts
+++ b/source/github-helpers/is-conversation-locked.ts
@@ -1,10 +1,10 @@
import elementReady from 'element-ready';
+import api from '../github-helpers/api.js';
+import {getConversationNumber} from '../github-helpers/index.js';
import {isInitialLoad} from '../helpers/feature-helpers.js';
import {hasToken} from '../options-storage.js';
-import api from '../github-helpers/api.js';
import GetIssueLockStatus from './is-conversation-locked.gql';
-import {getConversationNumber} from '../github-helpers/index.js';
async function isConversationLockedViaApi(): Promise {
if (!await hasToken()) {
@@ -35,7 +35,9 @@ async function isConversationLockedViaReactData(): Promise
}
const data = await elementReady('[data-target="react-app.embeddedData"]');
- return data ? JSON.parse(data.textContent).payload?.preloadedQueries?.[0].result.data.repository?.issue?.locked : undefined;
+ return data
+ ? JSON.parse(data.textContent).payload?.preloadedQueries?.[0].result.data.repository?.issue?.locked
+ : undefined;
}
export default async function isConversationLocked(): Promise {
diff --git a/source/github-helpers/load-details-menu.ts b/source/github-helpers/load-details-menu.ts
index f57ce74061a3..207ff024ca00 100644
--- a/source/github-helpers/load-details-menu.ts
+++ b/source/github-helpers/load-details-menu.ts
@@ -1,5 +1,5 @@
-import {$optional} from 'select-dom/strict.js';
import oneEvent from 'one-event';
+import {$optional} from 'select-dom';
export default async function loadDetailsMenu(detailsMenu: HTMLElement): Promise {
const fragment = $optional('.js-comment-header-actions-deferred-include-fragment', detailsMenu);
diff --git a/source/github-helpers/parse-backticks.test.ts b/source/github-helpers/parse-backticks.test.ts
index 8c342cfd4752..5c37b5761223 100644
--- a/source/github-helpers/parse-backticks.test.ts
+++ b/source/github-helpers/parse-backticks.test.ts
@@ -1,4 +1,4 @@
-import {test, assert} from 'vitest';
+import {assert, test} from 'vitest';
import {getParsedBackticksParts} from './parse-backticks.js';
diff --git a/source/github-helpers/pr-branches.test.ts b/source/github-helpers/pr-branches.test.ts
index de9cbfba91d7..f879df85beb2 100644
--- a/source/github-helpers/pr-branches.test.ts
+++ b/source/github-helpers/pr-branches.test.ts
@@ -1,4 +1,4 @@
-import {test, assert} from 'vitest';
+import {assert, test} from 'vitest';
import {parseReferenceRaw} from './pr-branches.js';
diff --git a/source/github-helpers/pr-branches.ts b/source/github-helpers/pr-branches.ts
index 3410c5caae51..36ac4567b859 100644
--- a/source/github-helpers/pr-branches.ts
+++ b/source/github-helpers/pr-branches.ts
@@ -1,4 +1,4 @@
-import {$} from 'select-dom/strict.js';
+import {$} from 'select-dom';
type PrReference = {
/** @example fregante/mem:main */
diff --git a/source/github-helpers/prevent-link-loss.test.ts b/source/github-helpers/prevent-link-loss.test.ts
index 0babb115dc72..714deafd1703 100644
--- a/source/github-helpers/prevent-link-loss.test.ts
+++ b/source/github-helpers/prevent-link-loss.test.ts
@@ -1,12 +1,12 @@
-import {test, assert} from 'vitest';
+import {assert, test} from 'vitest';
import {
- preventPrCommitLinkLoss,
- preventPrCompareLinkLoss,
- preventDiscussionLinkLoss,
+ discussionUrlRegex,
prCommitUrlRegex,
prCompareUrlRegex,
- discussionUrlRegex,
+ preventDiscussionLinkLoss,
+ preventPrCommitLinkLoss,
+ preventPrCompareLinkLoss,
} from './prevent-link-loss.js';
function replacePrCommitLink(string: string): string {
@@ -27,64 +27,92 @@ test('preventPrCommitLinkLoss', () => {
assert.equal(replacePrCommitLink('https://www.google.com/'), 'https://www.google.com/');
assert.equal(
- replacePrCommitLink('https://github.com/refined-github/refined-github/commit/cb44a4eb8cd5c66def3dc26dca0f386645fa29bb'),
+ replacePrCommitLink(
+ 'https://github.com/refined-github/refined-github/commit/cb44a4eb8cd5c66def3dc26dca0f386645fa29bb',
+ ),
'https://github.com/refined-github/refined-github/commit/cb44a4eb8cd5c66def3dc26dca0f386645fa29bb',
'It should not affect non PR commit URLs',
);
assert.equal(
- replacePrCommitLink('https://github.com/refined-github/refined-github/pull/3/commits/cb44a4eb8cd5c66def3dc26dca0f386645fa29bb'),
+ replacePrCommitLink(
+ 'https://github.com/refined-github/refined-github/pull/3/commits/cb44a4eb8cd5c66def3dc26dca0f386645fa29bb',
+ ),
'[`cb44a4e` (#3)](https://github.com/refined-github/refined-github/pull/3/commits/cb44a4eb8cd5c66def3dc26dca0f386645fa29bb)',
);
assert.equal(
- replacePrCommitLink('lorem ipsum dolor https://github.com/refined-github/refined-github/pull/3/commits/cb44a4eb8cd5c66def3dc26dca0f386645fa29bb some random string'),
+ replacePrCommitLink(
+ 'lorem ipsum dolor https://github.com/refined-github/refined-github/pull/3/commits/cb44a4eb8cd5c66def3dc26dca0f386645fa29bb some random string',
+ ),
'lorem ipsum dolor [`cb44a4e` (#3)](https://github.com/refined-github/refined-github/pull/3/commits/cb44a4eb8cd5c66def3dc26dca0f386645fa29bb) some random string',
);
assert.equal(
- replacePrCommitLink(replacePrCommitLink('lorem ipsum dolor https://github.com/refined-github/refined-github/pull/44/commits/cb44a4eb8cd5c66def3dc26dca0f386645fa29bb some random string')),
+ replacePrCommitLink(
+ replacePrCommitLink(
+ 'lorem ipsum dolor https://github.com/refined-github/refined-github/pull/44/commits/cb44a4eb8cd5c66def3dc26dca0f386645fa29bb some random string',
+ ),
+ ),
'lorem ipsum dolor [`cb44a4e` (#44)](https://github.com/refined-github/refined-github/pull/44/commits/cb44a4eb8cd5c66def3dc26dca0f386645fa29bb) some random string',
'It should not apply it twice',
);
assert.equal(
- replacePrCommitLink('I like [turtles](https://github.com/refined-github/refined-github/pull/3/commits/cb44a4eb8cd5c66def3dc26dca0f386645fa29bb)'),
+ replacePrCommitLink(
+ 'I like [turtles](https://github.com/refined-github/refined-github/pull/3/commits/cb44a4eb8cd5c66def3dc26dca0f386645fa29bb)',
+ ),
'I like [turtles](https://github.com/refined-github/refined-github/pull/3/commits/cb44a4eb8cd5c66def3dc26dca0f386645fa29bb)',
'It should ignore Markdown links',
);
assert.equal(
- replacePrCommitLink('lorem ipsum dolor https://github.com/refined-github/refined-github/pull/3205/commits/1da152b3f8c51dd72d8ae6ad9cc96e0c2d8716f5#diff-932095cc3c0dff00495b4c392d78f0afR60 some random string'),
+ replacePrCommitLink(
+ 'lorem ipsum dolor https://github.com/refined-github/refined-github/pull/3205/commits/1da152b3f8c51dd72d8ae6ad9cc96e0c2d8716f5#diff-932095cc3c0dff00495b4c392d78f0afR60 some random string',
+ ),
'lorem ipsum dolor [`1da152b` (#3205)](https://github.com/refined-github/refined-github/pull/3205/commits/1da152b3f8c51dd72d8ae6ad9cc96e0c2d8716f5#diff-932095cc3c0dff00495b4c392d78f0afR60) some random string',
'It should include line-permalink hashes',
);
assert.equal(
- replacePrCommitLink('lorem ipsum dolor https://github.com/refined-github/refined-github/pull/3205/commits/b0ac07948f9d30a760bda25a7106011441abfd5d#r438059292 some random string'),
+ replacePrCommitLink(
+ 'lorem ipsum dolor https://github.com/refined-github/refined-github/pull/3205/commits/b0ac07948f9d30a760bda25a7106011441abfd5d#r438059292 some random string',
+ ),
'lorem ipsum dolor [`b0ac079` (#3205)](https://github.com/refined-github/refined-github/pull/3205/commits/b0ac07948f9d30a760bda25a7106011441abfd5d#r438059292) some random string',
'It should include any hashes',
);
assert.equal(
- replacePrCommitLink(replacePrCommitLink('lorem ipsum dolor https://github.com/refined-github/refined-github/pull/3205/commits/1da152b3f8c51dd72d8ae6ad9cc96e0c2d8716f5#diff-932095cc3c0dff00495b4c392d78f0afR60 some random string')),
+ replacePrCommitLink(
+ replacePrCommitLink(
+ 'lorem ipsum dolor https://github.com/refined-github/refined-github/pull/3205/commits/1da152b3f8c51dd72d8ae6ad9cc96e0c2d8716f5#diff-932095cc3c0dff00495b4c392d78f0afR60 some random string',
+ ),
+ ),
'lorem ipsum dolor [`1da152b` (#3205)](https://github.com/refined-github/refined-github/pull/3205/commits/1da152b3f8c51dd72d8ae6ad9cc96e0c2d8716f5#diff-932095cc3c0dff00495b4c392d78f0afR60) some random string',
'It should not apply it twice even with hashes',
);
assert.equal(
- replacePrCommitLink('https://github.com/refined-github/shorten-repo-url/pull/33/commits/3d8d1cc8d784c7d92788a8a21e2c30cf87be3658'),
+ replacePrCommitLink(
+ 'https://github.com/refined-github/shorten-repo-url/pull/33/commits/3d8d1cc8d784c7d92788a8a21e2c30cf87be3658',
+ ),
'[refined-github/shorten-repo-url@`3d8d1cc` (#33)](https://github.com/refined-github/shorten-repo-url/pull/33/commits/3d8d1cc8d784c7d92788a8a21e2c30cf87be3658)',
);
// Test "this PR" behavior when on same PR
location.href = 'https://github.com/refined-github/refined-github/pull/3205';
assert.equal(
- replacePrCommitLink('https://github.com/refined-github/refined-github/pull/3205/commits/1da152b3f8c51dd72d8ae6ad9cc96e0c2d8716f5'),
+ replacePrCommitLink(
+ 'https://github.com/refined-github/refined-github/pull/3205/commits/1da152b3f8c51dd72d8ae6ad9cc96e0c2d8716f5',
+ ),
'[`1da152b` (this PR)](https://github.com/refined-github/refined-github/pull/3205/commits/1da152b3f8c51dd72d8ae6ad9cc96e0c2d8716f5)',
'It should use "this PR" when on the same PR',
);
assert.equal(
- replacePrCommitLink('lorem ipsum dolor https://github.com/refined-github/refined-github/pull/3205/commits/b0ac07948f9d30a760bda25a7106011441abfd5d#r438059292 some random string'),
+ replacePrCommitLink(
+ 'lorem ipsum dolor https://github.com/refined-github/refined-github/pull/3205/commits/b0ac07948f9d30a760bda25a7106011441abfd5d#r438059292 some random string',
+ ),
'lorem ipsum dolor [`b0ac079` (this PR)](https://github.com/refined-github/refined-github/pull/3205/commits/b0ac07948f9d30a760bda25a7106011441abfd5d#r438059292) some random string',
'It should use "this PR" when on the same PR with hash',
);
// When on PR 3205, a link to PR 44 should still show #44
assert.equal(
- replacePrCommitLink('https://github.com/refined-github/refined-github/pull/44/commits/cb44a4eb8cd5c66def3dc26dca0f386645fa29bb'),
+ replacePrCommitLink(
+ 'https://github.com/refined-github/refined-github/pull/44/commits/cb44a4eb8cd5c66def3dc26dca0f386645fa29bb',
+ ),
'[`cb44a4e` (#44)](https://github.com/refined-github/refined-github/pull/44/commits/cb44a4eb8cd5c66def3dc26dca0f386645fa29bb)',
'It should still use PR number when link is to a different PR',
);
@@ -100,20 +128,30 @@ test('preventPrCompareLinkLoss', () => {
'It should not affect compare URLs without a diff hash',
);
assert.equal(
- replacePrCompareLink('https://github.com/sindresorhus/got/compare/v11.5.2...v11.6.0#diff-6be2971b2bb8dbf48d15ff680dd898b0R191'),
+ replacePrCompareLink(
+ 'https://github.com/sindresorhus/got/compare/v11.5.2...v11.6.0#diff-6be2971b2bb8dbf48d15ff680dd898b0R191',
+ ),
'[sindresorhus/got@`v11.5.2...v11.6.0`#diff-6be2971b2b](https://github.com/sindresorhus/got/compare/v11.5.2...v11.6.0#diff-6be2971b2bb8dbf48d15ff680dd898b0R191)',
);
assert.equal(
- replacePrCompareLink('lorem ipsum dolor https://github.com/refined-github/refined-github/compare/main...incremental-tag-changelog-link#diff-5b3cf6bcc7c5b1373313553dc6f93a5eR7-R9 some random string'),
+ replacePrCompareLink(
+ 'lorem ipsum dolor https://github.com/refined-github/refined-github/compare/main...incremental-tag-changelog-link#diff-5b3cf6bcc7c5b1373313553dc6f93a5eR7-R9 some random string',
+ ),
'lorem ipsum dolor [`main...incremental-tag-changelog-link`#diff-5b3cf6bcc7](https://github.com/refined-github/refined-github/compare/main...incremental-tag-changelog-link#diff-5b3cf6bcc7c5b1373313553dc6f93a5eR7-R9) some random string',
);
assert.equal(
- replacePrCompareLink(replacePrCompareLink('lorem ipsum dolor https://github.com/sindresorhus/got/compare/v11.5.2...v11.6.0#diff-6be2971b2bb8dbf48d15ff680dd898b0R191 some random string')),
+ replacePrCompareLink(
+ replacePrCompareLink(
+ 'lorem ipsum dolor https://github.com/sindresorhus/got/compare/v11.5.2...v11.6.0#diff-6be2971b2bb8dbf48d15ff680dd898b0R191 some random string',
+ ),
+ ),
'lorem ipsum dolor [sindresorhus/got@`v11.5.2...v11.6.0`#diff-6be2971b2b](https://github.com/sindresorhus/got/compare/v11.5.2...v11.6.0#diff-6be2971b2bb8dbf48d15ff680dd898b0R191) some random string',
'It should not apply it twice',
);
assert.equal(
- replacePrCompareLink('I like [turtles](https://github.com/sindresorhus/got/compare/v11.5.2...v11.6.0#diff-6be2971b2bb8dbf48d15ff680dd898b0R191)'),
+ replacePrCompareLink(
+ 'I like [turtles](https://github.com/sindresorhus/got/compare/v11.5.2...v11.6.0#diff-6be2971b2bb8dbf48d15ff680dd898b0R191)',
+ ),
'I like [turtles](https://github.com/sindresorhus/got/compare/v11.5.2...v11.6.0#diff-6be2971b2bb8dbf48d15ff680dd898b0R191)',
'It should ignore Markdown links',
);
@@ -140,16 +178,24 @@ test('preventDiscussionLinkLoss', () => {
'It should work on any hash',
);
assert.equal(
- replaceDiscussionLink('https://github.com/eslint/eslint/discussions/15898?sort=top\nhttps://github.com/eslint/eslint/discussions/15898#discussioncomment-646707'),
+ replaceDiscussionLink(
+ 'https://github.com/eslint/eslint/discussions/15898?sort=top\nhttps://github.com/eslint/eslint/discussions/15898#discussioncomment-646707',
+ ),
'[eslint/eslint#15898](https://github.com/eslint/eslint/discussions/15898?sort=top)\nhttps://github.com/eslint/eslint/discussions/15898#discussioncomment-646707',
'It should work separately on links.',
);
assert.equal(
- replaceDiscussionLink('lorem ipsum dolor https://github.com/eslint/eslint/discussions/15898?sort=top some random string'),
+ replaceDiscussionLink(
+ 'lorem ipsum dolor https://github.com/eslint/eslint/discussions/15898?sort=top some random string',
+ ),
'lorem ipsum dolor [eslint/eslint#15898](https://github.com/eslint/eslint/discussions/15898?sort=top) some random string',
);
assert.equal(
- replaceDiscussionLink(replaceDiscussionLink('lorem ipsum dolor https://github.com/eslint/eslint/discussions/15898?sort=top#discussion-4086661 some random string')),
+ replaceDiscussionLink(
+ replaceDiscussionLink(
+ 'lorem ipsum dolor https://github.com/eslint/eslint/discussions/15898?sort=top#discussion-4086661 some random string',
+ ),
+ ),
'lorem ipsum dolor [eslint/eslint#15898 (comment)](https://github.com/eslint/eslint/discussions/15898?sort=top#discussion-4086661) some random string',
'It should not apply it twice',
);
@@ -159,7 +205,9 @@ test('preventDiscussionLinkLoss', () => {
'It should ignore Markdown links',
);
assert.equal(
- replaceDiscussionLink('https://github.com/streetcomplete/StreetComplete/discussions/15898?sort=top#discussioncomment-646707'),
+ replaceDiscussionLink(
+ 'https://github.com/streetcomplete/StreetComplete/discussions/15898?sort=top#discussioncomment-646707',
+ ),
'[streetcomplete/StreetComplete#15898 (comment)](https://github.com/streetcomplete/StreetComplete/discussions/15898?sort=top#discussioncomment-646707)',
);
});
diff --git a/source/github-helpers/prevent-link-loss.ts b/source/github-helpers/prevent-link-loss.ts
index 0b6228878ea9..c18ecf245dbd 100644
--- a/source/github-helpers/prevent-link-loss.ts
+++ b/source/github-helpers/prevent-link-loss.ts
@@ -1,6 +1,6 @@
import type {RepositoryInfo} from 'github-url-detection';
-import {getRepo, getConversationNumber} from './index.js';
+import {getConversationNumber, getRepo} from './index.js';
function getRepoReference(currentRepo: RepositoryInfo | undefined, repoNameWithOwner: string, delimiter = ''): string {
return repoNameWithOwner === currentRepo!.nameWithOwner ? '' : repoNameWithOwner + delimiter;
@@ -8,16 +8,32 @@ function getRepoReference(currentRepo: RepositoryInfo | undefined, repoNameWithO
const escapeRegex = (string: string): string => string.replaceAll(/[\\^$.*+?()[\]{}|]/g, String.raw`\$&`);
const prCommitPathnameRegex = /[/]([^/]+[/][^/]+)[/]pull[/](\d+)[/]commits[/]([\da-f]{7})[\da-f]{33}(?:#[\w-]+)?\b/;
-export const prCommitUrlRegex = new RegExp(String.raw`\b` + escapeRegex(location.origin) + prCommitPathnameRegex.source, 'gi');
+export const prCommitUrlRegex = new RegExp(
+ String.raw`\b` + escapeRegex(location.origin) + prCommitPathnameRegex.source,
+ 'gi',
+);
const prComparePathnameRegex = /[/]([^/]+[/][^/]+)[/]compare[/](.+)(#diff-[\da-fR-]+)/;
-export const prCompareUrlRegex = new RegExp(String.raw`\b` + escapeRegex(location.origin) + prComparePathnameRegex.source, 'gi');
+export const prCompareUrlRegex = new RegExp(
+ String.raw`\b` + escapeRegex(location.origin) + prComparePathnameRegex.source,
+ 'gi',
+);
const discussionPathnameRegex = /[/]([^/]+[/][^/]+)[/]discussions[/](\d+)[?][^#\s]+(#[\w-]+)?\b/;
-export const discussionUrlRegex = new RegExp(String.raw`\b` + escapeRegex(location.origin) + discussionPathnameRegex.source, 'gi');
+export const discussionUrlRegex = new RegExp(
+ String.raw`\b` + escapeRegex(location.origin) + discussionPathnameRegex.source,
+ 'gi',
+);
// To be used as replacer callback in string.replace() for PR commit links
-export function preventPrCommitLinkLoss(url: string, repoNameWithOwner: string, pr: string, commit: string, index: number, fullText: string): string {
+export function preventPrCommitLinkLoss(
+ url: string,
+ repoNameWithOwner: string,
+ pr: string,
+ commit: string,
+ index: number,
+ fullText: string,
+): string {
if (fullText[index + url.length] === ')') {
return url;
}
@@ -28,7 +44,14 @@ export function preventPrCommitLinkLoss(url: string, repoNameWithOwner: string,
}
// To be used as replacer callback in string.replace() for compare links
-export function preventPrCompareLinkLoss(url: string, repoNameWithOwner: string, compare: string, hash: string, index: number, fullText: string): string {
+export function preventPrCompareLinkLoss(
+ url: string,
+ repoNameWithOwner: string,
+ compare: string,
+ hash: string,
+ index: number,
+ fullText: string,
+): string {
if (fullText[index + url.length] === ')') {
return url;
}
@@ -37,7 +60,14 @@ export function preventPrCompareLinkLoss(url: string, repoNameWithOwner: string,
}
// To be used as replacer callback in string.replace() for discussion links
-export function preventDiscussionLinkLoss(url: string, repoNameWithOwner: string, discussion: string, comment: string, index: number, fullText: string): string {
+export function preventDiscussionLinkLoss(
+ url: string,
+ repoNameWithOwner: string,
+ discussion: string,
+ comment: string,
+ index: number,
+ fullText: string,
+): string {
if (fullText[index + url.length] === ')') {
return url;
}
diff --git a/source/github-helpers/search-query.test.ts b/source/github-helpers/search-query.test.ts
index 7b7586d8861c..75617dcafe14 100644
--- a/source/github-helpers/search-query.test.ts
+++ b/source/github-helpers/search-query.test.ts
@@ -1,4 +1,4 @@
-import {test, assert} from 'vitest';
+import {assert, test} from 'vitest';
import SearchQuery from './search-query.js';
diff --git a/source/github-helpers/selectors.test.ts b/source/github-helpers/selectors.test.ts
index 73d64109fc1c..b1640df4c6cb 100644
--- a/source/github-helpers/selectors.test.ts
+++ b/source/github-helpers/selectors.test.ts
@@ -1,14 +1,11 @@
-import pMemoize from 'p-memoize';
-import {test, assert, describe} from 'vitest';
-import {parseHTML} from 'linkedom';
import filenamify from 'filenamify';
+import {parseHTML} from 'linkedom';
import {
- writeFile,
- mkdir,
- unlink,
- readFile,
- access,
+ access, mkdir, readFile, unlink, writeFile,
} from 'node:fs/promises';
+import pMemoize from 'p-memoize';
+import {$$optional} from 'select-dom';
+import {assert, describe, test} from 'vitest';
import * as exports from './selectors.js';
@@ -69,7 +66,7 @@ describe.concurrent('selectors', () => {
const html = await fetchDocument(url);
const {document} = parseHTML(html);
// TODO: ? Use snapshot with outerHTML[]
- const matches = document.querySelectorAll(selector);
+ const matches = $$optional(selector, document);
assert.equal(matches.length, expectations, `Got wrong number of matches on ${url}:\n${selector}`);
}));
});
diff --git a/source/github-helpers/selectors.ts b/source/github-helpers/selectors.ts
index e7b78fa3f607..15de6b53d4ce 100644
--- a/source/github-helpers/selectors.ts
+++ b/source/github-helpers/selectors.ts
@@ -86,14 +86,14 @@ export const openPrsListLink_ = [
[4, 'https://github.com/refined-github/sandbox/issues?q=conflict'],
] satisfies UrlMatch[];
-export const openIssueToLastComment = `
+export const commentsCountInLists = `
:is(.js-issue-row, .js-pinned-issue-list-item)
.Link--muted:is(
a[aria-label$="comment"],
a[aria-label$="comments"]
)
`;
-export const openIssueToLastComment_ = [
+export const commentsCountInLists_ = [
[2, 'https://github.com/refined-github/sandbox/labels/bug'],
] satisfies UrlMatch[];
@@ -151,14 +151,20 @@ export const commitHashLinkInLists = [
'.js-details-container .text-right code a.Link--secondary', // `isPRConversation`
] as unknown as Array<'a'>;
export const commitHashLinkInLists_ = [
- [35, 'https://github.com/typed-ember/ember-cli-typescript/commits/master?after=5ff0c078a4274aeccaf83382c0d6b46323f57397+174'],
+ [
+ 35,
+ 'https://github.com/typed-ember/ember-cli-typescript/commits/master?after=5ff0c078a4274aeccaf83382c0d6b46323f57397+174',
+ ],
[4, 'https://github.com/refined-github/refined-github/pull/6194/commits'],
[5, 'https://github.com/refined-github/refined-github/pull/6194#event-8016526003'],
] satisfies UrlMatch[];
export const commitTitleInLists = '[data-testid="commit-row-item"] h4[class^="Title-module"]'; // `isCommitList`
export const commitTitleInLists_ = [
- [35, 'https://github.com/typed-ember/ember-cli-typescript/commits/master?after=5ff0c078a4274aeccaf83382c0d6b46323f57397+174'],
+ [
+ 35,
+ 'https://github.com/typed-ember/ember-cli-typescript/commits/master?after=5ff0c078a4274aeccaf83382c0d6b46323f57397+174',
+ ],
[4, 'https://github.com/refined-github/refined-github/pull/6194/commits'],
];
@@ -250,7 +256,8 @@ export const actionBarSelectors = [
];
export const actionBarSelectors_ = requiresLogin;
-export const prMergeabilityBoxCaption = '[aria-label="Conflicts"] [class^="MergeBoxSectionHeader-module__wrapper"] h3 + .fgColor-muted';
+export const prMergeabilityBoxCaption
+ = '[aria-label="Conflicts"] [class^="MergeBoxSectionHeader-module__wrapper"] h3 + .fgColor-muted';
export const prMergeabilityBoxCaption_ = requiresLogin;
export const prMergeabilityBoxHeader = '[aria-label="Conflicts"] [class^="MergeBoxSectionHeader-module__wrapper"]';
diff --git a/source/github-helpers/timeline-item.tsx b/source/github-helpers/timeline-item.tsx
index 4d76f8a16c36..70994bf3161b 100644
--- a/source/github-helpers/timeline-item.tsx
+++ b/source/github-helpers/timeline-item.tsx
@@ -2,5 +2,5 @@ import React from 'dom-chef';
export default function TimelineItem(): JSX.Element {
// Classes copied from #issuecomment-new + mt-3 added
- return ;
+ return ;
}
diff --git a/source/github-helpers/toast.tsx b/source/github-helpers/toast.tsx
index ffe54fcf428a..f86a67a40fef 100644
--- a/source/github-helpers/toast.tsx
+++ b/source/github-helpers/toast.tsx
@@ -1,8 +1,8 @@
import React from 'dom-chef';
-import {assertError} from 'ts-extras';
import CheckIcon from 'octicons-plain-react/Check';
import StopIcon from 'octicons-plain-react/Stop';
import oneEvent from 'one-event';
+import {assertError} from 'ts-extras';
import delay from '../helpers/delay.js';
import {frame} from '../helpers/dom-utils.js';
@@ -29,7 +29,9 @@ export default async function showToast(
doneMessage?: ToastMessage | false;
} = {},
): Promise {
- const iconWrapper = ;
+ const iconWrapper =
+
+ ;
const messageWrapper = {message};
const toast = (
= X | X[];
type AnyObject = Record;
-type Deinit = {disconnect: VoidFunction} | {clear: VoidFunction} | {destroy: VoidFunction} | {abort: VoidFunction} | VoidFunction;
+type Deinit
+ = | {disconnect: VoidFunction}
+ | {clear: VoidFunction}
+ | {destroy: VoidFunction}
+ | {abort: VoidFunction}
+ | VoidFunction;
type FeatureId = string & {feature: true};
interface FeatureMeta {
@@ -20,6 +25,7 @@ interface FeatureMeta {
description: string;
screenshot: string | null; // eslint-disable-line @typescript-eslint/no-restricted-types -- We use `null` in the JSON file
css?: true;
+ cssOnly?: true;
}
// These types are unnecessarily loose
diff --git a/source/helpers/bisect.tsx b/source/helpers/bisect.tsx
index 260650174a6b..c84477fc1914 100644
--- a/source/helpers/bisect.tsx
+++ b/source/helpers/bisect.tsx
@@ -1,12 +1,11 @@
import React from 'dom-chef';
-import {CachedValue} from 'webext-storage-cache';
-import {$$} from 'select-dom';
-import {$optional} from 'select-dom/strict.js';
import elementReady from 'element-ready';
+import {$$, $optional} from 'select-dom';
+import {CachedValue} from 'webext-storage-cache';
+import {importedFeatures} from '../feature-data.js';
import pluralize from './pluralize.js';
import {getFeatureUrl} from './rgh-links.js';
-import {importedFeatures} from '../feature-data.js';
export const state = new CachedValue('bisect', {maxAge: {minutes: 15}});
@@ -28,9 +27,10 @@ async function onChoiceButtonClick({currentTarget: button}: React.MouseEvent 1) {
- await state.set(answer === 'yes'
- ? bisectedFeatures.slice(0, getMiddleStep(bisectedFeatures))
- : bisectedFeatures.slice(getMiddleStep(bisectedFeatures)),
+ await state.set(
+ answer === 'yes'
+ ? bisectedFeatures.slice(0, getMiddleStep(bisectedFeatures))
+ : bisectedFeatures.slice(getMiddleStep(bisectedFeatures)),
);
button.parentElement!.replaceWith(