Skip to content

Commit de69648

Browse files
michaldudakmichaldudak
committed
Use shared npm packages
1 parent ff52290 commit de69648

8 files changed

+43
-48
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: 36 additions & 34 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,28 @@
17961796
react-test-renderer "^18.0.0"
17971797
semver "^5.7.0"
17981798

1799+
"@mui-internal/docs-utils@https://pkg.csb.dev/mui/material-ui/commit/a7883c38/@mui-internal/docs-utils":
1800+
version "1.0.0"
1801+
resolved "https://pkg.csb.dev/mui/material-ui/commit/a7883c38/@mui-internal/docs-utils#6e910a5684160395518813f694d3992fecd7de6c"
1802+
dependencies:
1803+
rimraf "^5.0.5"
1804+
typescript "^5.1.6"
1805+
1806+
"@mui-internal/typescript-to-proptypes@https://pkg.csb.dev/mui/material-ui/commit/a7883c38/@mui-internal/typescript-to-proptypes":
1807+
version "1.0.0"
1808+
resolved "https://pkg.csb.dev/mui/material-ui/commit/a7883c38/@mui-internal/typescript-to-proptypes#529869b83fe7225e6473427e82db66363b9c5649"
1809+
dependencies:
1810+
"@babel/core" "^7.23.7"
1811+
"@babel/plugin-syntax-class-properties" "^7.12.13"
1812+
"@babel/plugin-syntax-jsx" "^7.23.3"
1813+
"@babel/plugin-syntax-typescript" "^7.23.3"
1814+
"@babel/types" "^7.23.6"
1815+
"@mui-internal/docs-utils" "https://pkg.csb.dev/mui/material-ui/commit/a7883c38/@mui-internal/docs-utils"
1816+
doctrine "^3.0.0"
1817+
lodash "^4.17.21"
1818+
typescript "^5.3.3"
1819+
uuid "^9.0.1"
1820+
17991821
"@mui/[email protected]", "@mui/base@^5.0.0-beta.34":
18001822
version "5.0.0-beta.34"
18011823
resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-beta.34.tgz#44b0f203250a6e3b2d810f37c9720d114182abd0"
@@ -1866,9 +1888,9 @@
18661888
react-is "^18.2.0"
18671889
react-transition-group "^4.4.5"
18681890

1869-
"@mui/monorepo@https://github.com/mui/material-ui.git#master":
1891+
"@mui/monorepo@https://github.com/michaldudak/material-ui.git#npm-publishing/typescript-to-proptypes":
18701892
version "5.15.7"
1871-
resolved "https://github.com/mui/material-ui.git#19ff6ada02dafa827531653801a3b657d58047ba"
1893+
resolved "https://github.com/michaldudak/material-ui.git#f9dffaa39d8a9a1a3be66e09a848106bc4d4335e"
18721894
dependencies:
18731895
"@googleapis/sheets" "^5.0.5"
18741896
"@slack/bolt" "^3.17.1"
@@ -7952,9 +7974,9 @@ gm@^1.25.0:
79527974
debug "^3.1.0"
79537975

79547976
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==
7977+
version "9.5.0"
7978+
resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-9.5.0.tgz#fd97b78bc1512025b9c9ad3998c60e2d75b6137e"
7979+
integrity sha512-OUbP509lWVlZxuMY+Cgomw49VzZFP9myIcVeYEpeBlbXJbPC4R+K4BmO9hd3ciYM5QIwm5W1PODcKjqxtkye9Q==
79587980
dependencies:
79597981
base64-js "^1.3.0"
79607982
ecdsa-sig-formatter "^1.0.11"
@@ -10035,7 +10057,7 @@ [email protected]:
1003510057
resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce"
1003610058
integrity sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg==
1003710059

10038-
lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21:
10060+
lodash@^4.17.11, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21:
1003910061
version "4.17.21"
1004010062
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
1004110063
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -14246,7 +14268,7 @@ [email protected]:
1424614268
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
1424714269
integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
1424814270

14249-
tslib@^1.13.0, tslib@^1.8.1:
14271+
tslib@^1.8.1:
1425014272
version "1.14.1"
1425114273
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
1425214274
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
@@ -14406,27 +14428,7 @@ typedarray@^0.0.6:
1440614428
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
1440714429
integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
1440814430

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-
[email protected]:
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:
14431+
"typescript@>=3 < 6", typescript@^5.1.6, typescript@^5.3.3:
1443014432
version "5.3.3"
1443114433
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"
1443214434
integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==
@@ -14685,12 +14687,12 @@ [email protected]:
1468514687
resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
1468614688
integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
1468714689

14688-
uuid@^8.1.0, uuid@^8.3.0, uuid@^8.3.2:
14690+
uuid@^8.3.0, uuid@^8.3.2:
1468914691
version "8.3.2"
1469014692
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
1469114693
integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
1469214694

14693-
uuid@^9.0.0:
14695+
uuid@^9.0.0, uuid@^9.0.1:
1469414696
version "9.0.1"
1469514697
resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
1469614698
integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==

0 commit comments

Comments
 (0)