From a97d9d990fe6522daf28e72299553bbaeb98139c Mon Sep 17 00:00:00 2001 From: Georgy K <36447502+Lykoi18@users.noreply.github.com> Date: Thu, 26 Jan 2023 15:40:32 +0400 Subject: [PATCH] fix: Fix esm bundle (#3629) --- packages/dx-react-grid-material-ui/rollup.config.js | 6 +++++- packages/dx-react-scheduler-material-ui/.babelrc | 8 -------- packages/dx-react-scheduler-material-ui/package.json | 1 - packages/dx-react-scheduler-material-ui/rollup.config.js | 6 +++++- packages/dx-scheduler-core/rollup.config.js | 5 ----- 5 files changed, 10 insertions(+), 16 deletions(-) diff --git a/packages/dx-react-grid-material-ui/rollup.config.js b/packages/dx-react-grid-material-ui/rollup.config.js index 2ba7c29283..9a3f0cd39a 100644 --- a/packages/dx-react-grid-material-ui/rollup.config.js +++ b/packages/dx-react-grid-material-ui/rollup.config.js @@ -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';`, }), ], }, diff --git a/packages/dx-react-scheduler-material-ui/.babelrc b/packages/dx-react-scheduler-material-ui/.babelrc index b82a5cd668..44cb0cc52e 100644 --- a/packages/dx-react-scheduler-material-ui/.babelrc +++ b/packages/dx-react-scheduler-material-ui/.babelrc @@ -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": { diff --git a/packages/dx-react-scheduler-material-ui/package.json b/packages/dx-react-scheduler-material-ui/package.json index bb1297e407..766049412a 100644 --- a/packages/dx-react-scheduler-material-ui/package.json +++ b/packages/dx-react-scheduler-material-ui/package.json @@ -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", diff --git a/packages/dx-react-scheduler-material-ui/rollup.config.js b/packages/dx-react-scheduler-material-ui/rollup.config.js index 2ba7c29283..9a3f0cd39a 100644 --- a/packages/dx-react-scheduler-material-ui/rollup.config.js +++ b/packages/dx-react-scheduler-material-ui/rollup.config.js @@ -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';`, }), ], }, diff --git a/packages/dx-scheduler-core/rollup.config.js b/packages/dx-scheduler-core/rollup.config.js index 64148c3039..da364b5df5 100644 --- a/packages/dx-scheduler-core/rollup.config.js +++ b/packages/dx-scheduler-core/rollup.config.js @@ -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'; @@ -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, }),