From 7eb5239dfe6373fc475821420c79400a3140838b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 6 Jul 2025 13:17:53 -0500 Subject: [PATCH] chore: Update dependency prettier to v3.6.2 (#3464) * chore: Update dependency prettier to v3.6.2 * format files to match prettier changes --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Matt Jennings --- package-lock.json | 8 ++-- package.json | 2 +- .../Collision/Detection/CollisionContact.ts | 4 +- .../DynamicTreeCollisionProcessor.ts | 2 +- .../SparseHashGridCollisionProcessor.ts | 2 +- src/engine/Engine.ts | 4 +- src/engine/Graphics/Animation.ts | 2 +- src/engine/Util/Coroutine.ts | 2 +- .../assets/images/GraphicsTextSpec/fonts.css | 40 +++++++++++-------- 9 files changed, 37 insertions(+), 29 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7b868f12..ec63ff46 100644 --- a/package-lock.json +++ b/package-lock.json @@ -53,7 +53,7 @@ "lint-staged": "15.5.2", "pixelmatch": "5.3.0", "playwright": "1.53.2", - "prettier": "3.2.5", + "prettier": "3.6.2", "puppeteer": "24.10.0", "raw-loader": "4.0.2", "react": "18.3.1", @@ -11674,9 +11674,9 @@ } }, "node_modules/prettier": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", - "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz", + "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==", "dev": true, "license": "MIT", "bin": { diff --git a/package.json b/package.json index 893bff25..06e7bca2 100644 --- a/package.json +++ b/package.json @@ -118,7 +118,7 @@ "lint-staged": "15.5.2", "pixelmatch": "5.3.0", "playwright": "1.53.2", - "prettier": "3.2.5", + "prettier": "3.6.2", "puppeteer": "24.10.0", "raw-loader": "4.0.2", "react": "18.3.1", diff --git a/src/engine/Collision/Detection/CollisionContact.ts b/src/engine/Collision/Detection/CollisionContact.ts index f5e2bbc8..955d8921 100644 --- a/src/engine/Collision/Detection/CollisionContact.ts +++ b/src/engine/Collision/Detection/CollisionContact.ts @@ -81,8 +81,8 @@ export class CollisionContact { this.id = Pair.calculatePairHash(colliderA.id, colliderB.id); if (colliderA.composite || colliderB.composite) { // Add on the parent composite pair for start/end contact if 'together' - const colliderAId = colliderA.composite?.compositeStrategy === 'separate' ? colliderA.id : colliderA.composite?.id ?? colliderA.id; - const colliderBId = colliderB.composite?.compositeStrategy === 'separate' ? colliderB.id : colliderB.composite?.id ?? colliderB.id; + const colliderAId = colliderA.composite?.compositeStrategy === 'separate' ? colliderA.id : (colliderA.composite?.id ?? colliderA.id); + const colliderBId = colliderB.composite?.compositeStrategy === 'separate' ? colliderB.id : (colliderB.composite?.id ?? colliderB.id); this.id += '|' + Pair.calculatePairHash(colliderAId, colliderBId); } if (this.colliderA.owner) { diff --git a/src/engine/Collision/Detection/DynamicTreeCollisionProcessor.ts b/src/engine/Collision/Detection/DynamicTreeCollisionProcessor.ts index 3814700c..0cb5f46e 100644 --- a/src/engine/Collision/Detection/DynamicTreeCollisionProcessor.ts +++ b/src/engine/Collision/Detection/DynamicTreeCollisionProcessor.ts @@ -75,7 +75,7 @@ export class DynamicTreeCollisionProcessor implements CollisionProcessor { const results: RayCastHit[] = []; const maxDistance = options?.maxDistance ?? Infinity; const collisionGroup = options?.collisionGroup; - const collisionMask = !collisionGroup ? options?.collisionMask ?? CollisionGroup.All.category : collisionGroup.category; + const collisionMask = !collisionGroup ? (options?.collisionMask ?? CollisionGroup.All.category) : collisionGroup.category; const searchAllColliders = options?.searchAllColliders ?? false; this._dynamicCollisionTree.rayCastQuery(ray, maxDistance, (collider) => { const owner = collider.owner; diff --git a/src/engine/Collision/Detection/SparseHashGridCollisionProcessor.ts b/src/engine/Collision/Detection/SparseHashGridCollisionProcessor.ts index 40fd3516..5777003c 100644 --- a/src/engine/Collision/Detection/SparseHashGridCollisionProcessor.ts +++ b/src/engine/Collision/Detection/SparseHashGridCollisionProcessor.ts @@ -129,7 +129,7 @@ export class SparseHashGridCollisionProcessor implements CollisionProcessor { const results: RayCastHit[] = []; const maxDistance = options?.maxDistance ?? Infinity; const collisionGroup = options?.collisionGroup; - const collisionMask = !collisionGroup ? options?.collisionMask ?? CollisionGroup.All.category : collisionGroup.category; + const collisionMask = !collisionGroup ? (options?.collisionMask ?? CollisionGroup.All.category) : collisionGroup.category; const searchAllColliders = options?.searchAllColliders ?? false; const unitRay = ray.dir.normalize(); diff --git a/src/engine/Engine.ts b/src/engine/Engine.ts index ad98f487..3abf05b0 100644 --- a/src/engine/Engine.ts +++ b/src/engine/Engine.ts @@ -1021,7 +1021,7 @@ O|===|* >________________>\n\ viewport: options.viewport ?? (options.width && options.height ? { width: options.width, height: options.height } : Resolution.SVGA), resolution: options.resolution, displayMode, - pixelRatio: options.suppressHiDPIScaling ? 1 : options.pixelRatio ?? null + pixelRatio: options.suppressHiDPIScaling ? 1 : (options.pixelRatio ?? null) }); // TODO REMOVE STATIC!!! @@ -1202,7 +1202,7 @@ O|===|* >________________>\n\ viewport: options.viewport ?? (options.width && options.height ? { width: options.width, height: options.height } : Resolution.SVGA), resolution: options.resolution, displayMode, - pixelRatio: options.suppressHiDPIScaling ? 1 : options.pixelRatio ?? null + pixelRatio: options.suppressHiDPIScaling ? 1 : (options.pixelRatio ?? null) }); this.screen.setCurrentCamera(this.currentScene.camera); diff --git a/src/engine/Graphics/Animation.ts b/src/engine/Graphics/Animation.ts index d8bb7ff2..e4801834 100644 --- a/src/engine/Graphics/Animation.ts +++ b/src/engine/Graphics/Animation.ts @@ -172,7 +172,7 @@ export class Animation extends Graphic implements HasTick { this.frames = options.frames; this.speed = options.speed ?? this.speed; this.strategy = options.strategy ?? this.strategy; - this.frameDuration = options.totalDuration ? options.totalDuration / this.frames.length : options.frameDuration ?? this.frameDuration; + this.frameDuration = options.totalDuration ? options.totalDuration / this.frames.length : (options.frameDuration ?? this.frameDuration); if (options.reverse) { this.reverse(); } diff --git a/src/engine/Util/Coroutine.ts b/src/engine/Util/Coroutine.ts index fab186aa..671673b1 100644 --- a/src/engine/Util/Coroutine.ts +++ b/src/engine/Util/Coroutine.ts @@ -146,7 +146,7 @@ export function coroutine(...args: any[]): CoroutineInstance { const inside = useContext(InsideCoroutineContext); const schedule = options?.timing; - const autostart = inside ? false : options?.autostart ?? true; + const autostart = inside ? false : (options?.autostart ?? true); let engine: Engine; try { engine = passedEngine ?? Engine.useEngine(); diff --git a/src/spec/assets/images/GraphicsTextSpec/fonts.css b/src/spec/assets/images/GraphicsTextSpec/fonts.css index 73d9ed66..d1ec788c 100644 --- a/src/spec/assets/images/GraphicsTextSpec/fonts.css +++ b/src/spec/assets/images/GraphicsTextSpec/fonts.css @@ -5,8 +5,9 @@ font-weight: 400; font-display: block; src: url(/src/spec/assets/images/GraphicsTextSpec/fonts/italic-400.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, - U+2212, U+2215, U+FEFF, U+FFFD; + unicode-range: + U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, + U+2215, U+FEFF, U+FFFD; } /* latin */ @@ -16,8 +17,9 @@ font-weight: 600; font-display: block; src: url(/src/spec/assets/images/GraphicsTextSpec/fonts/italic-600.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, - U+2212, U+2215, U+FEFF, U+FFFD; + unicode-range: + U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, + U+2215, U+FEFF, U+FFFD; } /* latin */ @@ -27,8 +29,9 @@ font-weight: 700; font-display: block; src: url(/src/spec/assets/images/GraphicsTextSpec/fonts/italic-700.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, - U+2212, U+2215, U+FEFF, U+FFFD; + unicode-range: + U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, + U+2215, U+FEFF, U+FFFD; } /* latin */ @@ -38,8 +41,9 @@ font-weight: 800; font-display: block; src: url(/src/spec/assets/images/GraphicsTextSpec/fonts/italic-800.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, - U+2212, U+2215, U+FEFF, U+FFFD; + unicode-range: + U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, + U+2215, U+FEFF, U+FFFD; } /* latin */ @@ -49,8 +53,9 @@ font-weight: 400; font-display: block; src: url(/src/spec/assets/images/GraphicsTextSpec/fonts/normal-400.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, - U+2212, U+2215, U+FEFF, U+FFFD; + unicode-range: + U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, + U+2215, U+FEFF, U+FFFD; } /* latin */ @@ -60,8 +65,9 @@ font-weight: 600; font-display: block; src: url(/src/spec/assets/images/GraphicsTextSpec/fonts/normal-600.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, - U+2212, U+2215, U+FEFF, U+FFFD; + unicode-range: + U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, + U+2215, U+FEFF, U+FFFD; } /* latin */ @@ -71,8 +77,9 @@ font-weight: 700; font-display: block; src: url(/src/spec/assets/images/GraphicsTextSpec/fonts/normal-700.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, - U+2212, U+2215, U+FEFF, U+FFFD; + unicode-range: + U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, + U+2215, U+FEFF, U+FFFD; } /* latin */ @@ -82,6 +89,7 @@ font-weight: 800; font-display: block; src: url(/src/spec/assets/images/GraphicsTextSpec/fonts/normal-800.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, - U+2212, U+2215, U+FEFF, U+FFFD; + unicode-range: + U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, + U+2215, U+FEFF, U+FFFD; } -- 2.51.2