Skip to content

Commit e8a679b

Browse files
Merge branch 'main' into fix/workflow-monitor-oom
2 parents 6d7099b + eb06f86 commit e8a679b

5 files changed

Lines changed: 1295 additions & 1453 deletions

File tree

ui-next/.npmrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@
33
public-hoist-pattern[]=@mui/*
44
public-hoist-pattern[]=@use-gesture/*
55
public-hoist-pattern[]=@eslint/*
6-
public-hoist-pattern[]=globals
76
public-hoist-pattern[]=monaco-editor

ui-next/README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@ The open-source React UI for [Conductor](https://github.com/conductor-oss/conduc
66

77
### Prerequisites
88

9-
- Node.js 22+
10-
- [pnpm](https://pnpm.io/) 10.32.0 (`corepack use pnpm@10.32.0`)
9+
- Node.js 18+
10+
- [pnpm](https://pnpm.io/) 10.x — we use pnpm 10 (not v11) since pnpm v11 requires Node.js v22+. The exact version is pinned via `packageManager` in `package.json`. Run once to activate it:
11+
```bash
12+
corepack enable
13+
```
1114
- A running Conductor server (default: `http://localhost:8080`)
1215

1316
### Setup

ui-next/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,9 @@
7979
"@datasert/cronjs-matcher": "^1.4.0",
8080
"@growthbook/growthbook": "^1.5.1",
8181
"@growthbook/growthbook-react": "^1.5.1",
82+
"@mui/types": "^9.0.0",
8283
"@phosphor-icons/react": "^2.1.10",
84+
"@use-gesture/core": "^10.3.1",
8385
"@use-gesture/react": "^10.2.21",
8486
"@xstate/inspect": "^0.8.0",
8587
"@xstate/react": "^3.2.1",
@@ -161,6 +163,7 @@
161163
"eslint": "9.32.0",
162164
"eslint-plugin-react-hooks": "^5.2.0",
163165
"eslint-plugin-react-refresh": "^0.4.20",
166+
"globals": "^17.6.0",
164167
"husky": "^9.1.7",
165168
"jsdom": "^26.1.0",
166169
"lint-staged": "^16.4.0",
@@ -184,6 +187,7 @@
184187
},
185188
"resolutions": {
186189
"vis-timeline": "7.3.6",
190+
"vis-data": "7.1.9",
187191
"mini-css-extract-plugin": "2.4.5"
188192
},
189193
"pnpm": {
@@ -192,5 +196,5 @@
192196
"mini-css-extract-plugin": "2.4.5"
193197
}
194198
},
195-
"packageManager": "pnpm@10.32.0+sha512.9b2634bb3fed5601c33633f2d92593f506270a3963b8c51d2b2d6a828da615ce4e9deebef9614ccebbc13ac8d3c0f9c9ccceb583c69c8578436fa477dbb20d70"
199+
"packageManager": "pnpm@10.34.1+sha512.b58fbde6dca66a929538021581f648b4570b6ca19b18e7cbd7f2c07a7b24454155388dacdf08f2af3678e88a6d1fe04f9d609df24bf51735a060ea041b374ab7"
196200
}

0 commit comments

Comments
 (0)