Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
run: yarn install

- name: Run Prettier (Check)
run: yarn prettier-check
run: yarn prettier:check

- name: Run Jest
run: yarn test --coverage --runInBand
Expand Down
4 changes: 0 additions & 4 deletions .prettierrc

This file was deleted.

4 changes: 4 additions & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module.exports = {
tabWidth: 2,
singleQuote: true,
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ The release process is automated. Follow the steps below.
There are 2 checks - one for prettier and one for the unit tests with `jest`.

// Run prettier to check
yarn run prettier-check
yarn run prettier:check

// Run linter & unit tests with coverage
yarn run test
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"make:linux": "electron-builder --linux",
"make:macos": "electron-builder --mac",
"make:win": "electron-builder --win",
"prettier-check": "prettier --check 'src/**/*.{js,ts,tsx}'",
"prettier": "prettier --single-quote --trailing-comma es5 --write 'src/**/*.{js,ts,tsx}'",
"prettier:check": "prettier --check 'src/**/*.{js,ts,tsx}'",
"prettier:apply": "prettier --write 'src/**/*.{js,ts,tsx}'",
"jest": "jest",
"test": "yarn jest",
"start": "electron . -–enable-logging"
Expand Down Expand Up @@ -106,9 +106,9 @@
"afterSign": "scripts/notarize.js"
},
"dependencies": {
"@primer/octicons-react": "^9.6.0",
"axios": "=0.19.2",
"date-fns": "^2.11.1",
"@primer/octicons-react": "^11.1.0",
"axios": "=0.21.0",
"date-fns": "^2.16.1",
"electron-updater": "^4.3.5",
"final-form": "^4.19.1",
"lodash": "^4.17.20",
Expand All @@ -135,8 +135,8 @@
"devDependencies": {
"@testing-library/react": "^10.0.2",
"@types/jest": "^26.0.15",
"@types/lodash": "^4.14.149",
"@types/node": "^13.11.0",
"@types/lodash": "^4.14.165",
"@types/node": "^14.14.9",
"@types/react": "^16.9.32",
"@types/react-redux": "^7.1.7",
"@types/react-transition-group": "^4.2.4",
Expand All @@ -146,7 +146,7 @@
"electron-notarize": "^1.0.0",
"jest": "^26.6.3",
"nock": "^12.0.3",
"prettier": "=2.0.2",
"prettier": "=2.2.0",
"react-test-renderer": "=16.13.1",
"redux-mock-store": "=1.5.4",
"ts-jest": "^26.4.4",
Expand Down
36 changes: 18 additions & 18 deletions src/js/components/__snapshots__/account-notifications.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,24 @@ exports[`components/account-notifications.tsx should render itself (github.com w
<svg
aria-hidden="true"
className="octicon"
dangerouslySetInnerHTML={
Object {
"__html": "<path fill-rule=\\"evenodd\\" d=\\"M12.78 6.22a.75.75 0 010 1.06l-4.25 4.25a.75.75 0 01-1.06 0L3.22 7.28a.75.75 0 011.06-1.06L8 9.94l3.72-3.72a.75.75 0 011.06 0z\\"></path>",
}
}
fill="currentColor"
height={20}
role="img"
style={
Object {
"display": "inline-block",
"fill": "currentColor",
"userSelect": "none",
"verticalAlign": "text-bottom",
}
}
viewBox="0 0 10 16"
width={12.5}
>
<path
d="M5 11L0 6l1.5-1.5L5 8.25 8.5 4.5 10 6l-5 5z"
fillRule="evenodd"
/>
</svg>
viewBox="0 0 16 16"
width={20}
/>
</div>
`;

Expand All @@ -37,23 +37,23 @@ exports[`components/account-notifications.tsx should render itself (github.com w
<svg
aria-hidden="true"
className="octicon"
dangerouslySetInnerHTML={
Object {
"__html": "<path fill-rule=\\"evenodd\\" d=\\"M9.78 12.78a.75.75 0 01-1.06 0L4.47 8.53a.75.75 0 010-1.06l4.25-4.25a.75.75 0 011.06 1.06L6.06 8l3.72 3.72a.75.75 0 010 1.06z\\"></path>",
}
}
fill="currentColor"
height={20}
role="img"
style={
Object {
"display": "inline-block",
"fill": "currentColor",
"userSelect": "none",
"verticalAlign": "text-bottom",
}
}
viewBox="0 0 8 16"
width={10}
>
<path
d="M5.5 3L7 4.5 3.25 8 7 11.5 5.5 13l-5-5 5-5z"
fillRule="evenodd"
/>
</svg>
viewBox="0 0 16 16"
width={20}
/>
</div>
`;
50 changes: 25 additions & 25 deletions src/js/components/__snapshots__/notification.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,24 @@ exports[`components/notification.js should render itself & its children 1`] = `
aria-hidden="false"
aria-label="Issue"
className="octicon"
dangerouslySetInnerHTML={
Object {
"__html": "<path fill-rule=\\"evenodd\\" d=\\"M8 1.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13zM0 8a8 8 0 1116 0A8 8 0 010 8zm9 3a1 1 0 11-2 0 1 1 0 012 0zm-.25-6.25a.75.75 0 00-1.5 0v3.5a.75.75 0 001.5 0v-3.5z\\"></path>",
}
}
fill="currentColor"
height={20}
role="img"
style={
Object {
"display": "inline-block",
"fill": "currentColor",
"userSelect": "none",
"verticalAlign": "text-bottom",
}
}
viewBox="0 0 14 16"
width={17.5}
>
<path
d="M7 2.3c3.14 0 5.7 2.56 5.7 5.7s-2.56 5.7-5.7 5.7A5.71 5.71 0 011.3 8c0-3.14 2.56-5.7 5.7-5.7zM7 1C3.14 1 0 4.14 0 8s3.14 7 7 7 7-3.14 7-7-3.14-7-7-7zm1 3H6v5h2V4zm0 6H6v2h2v-2z"
fillRule="evenodd"
/>
</svg>
viewBox="0 0 16 16"
width={20}
/>
</div>
<div
className="sc-AxirZ ibrlFv"
Expand Down Expand Up @@ -60,24 +60,24 @@ exports[`components/notification.js should render itself & its children 1`] = `
aria-hidden="false"
aria-label="Unsubscribe"
className="octicon"
dangerouslySetInnerHTML={
Object {
"__html": "<path fill-rule=\\"evenodd\\" d=\\"M8 2.75a.75.75 0 00-1.238-.57L3.472 5H1.75A1.75 1.75 0 000 6.75v2.5C0 10.216.784 11 1.75 11h1.723l3.289 2.82A.75.75 0 008 13.25V2.75zM4.238 6.32L6.5 4.38v7.24L4.238 9.68a.75.75 0 00-.488-.18h-2a.25.25 0 01-.25-.25v-2.5a.25.25 0 01.25-.25h2a.75.75 0 00.488-.18zm7.042-1.1a.75.75 0 10-1.06 1.06L11.94 8l-1.72 1.72a.75.75 0 101.06 1.06L13 9.06l1.72 1.72a.75.75 0 101.06-1.06L14.06 8l1.72-1.72a.75.75 0 00-1.06-1.06L13 6.94l-1.72-1.72z\\"></path>",
}
}
fill="currentColor"
height={13}
role="img"
style={
Object {
"display": "inline-block",
"fill": "currentColor",
"userSelect": "none",
"verticalAlign": "text-bottom",
}
}
viewBox="0 0 16 16"
width={13}
>
<path
d="M8 2.81v10.38c0 .67-.81 1-1.28.53L3 10H1c-.55 0-1-.45-1-1V7c0-.55.45-1 1-1h2l3.72-3.72C7.19 1.81 8 2.14 8 2.81zm7.53 3.22l-1.06-1.06-1.97 1.97-1.97-1.97-1.06 1.06L11.44 8 9.47 9.97l1.06 1.06 1.97-1.97 1.97 1.97 1.06-1.06L13.56 8l1.97-1.97z"
fillRule="evenodd"
/>
</svg>
/>
</button>
</div>
</div>
Expand All @@ -93,24 +93,24 @@ exports[`components/notification.js should render itself & its children 1`] = `
aria-hidden="false"
aria-label="Mark as Read"
className="octicon"
dangerouslySetInnerHTML={
Object {
"__html": "<path fill-rule=\\"evenodd\\" d=\\"M13.78 4.22a.75.75 0 010 1.06l-7.25 7.25a.75.75 0 01-1.06 0L2.22 9.28a.75.75 0 011.06-1.06L6 10.94l6.72-6.72a.75.75 0 011.06 0z\\"></path>",
}
}
fill="currentColor"
height={20}
role="img"
style={
Object {
"display": "inline-block",
"fill": "currentColor",
"userSelect": "none",
"verticalAlign": "text-bottom",
}
}
viewBox="0 0 12 16"
width={15}
>
<path
d="M12 5l-8 8-4-4 1.5-1.5L4 10l6.5-6.5L12 5z"
fillRule="evenodd"
/>
</svg>
viewBox="0 0 16 16"
width={20}
/>
</button>
</div>
</div>
Expand Down
18 changes: 9 additions & 9 deletions src/js/components/__snapshots__/repository.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -29,24 +29,24 @@ Array [
aria-hidden="false"
aria-label="Mark Repository as Read"
className="octicon"
dangerouslySetInnerHTML={
Object {
"__html": "<path fill-rule=\\"evenodd\\" d=\\"M13.78 4.22a.75.75 0 010 1.06l-7.25 7.25a.75.75 0 01-1.06 0L2.22 9.28a.75.75 0 011.06-1.06L6 10.94l6.72-6.72a.75.75 0 011.06 0z\\"></path>",
}
}
fill="currentColor"
height={20}
role="img"
style={
Object {
"display": "inline-block",
"fill": "currentColor",
"userSelect": "none",
"verticalAlign": "text-bottom",
}
}
viewBox="0 0 12 16"
width={15}
>
<path
d="M12 5l-8 8-4-4 1.5-1.5L4 10l6.5-6.5L12 5z"
fillRule="evenodd"
/>
</svg>
viewBox="0 0 16 16"
width={20}
/>
</button>
</div>
</div>,
Expand Down
Loading