Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(react-core): fix importing of mui packages that do not support ES…
…M yet (#3608) * Use material root import instead of specific components to support ESM * Use material root import instead of specific components to support ESM in scheduler material ui package * Transform icons-material to add extension to a file * Add bootstrap4 styles to exports * Modify x-date-pickers import path * Fix rrule import error * Fix bundled icons-material imports * Update yarn.lock * Rollback dependencies * Refactor rollup config Co-authored-by: Lykoi18 <aiden.ghost666@gmail.com>
- Loading branch information
Showing
11 changed files
with
119 additions
and
67 deletions.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,47 @@ | ||
| import babel from 'rollup-plugin-babel'; | ||
| import license from 'rollup-plugin-license'; | ||
| import resolve from '@rollup/plugin-node-resolve'; | ||
| import modify from 'rollup-plugin-modify'; | ||
| import { banner, external, stubProcess } from '../../tools/rollup-utils'; | ||
| import pkg from './package.json'; | ||
|
|
||
| export default { | ||
| const commonPlugins = [ | ||
| resolve({ | ||
| extensions: ['.js', '.jsx'], | ||
| }), | ||
| babel({ | ||
| runtimeHelpers: true, | ||
| exclude: 'node_modules/**', | ||
| }), | ||
| license({ | ||
| banner, | ||
| }), | ||
| ]; | ||
|
|
||
| const commonConfig = { | ||
| input: 'src/index.js', | ||
| output: [ | ||
| { | ||
| file: pkg.main, format: 'cjs', sourcemap: true, intro: stubProcess, | ||
| }, | ||
| { file: pkg.module, format: 'es', sourcemap: true }, | ||
| ], | ||
| external: external(__dirname), | ||
| plugins: [ | ||
| resolve({ | ||
| extensions: ['.js', '.jsx'], | ||
| }), | ||
| babel({ | ||
| runtimeHelpers: true, | ||
| exclude: 'node_modules/**', | ||
| }), | ||
| license({ | ||
| banner, | ||
| }), | ||
| ], | ||
| plugins: commonPlugins, | ||
| }; | ||
|
|
||
| export default [ | ||
| { | ||
| ...commonConfig, | ||
| output: { | ||
| file: pkg.main, format: 'cjs', sourcemap: true, intro: stubProcess, | ||
| }, | ||
| }, | ||
| { | ||
| ...commonConfig, | ||
| output: { | ||
| file: pkg.module, format: 'es', sourcemap: true, | ||
| }, | ||
| plugins: [ | ||
| ...commonPlugins, | ||
| modify({ | ||
| find: /import (\w+) from '@mui\/icons-material\/(.+)';/, | ||
| replace: (match, name, path) => `import ${name}Pkg from '@mui/icons-material/${path}.js'; const ${name} = ${name}Pkg.default;`, | ||
| }), | ||
| ], | ||
| }, | ||
| ]; |
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 |
|---|---|---|
| @@ -1,28 +1,47 @@ | ||
| import babel from 'rollup-plugin-babel'; | ||
| import license from 'rollup-plugin-license'; | ||
| import resolve from '@rollup/plugin-node-resolve'; | ||
| import modify from 'rollup-plugin-modify'; | ||
| import { banner, external, stubProcess } from '../../tools/rollup-utils'; | ||
| import pkg from './package.json'; | ||
|
|
||
| export default { | ||
| const commonPlugins = [ | ||
| resolve({ | ||
| extensions: ['.js', '.jsx'], | ||
| }), | ||
| babel({ | ||
| runtimeHelpers: true, | ||
| exclude: 'node_modules/**', | ||
| }), | ||
| license({ | ||
| banner, | ||
| }), | ||
| ]; | ||
|
|
||
| const commonConfig = { | ||
| input: 'src/index.js', | ||
| output: [ | ||
| { | ||
| file: pkg.main, format: 'cjs', sourcemap: true, intro: stubProcess, | ||
| }, | ||
| { file: pkg.module, format: 'es', sourcemap: true }, | ||
| ], | ||
| external: external(__dirname), | ||
| plugins: [ | ||
| resolve({ | ||
| extensions: ['.js', '.jsx'], | ||
| }), | ||
| babel({ | ||
| runtimeHelpers: true, | ||
| exclude: 'node_modules/**', | ||
| }), | ||
| license({ | ||
| banner, | ||
| }), | ||
| ], | ||
| plugins: commonPlugins, | ||
| }; | ||
|
|
||
| export default [ | ||
| { | ||
| ...commonConfig, | ||
| output: { | ||
| file: pkg.main, format: 'cjs', sourcemap: true, intro: stubProcess, | ||
| }, | ||
| }, | ||
| { | ||
| ...commonConfig, | ||
| output: { | ||
| file: pkg.module, format: 'es', sourcemap: true, | ||
| }, | ||
| plugins: [ | ||
| ...commonPlugins, | ||
| modify({ | ||
| find: /import (\w+) from '@mui\/icons-material\/(.+)';/, | ||
| replace: (match, name, path) => `import ${name}Pkg from '@mui/icons-material/${path}.js'; const ${name} = ${name}Pkg.default;`, | ||
| }), | ||
| ], | ||
| }, | ||
| ]; |
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 |
|---|---|---|
|
|
@@ -73,6 +73,6 @@ | |
| }, | ||
| "dependencies": { | ||
| "moment": "^2.24.0", | ||
| "rrule": "2.6.4" | ||
| "rrule": "2.7.1" | ||
| } | ||
| } | ||
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