Skip to content

Commit d2bf0df

Browse files
authored
Merge pull request #10475 from marmelab/fix-vite-config-simple-crm
[Demo] Fix vite config in Simple and CRM demos
2 parents 005331a + 27a70e7 commit d2bf0df

File tree

2 files changed

+31
-24
lines changed

2 files changed

+31
-24
lines changed

examples/crm/vite.config.ts

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,20 @@ export default defineConfig(async () => {
1111
const aliases: Record<string, string> = {};
1212
for (const dirName of packages) {
1313
if (dirName === 'create-react-admin') continue;
14-
// eslint-disable-next-line prettier/prettier
15-
const packageJson = await import(
16-
path.resolve(__dirname, '../../packages', dirName, 'package.json'),
17-
{ with: { type: 'json' } }
14+
const packageJson = JSON.parse(
15+
fs.readFileSync(
16+
path.resolve(
17+
__dirname,
18+
'../../packages',
19+
dirName,
20+
'package.json'
21+
),
22+
'utf8'
23+
)
1824
);
19-
aliases[packageJson.default.name] = path.resolve(
25+
aliases[packageJson.name] = path.resolve(
2026
__dirname,
21-
`../../packages/${packageJson.default.name}/src`
27+
`../../packages/${packageJson.name}/src`
2228
);
2329
}
2430
return {

examples/simple/vite.config.ts

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,42 +10,43 @@ import { defineConfig } from 'vite';
1010
export default defineConfig(async () => {
1111
// In codesandbox, we won't have the packages folder
1212
// We ignore errors in this case
13-
let aliases: any[] = [];
13+
const aliases: Record<string, string> = {};
1414
try {
1515
const packages = fs.readdirSync(
1616
path.resolve(__dirname, '../../packages')
1717
);
1818
for (const dirName of packages) {
1919
if (dirName === 'create-react-admin') continue;
20-
// eslint-disable-next-line prettier/prettier
21-
const packageJson = await import(
22-
path.resolve(
23-
__dirname,
24-
'../../packages',
25-
dirName,
26-
'package.json'
27-
),
28-
{ with: { type: 'json' } }
20+
const packageJson = JSON.parse(
21+
fs.readFileSync(
22+
path.resolve(
23+
__dirname,
24+
'../../packages',
25+
dirName,
26+
'package.json'
27+
),
28+
'utf8'
29+
)
30+
);
31+
aliases[packageJson.name] = path.resolve(
32+
__dirname,
33+
`../../packages/${packageJson.name}/src`
2934
);
30-
aliases.push({
31-
find: new RegExp(`^${packageJson.default.name}$`),
32-
replacement: path.resolve(
33-
__dirname,
34-
`../../packages/${packageJson.default.name}/src`
35-
),
36-
});
3735
}
3836
} catch {}
3937

4038
return {
4139
plugins: [react()],
4240
resolve: {
4341
alias: [
44-
...aliases,
4542
{
4643
find: /^@mui\/icons-material\/(.*)/,
4744
replacement: '@mui/icons-material/esm/$1',
4845
},
46+
...Object.keys(aliases).map(packageName => ({
47+
find: packageName,
48+
replacement: aliases[packageName],
49+
})),
4950
],
5051
},
5152
server: {

0 commit comments

Comments
 (0)