From 6afcdae5de6cedc8cebcf90ad7f2622a99d4781e Mon Sep 17 00:00:00 2001 From: Eugene Dyko <13007925+yevdyko@users.noreply.github.com> Date: Mon, 18 Aug 2025 23:19:39 +0100 Subject: [PATCH 1/2] Fix paths --- demo/app.jsx | 2 +- src/components/ReactP5Wrapper.tsx | 2 +- src/components/ReactP5WrapperGuard.tsx | 2 +- src/main.tsx | 12 ++++++------ src/utils/updateCanvasInstance.ts | 4 ++-- tests/exports.test.tsx | 2 +- tests/utils/removeCanvasInstance.test.ts | 2 +- tests/utils/updateCanvasInstance.test.ts | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/demo/app.jsx b/demo/app.jsx index a335265..dd0b440 100644 --- a/demo/app.jsx +++ b/demo/app.jsx @@ -1,7 +1,7 @@ import React, { useCallback, useMemo, useState } from "react"; import { createRoot } from "react-dom/client"; -import { ReactP5Wrapper } from "../src/main.tsx"; +import { ReactP5Wrapper } from "@/main.tsx"; import "./demo.css"; import { sketch as box } from "./sketches/box"; import { sketch as plane } from "./sketches/plane"; diff --git a/src/components/ReactP5Wrapper.tsx b/src/components/ReactP5Wrapper.tsx index 5836583..922da80 100644 --- a/src/components/ReactP5Wrapper.tsx +++ b/src/components/ReactP5Wrapper.tsx @@ -1,6 +1,6 @@ import * as React from "react"; import { propsAreEqual } from "@utils/propsAreEqual"; -const ReactP5WrapperGuard = React.lazy(() => import("./ReactP5WrapperGuard")); +const ReactP5WrapperGuard = React.lazy(() => import("@components/ReactP5WrapperGuard")); export const ReactP5Wrapper = React.memo(ReactP5WrapperGuard, propsAreEqual); diff --git a/src/components/ReactP5WrapperGuard.tsx b/src/components/ReactP5WrapperGuard.tsx index 2b4a573..0b11d71 100644 --- a/src/components/ReactP5WrapperGuard.tsx +++ b/src/components/ReactP5WrapperGuard.tsx @@ -7,7 +7,7 @@ import { ReactNode } from "react"; import { FallbackProps } from "react-error-boundary"; const ReactP5WrapperWithSketch = React.lazy( - () => import("./ReactP5WrapperWithSketch") + () => import("@components/ReactP5WrapperWithSketch") ); const ErrorBoundary = React.lazy(() => diff --git a/src/main.tsx b/src/main.tsx index 09379ce..5531cc7 100644 --- a/src/main.tsx +++ b/src/main.tsx @@ -1,6 +1,6 @@ -export { ReactP5Wrapper } from "./components/ReactP5Wrapper"; -export { P5WrapperClassName } from "./constants/P5WrapperClassName"; -export { type P5CanvasInstance } from "./contracts/P5CanvasInstance"; -export { type P5WrapperProps } from "./contracts/P5WrapperProps"; -export { type Sketch } from "./contracts/Sketch"; -export { type SketchProps } from "./contracts/SketchProps"; +export { ReactP5Wrapper } from "@components/ReactP5Wrapper"; +export { P5WrapperClassName } from "@constants/P5WrapperClassName"; +export { type P5CanvasInstance } from "@contracts/P5CanvasInstance"; +export { type P5WrapperProps } from "@contracts/P5WrapperProps"; +export { type Sketch } from "@contracts/Sketch"; +export { type SketchProps } from "@contracts/SketchProps"; diff --git a/src/utils/updateCanvasInstance.ts b/src/utils/updateCanvasInstance.ts index fdafc8e..0481cd8 100644 --- a/src/utils/updateCanvasInstance.ts +++ b/src/utils/updateCanvasInstance.ts @@ -3,8 +3,8 @@ import { type Sketch } from "@contracts/Sketch"; import { type SketchProps } from "@contracts/SketchProps"; import { type WrapperRef } from "@contracts/WrapperRef"; -import { createCanvasInstance } from "./createCanvasInstance"; -import { removeCanvasInstance } from "./removeCanvasInstance"; +import { createCanvasInstance } from "@utils/createCanvasInstance"; +import { removeCanvasInstance } from "@utils/removeCanvasInstance"; export function updateCanvasInstance( canvasInstanceRef: CanvasInstanceRef, diff --git a/tests/exports.test.tsx b/tests/exports.test.tsx index 4cf1ead..d5523f0 100644 --- a/tests/exports.test.tsx +++ b/tests/exports.test.tsx @@ -1,7 +1,7 @@ import { createElement, isValidElement } from "react"; import { assert, describe, expect, it, vi } from "vitest"; -import { P5WrapperClassName, ReactP5Wrapper } from "../src/main"; +import { P5WrapperClassName, ReactP5Wrapper } from "@/main"; describe("Exports", () => { describe("P5WrapperClassName", () => { diff --git a/tests/utils/removeCanvasInstance.test.ts b/tests/utils/removeCanvasInstance.test.ts index 2b7d033..d83ed67 100644 --- a/tests/utils/removeCanvasInstance.test.ts +++ b/tests/utils/removeCanvasInstance.test.ts @@ -4,7 +4,7 @@ import { removeCanvasInstance } from "@utils/removeCanvasInstance"; import { createRef } from "react"; import { describe, expect, it, vi } from "vitest"; -import { SketchProps } from "../../src/main"; +import { SketchProps } from "@/main"; describe("removeCanvasInstance", () => { it("Calls the remove method on the canvas if it exists", () => { diff --git a/tests/utils/updateCanvasInstance.test.ts b/tests/utils/updateCanvasInstance.test.ts index cd2a310..9c96c0f 100644 --- a/tests/utils/updateCanvasInstance.test.ts +++ b/tests/utils/updateCanvasInstance.test.ts @@ -6,7 +6,7 @@ import { updateCanvasInstance } from "@utils/updateCanvasInstance"; import { createRef } from "react"; import { describe, expect, it, vi } from "vitest"; -import { SketchProps } from "../../src/main"; +import { SketchProps } from "@/main"; describe("updateCanvasInstance", () => { it("Should update a canvas instance to a new version", () => { From 7e53736a4a1aa416cb158bfe840b215b5b838155 Mon Sep 17 00:00:00 2001 From: Eugene Dyko <13007925+yevdyko@users.noreply.github.com> Date: Mon, 18 Aug 2025 23:51:58 +0100 Subject: [PATCH 2/2] Format changes --- demo/app.jsx | 2 +- src/components/ReactP5Wrapper.tsx | 4 +++- src/utils/updateCanvasInstance.ts | 1 - tests/exports.test.tsx | 3 +-- tests/utils/removeCanvasInstance.test.ts | 3 +-- tests/utils/updateCanvasInstance.test.ts | 3 +-- 6 files changed, 7 insertions(+), 9 deletions(-) diff --git a/demo/app.jsx b/demo/app.jsx index dd0b440..4124ef9 100644 --- a/demo/app.jsx +++ b/demo/app.jsx @@ -1,7 +1,7 @@ +import { ReactP5Wrapper } from "@/main.tsx"; import React, { useCallback, useMemo, useState } from "react"; import { createRoot } from "react-dom/client"; -import { ReactP5Wrapper } from "@/main.tsx"; import "./demo.css"; import { sketch as box } from "./sketches/box"; import { sketch as plane } from "./sketches/plane"; diff --git a/src/components/ReactP5Wrapper.tsx b/src/components/ReactP5Wrapper.tsx index 922da80..508c5b5 100644 --- a/src/components/ReactP5Wrapper.tsx +++ b/src/components/ReactP5Wrapper.tsx @@ -1,6 +1,8 @@ import * as React from "react"; import { propsAreEqual } from "@utils/propsAreEqual"; -const ReactP5WrapperGuard = React.lazy(() => import("@components/ReactP5WrapperGuard")); +const ReactP5WrapperGuard = React.lazy( + () => import("@components/ReactP5WrapperGuard") +); export const ReactP5Wrapper = React.memo(ReactP5WrapperGuard, propsAreEqual); diff --git a/src/utils/updateCanvasInstance.ts b/src/utils/updateCanvasInstance.ts index 0481cd8..e8d9259 100644 --- a/src/utils/updateCanvasInstance.ts +++ b/src/utils/updateCanvasInstance.ts @@ -2,7 +2,6 @@ import { type CanvasInstanceRef } from "@contracts/CanvasInstanceRef"; import { type Sketch } from "@contracts/Sketch"; import { type SketchProps } from "@contracts/SketchProps"; import { type WrapperRef } from "@contracts/WrapperRef"; - import { createCanvasInstance } from "@utils/createCanvasInstance"; import { removeCanvasInstance } from "@utils/removeCanvasInstance"; diff --git a/tests/exports.test.tsx b/tests/exports.test.tsx index d5523f0..0c3fb97 100644 --- a/tests/exports.test.tsx +++ b/tests/exports.test.tsx @@ -1,8 +1,7 @@ +import { P5WrapperClassName, ReactP5Wrapper } from "@/main"; import { createElement, isValidElement } from "react"; import { assert, describe, expect, it, vi } from "vitest"; -import { P5WrapperClassName, ReactP5Wrapper } from "@/main"; - describe("Exports", () => { describe("P5WrapperClassName", () => { it("Exports the css class name used on the wrapper", () => { diff --git a/tests/utils/removeCanvasInstance.test.ts b/tests/utils/removeCanvasInstance.test.ts index d83ed67..cc85836 100644 --- a/tests/utils/removeCanvasInstance.test.ts +++ b/tests/utils/removeCanvasInstance.test.ts @@ -1,11 +1,10 @@ +import { SketchProps } from "@/main"; import { type CanvasInstanceRef } from "@contracts/CanvasInstanceRef"; import p5 from "@contracts/p5"; import { removeCanvasInstance } from "@utils/removeCanvasInstance"; import { createRef } from "react"; import { describe, expect, it, vi } from "vitest"; -import { SketchProps } from "@/main"; - describe("removeCanvasInstance", () => { it("Calls the remove method on the canvas if it exists", () => { const instance = new p5(() => { diff --git a/tests/utils/updateCanvasInstance.test.ts b/tests/utils/updateCanvasInstance.test.ts index 9c96c0f..e9a5faf 100644 --- a/tests/utils/updateCanvasInstance.test.ts +++ b/tests/utils/updateCanvasInstance.test.ts @@ -1,3 +1,4 @@ +import { SketchProps } from "@/main"; import { type CanvasInstanceRef } from "@contracts/CanvasInstanceRef"; import p5 from "@contracts/p5"; import { type WrapperRef } from "@contracts/WrapperRef"; @@ -6,8 +7,6 @@ import { updateCanvasInstance } from "@utils/updateCanvasInstance"; import { createRef } from "react"; import { describe, expect, it, vi } from "vitest"; -import { SketchProps } from "@/main"; - describe("updateCanvasInstance", () => { it("Should update a canvas instance to a new version", () => { const sketch = vi.fn();