Update Prettier version

chicory-pizza · Jan 27, 2024 · 24e9ad3 · 24e9ad3
1 parent 1446756
commit 24e9ad3
Show file tree

Hide file tree

Showing 44 changed files with 97 additions and 88 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -1,5 +1,14 @@
 {
 	"useTabs": true,
 	"singleQuote": true,
-	"bracketSpacing": false
+	"trailingComma": "es5",
+	"bracketSpacing": false,
+	"overrides": [
+		{
+			"files": ["devcontainer.json"],
+			"options": {
+				"trailingComma": "none"
+			}
+		}
+	]
 }
diff --git a/flow-typed/react-helmet-async.js b/flow-typed/react-helmet-async.js
@@ -1,3 +1,5 @@
+// @flow strict
+
 declare module 'react-helmet-async' {
 	declare class HelmetProvider
 		extends

diff --git a/flow-typed/react-hotkeys-hook.js b/flow-typed/react-hotkeys-hook.js
@@ -1,3 +1,5 @@
+// @flow strict
+
 declare module 'react-hotkeys-hook' {
 	declare type FormTags =
 		| 'input'

diff --git a/flow-typed/react-use.js b/flow-typed/react-use.js
@@ -1,3 +1,5 @@
+// @flow strict
+
 declare module 'react-use' {
 	declare function useInterval(callback: () => mixed, delay?: ?number): boolean;
 

diff --git a/index.html b/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -51,7 +51,7 @@
     "jest": "29.6.1",
     "jest-environment-jsdom": "29.6.1",
     "jest-image-snapshot": "6.1.0",
-    "prettier": "2.8.8",
+    "prettier": "3.2.4",
     "vite": "4.4.3",
     "whatwg-fetch": "3.6.2"
   },

diff --git a/src/common/CustomSelect.jsx b/src/common/CustomSelect.jsx
@@ -12,11 +12,11 @@ type Props<T> = $ReadOnly<{
 	components?: {
 		Option?: React$AbstractComponent<
 			{children: React$Node, data: OptionType<T>, isFocused: boolean, ...},
-			mixed
+			mixed,
 		>,
 		SingleValue?: React$AbstractComponent<
 			{children: React$Node, data: OptionType<T>, ...},
-			mixed
+			mixed,
 		>,
 	},
 	formatOptionLabel?: (option: OptionType<T>) => React$Node,

diff --git a/src/dog/__tests__/drawDogToCanvas.js b/src/dog/__tests__/drawDogToCanvas.js
@@ -156,7 +156,7 @@ test.each(DRAWDOG_PRESETS)('$name', async (preset: DrawdogPreset) => {
 			preset.customClothesImage != null
 				? await loadImage(
 						path.resolve(__dirname, '../presets/', preset.customClothesImage)
-				  )
+					)
 				: null,
 		earColor: preset.earColor,
 		expression: preset.expression,
@@ -169,7 +169,7 @@ test.each(DRAWDOG_PRESETS)('$name', async (preset: DrawdogPreset) => {
 						hat.customImage != null
 							? await loadImage(
 									path.resolve(__dirname, '../presets/', hat.customImage)
-							  )
+								)
 							: null,
 				};
 			})
@@ -178,7 +178,7 @@ test.each(DRAWDOG_PRESETS)('$name', async (preset: DrawdogPreset) => {
 			preset.headSkinImage != null
 				? await loadImage(
 						path.resolve(__dirname, '../presets/', preset.headSkinImage)
-				  )
+					)
 				: null,
 		skinColor: preset.skinColor,
 		skinOutlineColor: preset.skinOutlineColor,

diff --git a/src/dog/editor/DogHairSelectModalLauncher.jsx b/src/dog/editor/DogHairSelectModalLauncher.jsx
@@ -53,7 +53,7 @@ export default function DogHairSelectModalLauncher({
 							name: 'None',
 							color: dogState.hats[0].color,
 						},
-				  ];
+					];
 
 			return {
 				...convertDogEditorStateToPreset(dogState),

diff --git a/src/dog/preview/DogPreview.jsx b/src/dog/preview/DogPreview.jsx
@@ -207,8 +207,8 @@ export default function DogPreview(props: Props): React$Node {
 							typeof hat.hat === 'string' && hatsImages
 								? hatsImages['hat_' + index]
 								: hat.hat instanceof Image
-								? hat.hat
-								: null,
+									? hat.hat
+									: null,
 						hatLayer2: hatsImages ? hatsImages['hatLayer2_' + index] : null,
 					};
 				}),

diff --git a/src/dog/preview/DogPreviewWithAutoplayAnimation.jsx b/src/dog/preview/DogPreviewWithAutoplayAnimation.jsx
@@ -16,7 +16,7 @@ type Props = $ReadOnly<{
 		DogPreviewProps,
 		{
 			animationIndex: number,
-		}
+		},
 	>,
 	playAnimations: boolean,
 }>;

diff --git a/src/dog/testUtil/drawDogToCanvasTestHelper.js b/src/dog/testUtil/drawDogToCanvasTestHelper.js
@@ -64,8 +64,8 @@ export default async function drawDogToCanvasTestHelper(options: {
 					hatInfo.internalName === 'Custom Hat' && chosenHat.customImage != null
 						? chosenHat.customImage
 						: hatInfo.imageWithPaddingPath != null
-						? await loadImage(hatInfo.imageWithPaddingPath)
-						: null,
+							? await loadImage(hatInfo.imageWithPaddingPath)
+							: null,
 				hatLayer2:
 					hatInfo.layer2ImagePath != null
 						? await loadImage(hatInfo.layer2ImagePath)

diff --git a/src/dog/types/DogAnimations.js b/src/dog/types/DogAnimations.js
@@ -18,7 +18,7 @@ const DOG_ANIMATIONS: Map<
 			y: number,
 			ang: number,
 		}>,
-	}
+	},
 > = new Map();
 
 DOG_ANIMATIONS.set('idle', {

diff --git a/src/header/AppHeaderUndoRedo.jsx b/src/header/AppHeaderUndoRedo.jsx
@@ -64,5 +64,5 @@ function AppHeaderUndoRedo(props: Props): React$MixedElement {
 
 export default (memo(AppHeaderUndoRedo): React$AbstractComponent<
 	React$ElementConfig<typeof AppHeaderUndoRedo>,
-	mixed
+	mixed,
 >);
diff --git a/src/levelEditor/CurrentCoordinatesContext.js b/src/levelEditor/CurrentCoordinatesContext.js
@@ -8,7 +8,7 @@ import convertLevelIdToCoordinates from './util/convertLevelIdToCoordinates';
 
 export function useCurrentCoordinates(): [
 	?[number, number, number],
-	(newCoordinates: [number, number, number]) => mixed
+	(newCoordinates: [number, number, number]) => mixed,
 ] {
 	const {levelId} = useParams();
 
@@ -37,7 +37,7 @@ export function useCurrentCoordinates(): [
 
 export function useCurrentCoordinatesNonNullable(): [
 	[number, number, number],
-	(newCoordinates: [number, number, number]) => mixed
+	(newCoordinates: [number, number, number]) => mixed,
 ] {
 	const hook = useCurrentCoordinates();
 

diff --git a/src/levelEditor/LevelDecoAdder.jsx b/src/levelEditor/LevelDecoAdder.jsx
@@ -7,10 +7,7 @@ import {SPRITES} from './types/SpriteEntities';
 import type {SpriteType} from './types/SpriteType';
 
 type Props = $ReadOnly<{
-	onAddingEntityLabel: (entity: {
-		type: 'DECO',
-		data: SpriteType,
-	}) => mixed,
+	onAddingEntityLabel: (entity: {type: 'DECO', data: SpriteType}) => mixed,
 }>;
 
 function LevelDecoAdder(props: Props): React$Node {
@@ -84,5 +81,5 @@ function LevelDecoAdder(props: Props): React$Node {
 
 export default (memo<Props>(LevelDecoAdder): React$AbstractComponent<
 	Props,
-	mixed
+	mixed,
 >);
diff --git a/src/levelEditor/LevelInspector.jsx b/src/levelEditor/LevelInspector.jsx
@@ -61,7 +61,7 @@ export default function LevelInspector({
 
 	// Sidebar
 	const [expandedSidebarPanels, setExpandedSidebarPanels] = useState<
-		Set<SidebarPanel>
+		Set<SidebarPanel>,
 	>(new Set(['LEVEL_PROPERTIES', 'OBJECTS']));
 	const [addingEntityLabel, setAddingEntityLabel] =
 		useState<?PlaceableType>(null);

diff --git a/src/levelEditor/common/LevelLayerDropdownSelect.jsx b/src/levelEditor/common/LevelLayerDropdownSelect.jsx
@@ -39,7 +39,7 @@ export default function LevelLayerDropdownSelect(props: Props): React$Node {
 			{
 				label: string,
 				options: Array<OptionType<string>>,
-			}
+			},
 		>();
 
 		levelIds.forEach((id) => {

diff --git a/src/levelEditor/duplicateLevel/DuplicateLevelModal.jsx b/src/levelEditor/duplicateLevel/DuplicateLevelModal.jsx
@@ -27,7 +27,7 @@ export default function DuplicateLevelModal(props: Props): React$Node {
 		useCurrentCoordinatesNonNullable();
 
 	const [draftCoordinates, setDraftCoordinates] = useState<
-		[?number, ?number, ?number]
+		[?number, ?number, ?number],
 	>([currentCoordinates[0], currentCoordinates[1], currentCoordinates[2]]);
 	const [prevCoordinates, setPrevCoordinates] = useState(currentCoordinates);
 

diff --git a/src/levelEditor/header/LevelSelector.jsx b/src/levelEditor/header/LevelSelector.jsx
@@ -52,7 +52,7 @@ export default function LevelSelector(): React$Node {
 
 	// Inputs
 	const [draftCoordinates, setDraftCoordinates] = useState<
-		[?number, ?number, ?number]
+		[?number, ?number, ?number],
 	>(
 		currentCoordinates
 			? [currentCoordinates[0], currentCoordinates[1], currentCoordinates[2]]

diff --git a/src/levelEditor/preview/LevelPreviewCustomDog.jsx b/src/levelEditor/preview/LevelPreviewCustomDog.jsx
@@ -28,5 +28,5 @@ function LevelPreviewCustomDog(props: Props): React$MixedElement {
 
 export default (memo(LevelPreviewCustomDog): React$AbstractComponent<
 	React$ElementConfig<typeof LevelPreviewCustomDog>,
-	mixed
+	mixed,
 >);
diff --git a/src/levelEditor/preview/LevelPreviewDecos.jsx b/src/levelEditor/preview/LevelPreviewDecos.jsx
@@ -103,5 +103,5 @@ function LevelPreviewDecos(props: Props): React$Node {
 
 export default (memo<Props>(LevelPreviewDecos): React$AbstractComponent<
 	Props,
-	mixed
+	mixed,
 >);
diff --git a/src/levelEditor/preview/LevelPreviewObjects.jsx b/src/levelEditor/preview/LevelPreviewObjects.jsx
@@ -104,5 +104,5 @@ function LevelPreviewObjects(props: Props): React$Node {
 
 export default (memo<Props>(LevelPreviewObjects): React$AbstractComponent<
 	Props,
-	mixed
+	mixed,
 >);
diff --git a/src/levelEditor/preview/TransformDiv.jsx b/src/levelEditor/preview/TransformDiv.jsx
@@ -171,7 +171,7 @@ export default function TransformDiv({
 			transform:
 				transforms.length !== 0
 					? (centerDiv === true ? 'translate(-50%, -50%) ' : '') +
-					  transforms.join(' ')
+						transforms.join(' ')
 					: null,
 			transformOrigin,
 			cursor: currentTransformAction === 'MOVE' ? 'move' : 'pointer',

diff --git a/src/levelEditor/sidebar/SidebarEntityAdder.jsx b/src/levelEditor/sidebar/SidebarEntityAdder.jsx
@@ -11,10 +11,7 @@ type Props<EntityType, Data> = $ReadOnly<{
 	enabled: boolean,
 	entityType: EntityType,
 	nameLabel: string,
-	onAddingEntityLabel: (entity: {
-		type: EntityType,
-		data: Data,
-	}) => mixed,
+	onAddingEntityLabel: (entity: {type: EntityType, data: Data}) => mixed,
 	options:
 		| $ReadOnlyArray<OptionType<Data>>
 		| $ReadOnlyArray<{

diff --git a/src/levelEditor/sidebar/SidebarObjectAdder.jsx b/src/levelEditor/sidebar/SidebarObjectAdder.jsx
@@ -65,5 +65,5 @@ function SidebarObjectAdder(props: Props): React$Node {
 
 export default (memo<Props>(SidebarObjectAdder): React$AbstractComponent<
 	Props,
-	mixed
+	mixed,
 >);
diff --git a/src/levelEditor/sidebar/SidebarViewMenu.jsx b/src/levelEditor/sidebar/SidebarViewMenu.jsx
@@ -68,5 +68,5 @@ function SidebarViewMenu(props: Props): React$Node {
 
 export default (memo<Props>(SidebarViewMenu): React$AbstractComponent<
 	Props,
-	mixed
+	mixed,
 >);
diff --git a/src/levelEditor/sidebar/objectsList/SidebarDecoList.jsx b/src/levelEditor/sidebar/objectsList/SidebarDecoList.jsx
@@ -72,5 +72,5 @@ function SidebarObjectList(props: Props): React$MixedElement {
 
 export default (memo<Props>(SidebarObjectList): React$AbstractComponent<
 	Props,
-	mixed
+	mixed,
 >);
diff --git a/src/levelEditor/sidebar/objectsList/SidebarEntityItem.jsx b/src/levelEditor/sidebar/objectsList/SidebarEntityItem.jsx
@@ -14,11 +14,11 @@ import styles from './SidebarEntityItem.module.css';
 
 type Props<
 	Entity: GameObjectType | DecorationType,
-	EntityType: GameEntityType
+	EntityType: GameEntityType,
 > = $ReadOnly<{
 	entity: Entity,
 	entityPropertiesComponent: React$ComponentType<
-		SidebarEntityPropertiesComponentType<Entity, EntityType>
+		SidebarEntityPropertiesComponentType<Entity, EntityType>,
 	>,
 	expandedTime: ?number,
 	getEntityName: (entity: Entity, filter: string) => string,
@@ -41,7 +41,7 @@ type Props<
 
 function SidebarEntityItem<
 	Entity: GameObjectType | DecorationType,
-	EntityType: GameEntityType
+	EntityType: GameEntityType,
 >(props: Props<Entity, EntityType>): React$Node {
 	const item = useRef<?HTMLLIElement>(null);
 
@@ -136,5 +136,5 @@ function SidebarEntityItem<
 
 export default (memo(SidebarEntityItem): React$AbstractComponent<
 	React$ElementConfig<typeof SidebarEntityItem>,
-	mixed
+	mixed,
 >);