Skip to content
This repository was archived by the owner on Sep 3, 2025. It is now read-only.
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
1 change: 1 addition & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"@typescript-eslint/no-use-before-define": "off",
"@typescript-eslint/no-non-null-assertion": "off",
"@typescript-eslint/no-empty-interface": "off",
"@typescript-eslint/ban-ts-ignore": "off",
"jsx-a11y/anchor-has-content": "off",
"jsx-a11y/anchor-is-valid": "off",
"jsx-a11y/accessible-emoji": "off",
Expand Down
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
"dependencies": {
"@emotion/core": "^10.0.17",
"@emotion/styled": "^10.0.17",
"@material-ui/core": "^4.4.0",
"@material-ui/core": "^4.4.3",
"color": "^3.1.2",
"luxon": "^1.17.2",
"next": "9.0.5",
"luxon": "^1.19.2",
"next": "9.0.6",
"react": "^16.9.0",
"react-dom": "^16.9.0",
"react-spring": "^8.0.27",
"smoothscroll-polyfill": "^0.4.4",
"twemoji": "^12.1.2"
"twemoji": "^12.1.3"
},
"_moduleAliases": {
"src": ".tsbuild/src",
Expand Down Expand Up @@ -54,20 +54,20 @@
"@types/react": "^16.9.2",
"@types/react-dom": "^16.9.0",
"@types/smoothscroll-polyfill": "^0.3.1",
"@typescript-eslint/eslint-plugin": "^1.13.0",
"@typescript-eslint/parser": "^1.13.0",
"@typescript-eslint/eslint-plugin": "^2.3.1",
"@typescript-eslint/parser": "^2.3.1",
"babel-eslint": "^10.0.3",
"babel-plugin-emotion": "^10.0.17",
"babel-plugin-emotion": "^10.0.19",
"concurrently": "^4.1.2",
"eslint": "^5.16.0",
"eslint": "^6.4.0",
"eslint-config-prettier": "^6.2.0",
"eslint-config-react-app": "^4.0.1",
"eslint-plugin-flowtype": "^2.x",
"eslint-config-react-app": "^5.0.2",
"eslint-plugin-flowtype": "3.x",
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-prettier": "^3.1.0",
"eslint-plugin-prettier": "^3.1.1",
"eslint-plugin-react": "^7.14.3",
"eslint-plugin-react-hooks": "^1.6.1",
"eslint-plugin-react-hooks": "1.x",
"fs-extra": "^8.1.0",
"glob": "^7.1.4",
"jest": "^24.9.0",
Expand Down
2 changes: 1 addition & 1 deletion scripts/lib/buildExpressionContainers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const buildExpressionContainers = ({
}: ExpressionRunnerConfig): readonly ExpressionContainer[] => {
if (initialExpressionContainer) {
let currentExpressionContainer: SteppedExpressionContainer = initialExpressionContainer
let results: ExpressionContainer[] = []
const results: ExpressionContainer[] = []
const stepOptions = {
showAllShowSteps,
skipAlphaConvert,
Expand Down
3 changes: 1 addition & 2 deletions scripts/lib/buildExpressionFromParams.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,7 @@ export default function buildExpressionFromParams(
if (isVariableExpressionParams(expressionParams)) {
return buildVariableExpression(expressionParams, true, 'default')
} else if (isCallExpressionParams(expressionParams)) {
let nestedCallExpressionParams: CallExpressionParams
nestedCallExpressionParams =
const nestedCallExpressionParams: CallExpressionParams =
expressionParams.length > 2
? nestCallExpressions(expressionParams)
: expressionParams
Expand Down
2 changes: 1 addition & 1 deletion scripts/lib/buildExpressionRunnerConfigFromShorthand.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ function mergeWithDefault<
A extends Record<string, any>,
B extends Record<string, any>
>(base: A, defaults: B): A & B {
let result: Record<string, any> = { ...base }
const result: Record<string, any> = { ...base }
Object.keys(defaults).forEach(key => {
if (base[key] === undefined) {
result[key] = defaults[key]
Expand Down
5 changes: 1 addition & 4 deletions src/hooks/useConditionalCards.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ import EpisodeContext from 'src/components/EpisodeContext'
import { EpisodeCardListType } from 'src/components/EpisodeCardList'
import locale from 'src/lib/locale'

const getNextYesNoQuizIndex = (
cards: EpisodeCardListType,
fromIndex: number = 0
) => {
const getNextYesNoQuizIndex = (cards: EpisodeCardListType, fromIndex = 0) => {
for (let i = fromIndex; i < cards.length; i++) {
if (cards[i].type === 'yesNoQuiz') {
return i
Expand Down
2 changes: 1 addition & 1 deletion src/hooks/useInterval.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default function useInterval(
savedCallback.current && savedCallback.current()
}
if (delay !== null) {
let id = setInterval(tick, delay)
const id = setInterval(tick, delay)
return () => clearInterval(id)
}
}, [delay])
Expand Down
Loading