From ad5e159b4a506b8e9e99e6f525a611b934d6f81e Mon Sep 17 00:00:00 2001 From: Yehor <20585619+satelllte@users.noreply.github.com> Date: Thu, 9 May 2024 21:23:16 +0300 Subject: [PATCH 1/6] prettier scripts --- package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index e8141d4bc1..52bd5cef40 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,9 @@ "vers": "yarn changeset version", "codegen:eslint": "cd packages/eslint-plugin && yarn codegen", "analyze-fiber": "cd packages/fiber && npm publish --dry-run", - "analyze-test": "cd packages/test-renderer && npm publish --dry-run" + "analyze-test": "cd packages/test-renderer && npm publish --dry-run", + "format": "prettier --check .", + "format:fix": "prettier --write ." }, "devDependencies": { "@babel/core": "7.17.8", From 99a0f3c3c10d3cb9358a6a3dd657de47c94854bb Mon Sep 17 00:00:00 2001 From: Yehor <20585619+satelllte@users.noreply.github.com> Date: Thu, 9 May 2024 21:23:45 +0300 Subject: [PATCH 2/6] replace deprecated "jsxBracketSameLine" option --- .prettierrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.prettierrc b/.prettierrc index 754aefb5df..4ecf31432b 100644 --- a/.prettierrc +++ b/.prettierrc @@ -4,6 +4,6 @@ "singleQuote": true, "tabWidth": 2, "printWidth": 120, - "jsxBracketSameLine": true, + "bracketSameLine": true, "endOfLine": "auto" } From 35e99154a159b09e60dfdeb0604b2e482a54fde9 Mon Sep 17 00:00:00 2001 From: Yehor <20585619+satelllte@users.noreply.github.com> Date: Thu, 9 May 2024 21:23:54 +0300 Subject: [PATCH 3/6] .prettierignore config --- .prettierignore | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .prettierignore diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000000..3031e807fb --- /dev/null +++ b/.prettierignore @@ -0,0 +1,4 @@ +dist/ +node_modules/ +.yarn/ +*.gltf \ No newline at end of file From 3ea96d55195cdc3b39f1fc70846f0bf2055b889e Mon Sep 17 00:00:00 2001 From: Yehor <20585619+satelllte@users.noreply.github.com> Date: Thu, 9 May 2024 21:24:02 +0300 Subject: [PATCH 4/6] CI/CD --- .github/workflows/test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 94054ea208..753ceb3d98 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,3 +40,6 @@ jobs: - name: Report Test Renderer size run: yarn run analyze-test + + - name: Check formatting + run: yarn run format From 47c5669c06e66c8c933741c1e57357f01227408a Mon Sep 17 00:00:00 2001 From: Yehor <20585619+satelllte@users.noreply.github.com> Date: Thu, 9 May 2024 21:34:10 +0300 Subject: [PATCH 5/6] ignore .mdx & coverage/ --- .prettierignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.prettierignore b/.prettierignore index 3031e807fb..de2a8a33dc 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,4 +1,6 @@ dist/ +coverage/ node_modules/ .yarn/ -*.gltf \ No newline at end of file +*.gltf +*.mdx \ No newline at end of file From 338038158f270e921e55e238458a1e4f5c1eafe2 Mon Sep 17 00:00:00 2001 From: Yehor <20585619+satelllte@users.noreply.github.com> Date: Thu, 9 May 2024 21:34:17 +0300 Subject: [PATCH 6/6] format:fix --- packages/fiber/tests/core/events.test.tsx | 27 ++++++++++++++--------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/packages/fiber/tests/core/events.test.tsx b/packages/fiber/tests/core/events.test.tsx index dcb9a88f57..a2d522d097 100644 --- a/packages/fiber/tests/core/events.test.tsx +++ b/packages/fiber/tests/core/events.test.tsx @@ -275,11 +275,16 @@ describe('events', () => { const handlePointerLeave = jest.fn() /* This component lets us unmount the event-handling object */ - function PointerCaptureTest(props: { hasMesh: boolean, manualRelease?: boolean }) { + function PointerCaptureTest(props: { hasMesh: boolean; manualRelease?: boolean }) { return ( {props.hasMesh && ( - + @@ -350,9 +355,9 @@ describe('events', () => { /* testing-utils/react's fireEvent wraps the event like React does, so it doesn't match how our event handlers are called in production, so we call dispatchEvent directly. */ await act(async () => canvas.dispatchEvent(moveIn)) - expect(handlePointerEnter).toHaveBeenCalledTimes(1); - expect(handlePointerMove).toHaveBeenCalledTimes(1); - + expect(handlePointerEnter).toHaveBeenCalledTimes(1) + expect(handlePointerMove).toHaveBeenCalledTimes(1) + const down = new PointerEvent('pointerdown', { pointerId }) Object.defineProperty(down, 'offsetX', { get: () => 577 }) Object.defineProperty(down, 'offsetY', { get: () => 480 }) @@ -362,11 +367,11 @@ describe('events', () => { // If we move the pointer now, when it is captured, it should raise the onPointerMove event even though the pointer is not over the element, // and NOT raise the onPointerLeave event. await act(async () => canvas.dispatchEvent(moveOut)) - expect(handlePointerMove).toHaveBeenCalledTimes(2); - expect(handlePointerLeave).not.toHaveBeenCalled(); + expect(handlePointerMove).toHaveBeenCalledTimes(2) + expect(handlePointerLeave).not.toHaveBeenCalled() await act(async () => canvas.dispatchEvent(moveIn)) - expect(handlePointerMove).toHaveBeenCalledTimes(3); + expect(handlePointerMove).toHaveBeenCalledTimes(3) const up = new PointerEvent('pointerup', { pointerId }) Object.defineProperty(up, 'offsetX', { get: () => 577 }) @@ -377,11 +382,11 @@ describe('events', () => { await act(async () => canvas.dispatchEvent(lostpointercapture)) // The pointer is still over the element, so onPointerLeave should not have been called. - expect(handlePointerLeave).not.toHaveBeenCalled(); + expect(handlePointerLeave).not.toHaveBeenCalled() // The element pointer should no longer be captured, so moving it away should call onPointerLeave. - await act(async () => canvas.dispatchEvent(moveOut)); - expect(handlePointerEnter).toHaveBeenCalledTimes(1); + await act(async () => canvas.dispatchEvent(moveOut)) + expect(handlePointerEnter).toHaveBeenCalledTimes(1) expect(handlePointerLeave).toHaveBeenCalledTimes(1) }) })