Skip to content

Commit cc43427

Browse files
Janpotbernardobelchior
authored andcommitted
[code-infra] Remove webpack aliases (#45841)
1 parent 80dd4c0 commit cc43427

File tree

9 files changed

+47
-187
lines changed

9 files changed

+47
-187
lines changed

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,9 @@
141141
"@types/yargs": "^17.0.33",
142142
"@typescript-eslint/eslint-plugin": "^8.28.0",
143143
"@typescript-eslint/parser": "^8.28.0",
144+
"@vitejs/plugin-react": "^4.3.4",
144145
"@vitest/browser": "^3.0.9",
145146
"@vitest/coverage-v8": "^3.0.9",
146-
"@vitejs/plugin-react": "^4.3.4",
147-
"vite": "^6.0.7",
148147
"babel-loader": "^9.2.1",
149148
"babel-plugin-istanbul": "^7.0.0",
150149
"babel-plugin-module-resolver": "^5.0.2",
@@ -201,8 +200,10 @@
201200
"stylelint": "^16.17.0",
202201
"stylelint-config-standard": "^37.0.0",
203202
"terser-webpack-plugin": "^5.3.14",
203+
"tsconfig-paths-webpack-plugin": "^4.2.0",
204204
"tsx": "^4.19.3",
205205
"typescript": "^5.8.2",
206+
"vite": "^6.0.7",
206207
"vitest": "^3.0.9",
207208
"vitest-fail-on-console": "^0.7.1",
208209
"webpack": "^5.98.0",

packages/mui-docs/tsconfig.build.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111
"rootDir": "./src",
1212
"tsBuildInfoFile": "build/tsconfig.build.tsbuildinfo"
1313
},
14-
"include": ["src/**/*.ts*", "src/**/*.json"],
14+
"include": ["./types.d.ts", "src/**/*.ts*", "src/**/*.json"],
1515
"exclude": ["src/**/*.spec.ts*", "src/**/*.test.ts*"],
1616
"references": [
1717
{ "path": "../mui-material/tsconfig.build.json" },
18-
{ "path": "../mui-system/tsconfig.build.json" }
18+
{ "path": "../mui-system/tsconfig.build.json" },
19+
{ "path": "../mui-icons-material/tsconfig.build.json" }
1920
]
2021
}

packages/mui-docs/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
"resolveJsonModule": true,
77
"types": ["react", "node", "csstype", "mocha"]
88
},
9-
"include": ["src/**/*", "test/**/*"]
9+
"include": ["./types.d.ts", "src/**/*", "test/**/*"]
1010
}

packages/mui-docs/types.d.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// In our repo, type declarations for icons are only added at build time
2+
declare module '@mui/icons-material/*' {
3+
import SvgIcon from '@mui/material/SvgIcon';
4+
5+
export default SvgIcon;
6+
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
// This config is for emitting declarations (.d.ts) only
3+
// Actual .ts source files are transpiled via babel
4+
"extends": "./tsconfig.json",
5+
"compilerOptions": {
6+
"composite": true,
7+
"declaration": false,
8+
"noEmit": false,
9+
"emitDeclarationOnly": false,
10+
"outDir": "build/esm",
11+
"rootDir": "./lib"
12+
},
13+
"include": ["lib/**/*.*"]
14+
}

pnpm-lock.yaml

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

scripts/buildTypes.mjs

Lines changed: 0 additions & 154 deletions
This file was deleted.

tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"@mui/joy/package.json": ["./packages/mui-joy/package.json"],
4545
"@mui/joy/*": ["./packages/mui-joy/src/*"],
4646
"@mui/icons-material": ["./packages/mui-icons-material/lib/esm/index.js"],
47-
"@mui/icons-material/*": ["./packages/mui-icons-material/src/icon.d.ts"],
47+
"@mui/icons-material/*": ["./packages/mui-icons-material/lib/esm/*"],
4848
"@mui/internal-docs-utils": ["./packages-internal/docs-utils/src"],
4949
"@mui/internal-scripts/typescript-to-proptypes": [
5050
"./packages-internal/scripts/typescript-to-proptypes/src"

webpackBaseConfig.js

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
const path = require('path');
2+
const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
3+
4+
const extensions = ['.js', '.mjs', '.ts', '.tsx'];
25

36
// WARNING: Use this module only as an inspiration.
47
// Cherry-pick the parts you need and inline them in the webpack.config you need.
@@ -8,32 +11,7 @@ module.exports = {
811
context: path.resolve(__dirname),
912
resolve: {
1013
modules: [__dirname, 'node_modules'],
11-
alias: {
12-
'@mui/internal-markdown': path.resolve(__dirname, './packages/markdown'),
13-
'@mui/material/package.json': path.resolve(__dirname, './packages/mui-material/package.json'),
14-
'@mui/material': path.resolve(__dirname, './packages/mui-material/src'),
15-
'@mui/docs': path.resolve(__dirname, './packages/mui-docs/src'),
16-
'@mui/icons-material': path.resolve(__dirname, './packages/mui-icons-material/lib/esm'),
17-
'@mui/lab': path.resolve(__dirname, './packages/mui-lab/src'),
18-
'@mui/styled-engine': path.resolve(__dirname, './packages/mui-styled-engine/src'),
19-
'@mui/styled-engine-sc': path.resolve(__dirname, './packages/mui-styled-engine-sc/src'),
20-
'@mui/system/package.json': path.resolve(__dirname, './packages/mui-system/package.json'),
21-
'@mui/system': path.resolve(__dirname, './packages/mui-system/src'),
22-
'@mui/private-theming': path.resolve(__dirname, './packages/mui-private-theming/src'),
23-
'@mui/base/package.json': path.resolve(__dirname, './packages/mui-base/package.json'),
24-
'@mui/base': path.resolve(__dirname, './packages/mui-base/src'),
25-
'@mui/utils': path.resolve(__dirname, './packages/mui-utils/src'),
26-
'@mui/material-nextjs': path.resolve(__dirname, './packages/mui-material-nextjs/src'),
27-
'@mui/joy/package.json': path.resolve(__dirname, './packages/mui-joy/package.json'),
28-
'@mui/joy': path.resolve(__dirname, './packages/mui-joy/src'),
29-
'@mui/internal-docs-utils': path.resolve(__dirname, './packages-internal/docs-utils/src'),
30-
'@mui/internal-scripts/typescript-to-proptypes': path.resolve(
31-
__dirname,
32-
'./packages-internal/scripts/typescript-to-proptypes/src',
33-
),
34-
'@mui/internal-test-utils': path.resolve(__dirname, './packages-internal/test-utils/src'),
35-
docs: path.resolve(__dirname, './docs'),
36-
},
37-
extensions: ['.js', '.mjs', '.ts', '.tsx', '.d.ts'],
14+
extensions,
15+
plugins: [new TsconfigPathsPlugin({ extensions })],
3816
},
3917
};

0 commit comments

Comments
 (0)