[core] Port fixes from Material UI v6 migration branch (#3910)

mui · Aug 9, 2024 · 28ba0e8 · 28ba0e8
1 parent a74365e
commit 28ba0e8
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -122,6 +122,8 @@ jobs:
       - run:
           name: Check Typescript types
           command: pnpm check-types
+          environment:
+            NODE_OPTIONS: --max-old-space-size=3584
   test_static:
     <<: *default-job
     steps:
@@ -163,6 +165,8 @@ jobs:
       - run:
           name: 'Build packages'
           command: pnpm release:build
+          environment:
+            NODE_OPTIONS: --max-old-space-size=3584
       - run:
           name: Tests fake browser
           command: pnpm test
@@ -182,6 +186,8 @@ jobs:
       - run:
           name: 'Build packages'
           command: pnpm release:build
+          environment:
+            NODE_OPTIONS: --max-old-space-size=3584
       - run:
           name: Tests real browser
           command: pnpm test:browser
@@ -203,6 +209,8 @@ jobs:
       - run:
           name: 'Build packages'
           command: pnpm release:build
+          environment:
+            NODE_OPTIONS: --max-old-space-size=3584
       - run:
           name: Tests real browser
           command: pnpm test:integration

diff --git a/examples/core-auth-nextjs-pages/package.json b/examples/core-auth-nextjs-pages/package.json
@@ -14,7 +14,7 @@
     "@mui/material-nextjs": "next",
     "@toolpad/core": "latest",
     "next": "14.2.4",
-    "next-auth": "beta",
+    "next-auth": "5.0.0-beta.20",
     "react": "18.3.1",
     "react-dom": "18.3.1"
   },

diff --git a/examples/core-auth-nextjs/package.json b/examples/core-auth-nextjs/package.json
@@ -14,7 +14,7 @@
     "@mui/material-nextjs": "next",
     "@toolpad/core": "latest",
     "next": "14.2.4",
-    "next-auth": "beta",
+    "next-auth": "5.0.0-beta.20",
     "react": "18.3.1",
     "react-dom": "18.3.1"
   },

diff --git a/examples/core-tutorial/theme.ts b/examples/core-tutorial/theme.ts
@@ -2,6 +2,9 @@
 import { createTheme } from '@mui/material/styles';
 
 const theme = createTheme({
+  cssVariables: {
+    colorSchemeSelector: 'data-toolpad-color-scheme',
+  },
   colorSchemes: {
     light: {
       palette: {

diff --git a/package.json b/package.json
@@ -33,7 +33,7 @@
     "test:browser": "FORCE_COLOR=1 pnpm run -r test:browser",
     "test:argos": "node ./scripts/pushArgos.mjs",
     "test": "lerna run test --stream",
-    "check-types": "lerna run check-types",
+    "check-types": "lerna run --concurrency 1 check-types",
     "toolpad-studio": "node --enable-source-maps packages/toolpad-studio/cli.mjs",
     "jsonSchemas": "tsx ./scripts/docs/generateJsonSchemas.ts",
     "update-monorepo": "tsx ./scripts/updateMonorepo.ts",

diff --git a/playground/nextjs-pages/package.json b/playground/nextjs-pages/package.json
@@ -17,7 +17,7 @@
     "@types/react-dom": "18.3.0",
     "eslint-config-next": "14.2.5",
     "next": "14.2.5",
-    "next-auth": "beta",
+    "next-auth": "5.0.0-beta.20",
     "react": "18.3.1",
     "react-dom": "18.3.1"
   }

diff --git a/playground/nextjs-pages/src/auth.ts b/playground/nextjs-pages/src/auth.ts
@@ -20,7 +20,7 @@ const providers: Provider[] = [
       return {
         id: 'test',
         name: 'Test User',
-        email: c.email,
+        email: String(c.email),
       };
     },
   }),

diff --git a/playground/nextjs/package.json b/playground/nextjs/package.json
@@ -19,7 +19,7 @@
     "@types/react-dom": "18.3.0",
     "eslint-config-next": "14.2.5",
     "next": "14.2.5",
-    "next-auth": "beta",
+    "next-auth": "5.0.0-beta.20",
     "react": "18.3.1",
     "react-dom": "18.3.1"
   }

diff --git a/playground/nextjs/src/auth.ts b/playground/nextjs/src/auth.ts
@@ -20,7 +20,7 @@ const providers: Provider[] = [
       return {
         id: 'test',
         name: 'Test User',
-        email: c.email,
+        email: String(c.email),
       };
     },
   }),

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml