Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Janpot committed May 6, 2024
2 parents 2c067b0 + 250e2e4 commit d057f7e
Show file tree
Hide file tree
Showing 11 changed files with 343 additions and 330 deletions.
10 changes: 5 additions & 5 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
"typescript:transpile:dev": "cross-env BABEL_ENV=development babel-node --extensions \".tsx,.ts,.js\" scripts/formattedTSDemos --watch"
},
"dependencies": {
"@babel/core": "7.24.4",
"@babel/core": "7.24.5",
"@babel/plugin-transform-object-assign": "7.24.1",
"@babel/runtime-corejs2": "7.24.4",
"@babel/runtime-corejs2": "7.24.5",
"@date-io/date-fns-jalali": "3.0.0",
"@docsearch/react": "3.6.0",
"@emotion/cache": "11.11.0",
Expand All @@ -38,7 +38,7 @@
"@mui/x-license": "7.2.0",
"@toolpad/studio": "workspace:*",
"@trendmicro/react-interpolate": "0.5.5",
"@types/lodash": "4.17.0",
"@types/lodash": "4.17.1",
"@types/react-dom": "18.3.0",
"@types/react-router-dom": "5.3.3",
"ast-types": "0.14.2",
Expand Down Expand Up @@ -73,7 +73,7 @@
"react": "18.2.0",
"react-docgen": "7.0.3",
"react-dom": "18.2.0",
"react-hook-form": "7.51.3",
"react-hook-form": "7.51.4",
"react-is": "18.2.0",
"react-router": "6.22.3",
"react-router-dom": "6.22.3",
Expand All @@ -82,7 +82,7 @@
"react-transition-group": "4.4.5",
"recast": "0.23.6",
"rimraf": "5.0.5",
"styled-components": "6.1.8",
"styled-components": "6.1.9",
"stylis": "4.3.2",
"stylis-plugin-rtl": "npm:stylis-plugin-rtl@^2.1.1",
"stylis-plugin-rtl-sc": "npm:stylis-plugin-rtl@^2.1.1",
Expand Down
2 changes: 1 addition & 1 deletion docs/public/_redirects
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Avoid conflicts with the other Next.js apps hosted under https://mui.com/
/toolpad/_next/* /_next/:splat 301
/toolpad/_next/* /_next/:splat 200

# Legacy redirection
# 2022
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
"@types/archiver": "6.0.2",
"@types/gtag.js": "0.0.19",
"@types/invariant": "2.2.37",
"@types/node": "20.12.7",
"@typescript-eslint/eslint-plugin": "7.6.0",
"@typescript-eslint/parser": "7.6.0",
"@types/node": "20.12.8",
"@typescript-eslint/eslint-plugin": "7.8.0",
"@typescript-eslint/parser": "7.8.0",
"chalk": "5.3.0",
"eslint": "8.57.0",
"eslint-config-airbnb": "19.0.4",
Expand Down Expand Up @@ -81,7 +81,7 @@
"vitest-fail-on-console": "0.6.3"
},
"dependencies": {
"@types/lodash": "4.17.0",
"@types/lodash": "4.17.1",
"archiver": "7.0.1",
"cross-env": "7.0.3",
"dotenv-cli": "7.4.1",
Expand All @@ -92,17 +92,17 @@
"semver": "7.6.0",
"tsup": "8.0.2",
"tsx": "4.7.3",
"vitest": "1.5.2",
"vitest": "1.6.0",
"yargs": "17.7.2",
"zod": "3.22.4",
"zod-to-json-schema": "3.22.5"
},
"engines": {
"node": ">=18",
"pnpm": "8.15.7"
"pnpm": "8.15.8"
},
"resolutions": {
"google-auth-library": "*"
},
"packageManager": "pnpm@8.15.7"
"packageManager": "pnpm@8.15.8"
}
2 changes: 1 addition & 1 deletion packages/create-toolpad-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"devDependencies": {
"@types/inquirer": "9.0.7",
"@types/invariant": "2.2.37",
"@types/node": "20.12.7",
"@types/node": "20.12.8",
"@types/semver": "7.5.8",
"@types/tar": "6.1.13",
"@types/yargs": "17.0.32"
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin-material-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"devDependencies": {
"@types/eslint": "8.56.10",
"@typescript-eslint/parser": "7.6.0"
"@typescript-eslint/parser": "7.8.0"
},
"scripts": {},
"repository": {
Expand Down
6 changes: 3 additions & 3 deletions packages/toolpad-studio-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@
"@mui/x-data-grid-premium": "7.3.2",
"@mui/x-date-pickers": "7.3.2",
"@mui/x-license": "7.2.0",
"@tanstack/react-query": "5.29.2",
"@tanstack/react-query": "5.34.1",
"@toolpad/studio-runtime": "workspace:*",
"@toolpad/utils": "workspace:*",
"dayjs": "1.11.10",
"dayjs": "1.11.11",
"invariant": "2.2.4",
"markdown-to-jsx": "7.4.7",
"react-error-boundary": "4.0.13",
"react-hook-form": "7.51.3"
"react-hook-form": "7.51.4"
},
"devDependencies": {
"@types/invariant": "2.2.37",
Expand Down
2 changes: 1 addition & 1 deletion packages/toolpad-studio-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"dependencies": {
"@auth/core": "0.30.0",
"@mui/material": "5.15.16",
"@tanstack/react-query": "5.29.2",
"@tanstack/react-query": "5.34.1",
"@toolpad/utils": "workspace:*",
"@types/json-schema": "7.0.15",
"@webcontainer/env": "1.1.1",
Expand Down
28 changes: 14 additions & 14 deletions packages/toolpad-studio/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@emotion/react": "11.11.4",
"@emotion/server": "11.11.0",
"@emotion/styled": "11.11.5",
"@googleapis/drive": "8.7.0",
"@googleapis/drive": "8.8.0",
"@googleapis/sheets": "5.0.5",
"@mui/icons-material": "5.15.16",
"@mui/lab": "5.0.0-alpha.170",
Expand All @@ -56,14 +56,14 @@
"@mui/x-date-pickers": "7.3.2",
"@mui/x-date-pickers-pro": "7.3.2",
"@mui/x-tree-view": "7.3.1",
"@tanstack/react-query": "5.29.2",
"@tanstack/react-query-devtools": "5.29.2",
"@tanstack/react-query": "5.34.1",
"@tanstack/react-query-devtools": "5.34.1",
"@toolpad/studio-components": "workspace:*",
"@toolpad/studio-runtime": "workspace:*",
"@toolpad/utils": "workspace:*",
"@types/cors": "2.8.17",
"@types/json-schema": "7.0.15",
"@types/node": "20.12.7",
"@types/node": "20.12.8",
"@types/react-dev-utils": "9.0.15",
"@vitejs/plugin-react": "4.2.1",
"@webcontainer/env": "1.1.1",
Expand All @@ -75,7 +75,7 @@
"concurrently": "8.2.2",
"cors": "2.8.5",
"csstype": "3.1.3",
"dayjs": "1.11.10",
"dayjs": "1.11.11",
"dotenv": "16.4.5",
"esbuild": "0.20.2",
"execa": "8.0.1",
Expand All @@ -84,7 +84,7 @@
"fractional-indexing": "3.2.0",
"get-port": "7.1.0",
"glob": "10.3.12",
"google-auth-library": "9.7.0",
"google-auth-library": "9.9.0",
"http-proxy-middleware": "3.0.0",
"invariant": "2.2.4",
"json-to-ts": "1.7.0",
Expand All @@ -93,7 +93,7 @@
"lodash-es": "4.17.21",
"markdown-to-jsx": "7.4.7",
"mime": "4.0.3",
"monaco-editor": "0.47.0",
"monaco-editor": "0.48.0",
"mysql2": "3.9.7",
"nanoid": "5.0.7",
"node-fetch": "2.7.0",
Expand All @@ -109,21 +109,21 @@
"react-dev-utils": "12.0.1",
"react-dom": "18.2.0",
"react-error-boundary": "4.0.13",
"react-hook-form": "7.51.3",
"react-hook-form": "7.51.4",
"react-inspector": "6.0.2",
"react-is": "18.2.0",
"react-resizable-panels": "2.0.18",
"react-resizable-panels": "2.0.19",
"react-router-dom": "6.22.3",
"recharts": "2.12.6",
"semver": "7.6.0",
"serialize-javascript": "6.0.2",
"superjson": "2.0.0",
"typescript": "5.4.5",
"vite": "5.2.10",
"vite": "5.2.11",
"vm-browserify": "1.1.2",
"whatwg-url": "14.0.0",
"ws": "8.16.0",
"yaml": "2.4.1",
"ws": "8.17.0",
"yaml": "2.4.2",
"yaml-diff-patch": "2.0.0",
"yargs": "17.7.2",
"zod": "3.22.4",
Expand All @@ -139,7 +139,7 @@
"@types/invariant": "2.2.37",
"@types/lodash-es": "4.17.12",
"@types/node-fetch": "2.6.11",
"@types/pg": "8.11.5",
"@types/pg": "8.11.6",
"@types/react": "18.3.1",
"@types/react-dom": "18.3.0",
"@types/react-is": "18.3.0",
Expand All @@ -148,7 +148,7 @@
"@types/whatwg-url": "11.0.4",
"@types/ws": "8.5.10",
"@types/yargs": "17.0.32",
"ajv": "8.12.0",
"ajv": "8.13.0",
"eslint": "8.57.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-import": "2.29.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/toolpad-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"prettier": "3.2.5",
"react-is": "18.2.0",
"title": "3.5.3",
"yaml": "2.4.1",
"yaml": "2.4.2",
"yaml-diff-patch": "2.0.0"
},
"devDependencies": {
Expand Down
Loading

0 comments on commit d057f7e

Please sign in to comment.