Skip to content
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

Jump to bottom

[email protected] #45

Merged
merged 2 commits into from
Nov 6, 2019
Merged

[email protected] #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e129dc3
Install [email protected]
Nov 6, 2019
6419673
Temporary patch for typescript's type infer bug
Nov 6, 2019
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
6 changes: 3 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@
"@types/react-syntax-highlighter": "^10.2.1",
"jest": "^24.8.0",
"ts-jest": "^24.0.2",
"typescript": "^3.6.4"
"typescript": "^3.7.2"
}
}
3 changes: 2 additions & 1 deletion src/pages/_app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import * as React from "react";
import NextApp, { AppContext } from "next/app";
import getLocale from "../utility/getLocale";
import LocaleString from "../entities/LocaleString";
import Person from "../entities/Person";
import { parseJsonToPerson, jsonifyPerson } from "../parsers/person";
import getTranslation from "../repositories/translationRepository";
import { getMyself } from "../repositories/personRepository";
Expand Down Expand Up @@ -53,7 +54,7 @@ class App extends NextApp<Props> {

const componentGetInitialProps =
Component.getInitialProps || (() => Promise.resolve());
const [myself, translation, pageProps] = await Promise.all([
const [myself, translation, pageProps] = await Promise.all<Person, Record<string, string>, {}>([
getMyself({ locale }),
getTranslation(locale),
componentGetInitialProps(ctx)
Expand Down