proposed fix

mnajdova · Nov 11, 2020 · c677b25 · c677b25
1 parent 4a6f762
commit c677b25
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 14 deletions.
diff --git a/babel.config.js b/babel.config.js
@@ -4,17 +4,20 @@ const errorCodesPath = path.resolve(__dirname, './docs/public/static/error-codes
 const missingError = process.env.MUI_EXTRACT_ERROR_CODES === 'true' ? 'write' : 'annotate';
 
 const defaultAlias = {
-  '@material-ui/core': './packages/material-ui/src',
-  '@material-ui/docs': './packages/material-ui-docs/src',
-  '@material-ui/icons': './packages/material-ui-icons/src',
-  '@material-ui/lab': './packages/material-ui-lab/src',
-  '@material-ui/styled-engine': './packages/material-ui-styled-engine/src',
-  '@material-ui/styled-engine-sc': './packages/material-ui-styled-engine-sc/src',
-  '@material-ui/styles': './packages/material-ui-styles/src',
-  '@material-ui/system': './packages/material-ui-system/src',
-  '@material-ui/unstyled': './packages/material-ui-unstyled/src',
-  '@material-ui/utils': './packages/material-ui-utils/src',
-  'typescript-to-proptypes': './packages/typescript-to-proptypes/src',
+  '@material-ui/core': path.resolve(__dirname, './packages/material-ui/src'),
+  '@material-ui/docs': path.resolve(__dirname, './packages/material-ui-docs/src'),
+  '@material-ui/icons': path.resolve(__dirname, './packages/material-ui-icons/src'),
+  '@material-ui/lab': path.resolve(__dirname, './packages/material-ui-lab/src'),
+  '@material-ui/styled-engine': path.resolve(__dirname, './packages/material-ui-styled-engine/src'),
+  '@material-ui/styled-engine-sc': path.resolve(
+    __dirname,
+    './packages/material-ui-styled-engine-sc/src',
+  ),
+  '@material-ui/styles': path.resolve(__dirname, './packages/material-ui-styles/src'),
+  '@material-ui/system': path.resolve(__dirname, './packages/material-ui-system/src'),
+  '@material-ui/unstyled': path.resolve(__dirname, './packages/material-ui-unstyled/src'),
+  '@material-ui/utils': path.resolve(__dirname, './packages/material-ui-utils/src'),
+  'typescript-to-proptypes': path.resolve(__dirname, './packages/typescript-to-proptypes/src'),
 };
 
 const productionPlugins = [
@@ -29,7 +32,7 @@ const productionPlugins = [
 ];
 
 module.exports = function getBabelConfig(api) {
-  const useESModules = api.env(['legacy', 'modern', 'stable']);
+  const useESModules = api.env(['legacy', 'modern', 'stable', 'rollup']);
 
   const presets = [
     [
@@ -114,6 +117,18 @@ module.exports = function getBabelConfig(api) {
           ],
         ],
       },
+      rollup: {
+        plugins: [
+          [
+            'babel-plugin-module-resolver',
+            {
+              alias: {
+                '@material-ui/unstyled': defaultAlias['@material-ui/unstyled'],
+              },
+            },
+          ],
+        ],
+      },
       legacy: {
         plugins: [
           // IE11 support

diff --git a/packages/material-ui/package.json b/packages/material-ui/package.json
@@ -31,7 +31,7 @@
     "build:modern": "node ../../scripts/build modern",
     "build:node": "node ../../scripts/build node",
     "build:stable": "node ../../scripts/build stable",
-    "build:umd": "cross-env BABEL_ENV=stable rollup -c scripts/rollup.config.js",
+    "build:umd": "cross-env BABEL_ENV=rollup rollup -c scripts/rollup.config.js",
     "build:copy-files": "node ../../scripts/copy-files.js",
     "build:types": "tsc -p tsconfig.build.json",
     "extract-error-codes": "cross-env MUI_EXTRACT_ERROR_CODES=true yarn build:modern",

diff --git a/packages/material-ui/scripts/rollup.config.js b/packages/material-ui/scripts/rollup.config.js
@@ -1,3 +1,4 @@
+import path from 'path';
 import nodeResolve from 'rollup-plugin-node-resolve';
 import commonjs from 'rollup-plugin-commonjs';
 import babel from 'rollup-plugin-babel';
@@ -16,7 +17,7 @@ const babelOptions = {
   // We are using @babel/plugin-transform-runtime
   runtimeHelpers: true,
   extensions: ['.js', '.ts', '.tsx'],
-  configFile: '../../babel.config.js',
+  configFile: path.resolve(__dirname, '../../../babel.config.js'),
 };
 const commonjsOptions = {
   ignoreGlobal: true,