Merge remote-tracking branch 'upstream/master'

.eslintrc.js

@@ -1,6 +1,6 @@
 const baseline = require('@mui/monorepo/.eslintrc');
-const lodash = require('lodash');
 const path = require('path');
+const lodash = require('lodash');
 
 const ALLOWED_LODASH_METHODS = new Set(['throttle', 'debounce', 'set']);
 

docs/next.config.mjs

@@ -14,13 +14,21 @@ const { findPages } = require('./src/modules/utils/find');
 
 const WORKSPACE_ROOT = path.resolve(currentDirectory, '../');
 const MONOREPO_PATH = path.resolve(currentDirectory, '../node_modules/@mui/monorepo');
+const MONOREPO_PACKAGES = {
+  '@mui/docs': path.resolve(MONOREPO_PATH, './packages/mui-docs/src'),
+};
 
 export default withDocsInfra({
   experimental: {
     workerThreads: true,
     cpus: 3,
   },
-  transpilePackages: ['@mui/monorepo', '@mui/x-charts', '@mui/docs'],
+  transpilePackages: [
+    '@mui/monorepo',
+    // TODO, those shouldn't be needed in the first place
+    '@mui/x-charts', // Fix ESM module support https://github.com/mui/mui-x/issues/9826#issuecomment-1658333978
+    '@mui/docs', // Fix trailingSlash support https://github.com/mui/mui-toolpad/pull/3301#issuecomment-2054213837
+  ],
   // Avoid conflicts with the other Next.js apps hosted under https://mui.com/
   assetPrefix: process.env.DEPLOY_ENV === 'development' ? undefined : '/toolpad',
   env: {
@@ -35,11 +43,21 @@ export default withDocsInfra({
   webpack: (config, options) => {
     return {
       ...config,
+      resolveLoader: {
+        ...config.resolveLoader,
+        alias: {
+          ...config.resolveLoader.alias,
+          '@mui/internal-markdown/loader': require.resolve(
+            '@mui/monorepo/packages/markdown/loader',
+          ),
+        },
+      },
       resolve: {
         ...config.resolve,
         alias: {
           ...config.resolve.alias,
           docs: path.resolve(MONOREPO_PATH, './docs'),
+          ...MONOREPO_PACKAGES,
           '@toolpad/studio-components': path.resolve(
             currentDirectory,
             '../packages/toolpad-studio-components/src',
@@ -63,7 +81,7 @@ export default withDocsInfra({
                 use: [
                   options.defaultLoaders.babel,
                   {
-                    loader: require.resolve('@mui/internal-markdown/loader'),
+                    loader: '@mui/internal-markdown/loader',
                     options: {
                       workspaceRoot: WORKSPACE_ROOT,
                       env: {

docs/package.json

@@ -26,13 +26,13 @@
     "@emotion/server": "11.11.0",
     "@emotion/styled": "11.11.5",
     "@mui/base": "5.0.0-beta.40",
-    "@mui/docs": "6.0.0-alpha.3",
+    "@mui/docs": "6.0.0-alpha.4",
     "@mui/icons-material": "5.15.15",
     "@mui/internal-markdown": "^1.0.1",
-    "@mui/joy": "5.0.0-beta.32",
+    "@mui/joy": "5.0.0-beta.36",
     "@mui/lab": "5.0.0-alpha.170",
     "@mui/material": "5.15.15",
-    "@mui/material-nextjs": "^5.15.11",
+    "@mui/material-nextjs": "5.15.11",
     "@mui/styles": "5.15.15",
     "@mui/utils": "5.15.14",
     "@mui/x-license": "7.2.0",
@@ -43,7 +43,7 @@
     "@types/react-router-dom": "5.3.3",
     "ast-types": "0.14.2",
     "autoprefixer": "10.4.19",
-    "babel-plugin-module-resolver": "5.0.0",
+    "babel-plugin-module-resolver": "5.0.2",
     "babel-plugin-optimize-clsx": "2.6.2",
     "babel-plugin-preval": "5.1.0",
     "babel-plugin-react-remove-properties": "0.3.0",
@@ -63,7 +63,7 @@
     "lodash": "4.17.21",
     "lz-string": "1.5.0",
     "markdown-to-jsx": "7.4.7",
-    "marked": "12.0.1",
+    "marked": "12.0.2",
     "next": "^14.2.1",
     "nprogress": "0.2.0",
     "postcss": "8.4.38",

eslintWebpackResolverConfig.js

@@ -5,6 +5,7 @@ module.exports = {
   resolve: {
     modules: [__dirname, 'node_modules'],
     alias: {
+      '@mui/docs': path.resolve(__dirname, './node_modules/@mui/monorepo/packages/mui-docs/src'),
       '@toolpad/studio-components': path.resolve(
         __dirname,
         './packages/toolpad-studio-components/src',

package.json

@@ -39,7 +39,7 @@
   },
   "devDependencies": {
     "@argos-ci/core": "1.5.5",
-    "@mui/monorepo": "github:mui/material-ui#f3cb496c999acbc8f19533e38df20be12e56d059",
+    "@mui/monorepo": "github:mui/material-ui#2d02b940af272f6a344c7ed954fdf791a7269424",
     "@mui/x-charts": "7.3.0",
     "@next/eslint-plugin-next": "14.2.1",
     "@playwright/test": "1.43.1",
@@ -60,7 +60,7 @@
     "eslint-plugin-import": "2.29.1",
     "eslint-plugin-jsx-a11y": "6.8.0",
     "eslint-plugin-material-ui": "workspace:*",
-    "eslint-plugin-mocha": "10.4.2",
+    "eslint-plugin-mocha": "10.4.3",
     "eslint-plugin-react": "7.34.1",
     "eslint-plugin-react-hooks": "4.6.0",
     "eslint-plugin-typescript-enum": "2.1.0",
@@ -86,7 +86,7 @@
     "cross-env": "7.0.3",
     "dotenv-cli": "7.4.1",
     "eslint-import-resolver-exports": "1.0.0-beta.5",
-    "inquirer": "9.2.18",
+    "inquirer": "9.2.19",
     "invariant": "2.2.4",
     "lodash": "4.17.21",
     "semver": "7.6.0",

packages/create-toolpad-app/package.json

@@ -33,7 +33,7 @@
     "@toolpad/utils": "workspace:*",
     "chalk": "5.3.0",
     "execa": "8.0.1",
-    "inquirer": "9.2.18",
+    "inquirer": "9.2.19",
     "invariant": "2.2.4",
     "semver": "7.6.0",
     "tar": "6.2.1",

packages/toolpad-studio/package.json

@@ -12,10 +12,7 @@
     "lint": "prettier --check .",
     "fix": "prettier --write .",
     "build:cli": "tsup",
-    "build:typings": "tsx ./scripts/typings.mts",
     "dev:cli": "tsup --watch",
-    "dev:typings": "pnpm build:typings",
-    "waitForApp": "tsx ./scripts/waitForApp.mts",
     "check-types": "tsup && tsc --noEmit",
     "test": "vitest run"
   },
@@ -71,7 +68,6 @@
     "@vitejs/plugin-react": "4.2.1",
     "@webcontainer/env": "1.1.1",
     "abort-controller": "3.0.0",
-    "arg": "5.0.2",
     "basic-auth": "2.0.1",
     "chalk": "5.3.0",
     "chokidar": "3.6.0",
@@ -98,7 +94,7 @@
     "markdown-to-jsx": "7.4.7",
     "mime": "4.0.1",
     "monaco-editor": "0.47.0",
-    "mysql2": "3.9.4",
+    "mysql2": "3.9.7",
     "nanoid": "5.0.7",
     "node-fetch": "2.7.0",
     "node-fetch-har": "1.0.1",
@@ -116,7 +112,7 @@
     "react-hook-form": "7.51.3",
     "react-inspector": "6.0.2",
     "react-is": "18.2.0",
-    "react-resizable-panels": "2.0.16",
+    "react-resizable-panels": "2.0.18",
     "react-router-dom": "6.22.3",
     "recharts": "2.12.5",
     "semver": "7.6.0",

packages/toolpad-studio/src/toolpadDataSources/local/client.tsx

@@ -6,9 +6,8 @@ import PlayArrowIcon from '@mui/icons-material/PlayArrow';
 import { TabContext, TabList } from '@mui/lab';
 import { useBrowserJsRuntime } from '@toolpad/studio-runtime/jsBrowserRuntime';
 import { errorFrom } from '@toolpad/utils/errors';
-
 import { useQuery } from '@tanstack/react-query';
-import Grid2 from '@mui/material/Unstable_Grid2/Grid2';
+import Grid2 from '@mui/material/Unstable_Grid2';
 import TabPanel from '../../components/TabPanel';
 import { ClientDataSource, QueryEditorProps } from '../../types';
 import { LocalPrivateApi, LocalQuery, LocalConnectionParams } from './types';