Merge branch 'paid-plan' of github.com:bharatkashyap/mui-toolpad into…

… paid-plan
mui · Feb 1, 2024 · 0a1bfad · 0a1bfad
2 parents 9b8948e + d20347d
commit 0a1bfad
Show file tree

Hide file tree

Showing 11 changed files with 342 additions and 336 deletions.
diff --git a/docs/babel.config.js b/docs/babel.config.js
@@ -4,28 +4,12 @@ const { version: transformRuntimeVersion } = fse.readJSONSync(
   require.resolve('@babel/runtime-corejs2/package.json'),
 );
 
-const errorCodesPath = require.resolve('@mui/monorepo/docs/public/static/error-codes.json');
-const missingError = process.env.MUI_EXTRACT_ERROR_CODES === 'true' ? 'write' : 'annotate';
-
-const muiErrorMacro = require.resolve('@mui/monorepo/packages/mui-babel-macros/MuiError.macro');
-
 module.exports = {
   presets: [
     // backport of https://github.com/zeit/next.js/pull/9511
     ['next/babel', { 'transform-runtime': { corejs: 2, version: transformRuntimeVersion } }],
   ],
   plugins: [
-    [
-      'babel-plugin-macros',
-      {
-        muiError: {
-          errorCodesPath,
-          missingError,
-        },
-        // TODO: Figure out dependency resolution for macros so this hack isn't needed.
-        resolvePath: () => muiErrorMacro,
-      },
-    ],
     'babel-plugin-optimize-clsx',
     // for IE 11 support
     '@babel/plugin-transform-object-assign',

diff --git a/docs/next.config.mjs b/docs/next.config.mjs
@@ -14,24 +14,8 @@ const { findPages } = require('./src/modules/utils/find');
 
 const MONOREPO_PATH = path.resolve(currentDirectory, '../node_modules/@mui/monorepo');
 const MONOREPO_PACKAGES = {
-  '@mui/base': path.resolve(MONOREPO_PATH, './packages/mui-base/src'),
-  '@mui/codemod': path.resolve(MONOREPO_PATH, './packages/mui-codemod/src'),
   '@mui/docs': path.resolve(MONOREPO_PATH, './packages/mui-docs/src'),
-  '@mui/envinfo': path.resolve(MONOREPO_PATH, './packages/mui-envinfo'),
-  '@mui/icons-material': path.resolve(MONOREPO_PATH, './packages/mui-icons-material/lib'),
-  '@mui/joy': path.resolve(MONOREPO_PATH, './packages/mui-joy/src'),
-  '@mui/lab': path.resolve(MONOREPO_PATH, './packages/mui-lab/src'),
-  '@mui/material': path.resolve(MONOREPO_PATH, './packages/mui-material/src'),
-  '@mui/material-next': path.resolve(MONOREPO_PATH, './packages/mui-material-next/src'),
-  '@mui/material-nextjs': path.resolve(MONOREPO_PATH, './packages/mui-material-nextjs/src'),
-  '@mui/private-theming': path.resolve(MONOREPO_PATH, './packages/mui-private-theming/src'),
-  '@mui/styled-engine': path.resolve(MONOREPO_PATH, './packages/mui-styled-engine/src'),
-  '@mui/styled-engine-sc': path.resolve(MONOREPO_PATH, './packages/mui-styled-engine-sc/src'),
-  '@mui/styles': path.resolve(MONOREPO_PATH, './packages/mui-styles'),
-  '@mui/system': path.resolve(MONOREPO_PATH, './packages/mui-system/src'),
-  '@mui/types': path.resolve(MONOREPO_PATH, './packages/mui-types'),
   '@mui/markdown': path.resolve(MONOREPO_PATH, './packages/markdown'),
-  '@mui/utils': path.resolve(MONOREPO_PATH, './packages/mui-utils/src'),
 };
 
 export default withDocsInfra({
@@ -88,6 +72,11 @@ export default withDocsInfra({
               },
             ],
           },
+          {
+            test: /\.+(js|jsx|mjs|ts|tsx)$/,
+            include: [/(@mui[\\/]monorepo)$/, /(@mui[\\/]monorepo)[\\/](?!.*node_modules)/],
+            use: options.defaultLoaders.babel,
+          },
         ]),
       },
     };

diff --git a/docs/package.json b/docs/package.json
@@ -26,15 +26,16 @@
     "@emotion/react": "11.11.3",
     "@emotion/server": "11.11.0",
     "@emotion/styled": "11.11.0",
-    "@mui/icons-material": "5.15.6",
-    "@mui/lab": "5.0.0-alpha.162",
-    "@mui/material": "5.15.6",
-    "@mui/material-nextjs": "^5.15.6",
+    "@mui/icons-material": "5.15.7",
+    "@mui/joy": "5.0.0-beta.25",
+    "@mui/lab": "5.0.0-alpha.163",
+    "@mui/material": "5.15.7",
+    "@mui/material-nextjs": "^5.15.7",
     "@mui/monorepo": "github:mui/material-ui#ef823704f3e956ba7815b5301da5d589cd2e5e13",
-    "@mui/styles": "5.15.6",
+    "@mui/styles": "5.15.7",
     "@mui/toolpad": "workspace:*",
-    "@mui/utils": "5.15.6",
-    "@mui/x-data-grid-pro": "6.19.2",
+    "@mui/utils": "5.15.7",
+    "@mui/x-data-grid-pro": "6.19.3",
     "@trendmicro/react-interpolate": "0.5.5",
     "@types/lodash": "4.14.202",
     "@types/react-dom": "18.2.18",
@@ -93,7 +94,6 @@
     "@types/doctrine": "0.0.9",
     "@types/json-schema": "7.0.15",
     "@types/react-is": "18.2.4",
-    "babel-plugin-macros": "3.1.0",
     "cpy-cli": "5.0.0",
     "cross-fetch": "4.0.0",
     "gm": "1.25.0",

diff --git a/examples/react-pages/package.json b/examples/react-pages/package.json
@@ -8,9 +8,9 @@
     "start": "toolpad start"
   },
   "dependencies": {
-    "@mui/material": "5.15.6",
+    "@mui/material": "5.15.7",
     "@mui/toolpad": "0.1.48",
-    "@mui/x-data-grid": "6.19.2",
+    "@mui/x-data-grid": "6.19.3",
     "@tanstack/react-query": "5.17.19"
   },
   "devDependencies": {}

diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
   "devDependencies": {
     "@argos-ci/core": "1.5.1",
     "@mui/monorepo": "github:mui/material-ui#ef823704f3e956ba7815b5301da5d589cd2e5e13",
-    "@mui/x-charts": "6.19.1",
+    "@mui/x-charts": "6.19.3",
     "@next/eslint-plugin-next": "14.1.0",
     "@playwright/test": "1.41.1",
     "@testing-library/react": "14.1.2",

diff --git a/packages/toolpad-app/package.json b/packages/toolpad-app/package.json
@@ -48,20 +48,20 @@
     "@emotion/styled": "11.11.0",
     "@googleapis/drive": "8.6.0",
     "@googleapis/sheets": "5.0.5",
-    "@mui/icons-material": "5.15.6",
-    "@mui/lab": "5.0.0-alpha.162",
-    "@mui/material": "5.15.6",
-    "@mui/system": "5.15.6",
+    "@mui/icons-material": "5.15.7",
+    "@mui/lab": "5.0.0-alpha.163",
+    "@mui/material": "5.15.7",
+    "@mui/system": "5.15.7",
     "@mui/toolpad-components": "workspace:*",
     "@mui/toolpad-core": "workspace:*",
     "@mui/toolpad-utils": "workspace:*",
     "@mui/types": "7.2.13",
-    "@mui/utils": "5.15.6",
-    "@mui/x-charts": "6.19.1",
-    "@mui/x-data-grid": "6.19.2",
-    "@mui/x-data-grid-pro": "6.19.2",
-    "@mui/x-date-pickers": "6.19.2",
-    "@mui/x-date-pickers-pro": "6.19.2",
+    "@mui/utils": "5.15.7",
+    "@mui/x-charts": "6.19.3",
+    "@mui/x-data-grid": "6.19.3",
+    "@mui/x-data-grid-pro": "6.19.3",
+    "@mui/x-date-pickers": "6.19.3",
+    "@mui/x-date-pickers-pro": "6.19.3",
     "@mui/x-tree-view": "6.17.0",
     "@tanstack/react-query": "5.17.19",
     "@tanstack/react-query-devtools": "5.17.21",

diff --git a/packages/toolpad-app/src/toolpad/AppEditor/BindingEditor.tsx b/packages/toolpad-app/src/toolpad/AppEditor/BindingEditor.tsx
@@ -536,8 +536,11 @@ export function BindingEditorDialog<V>({
         (input as JsExpressionAttrValue).$$jsExpression,
         data!,
       );
+      // Remove trailing spaces, newline characters for cleanliness and
+      // trailing semicolons since they introduce crashes while evaluation
+      const cleanedExpression = jsExpression.trim().replace(/;*$/, '');
       newValue = {
-        $$jsExpression: jsExpression,
+        $$jsExpression: cleanedExpression,
       };
     }
 

diff --git a/packages/toolpad-components/package.json b/packages/toolpad-components/package.json
@@ -35,14 +35,14 @@
     "url": "https://github.com/mui/mui-toolpad/issues"
   },
   "dependencies": {
-    "@mui/icons-material": "5.15.6",
-    "@mui/lab": "5.0.0-alpha.162",
-    "@mui/material": "5.15.6",
+    "@mui/icons-material": "5.15.7",
+    "@mui/lab": "5.0.0-alpha.163",
+    "@mui/material": "5.15.7",
     "@mui/toolpad-core": "workspace:*",
     "@mui/toolpad-utils": "workspace:*",
-    "@mui/x-charts": "6.19.1",
-    "@mui/x-data-grid-pro": "6.19.2",
-    "@mui/x-date-pickers": "6.19.2",
+    "@mui/x-charts": "6.19.3",
+    "@mui/x-data-grid-pro": "6.19.3",
+    "@mui/x-date-pickers": "6.19.3",
     "@mui/x-license-pro": "6.10.2",
     "@tanstack/react-query": "5.17.19",
     "dayjs": "1.11.10",

diff --git a/packages/toolpad-core/package.json b/packages/toolpad-core/package.json
@@ -41,7 +41,7 @@
     "url": "https://github.com/mui/mui-toolpad/issues"
   },
   "dependencies": {
-    "@mui/material": "5.15.6",
+    "@mui/material": "5.15.7",
     "@mui/toolpad-utils": "workspace:*",
     "@tanstack/react-query": "5.17.19",
     "@types/json-schema": "7.0.15",