Skip to content

Commit

Permalink
Merge branch 'development' into itsWindows11/fix-invalid-connections
Browse files Browse the repository at this point in the history
  • Loading branch information
@itsWindows11
itsWindows11 authored Oct 14, 2024
2 parents 7fa0e28 + 4b8dc4a commit 798873b
Show file tree
Hide file tree
Showing 9 changed files with 496 additions and 681 deletions.
20 changes: 10 additions & 10 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,27 @@
"**/*.{js,ts,tsx}": "eslint --fix"
},
"devDependencies": {
"@eslint/js": "^9.10.0",
"@eslint/js": "^9.12.0",
"@types/lodash": "^4.17.10",
"@types/node": "^22.7.4",
"@typescript-eslint/eslint-plugin": "^8.6.0",
"@typescript-eslint/parser": "^8.6.0",
"eslint": "^8.57.1",
"@types/node": "^22.7.5",
"@typescript-eslint/eslint-plugin": "^8.8.1",
"@typescript-eslint/parser": "^8.8.1",
"eslint": "^9.12.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-jsx-a11y": "^6.10.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react": "^7.37.1",
"husky": "^9.1.6",
"lerna": "^8.1.8",
"lint-staged": "^15.2.10",
"prettier": "^3.3.3",
"tsconfig-paths": "^4.2.0",
"typescript": "^5.6.2"
"typescript": "^5.6.3"
},
"packageManager": "[email protected]+sha512.73a29afa36a0d092ece5271de5177ecbf8318d454ecd701343131b8ebc0c1a91c487da46ab77c8e596d6acf1461e3594ced4becedf8921b074fbd8653ed7051c",
"dependencies": {
"chalk": "4",
"chalk": "^5.3.0",
"tslib": "2.7.0"
}
}
2 changes: 1 addition & 1 deletion packages/blocks/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
"@types/lodash": "^4.17.10",
"jest": "^29.7.0",
"ts-jest": "^29.2.5",
"typescript": "^5.6.2"
"typescript": "^5.6.3"
}
}
96 changes: 48 additions & 48 deletions packages/client/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,44 +14,43 @@
"tslib": "^1.14.1"
},
"dependencies": {
"reflect-metadata": "^0.1.13",
"@data-river/editor": "workspace:*",
"@data-river/execution-engine": "workspace:*",
"@hookform/resolvers": "^3.9.0",
"@radix-ui/primitive": "^1.1.0",
"@radix-ui/react-accordion": "^1.2.0",
"@radix-ui/react-alert-dialog": "^1.1.1",
"@radix-ui/react-accordion": "^1.2.1",
"@radix-ui/react-alert-dialog": "^1.1.2",
"@radix-ui/react-aspect-ratio": "^1.1.0",
"@radix-ui/react-avatar": "^1.1.0",
"@radix-ui/react-checkbox": "^1.1.1",
"@radix-ui/react-collapsible": "^1.1.0",
"@radix-ui/react-context-menu": "^2.2.1",
"@radix-ui/react-dialog": "^1.1.1",
"@radix-ui/react-dropdown-menu": "^2.1.1",
"@radix-ui/react-hover-card": "^1.1.1",
"@radix-ui/react-avatar": "^1.1.1",
"@radix-ui/react-checkbox": "^1.1.2",
"@radix-ui/react-collapsible": "^1.1.1",
"@radix-ui/react-context-menu": "^2.2.2",
"@radix-ui/react-dialog": "^1.1.2",
"@radix-ui/react-dropdown-menu": "^2.1.2",
"@radix-ui/react-hover-card": "^1.1.2",
"@radix-ui/react-icons": "^1.3.0",
"@radix-ui/react-label": "^2.1.0",
"@radix-ui/react-menubar": "^1.1.1",
"@radix-ui/react-navigation-menu": "^1.2.0",
"@radix-ui/react-popover": "^1.1.1",
"@radix-ui/react-menubar": "^1.1.2",
"@radix-ui/react-navigation-menu": "^1.2.1",
"@radix-ui/react-popover": "^1.1.2",
"@radix-ui/react-progress": "^1.1.0",
"@radix-ui/react-radio-group": "^1.2.0",
"@radix-ui/react-scroll-area": "^1.1.0",
"@radix-ui/react-select": "^2.1.1",
"@radix-ui/react-radio-group": "^1.2.1",
"@radix-ui/react-scroll-area": "^1.2.0",
"@radix-ui/react-select": "^2.1.2",
"@radix-ui/react-separator": "^1.1.0",
"@radix-ui/react-slider": "^1.2.0",
"@radix-ui/react-slider": "^1.2.1",
"@radix-ui/react-slot": "^1.1.0",
"@radix-ui/react-switch": "^1.1.0",
"@radix-ui/react-tabs": "^1.1.0",
"@radix-ui/react-toast": "^1.2.1",
"@radix-ui/react-switch": "^1.1.1",
"@radix-ui/react-tabs": "^1.1.1",
"@radix-ui/react-toast": "^1.2.2",
"@radix-ui/react-toggle": "^1.1.0",
"@radix-ui/react-toggle-group": "^1.1.0",
"@radix-ui/react-tooltip": "^1.1.2",
"@remix-run/node": "^2.12.1",
"@remix-run/react": "^2.12.1",
"@remix-run/router": "^1.19.2",
"@remix-run/serve": "^2.12.1",
"@remix-run/server-runtime": "^2.12.1",
"@radix-ui/react-tooltip": "^1.1.3",
"@remix-run/node": "^2.13.1",
"@remix-run/react": "^2.13.1",
"@remix-run/router": "^1.20.0",
"@remix-run/serve": "^2.13.1",
"@remix-run/server-runtime": "^2.13.1",
"@types/set-cookie-parser": "^2.4.10",
"@web3-storage/multipart-parser": "^1.0.0",
"class-variance-authority": "^0.7.0",
Expand All @@ -60,45 +59,46 @@
"date-fns": "^4.1.0",
"embla-carousel-react": "^8.3.0",
"input-otp": "^1.2.4",
"isbot": "^4.4.0",
"lucide-react": "^0.447.0",
"isbot": "^5.1.17",
"lucide-react": "^0.452.0",
"next-themes": "^0.3.0",
"react": "^18.3.1",
"react-day-picker": "8.10.1",
"react-day-picker": "9.1.3",
"react-dom": "^18.3.1",
"react-hook-form": "^7.53.0",
"react-resizable-panels": "^2.1.3",
"react-router": "^6.26.2",
"react-router-dom": "^6.26.2",
"react-resizable-panels": "^2.1.4",
"react-router": "^6.27.0",
"react-router-dom": "^6.27.0",
"reactflow": "^11.11.4",
"recharts": "^2.12.7",
"recharts": "^2.13.0",
"reflect-metadata": "^0.2.2",
"scheduler": "^0.23.2",
"set-cookie-parser": "^2.7.0",
"sonner": "^1.5.0",
"tailwind-merge": "^2.5.2",
"tailwind-merge": "^2.5.3",
"tailwindcss-animate": "^1.0.7",
"turbo-stream": "^2.4.1",
"vaul": "^0.9.4",
"vaul": "^1.1.0",
"zod": "^3.23.8"
},
"devDependencies": {
"@remix-run/dev": "^2.12.1",
"@types/react": "^18.3.8",
"@types/react-dom": "^18.3.0",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"@remix-run/dev": "^2.13.1",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.1",
"@typescript-eslint/eslint-plugin": "^8.8.1",
"@typescript-eslint/parser": "^8.8.1",
"autoprefixer": "^10.4.20",
"eslint": "^8.57.1",
"eslint": "^9.12.0",
"eslint-import-resolver-typescript": "^3.6.3",
"eslint-plugin-import": "^2.30.0",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-jsx-a11y": "^6.10.0",
"eslint-plugin-react": "^7.36.1",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react": "^7.37.1",
"eslint-plugin-react-hooks": "^5.0.0",
"postcss": "^8.4.47",
"tailwindcss": "^3.4.12",
"typescript": "^5.6.2",
"vite": "^5.4.7",
"vite-tsconfig-paths": "^4.3.2"
"tailwindcss": "^3.4.13",
"typescript": "^5.6.3",
"vite": "^5.4.8",
"vite-tsconfig-paths": "^5.0.1"
},
"engines": {
"node": ">=20.0.0"
Expand Down
14 changes: 7 additions & 7 deletions packages/editor/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,28 @@
"@data-river/blocks": "workspace:*",
"@data-river/execution-engine": "workspace:*",
"@data-river/shared": "workspace:*",
"@radix-ui/react-dialog": "^1.1.1",
"@radix-ui/react-dialog": "^1.1.2",
"@radix-ui/react-icons": "^1.3.0",
"@radix-ui/react-slot": "^1.1.0",
"@reduxjs/toolkit": "^2.2.7",
"@reduxjs/toolkit": "^2.2.8",
"@types/lodash.debounce": "^4.0.9",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1",
"lodash.debounce": "^4.0.8",
"lucide-react": "^0.441.0",
"lucide-react": "^0.452.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-hotkeys-hook": "^4.5.1",
"react-redux": "^9.1.2",
"reactflow": "^11.11.4",
"tailwind-merge": "^2.5.2",
"tailwind-merge": "^2.5.3",
"tailwindcss-animate": "^1.0.7",
"typescript": "^5.6.2"
"typescript": "^5.6.3"
},
"devDependencies": {
"@types/jest": "^29.5.13",
"@types/react": "^18.2.20",
"@types/react-dom": "^18.2.7",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.1",
"jest": "^29.7.0",
"ts-jest": "^29.2.5"
}
Expand Down
6 changes: 3 additions & 3 deletions packages/execution-engine/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
"dependencies": {
"@data-river/blocks": "workspace:*",
"@data-river/shared": "workspace:*",
"reflect-metadata": "^0.1.13",
"tsyringe": "^4.7.0",
"reflect-metadata": "^0.2.2",
"tsyringe": "^4.8.0",
"ws": "^8.18.0"
},
"devDependencies": {
"typescript": "^5.6.2"
"typescript": "^5.6.3"
}
}
6 changes: 3 additions & 3 deletions packages/server/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"dependencies": {
"@data-river/blocks": "workspace:*",
"@data-river/execution-engine": "workspace:*",
"@types/express": "^4.17.21",
"@types/express": "^5.0.0",
"@types/ws": "^8.5.12",
"cors": "^2.8.5",
"express": "^4.21.0",
"express": "^4.21.1",
"ws": "^8.18.0"
},
"devDependencies": {
Expand All @@ -21,6 +21,6 @@
"@types/jest": "^29.5.13",
"jest": "^29.7.0",
"ts-jest": "^29.2.5",
"typescript": "^5.6.2"
"typescript": "^5.6.3"
}
}
22 changes: 11 additions & 11 deletions packages/shared/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,24 @@
"dev": "tailwindcss -i ./src/tailwind.css -o ./dist/tailwind.css --watch"
},
"devDependencies": {
"tailwindcss": "^3.4.12",
"tailwindcss": "^3.4.13",
"tailwindcss-animate": "^1.0.7"
},
"dependencies": {
"@radix-ui/react-dialog": "^1.1.1",
"@radix-ui/react-dropdown-menu": "^2.1.1",
"@radix-ui/react-dialog": "^1.1.2",
"@radix-ui/react-dropdown-menu": "^2.1.2",
"@radix-ui/react-label": "^2.1.0",
"@radix-ui/react-scroll-area": "^1.1.0",
"@radix-ui/react-select": "^2.1.1",
"@radix-ui/react-scroll-area": "^1.2.0",
"@radix-ui/react-select": "^2.1.2",
"@radix-ui/react-separator": "^1.1.0",
"@radix-ui/react-slot": "^1.1.0",
"@radix-ui/react-tabs": "^1.1.0",
"@radix-ui/react-toast": "^1.2.1",
"@radix-ui/react-tooltip": "^1.1.2",
"@radix-ui/react-tabs": "^1.1.1",
"@radix-ui/react-toast": "^1.2.2",
"@radix-ui/react-tooltip": "^1.1.3",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1",
"lucide-react": "^0.441.0",
"react-resizable-panels": "^2.1.3",
"tailwind-merge": "^2.5.2"
"lucide-react": "^0.452.0",
"react-resizable-panels": "^2.1.4",
"tailwind-merge": "^2.5.3"
}
}
Loading

0 comments on commit 798873b

Please sign in to comment.