Skip to content

Commit f07205b

Browse files
committed
Use shared npm packages
1 parent ff52290 commit f07205b

8 files changed

+76
-51
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,10 +92,11 @@
9292
"devDependencies": {
9393
"@babel/plugin-transform-react-constant-elements": "^7.23.3",
9494
"@babel/preset-typescript": "^7.23.3",
95+
"@mui-internal/docs-utils": "https://pkg.csb.dev/mui/material-ui/commit/a7883c38/@mui-internal/docs-utils",
96+
"@mui-internal/typescript-to-proptypes": "https://pkg.csb.dev/mui/material-ui/commit/a7883c38/@mui-internal/typescript-to-proptypes",
9597
"@types/doctrine": "^0.0.9",
9698
"@types/stylis": "^4.2.5",
9799
"cpy-cli": "^5.0.0",
98-
"gm": "^1.25.0",
99-
"typescript-to-proptypes": "^2.2.1"
100+
"gm": "^1.25.0"
100101
}
101102
}

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) {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"@mnajdova/enzyme-adapter-react-18": "^0.2.0",
8787
"@mui/icons-material": "^5.15.7",
8888
"@mui/material": "^5.15.7",
89-
"@mui/monorepo": "https://github.com/mui/material-ui.git#master",
89+
"@mui/monorepo": "https://github.com/michaldudak/material-ui.git#npm-publishing/typescript-to-proptypes",
9090
"@mui/utils": "^5.15.7",
9191
"@next/eslint-plugin-next": "14.0.4",
9292
"@octokit/plugin-retry": "^6.0.1",

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: 69 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,28 @@
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.7.5":
197+
version "7.23.7"
198+
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.7.tgz#4d8016e06a14b5f92530a13ed0561730b5c6483f"
199+
integrity sha512-+UpDgowcmqe36d4NwqvKsyPMlOLNGMsfMmQ5WGCu+siCe3t3dfe9njrzGfdN4qq+bcNUt0+Vw6haRxBOycs4dw==
200+
dependencies:
201+
"@ampproject/remapping" "^2.2.0"
202+
"@babel/code-frame" "^7.23.5"
203+
"@babel/generator" "^7.23.6"
204+
"@babel/helper-compilation-targets" "^7.23.6"
205+
"@babel/helper-module-transforms" "^7.23.3"
206+
"@babel/helpers" "^7.23.7"
207+
"@babel/parser" "^7.23.6"
208+
"@babel/template" "^7.22.15"
209+
"@babel/traverse" "^7.23.7"
210+
"@babel/types" "^7.23.6"
211+
convert-source-map "^2.0.0"
212+
debug "^4.1.0"
213+
gensync "^1.0.0-beta.2"
214+
json5 "^2.2.3"
215+
semver "^6.3.1"
216+
217+
"@babel/core@^7.23.9":
197218
version "7.23.9"
198219
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.9.tgz#b028820718000f267870822fec434820e9b1e4d1"
199220
integrity sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==
@@ -404,7 +425,7 @@
404425
"@babel/template" "^7.22.15"
405426
"@babel/types" "^7.22.19"
406427

407-
"@babel/helpers@^7.23.9":
428+
"@babel/helpers@^7.23.7", "@babel/helpers@^7.23.9":
408429
version "7.23.9"
409430
resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.9.tgz#c3e20bbe7f7a7e10cb9b178384b4affdf5995c7d"
410431
integrity sha512-87ICKgU5t5SzOT7sBMfCOZQ2rHjRU+Pcb9BoILMYz600W6DkVRLFBPwQ18gwUVvggqXivaUakpnxWQGbpywbBQ==
@@ -434,7 +455,7 @@
434455
regenerator-runtime "^0.14.0"
435456
v8flags "^3.1.1"
436457

437-
"@babel/parser@^7.1.0", "@babel/parser@^7.13.16", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9":
458+
"@babel/parser@^7.1.0", "@babel/parser@^7.13.16", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.23.6", "@babel/parser@^7.23.9":
438459
version "7.23.9"
439460
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.9.tgz#7b903b6149b0f8fa7ad564af646c4c38a77fc44b"
440461
integrity sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==
@@ -529,7 +550,7 @@
529550
dependencies:
530551
"@babel/helper-plugin-utils" "^7.8.0"
531552

532-
"@babel/plugin-syntax-class-properties@^7.10.4", "@babel/plugin-syntax-class-properties@^7.12.13":
553+
"@babel/plugin-syntax-class-properties@^7.12.13":
533554
version "7.12.13"
534555
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
535556
integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
@@ -592,7 +613,7 @@
592613
dependencies:
593614
"@babel/helper-plugin-utils" "^7.8.0"
594615

595-
"@babel/plugin-syntax-jsx@^7.10.4", "@babel/plugin-syntax-jsx@^7.23.3":
616+
"@babel/plugin-syntax-jsx@^7.23.3":
596617
version "7.23.3"
597618
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz#8f2e4f8a9b5f9aa16067e142c1ac9cd9f810f473"
598619
integrity sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==
@@ -1302,7 +1323,7 @@
13021323
"@babel/parser" "^7.23.9"
13031324
"@babel/types" "^7.23.9"
13041325

1305-
"@babel/traverse@^7.1.6", "@babel/traverse@^7.23.9", "@babel/traverse@^7.4.5":
1326+
"@babel/traverse@^7.1.6", "@babel/traverse@^7.23.7", "@babel/traverse@^7.23.9", "@babel/traverse@^7.4.5":
13061327
version "7.23.9"
13071328
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.9.tgz#2f9d6aead6b564669394c5ce0f9302bb65b9d950"
13081329
integrity sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==
@@ -1318,7 +1339,16 @@
13181339
debug "^4.3.1"
13191340
globals "^11.1.0"
13201341

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":
1342+
"@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.4.4", "@babel/types@^7.6.1":
1343+
version "7.23.6"
1344+
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.6.tgz#be33fdb151e1f5a56877d704492c240fc71c7ccd"
1345+
integrity sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==
1346+
dependencies:
1347+
"@babel/helper-string-parser" "^7.23.4"
1348+
"@babel/helper-validator-identifier" "^7.22.20"
1349+
to-fast-properties "^2.0.0"
1350+
1351+
"@babel/types@^7.23.9":
13221352
version "7.23.9"
13231353
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.9.tgz#1dd7b59a9a2b5c87f8b41e52770b5ecbf492e002"
13241354
integrity sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==
@@ -1796,6 +1826,28 @@
17961826
react-test-renderer "^18.0.0"
17971827
semver "^5.7.0"
17981828

1829+
"@mui-internal/docs-utils@https://pkg.csb.dev/mui/material-ui/commit/a7883c38/@mui-internal/docs-utils":
1830+
version "1.0.0"
1831+
resolved "https://pkg.csb.dev/mui/material-ui/commit/a7883c38/@mui-internal/docs-utils#6e910a5684160395518813f694d3992fecd7de6c"
1832+
dependencies:
1833+
rimraf "^5.0.5"
1834+
typescript "^5.1.6"
1835+
1836+
"@mui-internal/typescript-to-proptypes@https://pkg.csb.dev/mui/material-ui/commit/a7883c38/@mui-internal/typescript-to-proptypes":
1837+
version "1.0.0"
1838+
resolved "https://pkg.csb.dev/mui/material-ui/commit/a7883c38/@mui-internal/typescript-to-proptypes#529869b83fe7225e6473427e82db66363b9c5649"
1839+
dependencies:
1840+
"@babel/core" "^7.23.7"
1841+
"@babel/plugin-syntax-class-properties" "^7.12.13"
1842+
"@babel/plugin-syntax-jsx" "^7.23.3"
1843+
"@babel/plugin-syntax-typescript" "^7.23.3"
1844+
"@babel/types" "^7.23.6"
1845+
"@mui-internal/docs-utils" "https://pkg.csb.dev/mui/material-ui/commit/a7883c38/@mui-internal/docs-utils"
1846+
doctrine "^3.0.0"
1847+
lodash "^4.17.21"
1848+
typescript "^5.3.3"
1849+
uuid "^9.0.1"
1850+
17991851
"@mui/[email protected]", "@mui/base@^5.0.0-beta.34":
18001852
version "5.0.0-beta.34"
18011853
resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-beta.34.tgz#44b0f203250a6e3b2d810f37c9720d114182abd0"
@@ -1866,9 +1918,9 @@
18661918
react-is "^18.2.0"
18671919
react-transition-group "^4.4.5"
18681920

1869-
"@mui/monorepo@https://github.com/mui/material-ui.git#master":
1921+
"@mui/monorepo@https://github.com/michaldudak/material-ui.git#npm-publishing/typescript-to-proptypes":
18701922
version "5.15.7"
1871-
resolved "https://github.com/mui/material-ui.git#19ff6ada02dafa827531653801a3b657d58047ba"
1923+
resolved "https://github.com/michaldudak/material-ui.git#f9dffaa39d8a9a1a3be66e09a848106bc4d4335e"
18721924
dependencies:
18731925
"@googleapis/sheets" "^5.0.5"
18741926
"@slack/bolt" "^3.17.1"
@@ -7952,9 +8004,9 @@ gm@^1.25.0:
79528004
debug "^3.1.0"
79538005

79548006
google-auth-library@^9.0.0, google-auth-library@^9.5.0:
7955-
version "9.6.0"
7956-
resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-9.6.0.tgz#47a20aad0a358e9798c2adc489a89f1938e9c3ff"
7957-
integrity sha512-bM/buCwCeYZjmnzGstwREu3BsnbmnuI064ZGur0NmHyXUxubWMJTCO9kxsyy4T6jdzacHJY3XQWHxX4D4Mc+EA==
8007+
version "9.5.0"
8008+
resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-9.5.0.tgz#fd97b78bc1512025b9c9ad3998c60e2d75b6137e"
8009+
integrity sha512-OUbP509lWVlZxuMY+Cgomw49VzZFP9myIcVeYEpeBlbXJbPC4R+K4BmO9hd3ciYM5QIwm5W1PODcKjqxtkye9Q==
79588010
dependencies:
79598011
base64-js "^1.3.0"
79608012
ecdsa-sig-formatter "^1.0.11"
@@ -10035,7 +10087,7 @@ [email protected]:
1003510087
resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce"
1003610088
integrity sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg==
1003710089

10038-
lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21:
10090+
lodash@^4.17.11, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21:
1003910091
version "4.17.21"
1004010092
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
1004110093
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -14246,7 +14298,7 @@ [email protected]:
1424614298
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
1424714299
integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
1424814300

14249-
tslib@^1.13.0, tslib@^1.8.1:
14301+
tslib@^1.8.1:
1425014302
version "1.14.1"
1425114303
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
1425214304
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
@@ -14406,27 +14458,7 @@ typedarray@^0.0.6:
1440614458
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
1440714459
integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
1440814460

14409-
typescript-to-proptypes@^2.2.1:
14410-
version "2.2.1"
14411-
resolved "https://registry.yarnpkg.com/typescript-to-proptypes/-/typescript-to-proptypes-2.2.1.tgz#45fd201f6526bc45da3c5c0faa3b00cc23707613"
14412-
integrity sha512-FxVo0Rcf/c6dmHxA1DlAmpxct+1SuuDyX3Rl8MkfQt//yvZCMhWOuWZvJ3aP0/5eZTYIb+DpPt7htTL6A1xK9A==
14413-
dependencies:
14414-
"@babel/core" "^7.11.1"
14415-
"@babel/plugin-syntax-class-properties" "^7.10.4"
14416-
"@babel/plugin-syntax-jsx" "^7.10.4"
14417-
"@babel/types" "^7.11.0"
14418-
doctrine "^3.0.0"
14419-
lodash "^4.17.14"
14420-
tslib "^1.13.0"
14421-
typescript "3.8.3"
14422-
uuid "^8.1.0"
14423-
14424-
14425-
version "3.8.3"
14426-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061"
14427-
integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==
14428-
14429-
"typescript@>=3 < 6", typescript@^5.3.3:
14461+
"typescript@>=3 < 6", typescript@^5.1.6, typescript@^5.3.3:
1443014462
version "5.3.3"
1443114463
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"
1443214464
integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==
@@ -14685,12 +14717,12 @@ [email protected]:
1468514717
resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
1468614718
integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
1468714719

14688-
uuid@^8.1.0, uuid@^8.3.0, uuid@^8.3.2:
14720+
uuid@^8.3.0, uuid@^8.3.2:
1468914721
version "8.3.2"
1469014722
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
1469114723
integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
1469214724

14693-
uuid@^9.0.0:
14725+
uuid@^9.0.0, uuid@^9.0.1:
1469414726
version "9.0.1"
1469514727
resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
1469614728
integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==

0 commit comments

Comments
 (0)