[core] Only define aliases once for TypeScript and once for Webpack + Babel #35197
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| const path = require('path'); | ||
|
|
||
| /** | ||
| * @param {object} params The parameters of the function. | ||
| * @param {'build' | 'src'} params.type Define if the target should be the built version or the source. | ||
| * @param {boolean | undefined} params.isRelative If `true` the path will be relative to the repository root. | ||
| * @param {boolean | undefined} params.useESIcons If `true` will use the ES version of `@mui/icons-material`. | ||
| */ | ||
| function getMuiAliases({ type, isRelative = false, useESIcons = false }) { | ||
| const workspaceRoot = path.join(__dirname, '..'); | ||
|
|
||
| const resolveAliasPath = (aliasPath) => { | ||
| const fullPath = path.join(workspaceRoot, aliasPath); | ||
|
|
||
| if (!isRelative) { | ||
| return fullPath; | ||
| } | ||
|
|
||
| const resolvedPath = path.relative(process.cwd(), fullPath); | ||
| return `./${resolvedPath.replace('\\', '/')}`; | ||
| }; | ||
|
|
||
| return { | ||
| '@mui/base': resolveAliasPath(`packages/mui-base/${type}`), | ||
| '@mui/docs': resolveAliasPath(`packages/mui-docs/${type}`), | ||
| '@mui/icons-material': resolveAliasPath( | ||
| `packages/mui-icons-material/lib${useESIcons ? '/esm' : ''}`, | ||
| ), | ||
| '@mui/joy': resolveAliasPath(`packages/mui-joy/${type}`), | ||
| '@mui/lab': resolveAliasPath(`packages/mui-lab/${type}`), | ||
| '@mui/markdown': resolveAliasPath('packages/markdown'), | ||
| '@mui/material': resolveAliasPath(`packages/mui-material/${type}`), | ||
| '@mui/material-next': resolveAliasPath(`packages/mui-material-next/${type}`), | ||
| '@mui/private-theming': resolveAliasPath(`packages/mui-private-theming/${type}`), | ||
| '@mui/styled-engine': resolveAliasPath(`packages/mui-styled-engine/${type}`), | ||
| '@mui/styled-engine-sc': resolveAliasPath(`packages/mui-styled-engine-sc/${type}`), | ||
| '@mui/styles': resolveAliasPath(`packages/mui-styles/${type}`), | ||
| '@mui/system': resolveAliasPath(`packages/mui-system/${type}`), | ||
| '@mui/utils': resolveAliasPath(`packages/mui-utils/${type}`), | ||
| docs: resolveAliasPath('docs'), | ||
| modules: resolveAliasPath('modules'), | ||
| 'typescript-to-proptypes': resolveAliasPath('packages/typescript-to-proptypes/src'), | ||
| }; | ||
| } | ||
|
|
||
| module.exports = getMuiAliases; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| const path = require('path'); | ||
| const playwright = require('playwright'); | ||
| const webpack = require('webpack'); | ||
| const getMuiAliases = require('../scripts/muiAliases'); | ||
|
|
||
| const CI = Boolean(process.env.CI); | ||
| // renovate PRs are based off of upstream branches. | ||
|
|
@@ -133,36 +134,22 @@ module.exports = function setKarmaConfig(config) { | |
| envName: 'stable', | ||
| }, | ||
| }, | ||
|
There was a problem hiding this comment. The tests are passing without it There was a problem hiding this comment. We need it again for the tree view 😆 |
||
| // Transpile dependencies outside this repository with dependencies in this repository | ||
| // TODO: Remove when the lab will stop exporting components from `@mui/x-tree-view` | ||
| { | ||
| test: /\.(js|mjs|jsx)$/, | ||
| include: /node_modules(\/|\\)@mui(\/|\\)x-tree-view/, | ||
| use: { | ||
|
There was a problem hiding this comment. We miss notistack here no? https://mui.com/material-ui/react-snackbar/#notistack. Ah, same for data grid, and all MUI X components no? This logic is meant to help us test fixes for these components, make sure if we break something in Material UI for MUI X, we know it as soon as we work on the PR, not once Material UI is released and MUI X updates it dependencies. There was a problem hiding this comment.
But we don't have any test using those components right? |
||
| loader: 'babel-loader', | ||
| options: { | ||
| // We have to apply `babel-plugin-module-resolve` to the files in `@mui/x-tree-view`. | ||
| // Otherwise, we can't import `@mui/material` from `@mui/x-tree-view` in `yarn test:karma`. | ||
| sourceType: 'unambiguous', | ||
| plugins: [ | ||
| [ | ||
| 'babel-plugin-module-resolver', | ||
| { | ||
| alias: getMuiAliases({ type: 'src', isRelative: true }), | ||
| transformFunctions: ['require'], | ||
| }, | ||
| ], | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It now uses the TypeScript aliases
https://nextjs.org/docs/advanced-features/module-path-aliases