diff --git a/docs/next.config.ts b/docs/next.config.ts index 4b0c03c0d94d1..279456fa04be3 100644 --- a/docs/next.config.ts +++ b/docs/next.config.ts @@ -1,6 +1,7 @@ import * as path from 'path'; import * as fs from 'fs'; import * as url from 'url'; +import * as semver from 'semver'; import { createRequire } from 'module'; import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer'; import { withDeploymentConfig } from '@mui/internal-docs-infra/withDocsInfra'; @@ -80,6 +81,7 @@ export default withDeploymentConfig({ env: { // docs-infra LIB_VERSION: pkg.version, + SEARCH_INDEX: `material-ui-v${semver.major(pkg.version)}`, SOURCE_CODE_REPO, SOURCE_GITHUB_BRANCH, GITHUB_TEMPLATE_DOCS_FEEDBACK: '6.docs-feedback.yml', diff --git a/docs/package.json b/docs/package.json index 9d2d3721406d2..83feb62159656 100644 --- a/docs/package.json +++ b/docs/package.json @@ -94,6 +94,7 @@ "rifm": "0.12.1", "rimraf": "catalog:", "rxjs": "^7.8.2", + "semver": "7.7.3", "styled-components": "^6.1.19", "stylis": "catalog:", "webpack-bundle-analyzer": "^5.1.1" @@ -114,6 +115,7 @@ "@types/nprogress": "0.2.3", "@types/prop-types": "catalog:", "@types/react-dom": "catalog:", + "@types/semver": "catalog:", "@types/stylis": "4.2.7", "@types/webpack-bundle-analyzer": "4.7.0", "gm": "1.25.1", diff --git a/package.json b/package.json index 2ffc797dab805..61fce3edc9cbf 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "@mui/internal-netlify-cache": "0.0.2-canary.1", "@mui/internal-test-utils": "catalog:", "@mui/material": "catalog:", - "@mui/monorepo": "github:mui/material-ui#v7.x", + "@mui/monorepo": "github:mui/material-ui#5cb7317ba2d9ebdfcdc171edc91de87c0aff6276", "@mui/utils": "catalog:", "@next/eslint-plugin-next": "15.5.9", "@octokit/plugin-retry": "8.0.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b2c8fbde8d0ae..51e392e343fd3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -270,8 +270,8 @@ importers: specifier: 'catalog:' version: 7.3.7(@emotion/react@11.14.0(@types/react@19.2.7)(react@19.2.3))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.2.7)(react@19.2.3))(@types/react@19.2.7)(react@19.2.3))(@types/react@19.2.7)(react-dom@19.2.3(react@19.2.3))(react@19.2.3) '@mui/monorepo': - specifier: github:mui/material-ui#v7.x - version: https://codeload.github.com/mui/material-ui/tar.gz/79f9ffb67fa0e1a4b622526b4e0f5bc3a2826957(@babel/core@7.28.5)(@types/express@5.0.3)(eslint@9.39.2)(typescript@5.9.3)(vitest@4.0.16) + specifier: github:mui/material-ui#5cb7317ba2d9ebdfcdc171edc91de87c0aff6276 + version: https://codeload.github.com/mui/material-ui/tar.gz/5cb7317ba2d9ebdfcdc171edc91de87c0aff6276(@babel/core@7.28.5)(@types/express@5.0.3)(eslint@9.39.2)(typescript@5.9.3)(vitest@4.0.16) '@mui/utils': specifier: 'catalog:' version: 7.3.7(@types/react@19.2.7)(react@19.2.3) @@ -707,6 +707,9 @@ importers: rxjs: specifier: ^7.8.2 version: 7.8.2 + semver: + specifier: 7.7.3 + version: 7.7.3 styled-components: specifier: ^6.1.19 version: 6.1.19(react-dom@19.2.3(react@19.2.3))(react@19.2.3) @@ -762,6 +765,9 @@ importers: '@types/react-dom': specifier: 'catalog:' version: 19.2.3(@types/react@19.2.7) + '@types/semver': + specifier: 'catalog:' + version: 7.7.1 '@types/stylis': specifier: 4.2.7 version: 4.2.7 @@ -4115,7 +4121,6 @@ packages: '@lerna/create@9.0.3': resolution: {integrity: sha512-hUTEWrR8zH+/Z3bp/R1aLm6DW8vB/BB7KH7Yeg4fMfrvSwxegiLVW9uJFAzWkK4mzEagmj/Dti85Yg9MN13t0g==} engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0} - deprecated: This package is an implementation detail of Lerna and is no longer published separately. '@mdn/browser-compat-data@5.7.6': resolution: {integrity: sha512-7xdrMX0Wk7grrTZQwAoy1GkvPMFoizStUoL+VmtUkAxegbCCec+3FKwOM6yc/uGU5+BEczQHXAlWiqvM8JeENg==} @@ -4123,7 +4128,7 @@ packages: '@mui/base@5.0.0-beta.40-1': resolution: {integrity: sha512-agKXuNNy0bHUmeU7pNmoZwNFr7Hiyhojkb9+2PVyDG5+6RafYuyMgbrav8CndsB7KUc/U51JAw9vKNDLYBzaUA==} engines: {node: '>=12.0.0'} - deprecated: This package has been replaced by @base-ui-components/react + deprecated: This package has been replaced by @base-ui/react peerDependencies: '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0 react: ^17.0.0 || ^18.0.0 || ^19.0.0 @@ -4316,8 +4321,8 @@ packages: '@types/react': optional: true - '@mui/monorepo@https://codeload.github.com/mui/material-ui/tar.gz/79f9ffb67fa0e1a4b622526b4e0f5bc3a2826957': - resolution: {tarball: https://codeload.github.com/mui/material-ui/tar.gz/79f9ffb67fa0e1a4b622526b4e0f5bc3a2826957} + '@mui/monorepo@https://codeload.github.com/mui/material-ui/tar.gz/5cb7317ba2d9ebdfcdc171edc91de87c0aff6276': + resolution: {tarball: https://codeload.github.com/mui/material-ui/tar.gz/5cb7317ba2d9ebdfcdc171edc91de87c0aff6276} version: 7.3.9 engines: {node: '>=22.18.0', pnpm: 10.28.2} @@ -11109,6 +11114,7 @@ packages: tar@7.4.3: resolution: {integrity: sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==} engines: {node: '>=18'} + deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me temp-dir@1.0.0: resolution: {integrity: sha512-xZFXEGbG7SNC3itwBzI3RYjq/cEhBkx2hJuKGIUOcEULmkQExXiHat2z/qkISYsuR+IKumhEfKKbV5qXmhICFQ==} @@ -14756,7 +14762,7 @@ snapshots: '@emotion/styled': 11.14.1(@emotion/react@11.14.0(@types/react@19.2.7)(react@19.2.3))(@types/react@19.2.7)(react@19.2.3) '@types/react': 19.2.7 - '@mui/monorepo@https://codeload.github.com/mui/material-ui/tar.gz/79f9ffb67fa0e1a4b622526b4e0f5bc3a2826957(@babel/core@7.28.5)(@types/express@5.0.3)(eslint@9.39.2)(typescript@5.9.3)(vitest@4.0.16)': + '@mui/monorepo@https://codeload.github.com/mui/material-ui/tar.gz/5cb7317ba2d9ebdfcdc171edc91de87c0aff6276(@babel/core@7.28.5)(@types/express@5.0.3)(eslint@9.39.2)(typescript@5.9.3)(vitest@4.0.16)': dependencies: '@netlify/functions': 5.1.2 '@slack/bolt': 4.6.0(@types/express@5.0.3) diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index db105c1678e2e..a9151f4cc4a9e 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -26,7 +26,6 @@ catalog: '@mui/utils': ^7.3.5 '@mui/x-internal-exceljs-fork': 4.4.3 '@playwright/test': ^1.57.0 - 'playwright': ^1.57.0 '@react-spring/web': ^10.0.3 '@types/chance': ^1.1.7 '@types/karma': ^6.3.9 @@ -65,6 +64,7 @@ catalog: moment-jalaali: ^0.10.4 moment-timezone: ^0.6.0 motion: ^12.24.12 + playwright: ^1.57.0 prop-types: ^15.8.1 react: 19.2.3 react-dom: 19.2.3