From 30007a67b27574b821ab1c55837108aed8bf642f Mon Sep 17 00:00:00 2001 From: Evan Simkowitz Date: Sun, 29 Dec 2024 14:36:48 -0500 Subject: [PATCH] fix runtime errs --- docs/package.json | 8 +++++--- frontend/app/element/input.tsx | 2 +- frontend/app/tab/updatebanner.tsx | 6 +++++- frontend/app/tab/workspaceswitcher.tsx | 6 +++++- package.json | 2 +- yarn.lock | 18 +++++++++--------- 6 files changed, 26 insertions(+), 16 deletions(-) diff --git a/docs/package.json b/docs/package.json index 5f621e622..f80a0a7d0 100644 --- a/docs/package.json +++ b/docs/package.json @@ -26,8 +26,8 @@ "@waveterm/docusaurus-og": "https://github.com/wavetermdev/docusaurus-og", "clsx": "^2.1.1", "prism-react-renderer": "^2.3.0", - "react": "^19.0.0", - "react-dom": "^19.0.0", + "react": "^18.3.1", + "react-dom": "^18.3.1", "remark-gfm": "^4.0.0", "remark-typescript-code-import": "^1.0.1", "ua-parser-js": "^2.0.0" @@ -57,7 +57,9 @@ }, "resolutions": { "path-to-regexp@npm:2.2.1": "^3", - "cookie@0.6.0": "^0.7.0" + "cookie@0.6.0": "^0.7.0", + "react": "18.3.1", + "react-dom": "18.3.1" }, "browserslist": { "production": [ diff --git a/frontend/app/element/input.tsx b/frontend/app/element/input.tsx index 4c4603de6..2c92accbb 100644 --- a/frontend/app/element/input.tsx +++ b/frontend/app/element/input.tsx @@ -9,7 +9,7 @@ import "./input.scss"; interface InputGroupProps { children: React.ReactNode; className?: string; - ref: React.RefObject; + ref?: React.RefObject; } const InputGroup = memo(({ children, className, ref }: InputGroupProps) => { diff --git a/frontend/app/tab/updatebanner.tsx b/frontend/app/tab/updatebanner.tsx index cef3fcb0e..0aafbbe8a 100644 --- a/frontend/app/tab/updatebanner.tsx +++ b/frontend/app/tab/updatebanner.tsx @@ -4,7 +4,11 @@ import { useAtomValue } from "jotai"; import { memo, useEffect, useState } from "react"; import "./updatebanner.scss"; -const UpdateStatusBannerComponent = (ref: React.RefObject) => { +type UpdateStatusBannerProps = { + ref: React.RefObject; +}; + +const UpdateStatusBannerComponent = ({ ref }: UpdateStatusBannerProps) => { const appUpdateStatus = useAtomValue(atoms.updaterStatusAtom); let [updateStatusMessage, setUpdateStatusMessage] = useState(); const [dismissBannerTimeout, setDismissBannerTimeout] = useState(); diff --git a/frontend/app/tab/workspaceswitcher.tsx b/frontend/app/tab/workspaceswitcher.tsx index 060675fc3..1b2accdae 100644 --- a/frontend/app/tab/workspaceswitcher.tsx +++ b/frontend/app/tab/workspaceswitcher.tsx @@ -30,11 +30,15 @@ type WorkspaceListEntry = { workspace: Workspace; }; +type WorkspaceSwitcherProps = { + ref: React.RefObject; +}; + type WorkspaceList = WorkspaceListEntry[]; const workspaceMapAtom = atom([]); const workspaceSplitAtom = splitAtom(workspaceMapAtom); const editingWorkspaceAtom = atom(); -const WorkspaceSwitcher = (ref: React.RefObject) => { +const WorkspaceSwitcher = ({ ref }: WorkspaceSwitcherProps) => { const setWorkspaceList = useSetAtom(workspaceMapAtom); const activeWorkspace = useAtomValueSafe(atoms.workspace); const workspaceList = useAtomValue(workspaceSplitAtom); diff --git a/package.json b/package.json index ee22a60b3..1ddcfb76c 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "postinstall": "electron-builder install-app-deps" }, "devDependencies": { - "@chromatic-com/storybook": "^3.2.2", + "@chromatic-com/storybook": "^3.2.3", "@eslint/js": "^9.16.0", "@rollup/plugin-node-resolve": "^16.0.0", "@storybook/addon-essentials": "^8.4.7", diff --git a/yarn.lock b/yarn.lock index d46bb8ed4..5aa57802d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1644,9 +1644,9 @@ __metadata: languageName: node linkType: hard -"@chromatic-com/storybook@npm:^3.2.2": - version: 3.2.2 - resolution: "@chromatic-com/storybook@npm:3.2.2" +"@chromatic-com/storybook@npm:^3.2.3": + version: 3.2.3 + resolution: "@chromatic-com/storybook@npm:3.2.3" dependencies: chromatic: "npm:^11.15.0" filesize: "npm:^10.0.12" @@ -1655,7 +1655,7 @@ __metadata: strip-ansi: "npm:^7.1.0" peerDependencies: storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0 - checksum: 10c0/7b8da1ddb399c804337ff28a28594b548392b7bead52f66615b98e201cdeb4d31184b9e355791ba5d0d8cfdd2bea7d38355ecd0058f26f4790f9a887107bde0f + checksum: 10c0/23c59b7d225347d4af8cb6a7596da3417dc3abc2d5036c4ef5cee2852b994a16b5996a1bd1a584bb56e97266d85ce9ae7daeeac296b3060d6b80b14cad10d9d1 languageName: node linkType: hard @@ -18065,7 +18065,7 @@ __metadata: languageName: node linkType: hard -"react-dom@npm:^16.8.0 || ^17.0.0 || ^18.0.0": +"react-dom@npm:^16.8.0 || ^17.0.0 || ^18.0.0, react-dom@npm:^18.3.1": version: 18.3.1 resolution: "react-dom@npm:18.3.1" dependencies: @@ -18290,7 +18290,7 @@ __metadata: languageName: node linkType: hard -"react@npm:^16.8.0 || ^17.0.0 || ^18.0.0": +"react@npm:^16.8.0 || ^17.0.0 || ^18.0.0, react@npm:^18.3.1": version: 18.3.1 resolution: "react@npm:18.3.1" dependencies: @@ -22208,8 +22208,8 @@ __metadata: prettier-plugin-jsdoc: "npm:^1.3.0" prettier-plugin-organize-imports: "npm:^4.1.0" prism-react-renderer: "npm:^2.3.0" - react: "npm:^19.0.0" - react-dom: "npm:^19.0.0" + react: "npm:^18.3.1" + react-dom: "npm:^18.3.1" remark-cli: "npm:^12.0.1" remark-frontmatter: "npm:^5.0.0" remark-gfm: "npm:^4.0.0" @@ -22227,7 +22227,7 @@ __metadata: version: 0.0.0-use.local resolution: "waveterm@workspace:." dependencies: - "@chromatic-com/storybook": "npm:^3.2.2" + "@chromatic-com/storybook": "npm:^3.2.3" "@eslint/js": "npm:^9.16.0" "@floating-ui/react": "npm:^0.27.2" "@monaco-editor/loader": "npm:^1.4.0"