Skip to content

Commit

Permalink
chore: update prettier (#23)
Browse files Browse the repository at this point in the history
  • Loading branch information
dsanders11 authored Dec 8, 2023
1 parent 3051a44 commit c1fdda2
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 16 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
},
"devDependencies": {
"nodemon": "^3.0.1",
"prettier": "^2.1.2"
"prettier": "^3.1.0"
},
"scripts": {
"watch": "nodemon --watch src --ext js,css,handlebars --exec \"npm run start\"",
Expand Down
12 changes: 9 additions & 3 deletions src/data.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ const getGitHubRelease = pMemoize(
async (version) => {
try {
return (
await (await getOctokit()).repos.getReleaseByTag({
await (
await getOctokit()
).repos.getReleaseByTag({
owner: 'electron',
repo: version.includes('nightly') ? 'nightlies' : 'electron',
tag: version,
Expand All @@ -91,7 +93,9 @@ const getPR = pMemoize(
async (prNumber) => {
try {
return (
await (await getOctokit()).pulls.get({
await (
await getOctokit()
).pulls.get({
owner: 'electron',
repo: 'electron',
pull_number: prNumber,
Expand Down Expand Up @@ -131,7 +135,9 @@ const getPRComments = pMemoize(

const compareTagToCommit = pMemoize(
async (tag, commitSha) => {
const compare = await (await getOctokit()).repos.compareCommits({
const compare = await (
await getOctokit()
).repos.compareCommits({
owner: 'electron',
repo: 'electron',
base: tag,
Expand Down
4 changes: 3 additions & 1 deletion src/routes/home.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ Handlebars.registerPartial('releaseSquare', function (release) {
}
return `<a href="/release-build/${release.id}" class="active-release">
<span><i class="fas fa-code-branch"></i>${release.branch}</span>
<span>${channelIcon}${release.channel.substr(0, 1).toUpperCase()}${release.channel.substr(1)} Release</span>
<span>${channelIcon}${release.channel.substr(0, 1).toUpperCase()}${release.channel.substr(
1,
)} Release</span>
<span>Started ${minutesSince(release.started)}</span>
</a>`;
});
Expand Down
3 changes: 2 additions & 1 deletion src/routes/pr.js
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,8 @@ async function getPRReleaseStatus(prNumber) {
// This is a backport PR, we should scan from here for the primary PR and then re-call getPRReleaseStatus with that primary PR

// c.f. https://github.com/electron/trop/blob/master/src/utils/branch-util.ts#L62
const backportPattern = /(?:^|\n)(?:manual |manually )?backport (?:of )?(?:#(\d+)|https:\/\/github.com\/.*\/pull\/(\d+))/gim;
const backportPattern =
/(?:^|\n)(?:manual |manually )?backport (?:of )?(?:#(\d+)|https:\/\/github.com\/.*\/pull\/(\d+))/gim;
const match = backportPattern.exec(prInfo.body);
if (!match) return null;
const parentPRNumber = match[1] ? parseInt(match[1], 10) : parseInt(match[2], 10);
Expand Down
16 changes: 12 additions & 4 deletions src/static/css/pr.css
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,18 @@
border: 1px solid #00c7e6;
background: white;
min-width: 300px;
box-shadow: 0 2px 6px rgb(9 30 66 / 25%), 0 0 1px 0 rgb(9 30 66 / 31%);
box-shadow:
0 2px 6px rgb(9 30 66 / 25%),
0 0 1px 0 rgb(9 30 66 / 31%);
cursor: pointer;
user-select: none;
transition: box-shadow 0.1s ease-in-out;
}

.primary-cell:hover {
box-shadow: 0 8px 16px -4px rgb(9 30 66 / 25%), 0 0 1px rgb(9 30 66 / 31%);
box-shadow:
0 8px 16px -4px rgb(9 30 66 / 25%),
0 0 1px rgb(9 30 66 / 31%);
}

.primary-cell h4 {
Expand Down Expand Up @@ -65,14 +69,18 @@
border-radius: 4px;
min-width: 220px;
background: white;
box-shadow: 0 2px 6px rgb(9 30 66 / 25%), 0 0 1px 0 rgb(9 30 66 / 31%);
box-shadow:
0 2px 6px rgb(9 30 66 / 25%),
0 0 1px 0 rgb(9 30 66 / 31%);
cursor: pointer;
user-select: none;
transition: box-shadow 0.1s ease-in-out;
}

.backport-cell:hover {
box-shadow: 0 8px 16px -4px rgb(9 30 66 / 25%), 0 0 1px rgb(9 30 66 / 31%);
box-shadow:
0 8px 16px -4px rgb(9 30 66 / 25%),
0 0 1px rgb(9 30 66 / 31%);
}

.backport-pending .backport-cell,
Expand Down
13 changes: 11 additions & 2 deletions src/static/css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,17 @@
}

body {
font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Fira Sans,
Droid Sans, Helvetica Neue, sans-serif;
font-family:
-apple-system,
BlinkMacSystemFont,
Segoe UI,
Roboto,
Oxygen,
Ubuntu,
Fira Sans,
Droid Sans,
Helvetica Neue,
sans-serif;
color: #1d1d1d;
font-size: 16px;
line-height: 1.5rem;
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1285,10 +1285,10 @@ prelude-ls@~1.1.2:
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=

prettier@^2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.2.tgz#3050700dae2e4c8b67c4c3f666cdb8af405e1ce5"
integrity sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==
prettier@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.1.0.tgz#c6d16474a5f764ea1a4a373c593b779697744d5e"
integrity sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==

prismjs@^1.29.0:
version "1.29.0"
Expand Down

0 comments on commit c1fdda2

Please sign in to comment.