Skip to content

Commit 57c6f9d

Browse files
michaldudakmichaldudak
authored
[code-infra] Integrate changes from Core's #40842 (#11801)
1 parent b18b02f commit 57c6f9d

7 files changed

+43
-46
lines changed

‎babel.config.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@ const defaultAlias = {
2121
'@mui-internal/api-docs-builder': resolveAliasPath(
2222
'./node_modules/@mui/monorepo/packages/api-docs-builder',
2323
),
24-
'@mui-internal/docs-utilities': '@mui/monorepo/packages/docs-utilities',
2524
'@mui-internal/test-utils': resolveAliasPath(
2625
'./node_modules/@mui/monorepo/packages/test-utils/src',
2726
),
28-
'typescript-to-proptypes': '@mui/monorepo/packages/typescript-to-proptypes/src',
2927
docs: resolveAliasPath('./node_modules/@mui/monorepo/docs'),
3028
test: resolveAliasPath('./test'),
3129
packages: resolveAliasPath('./packages'),

‎docs/babel.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ const alias = {
1616
'@mui/monorepo': '../node_modules/@mui/monorepo',
1717
'@mui/material-nextjs': '../node_modules/@mui/monorepo/packages/mui-material-nextjs/src',
1818
'@mui-internal/api-docs-builder': '../node_modules/@mui/monorepo/packages/api-docs-builder',
19-
'@mui-internal/docs-utilities': '../node_modules/@mui/monorepo/packages/docs-utilities',
2019
docs: '../node_modules/@mui/monorepo/docs',
2120
docsx: './',
2221
};

‎docs/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,12 @@
9292
"devDependencies": {
9393
"@babel/plugin-transform-react-constant-elements": "^7.23.3",
9494
"@babel/preset-typescript": "^7.23.3",
95+
"@mui-internal/docs-utils": "^1.0.0",
96+
"@mui-internal/typescript-to-proptypes": "^1.0.2",
9597
"@types/doctrine": "^0.0.9",
9698
"@types/stylis": "^4.2.5",
9799
"@types/webpack-bundle-analyzer": "^4.6.3",
98100
"cpy-cli": "^5.0.0",
99-
"gm": "^1.25.0",
100-
"typescript-to-proptypes": "^2.2.1"
101+
"gm": "^1.25.0"
101102
}
102103
}

‎docs/scripts/createXTypeScriptProjects.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
createTypeScriptProject,
44
CreateTypeScriptProjectOptions,
55
TypeScriptProject,
6-
} from '@mui/monorepo/packages/api-docs-builder/utils/createTypeScriptProject';
6+
} from '@mui-internal/docs-utils';
77
import { getComponentFilesInFolder } from './utils';
88

99
const workspaceRoot = path.resolve(__dirname, '../../');

‎docs/scripts/generateProptypes.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@ import * as yargs from 'yargs';
22
import * as path from 'path';
33
import * as fse from 'fs-extra';
44
import * as prettier from 'prettier';
5-
import {
6-
getPropTypesFromFile,
7-
injectPropTypesInFile,
8-
} from '@mui/monorepo/packages/typescript-to-proptypes';
9-
import { fixBabelGeneratorIssues, fixLineEndings } from '@mui-internal/docs-utilities';
5+
import { getPropTypesFromFile, injectPropTypesInFile } from '@mui-internal/typescript-to-proptypes';
6+
import { fixBabelGeneratorIssues, fixLineEndings } from '@mui-internal/docs-utils';
107
import { createXTypeScriptProjects, XTypeScriptProject } from './createXTypeScriptProjects';
118

129
async function generateProptypes(project: XTypeScriptProject, sourceFile: string) {

‎tsconfig.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232
"@mui-internal/api-docs-builder/*": [
3333
"./node_modules/@mui/monorepo/packages/api-docs-builder/*"
3434
],
35-
"@mui-internal/docs-utilities": ["./node_modules/@mui/monorepo/packages/docs-utilities"],
36-
"@mui-internal/docs-utilities/*": ["./node_modules/@mui/monorepo/packages/docs-utilities/*"],
3735
"test/*": ["./test/*"],
3836
"docs/*": ["./node_modules/@mui/monorepo/docs"],
3937
"docsx/*": ["./docs/*"]

‎yarn.lock

Lines changed: 37 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@
193193
resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98"
194194
integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==
195195

196-
"@babel/core@^7.11.1", "@babel/core@^7.12.3", "@babel/core@^7.13.16", "@babel/core@^7.23.9", "@babel/core@^7.7.5":
196+
"@babel/core@^7.12.3", "@babel/core@^7.13.16", "@babel/core@^7.23.7", "@babel/core@^7.23.9", "@babel/core@^7.7.5":
197197
version "7.23.9"
198198
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.9.tgz#b028820718000f267870822fec434820e9b1e4d1"
199199
integrity sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==
@@ -529,7 +529,7 @@
529529
dependencies:
530530
"@babel/helper-plugin-utils" "^7.8.0"
531531

532-
"@babel/plugin-syntax-class-properties@^7.10.4", "@babel/plugin-syntax-class-properties@^7.12.13":
532+
"@babel/plugin-syntax-class-properties@^7.12.13":
533533
version "7.12.13"
534534
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
535535
integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
@@ -592,7 +592,7 @@
592592
dependencies:
593593
"@babel/helper-plugin-utils" "^7.8.0"
594594

595-
"@babel/plugin-syntax-jsx@^7.10.4", "@babel/plugin-syntax-jsx@^7.23.3":
595+
"@babel/plugin-syntax-jsx@^7.23.3":
596596
version "7.23.3"
597597
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz#8f2e4f8a9b5f9aa16067e142c1ac9cd9f810f473"
598598
integrity sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==
@@ -1318,7 +1318,7 @@
13181318
debug "^4.3.1"
13191319
globals "^11.1.0"
13201320

1321-
"@babel/types@^7.0.0", "@babel/types@^7.11.0", "@babel/types@^7.2.0", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.4", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.4.4", "@babel/types@^7.6.1":
1321+
"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.4", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.4.4", "@babel/types@^7.6.1":
13221322
version "7.23.9"
13231323
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.9.tgz#1dd7b59a9a2b5c87f8b41e52770b5ecbf492e002"
13241324
integrity sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==
@@ -1796,6 +1796,30 @@
17961796
react-test-renderer "^18.0.0"
17971797
semver "^5.7.0"
17981798

1799+
"@mui-internal/[email protected]", "@mui-internal/docs-utils@^1.0.0":
1800+
version "1.0.0"
1801+
resolved "https://registry.yarnpkg.com/@mui-internal/docs-utils/-/docs-utils-1.0.0.tgz#b1cd8fafe00dca045896daa2977e26eb551b891a"
1802+
integrity sha512-TqbdoXrXAk9JhcsGjekriQVU6A0w7oo01CfTfm4mefcKT2Z+RhHeFzG4fJrugN718qLdolJKGMoD7f+u/yBSBw==
1803+
dependencies:
1804+
rimraf "^5.0.5"
1805+
typescript "^5.1.6"
1806+
1807+
"@mui-internal/typescript-to-proptypes@^1.0.2":
1808+
version "1.0.2"
1809+
resolved "https://registry.yarnpkg.com/@mui-internal/typescript-to-proptypes/-/typescript-to-proptypes-1.0.2.tgz#93ccfe6f611ffc700e99570a34737842c6cc0c70"
1810+
integrity sha512-KpnPqY8MCQBHwmFMCZZxXwG3uREgMAbXKLBzcxlBhYxssZcYdsE/aImWE0B50QfVHBPjkNmt4dcI2UO2VEzS9w==
1811+
dependencies:
1812+
"@babel/core" "^7.23.7"
1813+
"@babel/plugin-syntax-class-properties" "^7.12.13"
1814+
"@babel/plugin-syntax-jsx" "^7.23.3"
1815+
"@babel/plugin-syntax-typescript" "^7.23.3"
1816+
"@babel/types" "^7.23.6"
1817+
"@mui-internal/docs-utils" "1.0.0"
1818+
doctrine "^3.0.0"
1819+
lodash "^4.17.21"
1820+
typescript "^5.3.3"
1821+
uuid "^9.0.1"
1822+
17991823
"@mui/[email protected]", "@mui/base@^5.0.0-beta.34":
18001824
version "5.0.0-beta.34"
18011825
resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-beta.34.tgz#44b0f203250a6e3b2d810f37c9720d114182abd0"
@@ -1868,7 +1892,7 @@
18681892

18691893
"@mui/monorepo@https://github.com/mui/material-ui.git#master":
18701894
version "5.15.7"
1871-
resolved "https://github.com/mui/material-ui.git#19ff6ada02dafa827531653801a3b657d58047ba"
1895+
resolved "https://github.com/mui/material-ui.git#475e186f1e31d194e1d80621effa8a866411ec30"
18721896
dependencies:
18731897
"@googleapis/sheets" "^5.0.5"
18741898
"@slack/bolt" "^3.17.1"
@@ -7961,9 +7985,9 @@ gm@^1.25.0:
79617985
debug "^3.1.0"
79627986

79637987
google-auth-library@^9.0.0, google-auth-library@^9.5.0:
7964-
version "9.6.0"
7965-
resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-9.6.0.tgz#47a20aad0a358e9798c2adc489a89f1938e9c3ff"
7966-
integrity sha512-bM/buCwCeYZjmnzGstwREu3BsnbmnuI064ZGur0NmHyXUxubWMJTCO9kxsyy4T6jdzacHJY3XQWHxX4D4Mc+EA==
7988+
version "9.5.0"
7989+
resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-9.5.0.tgz#fd97b78bc1512025b9c9ad3998c60e2d75b6137e"
7990+
integrity sha512-OUbP509lWVlZxuMY+Cgomw49VzZFP9myIcVeYEpeBlbXJbPC4R+K4BmO9hd3ciYM5QIwm5W1PODcKjqxtkye9Q==
79677991
dependencies:
79687992
base64-js "^1.3.0"
79697993
ecdsa-sig-formatter "^1.0.11"
@@ -10044,7 +10068,7 @@ [email protected]:
1004410068
resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce"
1004510069
integrity sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg==
1004610070

10047-
lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21:
10071+
lodash@^4.17.11, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21:
1004810072
version "4.17.21"
1004910073
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
1005010074
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -14255,7 +14279,7 @@ [email protected]:
1425514279
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
1425614280
integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
1425714281

14258-
tslib@^1.13.0, tslib@^1.8.1:
14282+
tslib@^1.8.1:
1425914283
version "1.14.1"
1426014284
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
1426114285
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
@@ -14415,27 +14439,7 @@ typedarray@^0.0.6:
1441514439
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
1441614440
integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
1441714441

14418-
typescript-to-proptypes@^2.2.1:
14419-
version "2.2.1"
14420-
resolved "https://registry.yarnpkg.com/typescript-to-proptypes/-/typescript-to-proptypes-2.2.1.tgz#45fd201f6526bc45da3c5c0faa3b00cc23707613"
14421-
integrity sha512-FxVo0Rcf/c6dmHxA1DlAmpxct+1SuuDyX3Rl8MkfQt//yvZCMhWOuWZvJ3aP0/5eZTYIb+DpPt7htTL6A1xK9A==
14422-
dependencies:
14423-
"@babel/core" "^7.11.1"
14424-
"@babel/plugin-syntax-class-properties" "^7.10.4"
14425-
"@babel/plugin-syntax-jsx" "^7.10.4"
14426-
"@babel/types" "^7.11.0"
14427-
doctrine "^3.0.0"
14428-
lodash "^4.17.14"
14429-
tslib "^1.13.0"
14430-
typescript "3.8.3"
14431-
uuid "^8.1.0"
14432-
14433-
[email protected]:
14434-
version "3.8.3"
14435-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061"
14436-
integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==
14437-
14438-
"typescript@>=3 < 6", typescript@^5.3.3:
14442+
"typescript@>=3 < 6", typescript@^5.1.6, typescript@^5.3.3:
1443914443
version "5.3.3"
1444014444
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"
1444114445
integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==
@@ -14694,12 +14698,12 @@ [email protected]:
1469414698
resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
1469514699
integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
1469614700

14697-
uuid@^8.1.0, uuid@^8.3.0, uuid@^8.3.2:
14701+
uuid@^8.3.0, uuid@^8.3.2:
1469814702
version "8.3.2"
1469914703
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
1470014704
integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
1470114705

14702-
uuid@^9.0.0:
14706+
uuid@^9.0.0, uuid@^9.0.1:
1470314707
version "9.0.1"
1470414708
resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
1470514709
integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==

0 commit comments

Comments
 (0)