Merge branch 'master' into issue-26440-renderTags-when-multiple-false

Author: ZeeshanTamboli

docs/pages/_app.js

@@ -6,10 +6,10 @@ import NextHead from 'next/head';
 import PropTypes from 'prop-types';
 import { useRouter } from 'next/router';
 import { LicenseInfo } from '@mui/x-license';
-import materialPkgJson from 'packages/mui-material/package.json';
-import joyPkgJson from 'packages/mui-joy/package.json';
-import systemPkgJson from 'packages/mui-system/package.json';
-import basePkgJson from 'packages/mui-base/package.json';
+import materialPkgJson from '@mui/material/package.json';
+import joyPkgJson from '@mui/joy/package.json';
+import systemPkgJson from '@mui/system/package.json';
+import basePkgJson from '@mui/base/package.json';
 import generalDocsPages from 'docs/data/docs/pages';
 import basePages from 'docs/data/base/pages';
 import docsInfraPages from 'docs/data/docs-infra/pages';

docs/tsconfig.json

@@ -5,6 +5,7 @@
     "isolatedModules": true,
     "moduleResolution": "bundler",
     /* files are emitted by babel */
+    "baseUrl": "../",
     "noEmit": true,
     "noUnusedLocals": true,
     "resolveJsonModule": true,

tsconfig.json

@@ -15,6 +15,7 @@
     "allowJs": true,
     "paths": {
       "@mui/material": ["./packages/mui-material/src"],
+      "@mui/material/package.json": ["./packages/mui-material/package.json"],
       "@mui/material/*": ["./packages/mui-material/src/*"],
       "@mui/lab": ["./packages/mui-lab/src"],
       "@mui/lab/*": ["./packages/mui-lab/src/*"],
@@ -25,11 +26,13 @@
       "@mui/styled-engine-sc": ["./packages/mui-styled-engine-sc/src"],
       "@mui/styled-engine-sc/*": ["./packages/mui-styled-engine-sc/src/*"],
       "@mui/system": ["./packages/mui-system/src"],
+      "@mui/system/package.json": ["./packages/mui-system/package.json"],
       "@mui/system/*": ["./packages/mui-system/src/*"],
       "@mui/types": ["./packages/mui-types/src"],
       "@mui/private-theming": ["./packages/mui-private-theming/src"],
       "@mui/private-theming/*": ["./packages/mui-private-theming/src/*"],
       "@mui/base": ["./packages/mui-base/src"],
+      "@mui/base/package.json": ["./packages/mui-base/package.json"],
       "@mui/base/*": ["./packages/mui-base/src/*"],
       "@mui/utils": ["./packages/mui-utils/src"],
       "@mui/utils/*": ["./packages/mui-utils/src/*"],
@@ -38,6 +41,7 @@
       "@mui/material-nextjs": ["./packages/mui-material-nextjs/src"],
       "@mui/material-nextjs/*": ["./packages/mui-material-nextjs/src/*"],
       "@mui/joy": ["./packages/mui-joy/src"],
+      "@mui/joy/package.json": ["./packages/mui-joy/package.json"],
       "@mui/joy/*": ["./packages/mui-joy/src/*"],
       "@mui/icons-material": ["./packages/mui-icons-material/lib/esm/index.js"],
       "@mui/icons-material/*": ["./packages/mui-icons-material/src/icon.d.ts"],

webpackBaseConfig.js

@@ -10,17 +10,21 @@ module.exports = {
     modules: [__dirname, 'node_modules'],
     alias: {
       '@mui/internal-markdown': path.resolve(__dirname, './packages/markdown'),
+      '@mui/material/package.json': path.resolve(__dirname, './packages/mui-material/package.json'),
       '@mui/material': path.resolve(__dirname, './packages/mui-material/src'),
       '@mui/docs': path.resolve(__dirname, './packages/mui-docs/src'),
       '@mui/icons-material': path.resolve(__dirname, './packages/mui-icons-material/lib/esm'),
       '@mui/lab': path.resolve(__dirname, './packages/mui-lab/src'),
       '@mui/styled-engine': path.resolve(__dirname, './packages/mui-styled-engine/src'),
       '@mui/styled-engine-sc': path.resolve(__dirname, './packages/mui-styled-engine-sc/src'),
+      '@mui/system/package.json': path.resolve(__dirname, './packages/mui-system/package.json'),
       '@mui/system': path.resolve(__dirname, './packages/mui-system/src'),
       '@mui/private-theming': path.resolve(__dirname, './packages/mui-private-theming/src'),
+      '@mui/base/package.json': path.resolve(__dirname, './packages/mui-base/package.json'),
       '@mui/base': path.resolve(__dirname, './packages/mui-base/src'),
       '@mui/utils': path.resolve(__dirname, './packages/mui-utils/src'),
       '@mui/material-nextjs': path.resolve(__dirname, './packages/mui-material-nextjs/src'),
+      '@mui/joy/package.json': path.resolve(__dirname, './packages/mui-joy/package.json'),
       '@mui/joy': path.resolve(__dirname, './packages/mui-joy/src'),
       '@mui/internal-docs-utils': path.resolve(__dirname, './packages-internal/docs-utils/src'),
       '@mui/internal-scripts/typescript-to-proptypes': path.resolve(