Skip to content

Commit 13dd87e

Browse files
michaldudakmichaldudak
committed
Use shared npm packages
1 parent 3a181aa commit 13dd87e

8 files changed

+31
-14
lines changed

‎babel.config.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +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-
'@mui-internal/typescript-to-proptypes': resolveAliasPath(
29-
'./node_modules/@mui/monorepo/packages/typescript-to-proptypes',
30-
),
3127
docs: resolveAliasPath('./node_modules/@mui/monorepo/docs'),
3228
test: resolveAliasPath('./test'),
3329
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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@
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/fb1fbe0a/@mui-internal/docs-utils",
96+
"@mui-internal/typescript-to-proptypes": "https://pkg.csb.dev/mui/material-ui/commit/fb1fbe0a/@mui-internal/typescript-to-proptypes",
9597
"@types/doctrine": "^0.0.9",
9698
"@types/stylis": "^4.2.5",
9799
"cpy-cli": "^5.0.0",

‎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/docs-utilities';
6+
} from '@mui-internal/docs-utils';
77
import { getComponentFilesInFolder } from './utils';
88

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

‎docs/scripts/generateProptypes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as path from 'path';
33
import * as fse from 'fs-extra';
44
import * as prettier from 'prettier';
55
import { getPropTypesFromFile, injectPropTypesInFile } from '@mui-internal/typescript-to-proptypes';
6-
import { fixBabelGeneratorIssues, fixLineEndings } from '@mui-internal/docs-utilities';
6+
import { fixBabelGeneratorIssues, fixLineEndings } from '@mui-internal/docs-utils';
77
import { createXTypeScriptProjects, XTypeScriptProject } from './createXTypeScriptProjects';
88

99
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.5",
8888
"@mui/material": "^5.15.5",
89-
"@mui/monorepo": "https://github.com/michaldudak/material-ui.git#make-proptypes-generic",
89+
"@mui/monorepo": "https://github.com/mui/material-ui.git#master",
9090
"@mui/utils": "^5.15.5",
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: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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/fb1fbe0a/@mui-internal/docs-utils":
1800+
version "0.0.1-alpha.1"
1801+
resolved "https://pkg.csb.dev/mui/material-ui/commit/fb1fbe0a/@mui-internal/docs-utils#1480446fd305cbb0fde22be4e190cb1b9ff5ef67"
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/fb1fbe0a/@mui-internal/typescript-to-proptypes":
1807+
version "0.0.1-alpha.1"
1808+
resolved "https://pkg.csb.dev/mui/material-ui/commit/fb1fbe0a/@mui-internal/typescript-to-proptypes#5708bc4f8d2500e3f0dbb352b07bc0e36f932203"
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/fb1fbe0a/@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.32":
18001822
version "5.0.0-beta.32"
18011823
resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-beta.32.tgz#cdda6c68389f0b8b39a5bff7ed16e40788aed510"
@@ -1866,9 +1888,9 @@
18661888
react-is "^18.2.0"
18671889
react-transition-group "^4.4.5"
18681890

1869-
"@mui/monorepo@https://github.com/michaldudak/material-ui.git#make-proptypes-generic":
1891+
"@mui/monorepo@https://github.com/mui/material-ui.git#master":
18701892
version "5.15.6"
1871-
resolved "https://github.com/michaldudak/material-ui.git#dc08d6d2f5467bf317453cd4f696102bcd534b87"
1893+
resolved "https://github.com/mui/material-ui.git#b63fb955e6cfab340fdc3597fbb399493d39d81d"
18721894
dependencies:
18731895
"@googleapis/sheets" "^5.0.5"
18741896
"@slack/bolt" "^3.17.1"
@@ -14389,7 +14411,7 @@ typedarray@^0.0.6:
1438914411
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
1439014412
integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
1439114413

14392-
"typescript@>=3 < 6", typescript@^5.3.3:
14414+
"typescript@>=3 < 6", typescript@^5.1.6, typescript@^5.3.3:
1439314415
version "5.3.3"
1439414416
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"
1439514417
integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==
@@ -14658,7 +14680,7 @@ uuid@^8.3.0:
1465814680
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
1465914681
integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
1466014682

14661-
uuid@^9.0.0:
14683+
uuid@^9.0.0, uuid@^9.0.1:
1466214684
version "9.0.1"
1466314685
resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
1466414686
integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==

0 commit comments

Comments
 (0)