Skip to content

Commit de8815d

Browse files
committedJun 2, 2023
Update to latest prettier
Preqreuisite to updating to the latest TypeScript (and thus using the type modifier for imports).
1 parent 9eb9fc6 commit de8815d

10 files changed

+43
-20
lines changed
 

‎.prettierignore

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
src/emulator/minivmac-*.js
2+
src/emulator/SheepShaver.js
3+
src/emulator/BasiliskII.js
4+
src/Data/*.json

‎package-lock.json

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

‎package.json

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
"preview": "vite preview --host",
4444
"worker-dev": "wrangler dev --local --port=3128",
4545
"worker-deploy": "wrangler publish --env production",
46+
"prettier": "prettier --write src workers-site",
4647
"lint": "eslint src",
4748
"check": "tsc --noEmit",
4849
"format-macemu": "clang-format -i --glob=macemu/BasiliskII/src/Unix/JS/*"

‎src/About.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ export function About({onDone}: {onDone: () => void}) {
4444
<a
4545
href="https://www.youtube.com/embed/tljxs9zuaA8"
4646
target="_blank"
47-
rel="noopener noreferrer">
47+
rel="noopener noreferrer"
48+
>
4849
this video
4950
</a>
5051
. To learn more, including how it was built, see{" "}

‎src/Browser.tsx

+4-2
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,8 @@ function DiskContents({disk, onRun, setBezelStyle}: DiskContentsProps) {
150150
disk.machines[e.target.selectedIndex];
151151
setMachine(machine);
152152
setBezelStyle(machine.bezelStyle);
153-
}}>
153+
}}
154+
>
154155
{disk.machines.map((machine, i) => (
155156
<option value={machine.name} key={i}>
156157
{machine.name}
@@ -208,7 +209,8 @@ function DiskContents({disk, onRun, setBezelStyle}: DiskContentsProps) {
208209
<Button
209210
appearance={buttonAppearance}
210211
className="CustomizeButton"
211-
onClick={() => setCustomizing(!customizing)}>
212+
onClick={() => setCustomizing(!customizing)}
213+
>
212214
{customizing ? "Cancel" : "Customize…"}
213215
</Button>
214216
<Button appearance={buttonAppearance} onClick={run}>

‎src/Dialog.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ export function Dialog(props: DialogProps) {
3232
onClick={e => {
3333
e.preventDefault();
3434
onDone();
35-
}}>
35+
}}
36+
>
3637
{doneLabel}
3738
</Button>
3839
</footer>

‎src/Footer.tsx

+4-2
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@ export function Footer({onLogoClick}: {onLogoClick?: () => void}) {
1616
</span>
1717
<span
1818
onClick={() => setAboutVisible(true)}
19-
className="Footer-About">
19+
className="Footer-About"
20+
>
2021
About
2122
</span>
2223
<span
2324
onClick={() => setDonateVisible(true)}
24-
className="Footer-Donate">
25+
className="Footer-Donate"
26+
>
2527
Donate
2628
</span>
2729
</div>

‎src/Mac.tsx

+8-4
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,8 @@ export default function Mac({
413413
/>
414414
)}
415415
</>
416-
}>
416+
}
417+
>
417418
{progress}
418419
{dragCount > 0 && <div className="Mac-Overlay Mac-Drag-Overlay" />}
419420
{ethernetProviderRef.current && (
@@ -529,7 +530,8 @@ function MacEthernetStatus({
529530
return (
530531
<div
531532
className="Mac-Ethernet-Status"
532-
onClick={() => setExpanded(!expanded)}>
533+
onClick={() => setExpanded(!expanded)}
534+
>
533535
<div className="ScreenFrame-Bezel-Text">{text}</div>
534536
{details}
535537
</div>
@@ -553,7 +555,8 @@ function MacSettings({
553555
<Dialog
554556
title="Settings"
555557
onDone={onDone}
556-
buttonAppearance={buttonAppearance}>
558+
buttonAppearance={buttonAppearance}
559+
>
557560
<label>
558561
<input
559562
type="checkbox"
@@ -585,7 +588,8 @@ function MacSettings({
585588
event.target.value
586589
) as EmulatorSpeed,
587590
})
588-
}>
591+
}
592+
>
589593
{Array.from(
590594
EMULATOR_SPEEDS.entries(),
591595
([speed, label]) => (

‎src/ScreenFrame.tsx

+6-3
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ export function ScreenFrame(props: ScreenFrameProps) {
6161
height: `calc(${height}px + 2 * var(--screen-underscan))`,
6262
transform: scale === undefined ? undefined : `scale(${scale})`,
6363
}}
64-
{...divProps}>
64+
{...divProps}
65+
>
6566
<div className="ScreenFrame-Controls-Container">
6667
<div className="ScreenFrame-Apple-Logo">
6768
<AppleLogo className="Background" />
@@ -74,7 +75,8 @@ export function ScreenFrame(props: ScreenFrameProps) {
7475
visibility: alwaysVisible ? "visible" : undefined,
7576
}}
7677
onClick={handler}
77-
key={label}>
78+
key={label}
79+
>
7880
{label}
7981
</div>
8082
))}
@@ -92,7 +94,8 @@ export function ScreenFrame(props: ScreenFrameProps) {
9294
style={{
9395
width,
9496
height,
95-
}}>
97+
}}
98+
>
9699
{screen}
97100
</div>
98101
{children}

‎src/index.css

+3-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ body {
88
background: #282c34;
99
}
1010

11-
body, html, #root {
11+
body,
12+
html,
13+
#root {
1214
height: 100%;
1315
width: 100%;
1416
}

0 commit comments

Comments
 (0)
Please sign in to comment.