|
Shows how far behind a PR head branch is + tells you its base commit
@@ -105,11 +105,12 @@ https://github.com/refined-github/refined-github/wiki/Contributing#metadata-guid
- [](# "repo-avatars") [Adds the profile picture to the header of public repositories.](https://github-production-user-asset-6210df.s3.amazonaws.com/1402241/255323568-aee4d90e-844e-41e8-880a-ce466826516c.png)
- [](# "quick-new-issue") [Adds a link to create issues from anywhere in a repository.](https://github-production-user-asset-6210df.s3.amazonaws.com/1402241/274816033-820ec518-049d-4248-9f8a-27b9423e350b.png)
- [](# "small-user-avatars") [Shows a small avatar next to the username in issue/PR lists and mentions.](https://github-production-user-asset-6210df.s3.amazonaws.com/1402241/271184107-24ec471e-54d1-434a-a5f2-615902d2cad9.png)
-- [](# "unreleased-commits") 🔥 [Tells you whether you're looking at the latest version of a repository, or if there are any unreleased commits.](https://github-production-user-asset-6210df.s3.amazonaws.com/1402241/267236196-8564c193-a3c7-4248-9735-54749c1990c7.png)
- [](# "action-pr-link") 🔥 [Adds a link back to the PR that ran the workflow.](https://github-production-user-asset-6210df.s3.amazonaws.com/50487467/241645264-076a0137-36a2-4fd0-a66e-735ef3b3a563.png)
- [](# "mobile-tabs") [Makes the tabs more compact on mobile so more of them can be seen.](https://user-images.githubusercontent.com/1402241/245446231-28f44b59-0151-4986-8cb9-05b5645592d8.png)
- [](# "repo-header-info") [Shows whether a repo is a fork and adds the number of stars to its header.](https://github-production-user-asset-6210df.s3.amazonaws.com/1402241/267216946-404d79ab-46d7-4bc8-ba88-ae8f8029150d.png)
- [](# "visit-tag") [When navigating a repo's file on a specific tag, it adds a link to see the release/tag itself.](https://github-production-user-asset-6210df.s3.amazonaws.com/1402241/285123739-e5f4fa0a-3f48-49ef-9b87-2fd6f183c923.png)
+- [](# "actions-run-removal") [Lets you cancel or delete workflow runs faster from the workflow list.](https://github.com/user-attachments/assets/a054f9b4-9d56-40c0-9aac-09a8b07bbb3b)
+- [](# "rerun-workflow") [Unwraps the "Re-run jobs" dropdown into individual buttons and adds a keyboard shortcut to re-run failed jobs: r f](https://github.com/user-attachments/assets/67331112-f5b2-4a2b-af43-800d46bd6bf7).
- {title}
+ {title} v{version}
@@ -41,14 +42,18 @@
}
h1 {
- display: flex;
- gap: 0.4em;
font-size: clamp(1.3em, 5vw, 2em);
font-weight: 200;
img {
height: 1.3em;
width: 1.3em;
+ vertical-align: top;
+ }
+
+ small {
+ font-size: 0.7em;
+ opacity: 0.9;
}
}
diff --git a/source/options/reload-without.ts b/source/options/reload-without.ts
index 6497e64a6a09..4b4bb0c05f75 100644
--- a/source/options/reload-without.ts
+++ b/source/options/reload-without.ts
@@ -1,12 +1,11 @@
import {StorageItem} from 'webext-storage';
import webextAlert from 'webext-alert';
-import chromeP from 'webext-polyfill-kinda';
import {isScriptableUrl} from 'webext-content-scripts';
-import {isFirefox} from 'webext-detect';
import {createContextMenu} from 'webext-tools';
-// Always Firefox… https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/storage/StorageArea/setAccessLevel
-const area = isFirefox() ? 'local' : 'session';
+// Always Firefox… https://developer.mozilla.org/docs/Mozilla/Add-ons/WebExtensions/API/storage/StorageArea/setAccessLevel
+// Don't use `isFirefox` - #9065
+const area = chrome.storage.session?.setAccessLevel === undefined ? 'local' : 'session';
export const contentScriptToggle = new StorageItem('contentScript', {
area,
@@ -14,19 +13,19 @@ export const contentScriptToggle = new StorageItem('contentScript', {
});
async function reload(_: unknown, tab: chrome.tabs.Tab): Promise {
- if (tab.url && isScriptableUrl(tab.url) && await chromeP.permissions.contains({
+ if (tab.url && isScriptableUrl(tab.url) && await chrome.permissions.contains({
origins: [tab.url],
})) {
await contentScriptToggle.set(false);
- chrome.tabs.reload(tab.id!);
+ await chrome.tabs.reload(tab.id!);
} else {
// TODO: Use https://github.com/fregante/webext-events/issues/31 to disable the item instead
- webextAlert('Refined GitHub is already not running on this page');
+ await webextAlert('Refined GitHub is already not running on this page');
}
}
export default function addReloadWithoutContentScripts(): void {
- chrome.storage.session.setAccessLevel?.({accessLevel: 'TRUSTED_AND_UNTRUSTED_CONTEXTS'});
+ void chrome.storage.session.setAccessLevel?.({accessLevel: 'TRUSTED_AND_UNTRUSTED_CONTEXTS'});
void createContextMenu({
id: 'reload-without-content-scripts',
diff --git a/source/options/storage-usage.svelte b/source/options/storage-usage.svelte
index d56b0f6a1aba..46fbe7c203e7 100644
--- a/source/options/storage-usage.svelte
+++ b/source/options/storage-usage.svelte
@@ -20,10 +20,11 @@
area: 'sync' | 'local';
item?: string;
} = $props();
- const storage = chrome.storage[area];
-
let used = $state(0);
- const available = $derived((item ? (storage as chrome.storage.SyncStorageArea).QUOTA_BYTES_PER_ITEM ?? storage.QUOTA_BYTES : storage.QUOTA_BYTES) - used);
+ const available = $derived.by(() => {
+ const storage = chrome.storage[area];
+ return (item ? (storage as chrome.storage.SyncStorageArea).QUOTA_BYTES_PER_ITEM ?? storage.QUOTA_BYTES : storage.QUOTA_BYTES) - used;
+ });
async function getStorageUsage() {
used = item ? await getStoredItemSize(area, item) : await getStorageBytesInUse(area);
@@ -39,12 +40,6 @@
}
};
- $effect(() => {
- if (item) {
- used = getTrueSizeOfObject(storage.get(item));
- }
- });
-
onMount(() => {
getStorageUsage();
diff --git a/source/options/token-validation.tsx b/source/options/token-validation.tsx
index 0e63174f8092..f18cab4c2619 100644
--- a/source/options/token-validation.tsx
+++ b/source/options/token-validation.tsx
@@ -4,9 +4,11 @@ import {$} from 'select-dom/strict.js';
import {assertError} from 'ts-extras';
import type {SyncedForm} from 'webext-options-sync-per-domain';
-import {getTokenScopes, tokenUser} from '../github-helpers/github-token.js';
+import {getTokenInfo, tokenUser} from '../github-helpers/github-token.js';
import delay from '../helpers/delay.js';
+const rtf = new Intl.RelativeTimeFormat('en', {numeric: 'auto'});
+
type Status = {
error?: true;
text?: string;
@@ -57,13 +59,24 @@ async function validateToken(): Promise {
try {
const base = getApiUrl();
- const [scopes, user] = await Promise.all([
- getTokenScopes(base, tokenField.value),
+ const [tokenInfo, user] = await Promise.all([
+ getTokenInfo(base, tokenField.value),
tokenUser.get(base, tokenField.value),
]);
+
+ // Build status message with user and expiration
+ let statusMessage = `👤 @${user}`;
+ if (tokenInfo.expiration) {
+ const msUntilExpiration = new Date(tokenInfo.expiration).getTime() - Date.now();
+ const daysUntilExpiration = Math.ceil(msUntilExpiration / (1000 * 60 * 60 * 24));
+ statusMessage += `, expires ${rtf.format(daysUntilExpiration, 'day')}`;
+ } else {
+ statusMessage += ', no expiration';
+ }
+
reportStatus({
- text: `👤 @${user}`,
- scopes,
+ text: statusMessage,
+ scopes: tokenInfo.scopes,
});
} catch (error) {
assertError(error);
diff --git a/source/options/version-info.svelte b/source/options/version-info.svelte
new file mode 100644
index 000000000000..a1a73fc0dd2b
--- /dev/null
+++ b/source/options/version-info.svelte
@@ -0,0 +1,22 @@
+
+
+
+
+
+
diff --git a/source/refined-github.css b/source/refined-github.css
index 39910c97d636..7543cf3058c1 100644
--- a/source/refined-github.css
+++ b/source/refined-github.css
@@ -199,3 +199,12 @@ div[data-target='readme-toc.content'] div.blob-wrapper img {
}
}
}
+
+.rgh-anchored-link {
+ position: absolute !important;
+ position-area: center;
+ z-index: 2;
+ pointer-events: auto;
+ /* For debugging */
+ /* color: red !important; */
+}
diff --git a/source/refined-github.ts b/source/refined-github.ts
index daa785ca340b..90f0faec22b4 100644
--- a/source/refined-github.ts
+++ b/source/refined-github.ts
@@ -9,7 +9,6 @@ import './features/github-bugs.css';
import './features/tab-size.css';
import './features/center-reactions-popup.css';
import './features/monospace-textareas.css';
-import './features/safer-destructive-actions.css';
import './features/clean-footer.css';
import './features/pr-approvals-count.css';
import './features/clean-conversations.css';
@@ -32,6 +31,7 @@ import './features/align-issue-labels.js';
import './features/clean-pinned-issues.js';
import './features/hide-diff-signs.js';
import './features/clean-rich-text-editor.js';
+import './features/sticky-comment-header.js';
// Disableable features
import './features/useful-not-found-page.js';
@@ -53,11 +53,9 @@ import './features/linkify-code.js';
import './features/download-folder-button.js';
import './features/linkify-branch-references.js';
import './features/open-all-conversations.js';
-import './features/pagination-hotkey.js';
import './features/conversation-links-on-repo-lists.js';
import './features/global-conversation-list-filters.js';
-import './features/more-conversation-filters.js';
-import './features/sort-conversations-by-update-time.js'; // Must be after global-conversation-list-filters and more-conversation-filters and conversation-links-on-repo-lists
+import './features/sort-conversations-by-update-time.js'; // Must be after global-conversation-list-filters and conversation-links-on-repo-lists
import './features/pinned-issues-update-time.js';
import './features/default-branch-button.js';
import './features/one-click-diff-options.js';
@@ -68,7 +66,6 @@ import './features/pull-request-hotkeys.js';
import './features/one-click-review-submission.js';
import './features/embed-gist-inline.js';
import './features/comments-time-machine-links.js';
-import './features/hide-issue-list-autocomplete.js';
import './features/esc-to-deselect-line.js';
import './features/create-release-shortcut.js';
import './features/patch-diff-links.js';
@@ -91,7 +88,6 @@ import './features/warn-pr-from-master.js';
import './features/preview-hidden-comments.js';
import './features/fit-textareas.js';
import './features/collapsible-content-button.js';
-import './features/resolve-conflicts.js';
import './features/actionable-pr-view-file.js'; // Must be before more-file-links
import './features/more-file-links.js';
import './features/pr-filters.js';
@@ -122,7 +118,6 @@ import './features/conflict-marker.js';
import './features/html-preview-link.js';
import './features/linkify-user-location.js';
import './features/repo-age.js';
-import './features/user-local-time.js';
import './features/quick-mention.js';
import './features/extend-conversation-status-filters.js';
import './features/expand-all-hidden-comments.js';
@@ -136,27 +131,28 @@ import './features/clear-pr-merge-commit-message.js';
import './features/action-used-by-link.js';
import './features/batch-mark-files-as-viewed.js';
import './features/unwrap-unnecessary-dropdowns.js';
+import './features/rerun-workflow.js';
import './features/stop-redirecting-in-notification-bar.js';
import './features/prevent-link-loss.js';
import './features/closing-remarks.js';
import './features/show-associated-branch-prs-on-fork.js';
+import './features/unclip-checks.js';
import './features/quick-review.js';
import './features/pr-jump-to-first-non-viewed-file.js';
import './features/keyboard-navigation.js';
import './features/vertical-front-matter.js';
import './features/pr-first-commit-title.js';
-import './features/linkify-user-edit-history-popup.js';
import './features/clean-repo-filelist-actions.js';
import './features/prevent-duplicate-pr-submission.js';
import './features/quick-label-removal.js';
import './features/clean-conversation-headers.js';
import './features/new-or-deleted-file.js';
import './features/convert-release-to-draft.js';
+import './features/confirm-release.js';
import './features/new-repo-disable-projects-and-wikis.js';
import './features/table-input.js';
import './features/link-to-github-io.js';
import './features/github-actions-indicators.js';
-import './features/convert-pr-to-draft-improvements.js';
import './features/unfinished-comments.js';
import './features/jump-to-change-requested-comment.js';
import './features/esc-to-cancel.js';
@@ -179,7 +175,6 @@ import './features/select-notifications.js';
import './features/clean-repo-tabs.js';
import './features/rgh-options-link.js';
import './features/same-branch-author-commits.js';
-import './features/prevent-pr-merge-panel-opening.js';
import './features/rgh-improve-new-issue-form.js';
import './features/easy-toggle-commit-messages.js';
import './features/command-palette-navigation-shortcuts.js';
@@ -222,3 +217,6 @@ import './features/unread-anywhere.js';
import './features/no-modals.js';
import './features/same-page-links.js';
import './features/linkify-text.js';
+import './features/actions-run-removal.js';
+import './features/new-milestone-button.js';
+import './features/no-self-reference.js';
diff --git a/source/resolve-conflicts.ts b/source/resolve-conflicts.ts
deleted file mode 100644
index 43707314c485..000000000000
--- a/source/resolve-conflicts.ts
+++ /dev/null
@@ -1,128 +0,0 @@
-import {regexJoinWithSeparator} from 'regex-join';
-import type CodeMirror from 'codemirror';
-
-declare module 'codemirror' {
- interface LineHandle {
- widgets: unknown[];
- lineNo: () => number;
- }
-}
-
-const editor = document.querySelector('.CodeMirror')!.CodeMirror;
-
-// Event fired when each file is loaded
-editor.on('swapDoc', () => setTimeout(addWidget, 1));
-
-// Restore widget on undo
-editor.on('changes', (_, [firstChange]) => {
- if (firstChange.origin === 'undo' && firstChange.text[0].startsWith('<<<<<<<')) {
- addWidget();
-
- // Reset cursor position to one line instead of multiple
- editor.setCursor(editor.getCursor());
- }
-});
-
-function getLineNumber(lineChild: Element): number {
- return Number(
- lineChild
- .closest(['.CodeMirror-gutter-wrapper', '.CodeMirror-linewidget'])!
- .parentElement!
- .querySelector('.CodeMirror-linenumber')!
- .textContent,
- ) - 1;
-}
-
-function appendLineInfo(lineHandle: CodeMirror.LineHandle, text: string): void {
- // Only append text if it's not already there
- if (!lineHandle.text.includes(text)) {
- const line = lineHandle.lineNo();
- editor.replaceRange(text, {line, ch: Number.POSITIVE_INFINITY}); // Infinity = end of line
- editor.clearHistory();
- }
-}
-
-// Create and add widget if not already in the document
-function addWidget(): void {
- editor.eachLine(lineHandle => {
- if (Array.isArray(lineHandle.widgets) && lineHandle.widgets.length > 0) {
- return;
- }
-
- if (lineHandle.text.startsWith('<<<<<<<')) {
- appendLineInfo(lineHandle, ' -- Incoming Change');
- const line = lineHandle.lineNo();
- editor.addLineClass(line, '', 'rgh-resolve-conflicts');
- editor.addLineWidget(line, newWidget(), {
- above: true,
- noHScroll: true,
- });
- } else if (lineHandle.text.startsWith('>>>>>>>')) {
- appendLineInfo(lineHandle, ' -- Current Change');
- }
- });
-}
-
-function createButton(branch: string, title = `Accept ${branch} Change`): HTMLButtonElement {
- const link = document.createElement('button');
- link.type = 'button';
- link.className = 'btn-link';
- link.textContent = title;
- link.addEventListener('click', ({target}) => {
- acceptBranch(branch, getLineNumber(target as Element));
- });
- return link;
-}
-
-// Create and return conflict resolve widget for specific conflict
-function newWidget(): HTMLDivElement {
- const widget = document.createElement('div');
- widget.style.fontWeight = 'bold';
- widget.append(
- createButton('Current'),
- ' | ',
- createButton('Incoming'),
- ' | ',
- createButton('Both', 'Accept Both Changes'),
- );
- return widget;
-}
-
-const currentChange = /^>>>>>>> .+ -- Current Change$/;
-const incomingChange = /^<<<<<<< .+ -- Incoming Change$/;
-const middle = /^=======$/;
-const anyMarker = regexJoinWithSeparator('|', [currentChange, incomingChange, middle]);
-
-// Accept one or both of branches and remove unnecessary lines
-function acceptBranch(branch: string, line: number): void {
- // This variable is only changed when a marker is encountered and is meant to stay positive/negative until the next marker
- let inDeletableSection = false;
-
- const linesToRemove: number[] = [];
- editor.eachLine(line, Number.POSITIVE_INFINITY, lineHandle => {
- const currentLine = lineHandle.text;
-
- // Determine whether to remove the following line(s)
- if (incomingChange.test(currentLine)) {
- inDeletableSection = branch === 'Current';
- } else if (currentLine === '=======') {
- inDeletableSection = branch === 'Incoming';
- }
-
- // Delete tracked lines and all conflict markers
- if (inDeletableSection || anyMarker.test(currentLine)) {
- linesToRemove.push(lineHandle.lineNo());
- }
-
- return currentChange.test(currentLine); // `true` ends loop
- });
-
- // Delete all lines at once in a performant way
- const ranges = linesToRemove.map(line => ({
- anchor: {line, ch: 0},
- head: {line, ch: 0},
- }));
- editor.setSelections(ranges);
- editor.execCommand('deleteLine');
- editor.setCursor(linesToRemove[0]);
-}
diff --git a/test/setup-file.js b/test/setup-file.js
index 4d693557b10e..128ea425ca66 100644
--- a/test/setup-file.js
+++ b/test/setup-file.js
@@ -26,7 +26,7 @@ link.type = 'application/atom+xml';
navigateToCommits('master', '/refined-github/refined-github/commits');
document.head.append(link);
-// eslint-disable-next-line import/prefer-default-export
+// eslint-disable-next-line import-x/prefer-default-export
export function navigateToCommits(branch, pathname) {
link.href = `https://github.com/refined-github/refined-github/commits/${branch}.atom`;
link.title = `Recent Commits to ava:${branch}`;
diff --git a/tsconfig.json b/tsconfig.json
index 161fcd2264c2..9699390e69cd 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -5,6 +5,7 @@
"rootDir": "./",
"module": "preserve",
"moduleResolution": "bundler",
+ "jsx": "react",
"declaration": false,
"noUncheckedIndexedAccess": false,
"noPropertyAccessFromIndexSignature": false,
@@ -21,6 +22,7 @@
"include": [
"source",
"test",
- "build"
+ "build",
+ "vite.config.ts"
]
}
| 
+ 