Merge branch 'master' into master

mui · Jan 23, 2025 · a5b8124 · a5b8124
2 parents 7fc57a1 + 6820cec
commit a5b8124
Show file tree

Hide file tree

Showing 9 changed files with 143 additions and 134 deletions.
diff --git a/docs/package.json b/docs/package.json
@@ -66,7 +66,7 @@
     "lodash": "4.17.21",
     "lz-string": "1.5.0",
     "markdown-to-jsx": "7.7.3",
-    "next": "^15.1.4",
+    "next": "^15.1.5",
     "nprogress": "0.2.0",
     "postcss": "8.4.49",
     "prismjs": "1.29.0",

diff --git a/packages/toolpad-core/package.json b/packages/toolpad-core/package.json
@@ -73,7 +73,7 @@
     "@types/react-dom": "^19.0.3",
     "@types/sinon": "^17.0.3",
     "@vitest/browser": "2.1.8",
-    "next": "^15.1.4",
+    "next": "^15.1.5",
     "next-router-mock": "^0.9.13",
     "playwright": "^1.47.2",
     "react-router": "7.1.0",

diff --git a/packages/toolpad-studio/package.json b/packages/toolpad-studio/package.json
@@ -114,7 +114,7 @@
     "latest-version": "9.0.0",
     "lodash-es": "4.17.21",
     "markdown-to-jsx": "7.7.3",
-    "mime": "4.0.4",
+    "mime": "4.0.6",
     "monaco-editor": "0.52.0",
     "mysql2": "3.11.4",
     "nanoid": "5.0.9",
@@ -140,7 +140,7 @@
     "serialize-javascript": "6.0.2",
     "superjson": "2.0.0",
     "typescript": "5.5.4",
-    "vite": "5.4.11",
+    "vite": "5.4.12",
     "vm-browserify": "1.1.2",
     "whatwg-url": "14.0.0",
     "ws": "8.18.0",
@@ -154,7 +154,7 @@
     "@types/babel__code-frame": "7.0.6",
     "@types/compression": "^1.7.5",
     "@types/express": "5.0.0",
-    "@types/express-serve-static-core": "5.0.4",
+    "@types/express-serve-static-core": "5.0.5",
     "@types/formidable": "3.4.5",
     "@types/glob": "8.1.0",
     "@types/har-format": "1.2.16",

diff --git a/playground/nextjs-pages/package.json b/playground/nextjs-pages/package.json
@@ -15,8 +15,8 @@
     "@toolpad/core": "workspace:*",
     "@types/react": "^19.0.0",
     "@types/react-dom": "^19.0.3",
-    "eslint-config-next": "15.1.4",
-    "next": "^15.1.4",
+    "eslint-config-next": "15.1.5",
+    "next": "^15.1.5",
     "next-auth": "5.0.0-beta.25",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"

diff --git a/playground/nextjs/package.json b/playground/nextjs/package.json
@@ -16,8 +16,8 @@
     "@types/node": "^20.17.12",
     "@types/react": "^19.0.0",
     "@types/react-dom": "^19.0.3",
-    "eslint-config-next": "15.1.4",
-    "next": "^15.1.4",
+    "eslint-config-next": "15.1.5",
+    "next": "^15.1.5",
     "next-auth": "5.0.0-beta.25",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"

diff --git a/playground/vite/package.json b/playground/vite/package.json
@@ -19,6 +19,6 @@
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "react-router": "7.1.0",
-    "vite": "5.4.11"
+    "vite": "5.4.12"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test/integration/propControls/basic.spec.ts b/test/integration/propControls/basic.spec.ts
@@ -15,7 +15,13 @@ test.use({
   },
 });
 
-test('can control component prop values in properties control panel', async ({ page }) => {
+test('can control component prop values in properties control panel', async ({
+  page,
+  browserName,
+}) => {
+  // TODO: fix flakyness
+  test.skip(browserName === 'firefox', 'This test is flaky in firefox');
+
   const editorModel = new ToolpadEditor(page);
 
   await editorModel.goto();

diff --git a/test/integration/propControls/defaults.spec.ts b/test/integration/propControls/defaults.spec.ts
@@ -15,7 +15,10 @@ test.use({
   },
 });
 
-test('changing defaultValue resets controlled value', async ({ page }) => {
+test('changing defaultValue resets controlled value', async ({ page, browserName }) => {
+  // TODO: fix flakyness
+  test.skip(browserName === 'firefox', 'This test is flaky in firefox');
+
   const editorModel = new ToolpadEditor(page);
   await editorModel.goto();