Skip to content

Commit 581fd41

Browse files
committed
Upgrade Prettier ahead of React Native 0.68.
1 parent cce6c88 commit 581fd41

File tree

6 files changed

+23
-28
lines changed

6 files changed

+23
-28
lines changed

.prettierrc.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports = {
88
// Custom:
99
semi: false,
1010
jsxSingleQuote: true,
11+
bracketSameLine: false,
1112
bracketSpacing: true,
12-
trailingComma: 'none',
13-
jsxBracketSameLine: false
13+
trailingComma: 'none'
1414
};

package-lock.json

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/minecraft/microsoft.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,8 @@ export const getGameProfile = async (
168168
}
169169

170170
export const XstsErrorCodes: { [error: string]: string } = {
171-
2148916235: 'The account is from a country where Xbox Live is not available/banned.',
171+
2148916235:
172+
'The account is from a country where Xbox Live is not available/banned.',
172173
2148916238:
173174
'The account is a child (under 18) and cannot proceed unless the account is added to' +
174175
' a Family by an adult. This only seems to occur when using a custom Microsoft Azure' +

src/screens/ChatScreen.tsx

+6-7
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,12 @@ const ChatMessageList = (props: {
7373
}
7474
const ChatMessageListMemo = React.memo(ChatMessageList) // Shallow prop compare.
7575

76-
const errorHandler = (
77-
addMessage: (text: MinecraftChat) => void,
78-
translated: string
79-
) => (error: unknown) => {
80-
console.error(error)
81-
addMessage('[EnderChat] ' + translated)
82-
}
76+
const errorHandler =
77+
(addMessage: (text: MinecraftChat) => void, translated: string) =>
78+
(error: unknown) => {
79+
console.error(error)
80+
addMessage('[EnderChat] ' + translated)
81+
}
8382
const sendMessageErr = 'Failed to send message to server!'
8483
const parseMessageErr = 'An error occurred when parsing chat.'
8584
const inventoryCloseErr = 'An error occurred when closing an inventory window.'

src/screens/ServerScreen.tsx

+4-9
Original file line numberDiff line numberDiff line change
@@ -52,22 +52,17 @@ const ServerScreen = () => {
5252
const darkMode = useDarkMode()
5353
const { servers, setServers } = useContext(ServersContext)
5454
const { accounts } = useContext(AccountsContext)
55-
const {
56-
connection,
57-
setConnection,
58-
disconnectReason,
59-
setDisconnectReason
60-
} = useContext(ConnectionContext)
55+
const { connection, setConnection, disconnectReason, setDisconnectReason } =
56+
useContext(ConnectionContext)
6157
const initiatingConnection = useRef(false)
6258

6359
const [ipAddr, setIpAddr] = useState('')
6460
const [ipAddrRed, setIpAddrRed] = useState(false)
6561
const [refreshing, setRefreshing] = useState(false)
6662
const [newServerName, setNewServerName] = useState('')
6763
const [serverNameRed, setServerNameRed] = useState(false)
68-
const [serverVersion, setServerVersion] = useState<keyof typeof protocolMap>(
69-
'auto'
70-
)
64+
const [serverVersion, setServerVersion] =
65+
useState<keyof typeof protocolMap>('auto')
7166
const [addServerDialogOpen, setAddServerDialogOpen] = useState(false)
7267
const [editServerDialogOpen, setEditServerDialogOpen] = useState('')
7368
const [pingResponses, setPingResponses] = useState<{

yarn.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -6680,9 +6680,9 @@
66806680
"fast-diff" "^1.1.2"
66816681

66826682
"prettier@^2.0.2", "prettier@>= 1.13.0":
6683-
"integrity" "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q=="
6684-
"resolved" "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz"
6685-
"version" "2.2.1"
6683+
"integrity" "sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg=="
6684+
"resolved" "https://registry.npmjs.org/prettier/-/prettier-2.5.1.tgz"
6685+
"version" "2.5.1"
66866686

66876687
"pretty-format@^25.2.1", "pretty-format@^25.5.0":
66886688
"integrity" "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ=="

0 commit comments

Comments
 (0)