Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Fix esm bundle #3629

Merged
merged 10 commits into from
Jan 26, 2023
Merged

fix: Fix esm bundle #3629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fd40411
Upgrade react and react-dom
timbset Jan 19, 2023
fa70d63
Upgrade rollup-plugin-typescript
Lykoi18 Jan 24, 2023
12fff97
Upgrade x-date-pickers / Fix scheduler mui bundle
Lykoi18 Jan 24, 2023
8f0d223
Fix grid mui bundle
Lykoi18 Jan 24, 2023
ec6b725
Drop modifying rrule import path
Lykoi18 Jan 24, 2023
700da66
Fix package.json
Lykoi18 Jan 24, 2023
391a9b2
Rebuild yarn.lock based on master
timbset Jan 24, 2023
2cbacb9
Merge remote-tracking branch 'fork-lykoi18/fix-esm-bundle' into fix-e…
timbset Jan 24, 2023
e3278f9
Merge remote-tracking branch 'origin/master' into fix-esm-bundle
Lykoi18 Jan 26, 2023
1f0391b
Merge with master
Lykoi18 Jan 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion packages/dx-react-grid-material-ui/rollup.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,11 @@ export default [
...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;`,
replace: (match, name, path) => `import ${name} from '@mui/icons-material/esm/${path}.js';`,
}),
modify({
find: /import (.+) from '@mui\/x-date-pickers\/(.+)';/,
replace: (match, name, path) => `import ${name} from '@mui/x-date-pickers/${path}/index.js';`,
}),
],
},
Expand Down
8 changes: 0 additions & 8 deletions packages/dx-react-scheduler-material-ui/.babelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,6 @@
"plugins": [
["transform-react-remove-prop-types", {
"mode": "unsafe-wrap"
}],
["transform-rename-import", {
"replacements": [
{
"original": "^@mui\\/x-date-pickers\\/(.*)$",
"replacement": "@mui/x-date-pickers/node/$1/index.js"
}
]
}]
],
"env": {
Expand Down
1 change: 0 additions & 1 deletion packages/dx-react-scheduler-material-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
"babel-eslint": "^10.0.3",
"babel-jest": "^29.2.2",
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
"babel-plugin-transform-rename-import": "^2.3.0",
"core-js": "^3.4.1",
"enzyme": "3.10.0",
"eslint": "^6.6.0",
Expand Down
6 changes: 5 additions & 1 deletion packages/dx-react-scheduler-material-ui/rollup.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,11 @@ export default [
...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;`,
replace: (match, name, path) => `import ${name} from '@mui/icons-material/esm/${path}.js';`,
}),
modify({
find: /import (.+) from '@mui\/x-date-pickers\/(.+)';/,
replace: (match, name, path) => `import ${name} from '@mui/x-date-pickers/${path}/index.js';`,
}),
],
},
Expand Down
5 changes: 0 additions & 5 deletions packages/dx-scheduler-core/rollup.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import license from 'rollup-plugin-license';
import { default as typescriptRollup } from 'rollup-plugin-typescript2';
import replace from '@rollup/plugin-replace';
import typescript from 'typescript';
import modify from 'rollup-plugin-modify';
import {
banner, external, globals, stubProcess,
} from '../../tools/rollup-utils';
Expand All @@ -26,10 +25,6 @@ export default {
'/** @class */': '/*#__PURE__*/',
delimiters: ['', ''],
}),
modify({
find: /import {(.+)} from 'rrule';/,
replace: (match, name) => `import rrulePkg from 'rrule/dist/es5/rrule.js'; const {${name}} = rrulePkg;`,
}),
license({
banner,
}),
Expand Down