8000 [core] Use React 18's JSX runtime for v5.x UMD builds (#44815) · mui/material-ui@a37b3d4 · GitHub
[go: up one dir, main page]
Skip to content

Commit a37b3d4

Browse files
DiegoAndaiDiegoAndai
authored
[core] Use React 18's JSX runtime for v5.x UMD builds (#44815)
1 parent b8fbcf5 commit a37b3d4

File tree

5 files changed

+103
-105
lines changed

5 files changed

+103
-105
lines changed

‎examples/material-ui-via-cdn/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<title>My page</title>
66
<meta name="viewport" content="initial-scale=1, width=device-width" />
77
<script
8-
src="https://unpkg.com/react@^18.0.0/umd/react.development.js"
8+
src="https://unpkg.com/react@^18.3.1/umd/react.development.js"
99
crossorigin="anonymous"
1010
></script>
11-
<script src="https://unpkg.com/react-dom@^18.0.0/umd/react-dom.development.js"></script>
11+
<script src="https://unpkg.com/react-dom@^18.3.1/umd/react-dom.development.js"></script>
1212
<script
1313
src="https://unpkg.com/@mui/material@5/umd/material-ui.development.js"
1414
crossorigin="anonymous"

‎packages/mui-material/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@
5858
"devDependencies": {
5959
"@mui-internal/test-utils": "workspace:^",
6060
"@mui/internal-babel-macros": "workspace:^",
61+
"@rollup/plugin-commonjs": "^28.0.2",
62+
"@rollup/plugin-node-resolve": "^16.0.0",
6163
"@rollup/plugin-replace": "^5.0.5",
6264
"@testing-library/dom": "^10.3.1",
6365
"@testing-library/user-event": "^14.5.2",
@@ -76,11 +78,10 @@
7678
"react": "^19.0.0",
7779
"react-dom": "^19.0.0",
7880
"react-router-dom": "^6.21.3",
81+
"react18": "npm:react@^18.3.1",
7982
"rollup": "^3.29.4",
8083
"rollup-plugin-babel": "^4.4.0",
81-
"rollup-plugin-commonjs": "^10.1.0",
8284
"rollup-plugin-node-globals": "^1.4.0",
83-
"rollup-plugin-node-resolve": "^5.2.0",
8485
"rollup-plugin-terser": "^7.0.2",
8586
"sinon": "^15.2.0"
8687
},

‎packages/mui-material/scripts/rollup.config.mjs

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ import * as url from 'url';
33
import path from 'path';
44
import zlib from 'zlib';
55
import { promisify } from 'util';
6-
import nodeResolve from 'rollup-plugin-node-resolve';
7-
import commonjs from 'rollup-plugin-commonjs';
6+
import nodeResolve from '@rollup/plugin-node-resolve';
7+
import commonjs from '@rollup/plugin-commonjs';
88
import babel from 'rollup-plugin-babel';
99
import replace from '@rollup/plugin-replace';
1010
import nodeGlobals from 'rollup-plugin-node-globals';
1111
import { terser } from 'rollup-plugin-terser';
12+
import { createRequire } from 'module';
1213

1314
const currentDirectory = url.fileURLToPath(new URL('.', import.meta.url));
1415

@@ -117,6 +118,10 @@ const nestedFolder = {
117118
return resolveNestedImport('mui-system', importee);
118119
}
119120

121+
if (importee.indexOf('react/jsx-runtime') === 0) {
122+
return createRequire(import.meta.url).resolve('react18/jsx-runtime');
123+
}
124+
120125
return undefined;
121126
},
122127
};
@@ -136,25 +141,6 @@ const babelOptions = {
136141
const commonjsOptions = {
137142
ignoreGlobal: true,
138143
include: /node_modules/,
139-
namedExports: {
140-
'node_modules/prop-types/index.js': [
141-
'elementType',
142-
'bool',
143-
'func',
144-
'object',
145-
'oneOfType',
146-
'element',
147-
],
148-
'node_modules/react/jsx-runtime.js': ['jsx', 'jsxs'],
149-
'node_modules/react-is/index.js': [
150-
'ForwardRef',
151-
'isFragment',
152-
'isLazy',
153-
'isMemo',
154-
'Memo',
155-
'isValidElementType',
156-
],
157-
},
158144
};
159145
const nodeOptions = {
160146
extensions: ['.js', '.tsx', '.ts'],

‎packages/mui-material/test/umd/run.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ async function createApp() {
5050
'utf8',
5151
);
5252
index = index.replace(
53-
'https://unpkg.com/@mui/material@latest/umd/material-ui.development.js',
53+
'https://unpkg.com/@mui/material@5/umd/material-ui.development.js',
5454
umdPath,
5555
);
5656
index = index.replace(

0 commit comments

Comments
 (0)
0