From 9c62cf0ac5685ed8269798c6a4c3584cf47eb36b Mon Sep 17 00:00:00 2001 From: Jan Potoms <2109932+Janpot@users.noreply.github.com> Date: Wed, 22 May 2024 18:17:29 +0200 Subject: [PATCH 1/5] [docs-infra] Add Toolpad to muiNpmOrgs for codesandbox demos (#42316) --- docs/src/modules/sandbox/Dependencies.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/modules/sandbox/Dependencies.ts b/docs/src/modules/sandbox/Dependencies.ts index f19f2b919d006a..b34c9dd36dc4c6 100644 --- a/docs/src/modules/sandbox/Dependencies.ts +++ b/docs/src/modules/sandbox/Dependencies.ts @@ -2,7 +2,7 @@ import { CODE_VARIANTS } from 'docs/src/modules/constants'; import type { MuiProductId } from 'docs/src/modules/utils/getProductInfoFromUrl'; const packagesWithBundledTypes = ['date-fns', '@emotion/react', '@emotion/styled', 'dayjs']; -const muiNpmOrgs = ['@mui', '@base_ui', '@pigment-css']; +const muiNpmOrgs = ['@mui', '@base_ui', '@pigment-css', '@toolpad']; /** * WARNING: Always uses `latest` typings. From 4771db00ab034b3a08847eca0d16e256821452a4 Mon Sep 17 00:00:00 2001 From: Kim Wonsik <50368758+mihilt@users.noreply.github.com> Date: Thu, 23 May 2024 04:01:57 +0900 Subject: [PATCH 2/5] [material-ui][docs] Add minor modifications to the Vertical stepper demo (#42342) --- .../steppers/VerticalLinearStepper.js | 32 +++++++++---------- .../steppers/VerticalLinearStepper.tsx | 32 +++++++++---------- 2 files changed, 30 insertions(+), 34 deletions(-) diff --git a/docs/data/material/components/steppers/VerticalLinearStepper.js b/docs/data/material/components/steppers/VerticalLinearStepper.js index f124736cc19fb5..732ac6bbf4fb65 100644 --- a/docs/data/material/components/steppers/VerticalLinearStepper.js +++ b/docs/data/material/components/steppers/VerticalLinearStepper.js @@ -51,7 +51,7 @@ export default function VerticalLinearStepper() { Last step ) : null } @@ -61,22 +61,20 @@ export default function VerticalLinearStepper() { {step.description} -
- - -
+ + diff --git a/docs/data/material/components/steppers/VerticalLinearStepper.tsx b/docs/data/material/components/steppers/VerticalLinearStepper.tsx index f124736cc19fb5..732ac6bbf4fb65 100644 --- a/docs/data/material/components/steppers/VerticalLinearStepper.tsx +++ b/docs/data/material/components/steppers/VerticalLinearStepper.tsx @@ -51,7 +51,7 @@ export default function VerticalLinearStepper() { Last step ) : null } @@ -61,22 +61,20 @@ export default function VerticalLinearStepper() { {step.description} -
- - -
+ + From e7c4a4f938f8bbde0aa4b16f247201c6d1541458 Mon Sep 17 00:00:00 2001 From: Zeeshan Tamboli Date: Thu, 23 May 2024 11:02:19 +0530 Subject: [PATCH 3/5] [core] Remove `WyW-in-JS` from Renovate config (#42335) --- renovate.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/renovate.json b/renovate.json index b5d4f9f892d666..a6e41949546972 100644 --- a/renovate.json +++ b/renovate.json @@ -25,10 +25,6 @@ "groupName": "Emotion", "matchPackagePatterns": "@emotion/*" }, - { - "groupName": "WyW-in-JS", - "matchPackagePatterns": ["@wyw-in-js/*"] - }, { "groupName": "Font awesome SVG icons", "matchPackagePatterns": "@fortawesome/*" From bb4ce66b0a2d18e1af034ad69f93f959dc5dec72 Mon Sep 17 00:00:00 2001 From: Zeeshan Tamboli Date: Thu, 23 May 2024 11:03:05 +0530 Subject: [PATCH 4/5] [core] Remove `@types/prettier` package (#42339) --- package.json | 1 - packages-internal/scripts/package.json | 1 - pnpm-lock.yaml | 10 ---------- 3 files changed, 12 deletions(-) diff --git a/package.json b/package.json index 7f5e8108211eb5..9fef7dfe0050ae 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,6 @@ "@types/lodash": "^4.17.4", "@types/mocha": "^10.0.6", "@types/node": "^18.19.33", - "@types/prettier": "^2.7.3", "@types/react": "^18.2.55", "@types/yargs": "^17.0.32", "@typescript-eslint/eslint-plugin": "^6.21.0", diff --git a/packages-internal/scripts/package.json b/packages-internal/scripts/package.json index 678e2489a648f9..b99a88efa8b566 100644 --- a/packages-internal/scripts/package.json +++ b/packages-internal/scripts/package.json @@ -43,7 +43,6 @@ "@types/doctrine": "^0.0.9", "@types/lodash": "^4.17.4", "@types/node": "^18.19.33", - "@types/prettier": "^2.7.3", "@types/react": "^18.2.55", "@types/uuid": "^9.0.8", "chai": "^4.4.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 872133790b3695..a7e1f9fcfa86be 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -125,9 +125,6 @@ importers: '@types/node': specifier: ^18.19.33 version: 18.19.33 - '@types/prettier': - specifier: ^2.7.3 - version: 2.7.3 '@types/react': specifier: 18.2.55 version: 18.2.55 @@ -966,9 +963,6 @@ importers: '@types/node': specifier: ^18.19.33 version: 18.19.33 - '@types/prettier': - specifier: ^2.7.3 - version: 2.7.3 '@types/react': specifier: 18.2.55 version: 18.2.55 @@ -8104,10 +8098,6 @@ packages: /@types/parse-json@4.0.0: resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==} - /@types/prettier@2.7.3: - resolution: {integrity: sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==} - dev: true - /@types/promise.allsettled@1.0.3: resolution: {integrity: sha512-b/IFHHTkYkTqu41IH9UtpICwqrpKj2oNlb4KHPzFQDMiz+h1BgAeATeO0/XTph4+UkH9W2U0E4B4j64KWOovag==} dev: false From 1f86f9003fd2c073c699b7ba79b3756260843a0c Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskii Date: Thu, 23 May 2024 10:59:37 +0200 Subject: [PATCH 5/5] [test] Remove `userAgent` override in `jsdom` env (#42344) --- packages/mui-material/src/Tabs/Tabs.test.js | 2 +- packages/mui-material/src/internal/animate.test.js | 2 +- packages/test-utils/src/createDOM.js | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/mui-material/src/Tabs/Tabs.test.js b/packages/mui-material/src/Tabs/Tabs.test.js index bc3ff1e1cbb555..86ddbc7f6c4696 100644 --- a/packages/mui-material/src/Tabs/Tabs.test.js +++ b/packages/mui-material/src/Tabs/Tabs.test.js @@ -46,7 +46,7 @@ function hasRightScrollButton(container) { describe('', () => { // tests mocking getBoundingClientRect prevent mocha to exit - const isJSDOM = navigator.userAgent === 'node.js'; + const isJSDOM = /jsdom/.test(window.navigator.userAgent); const { clock, render, renderToString } = createRenderer(); diff --git a/packages/mui-material/src/internal/animate.test.js b/packages/mui-material/src/internal/animate.test.js index 48b7640fea491d..239c2c48dddfcd 100644 --- a/packages/mui-material/src/internal/animate.test.js +++ b/packages/mui-material/src/internal/animate.test.js @@ -6,7 +6,7 @@ describe('animate', () => { before(function beforeHook() { const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent); - const isJSDOM = navigator.userAgent === 'node.js'; + const isJSDOM = /jsdom/.test(window.navigator.userAgent); if (isJSDOM || isSafari) { // The test fails on Safari with just: // diff --git a/packages/test-utils/src/createDOM.js b/packages/test-utils/src/createDOM.js index 867653ea38ccd8..c08017b408cf81 100644 --- a/packages/test-utils/src/createDOM.js +++ b/packages/test-utils/src/createDOM.js @@ -54,10 +54,6 @@ function createDOM() { } global.window.Touch = Touch; - global.navigator = { - userAgent: 'node.js', - }; - Object.keys(dom.window) .filter((key) => !blacklist.includes(key)) .concat(whitelist)