Skip to content

Commit 633bb12

Browse files
tstirrat15tstirrat15
committed
Upgrade some deps
1 parent 47f95cc commit 633bb12

27 files changed

+2434
-2215
lines changed

‎.oxfmtrc.jsonc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"$schema": "./node_modules/oxfmt/configuration_schema.json",
33
"ignorePatterns": ["src/spicedb-common/protodefs", "examples", "public"],
4-
"experimentalSortImports": {
4+
"sortImports": {
5+
"sortSideEffects": true,
56
"groups": [
6-
["side-effect"],
77
["builtin"],
88
["external", "type-external"],
99
["internal", "type-internal"],

‎package.json‎

Lines changed: 30 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -18,31 +18,28 @@
1818
},
1919
"dependencies": {
2020
"@authzed/spicedb-parser-js": "^1.0.5",
21-
"@aws-sdk/client-s3": "^3.0.0",
21+
"@aws-sdk/client-s3": "^3.997.0",
2222
"@bufbuild/protobuf": "^2.4.0",
2323
"@dagrejs/dagre": "^2.0.4",
2424
"@fontsource/roboto": "^5.1.1",
25-
"@fortawesome/fontawesome-svg-core": "^6.4.0",
26-
"@fortawesome/free-solid-svg-icons": "^6.2.1",
27-
"@fortawesome/react-fontawesome": "^0.2.0",
2825
"@glideapps/glide-data-grid": "^6.0.3",
2926
"@glideapps/glide-data-grid-cells": "^6.0.3",
3027
"@material-ui/core": "^4.12.4",
3128
"@material-ui/icons": "^4.11.3",
3229
"@material-ui/lab": "^4.0.0-alpha.61",
33-
"@monaco-editor/react": "^4.3.1",
34-
"@posthog/react": "^1.5.2",
35-
"@radix-ui/react-alert-dialog": "^1.1.11",
36-
"@radix-ui/react-select": "^2.2.2",
37-
"@radix-ui/react-slot": "^1.2.0",
38-
"@radix-ui/react-tabs": "^1.1.9",
39-
"@tailwindcss/vite": "^4.1.5",
40-
"@tanstack/react-pacer": "^0.17.4",
41-
"@tanstack/react-router": "^1.119.0",
42-
"@tanstack/react-router-devtools": "^1.119.1",
30+
"@monaco-editor/react": "^4.7.0",
31+
"@posthog/react": "^1.8.0",
32+
"@radix-ui/react-alert-dialog": "^1.1.15",
33+
"@radix-ui/react-select": "^2.2.6",
34+
"@radix-ui/react-slot": "^1.2.4",
35+
"@radix-ui/react-tabs": "^1.1.13",
36+
"@tailwindcss/vite": "^4.2.1",
37+
"@tanstack/react-pacer": "^0.20.0",
38+
"@tanstack/react-router": "^1.163.2",
39+
"@tanstack/react-router-devtools": "^1.163.2",
4340
"@vercel/node": "^5.2.0",
44-
"@xyflow/react": "^12.10.0",
45-
"ajv": "6.12.6",
41+
"@xyflow/react": "^12.10.1",
42+
"ajv": "8.18.0",
4643
"ansi-to-html": "^0.7.2",
4744
"class-variance-authority": "^0.7.1",
4845
"clsx": "^2.1.1",
@@ -51,61 +48,58 @@
5148
"file-saver": "^2.0.5",
5249
"file-select-dialog": "^1.5.4",
5350
"line-column": "^1.0.2",
54-
"lucide-react": "^0.503.0",
55-
"marked": "^4.0.10",
56-
"monaco-editor": "~0.40.0",
51+
"lucide-react": "^0.575.0",
52+
"monaco-editor": "~0.55.1",
5753
"next-themes": "^0.4.6",
5854
"parsimmon": "^1.18.1",
59-
"posthog-js": "^1.304.0",
55+
"posthog-js": "^1.353.1",
6056
"radix-ui": "^1.4.3",
6157
"react": "^18.3.1",
62-
"react-cookie": "^4.1.1",
58+
"react-cookie": "^8.0.1",
6359
"react-dom": "^18.3.1",
6460
"react-joyride": "^2.5.3",
65-
"react-reflex": "^4.0.9",
61+
"react-reflex": "^4.2.7",
6662
"react-responsive-carousel": "^3.2.23",
6763
"sjcl": "^1.0.8",
6864
"sonner": "^2.0.7",
6965
"string-to-color": "^2.2.2",
7066
"string.prototype.replaceall": "^1.0.6",
7167
"styled-components": "^6.1.14",
72-
"tailwind-merge": "^3.2.0",
73-
"tailwindcss": "^4.1.5",
68+
"tailwind-merge": "^3.5.0",
69+
"tailwindcss": "^4.2.1",
7470
"typeface-roboto-mono": "^1.1.13",
7571
"use-deep-compare": "^1.1.0",
7672
"use-deep-compare-effect": "^1.8.1",
77-
"visjs-network": "^4.24.11",
7873
"yaml": "^2.0.1",
79-
"zod": "^4.2.1"
74+
"zod": "^4.3.6"
8075
},
8176
"devDependencies": {
8277
"@testing-library/react": "^14.0.0",
8378
"@testing-library/user-event": "^14.4.3",
8479
"@types/d3-scale-chromatic": "^3.0.0",
8580
"@types/dagre": "^0.7.53",
8681
"@types/file-saver": "^2.0.5",
87-
"@types/jest": "^29.5.0",
8882
"@types/line-column": "^1.0.0",
89-
"@types/node": "^22.15.3",
83+
"@types/node": "^25.3.0",
9084
"@types/parsimmon": "^1.10.6",
9185
"@types/react": "^18.3.1",
9286
"@types/react-copy-to-clipboard": "^5.0.4",
9387
"@types/react-dom": "^18.3.1",
9488
"@types/sjcl": "^1.0.30",
9589
"@types/styled-components": "^5.1.26",
9690
"@types/use-deep-compare-effect": "^1.5.1",
97-
"@types/uuid": "^9.0.1",
98-
"@vitejs/plugin-react": "^4.3.4",
91+
"@types/uuid": "^11.0.0",
92+
"@vitejs/plugin-react": "^5.1.4",
9993
"cypress": "^12.9.0",
10094
"cypress-wait-until": "^1.7.2",
10195
"globals": "^15.14.0",
102-
"oxfmt": "^0.28.0",
103-
"oxlint": "^1.48.0",
104-
"oxlint-tsgolint": "^0.14.0",
96+
"oxfmt": "^0.35.0",
97+
"oxlint": "^1.50.0",
98+
"oxlint-tsgolint": "^0.15.0",
10599
"tw-animate-css": "^1.2.8",
106-
"typescript": "~5.7.3",
107-
"vite": "^6.0.7",
108-
"vite-plugin-svgr": "^4.3.0",
100+
"typescript": "~5.9.3",
101+
"vite": "^7.3.1",
102+
"vite-plugin-svgr": "^4.5.0",
109103
"vitest": "^2.1.8"
110104
},
111105
"browserslist": {

‎src/App.tsx‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
import "react-reflex/styles.css";
2-
import "typeface-roboto-mono/index.css"; // Import the Roboto Mono font.
3-
import "./App.css";
4-
51
import { PostHogProvider } from "@posthog/react";
62
import {
73
Outlet,
@@ -12,9 +8,13 @@ import {
128
} from "@tanstack/react-router";
139
import { TanStackRouterDevtools } from "@tanstack/react-router-devtools";
1410
import posthog from "posthog-js";
11+
import { CookiesProvider } from "react-cookie";
12+
import "react-reflex/styles.css";
13+
import "typeface-roboto-mono/index.css"; // Import the Roboto Mono font.
1514

1615
import { ThemeProvider } from "@/components/ThemeProvider";
1716

17+
import "./App.css";
1818
import { EmbeddedPlayground } from "./components/EmbeddedPlayground";
1919
import { FullPlayground } from "./components/FullPlayground";
2020
import { InlinePlayground } from "./components/InlinePlayground";
@@ -71,15 +71,18 @@ function App() {
7171
return (
7272
<>
7373
<Toaster />
74-
<PostHogProvider client={posthog}>
75-
<ThemeProvider>
76-
<PlaygroundUIThemed {...PLAYGROUND_UI_COLORS} forceDarkMode={isEmbeddedPlayground}>
77-
<ConfirmDialogProvider>
78-
<RouterProvider router={router} />
79-
</ConfirmDialogProvider>
80-
</PlaygroundUIThemed>
81-
</ThemeProvider>
82-
</PostHogProvider>
74+
{/* @ts-expect-error react-cookie's types are screwy */}
75+
<CookiesProvider>
76+
<PostHogProvider client={posthog}>
77+
<ThemeProvider>
78+
<PlaygroundUIThemed {...PLAYGROUND_UI_COLORS} forceDarkMode={isEmbeddedPlayground}>
79+
<ConfirmDialogProvider>
80+
<RouterProvider router={router} />
81+
</ConfirmDialogProvider>
82+
</PlaygroundUIThemed>
83+
</ThemeProvider>
84+
</PostHogProvider>
85+
</CookiesProvider>
8386
</>
8487
);
8588
}

‎src/components/EditorDisplay.tsx‎

Lines changed: 61 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
import "react-reflex/styles.css";
2-
31
import { TextRange } from "@authzed/spicedb-parser-js";
4-
import Editor, { DiffEditor, useMonaco } from "@monaco-editor/react";
2+
import { Editor, DiffEditor, useMonaco } from "@monaco-editor/react";
53
import { useDebouncedCallback } from "@tanstack/react-pacer/debouncer";
64
import { useNavigate, useLocation } from "@tanstack/react-router";
75
import lineColumn from "line-column";
86
import * as monaco from "monaco-editor";
97
import { useEffect, useMemo, useRef, useState } from "react";
108
import { flushSync } from "react-dom";
9+
import "react-reflex/styles.css";
1110

1211
import { useMediaQuery } from "@/hooks/use-media-query";
1312

@@ -428,55 +427,69 @@ export function EditorDisplay(props: EditorDisplayProps) {
428427
props.services.problemService.stateKey,
429428
]);
430429

431-
const Component = props.diff ? DiffEditor : Editor;
432-
const extraProps = props.diff
433-
? {
434-
original: props.diff,
435-
modified: currentItem?.editableContents,
436-
language: languageName,
437-
}
438-
: {};
439-
440430
return (
441431
<div>
442432
{monacoReady && currentItem && (
443433
<div className="w-full h-full">
444-
<Component
445-
key={`${currentItem.id}-${props.diff ? "diff" : ""}`}
446-
height={
447-
props.dimensions ? `${props.dimensions.height}px` : (props.defaultHeight ?? "40vh")
448-
}
449-
width={
450-
props.dimensions ? `${props.dimensions.width}px` : (props.defaultWidth ?? "60vw")
451-
}
452-
defaultLanguage={languageName}
453-
value={currentItem.editableContents}
454-
theme={themeName}
455-
onChange={handleEditorChange}
456-
// TODO: this is weirdly typed because we're conditionally rendering
457-
// a diff editor or a code editor and typescript doesn't know about that.
458-
// It'd be better to separate this into two different components that
459-
// reuse their internals.
460-
// @ts-expect-error the mount handler is a no-op if the component is in diff mode
461-
onMount={handleEditorMounted}
462-
options={{
463-
readOnly: props.isReadOnly || !!props.diff,
464-
scrollbar: {
465-
handleMouseWheel:
466-
props.disableScrolling !== true && props.disableMouseWheelScrolling !== true,
467-
vertical: props.disableScrolling ? "hidden" : undefined,
468-
},
469-
"semanticHighlighting.enabled": true,
470-
fixedOverflowWidgets: true,
471-
minimap: {
472-
enabled: props.hideMinimap !== true,
473-
},
474-
fontSize: props.fontSize,
475-
scrollBeyondLastLine:
476-
props.scrollBeyondLastLine ?? (props.disableScrolling === true ? false : true),
477-
}}
478-
{...extraProps}
479-
/>
434+
{props.diff ? (
435+
<DiffEditor
436+
height={
437+
props.dimensions ? `${props.dimensions.height}px` : (props.defaultHeight ?? "40vh")
438+
}
439+
width={
440+
props.dimensions ? `${props.dimensions.width}px` : (props.defaultWidth ?? "60vw")
441+
}
442+
theme={themeName}
443+
options={{
444+
readOnly: props.isReadOnly || !!props.diff,
445+
scrollbar: {
446+
handleMouseWheel:
447+
props.disableScrolling !== true && props.disableMouseWheelScrolling !== true,
448+
vertical: props.disableScrolling ? "hidden" : undefined,
449+
},
450+
fixedOverflowWidgets: true,
451+
minimap: {
452+
enabled: props.hideMinimap !== true,
453+
},
454+
fontSize: props.fontSize,
455+
scrollBeyondLastLine:
456+
props.scrollBeyondLastLine ?? (props.disableScrolling === true ? false : true),
457+
}}
458+
original={props.diff}
459+
modified={currentItem?.editableContents}
460+
language={languageName}
461+
/>
462+
) : (
463+
<Editor
464+
height={
465+
props.dimensions ? `${props.dimensions.height}px` : (props.defaultHeight ?? "40vh")
466+
}
467+
width={
468+
props.dimensions ? `${props.dimensions.width}px` : (props.defaultWidth ?? "60vw")
469+
}
470+
defaultLanguage={languageName}
471+
value={currentItem.editableContents}
472+
theme={themeName}
473+
onChange={handleEditorChange}
474+
onMount={handleEditorMounted}
475+
options={{
476+
readOnly: props.isReadOnly || !!props.diff,
477+
scrollbar: {
478+
handleMouseWheel:
479+
props.disableScrolling !== true && props.disableMouseWheelScrolling !== true,
480+
vertical: props.disableScrolling ? "hidden" : undefined,
481+
},
482+
"semanticHighlighting.enabled": true,
483+
fixedOverflowWidgets: true,
484+
minimap: {
485+
enabled: props.hideMinimap !== true,
486+
},
487+
fontSize: props.fontSize,
488+
scrollBeyondLastLine:
489+
props.scrollBeyondLastLine ?? (props.disableScrolling === true ? false : true),
490+
}}
491+
/>
492+
)}
480493
</div>
481494
)}
482495
</div>

0 commit comments

Comments
 (0)