Merge branch 'master' of github.com:mui/mui-toolpad into renovate/react

mui · Jan 13, 2025 · 65acba9 · 65acba9
2 parents 56391f1 + 603f288
commit 65acba9
Show file tree

Hide file tree

Showing 11 changed files with 94 additions and 47 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@babb554ede22fd5605947329c4d04d8e7a0b8155 # v3.27.7
+        uses: github/codeql-action/init@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
         with:
           languages: typescript
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -29,4 +29,4 @@ jobs:
           # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
           # queries: security-extended,security-and-quality
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@babb554ede22fd5605947329c4d04d8e7a0b8155 # v3.27.7
+        uses: github/codeql-action/analyze@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
diff --git a/.github/workflows/maintenance.yml b/.github/workflows/maintenance.yml
@@ -29,7 +29,7 @@ jobs:
     steps:
       - run: echo "${{ github.actor }}"
       - name: check if prs are dirty
-        uses: eps1lon/actions-label-merge-conflict@1b1b1fcde06a9b3d089f3464c96417961dde1168 # v3.0.2
+        uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3.0.3
         with:
           dirtyLabel: 'PR: out-of-date'
           removeOnDirtyLabel: 'PR: ready to ship'

diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -44,6 +44,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: Upload to code-scanning
-        uses: github/codeql-action/upload-sarif@babb554ede22fd5605947329c4d04d8e7a0b8155 # v3.27.7
+        uses: github/codeql-action/upload-sarif@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
         with:
           sarif_file: results.sarif
diff --git a/docs/package.json b/docs/package.json
@@ -65,7 +65,7 @@
     "jss-rtl": "0.3.0",
     "lodash": "4.17.21",
     "lz-string": "1.5.0",
-    "markdown-to-jsx": "7.7.0",
+    "markdown-to-jsx": "7.7.3",
     "next": "^15.1.3",
     "nprogress": "0.2.0",
     "postcss": "8.4.49",
@@ -98,7 +98,7 @@
     "@types/doctrine": "0.0.9",
     "@types/json-schema": "7.0.15",
     "@types/react": "^19.0.6",
-    "@types/react-dom": "^19.0.0",
+    "@types/react-dom": "^19.0.3",
     "@types/react-is": "^19.0.0",
     "@types/react-swipeable-views": "^0.13.6",
     "cpy-cli": "5.0.0",

diff --git a/packages/toolpad-core/package.json b/packages/toolpad-core/package.json
@@ -70,7 +70,7 @@
     "@types/invariant": "2.2.37",
     "@types/prop-types": "15.7.14",
     "@types/react": "^19.0.6",
-    "@types/react-dom": "^19.0.0",
+    "@types/react-dom": "^19.0.3",
     "@types/sinon": "^17.0.3",
     "@vitest/browser": "2.1.8",
     "next": "^15.1.3",

diff --git a/packages/toolpad-studio-components/package.json b/packages/toolpad-studio-components/package.json
@@ -53,7 +53,7 @@
     "@toolpad/utils": "workspace:*",
     "dayjs": "1.11.13",
     "invariant": "2.2.4",
-    "markdown-to-jsx": "7.7.0",
+    "markdown-to-jsx": "7.7.3",
     "react-error-boundary": "4.0.13",
     "react-hook-form": "7.53.2"
   },

diff --git a/packages/toolpad-studio/package.json b/packages/toolpad-studio/package.json
@@ -101,7 +101,7 @@
     "dotenv": "16.4.7",
     "esbuild": "0.24.2",
     "execa": "9.5.2",
-    "express": "4.21.1",
+    "express": "4.21.2",
     "find-up": "7.0.0",
     "fractional-indexing": "3.2.0",
     "get-port": "7.1.0",
@@ -113,7 +113,7 @@
     "json5": "2.2.3",
     "latest-version": "9.0.0",
     "lodash-es": "4.17.21",
-    "markdown-to-jsx": "7.7.0",
+    "markdown-to-jsx": "7.7.3",
     "mime": "4.0.4",
     "monaco-editor": "0.52.0",
     "mysql2": "3.11.4",
@@ -163,7 +163,7 @@
     "@types/node-fetch": "2.6.12",
     "@types/pg": "8.11.10",
     "@types/react": "^19.0.6",
-    "@types/react-dom": "^19.0.0",
+    "@types/react-dom": "^19.0.3",
     "@types/react-is": "^19.0.0",
     "@types/semver": "7.5.8",
     "@types/serialize-javascript": "5.0.4",

diff --git a/playground/nextjs-pages/package.json b/playground/nextjs-pages/package.json
@@ -14,7 +14,7 @@
     "@mui/material-nextjs": "6.3.1",
     "@toolpad/core": "workspace:*",
     "@types/react": "^19.0.6",
-    "@types/react-dom": "^19.0.0",
+    "@types/react-dom": "^19.0.3",
     "eslint-config-next": "15.1.3",
     "next": "15.1.3",
     "next-auth": "5.0.0-beta.25",

diff --git a/playground/nextjs/package.json b/playground/nextjs/package.json
@@ -15,7 +15,7 @@
     "@toolpad/core": "workspace:*",
     "@types/node": "^20.17.12",
     "@types/react": "^19.0.6",
-    "@types/react-dom": "^19.0.0",
+    "@types/react-dom": "^19.0.3",
     "eslint-config-next": "15.1.3",
     "next": "15.1.3",
     "next-auth": "5.0.0-beta.25",

diff --git a/playground/vite/package.json b/playground/vite/package.json
@@ -14,7 +14,7 @@
     "@mui/material": "6.3.1",
     "@toolpad/core": "workspace:*",
     "@types/react": "^19.0.6",
-    "@types/react-dom": "^19.0.0",
+    "@types/react-dom": "^19.0.3",
     "@vitejs/plugin-react": "4.3.4",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",