Skip to content

feat: support configurable branch name for 'main' and other defaults (fixes #523) #687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
li5435945-ship-it wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: support configurable branch name for 'main' and other defaults (fixes #523) #687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/github.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,14 @@ export const reactionTypes: ReactionID[] = ['+1', '-1', 'laugh', 'hooray', 'conf

let owner: string;
let repo: string;
const branch = 'master';
let branch = 'master';

export function setRepoContext(context: { owner: string; repo: string; }) {
export function setRepoContext(context: { owner: string; repo: string; branch?: string; }) {
owner = context.owner;
repo = context.repo;
if (context.branch) {
branch = context.branch;
}
}

function githubRequest(relativeUrl: string, init?: RequestInit) {
Expand Down
3 changes: 2 additions & 1 deletion src/page-attributes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ function readPageAttributes() {
description: params.description,
label: params.label,
theme: params.theme || 'github-light',
session: params.session
session: params.session,
branch: params.branch || 'master'
};
}

Expand Down
4 changes: 2 additions & 2 deletions src/utterances.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ async function renderComments(issue: Issue, timeline: TimelineComponent) {

export async function assertOrigin() {
const { origins } = await getRepoConfig();
const { origin, owner, repo } = page;
const { origin, owner, repo, branch } = page;
if (origins.indexOf(origin) !== -1) {
return;
}
Expand All @@ -147,7 +147,7 @@ export async function assertOrigin() {
<div class="flash flash-error flash-not-installed">
Error: <code>${origin}</code> is not permitted to post to <code>${owner}/${repo}</code>.
Confirm this is the correct repo for this site's comments. If you own this repo,
<a href="https://github.com/${owner}/${repo}/edit/master/utterances.json" target="_top">
<a href="https://github.com/${owner}/${repo}/edit/${branch}/utterances.json" target="_top">
<strong>update the utterances.json</strong>
</a>
to include <code>${origin}</code> in the list of origins.<br/><br/>
Expand Down