From 0f2a329171055be1eca470cf5c5db52fa77e4a70 Mon Sep 17 00:00:00 2001 From: Charlie Brown Date: Thu, 9 Nov 2023 14:27:37 -0600 Subject: [PATCH 01/12] Use monaco-editor for code display --- .changeset/early-hairs-hug.md | 5 + package.json | 1 - packages/webui/package.json | 6 +- .../src/components/Authorization.test.tsx | 5 +- .../webui/src/components/Authorization.tsx | 21 ++- .../webui/src/components/CodeDisplay.test.tsx | 53 ++++++ packages/webui/src/components/CodeDisplay.tsx | 43 +++++ .../webui/src/components/JsonDisplay.test.tsx | 45 ----- packages/webui/src/components/JsonDisplay.tsx | 60 ------- .../webui/src/components/MonacoEditor.tsx | 29 ++++ packages/webui/src/components/index.ts | 2 +- .../src/components/ui/TraceDetail.test.tsx | 4 +- .../webui/src/components/ui/TraceDetail.tsx | 54 ++---- packages/webui/src/styles/base.css | 38 +++- packages/webui/src/styles/react-json-view.css | 78 --------- yarn.lock | 163 +++--------------- 16 files changed, 224 insertions(+), 383 deletions(-) create mode 100644 .changeset/early-hairs-hug.md create mode 100644 packages/webui/src/components/CodeDisplay.test.tsx create mode 100644 packages/webui/src/components/CodeDisplay.tsx delete mode 100644 packages/webui/src/components/JsonDisplay.test.tsx delete mode 100644 packages/webui/src/components/JsonDisplay.tsx create mode 100644 packages/webui/src/components/MonacoEditor.tsx delete mode 100644 packages/webui/src/styles/react-json-view.css diff --git a/.changeset/early-hairs-hug.md b/.changeset/early-hairs-hug.md new file mode 100644 index 0000000..6de8614 --- /dev/null +++ b/.changeset/early-hairs-hug.md @@ -0,0 +1,5 @@ +--- +'@envyjs/webui': minor +--- + +Use monaco-editor for code display diff --git a/package.json b/package.json index 69428ec..05d9b87 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,6 @@ "wait-on": "^7.0.1" }, "resolutions": { - "@microlink/react-json-view/react": ">=17", "react-hot-toast/csstype": "^3.0.10" }, "lint-staged": { diff --git a/packages/webui/package.json b/packages/webui/package.json index bc3bcf2..f2682a8 100644 --- a/packages/webui/package.json +++ b/packages/webui/package.json @@ -62,7 +62,9 @@ }, "dependencies": { "@envyjs/core": "0.8.4", + "@monaco-editor/react": "4.6.0", "chalk": "^4.1.2", + "monaco-editor": "0.44.0", "react": "^18.2.0", "react-dom": "^18.2.0", "serve-handler": "^6.1.5", @@ -71,7 +73,6 @@ "yargs-parser": "^21.1.1" }, "devDependencies": { - "@microlink/react-json-view": "^1.22.2", "@parcel/config-default": "^2.9.3", "@parcel/core": "^2.9.3", "@storybook/cli": "^7.4.6", @@ -115,9 +116,6 @@ "ts-jest-mock-import-meta": "^1.1.0", "vite": "^4.4.9" }, - "peerDependencies": { - "@microlink/react-json-view": "^1.22.2" - }, "browserslist": [ ">0.2%", "not ie <= 11" diff --git a/packages/webui/src/components/Authorization.test.tsx b/packages/webui/src/components/Authorization.test.tsx index 4e1892e..2261710 100644 --- a/packages/webui/src/components/Authorization.test.tsx +++ b/packages/webui/src/components/Authorization.test.tsx @@ -10,9 +10,8 @@ jest.mock('@/components', () => ({ IconButton: function ({ short, Icon, ...safeProps }: any) { return