From 59c479c78a6c92fd563e782d5cb9a6e03f3732cb Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Mon, 5 Feb 2024 13:21:17 +0100 Subject: [PATCH 1/7] rename folder --- packages/{x-license-pro => x-license}/LICENSE | 0 packages/{x-license-pro => x-license}/README.md | 0 packages/{x-license-pro => x-license}/generateReleaseInfo.js | 0 packages/{x-license-pro => x-license}/package.json | 0 .../src/Unstable_LicenseInfoProvider/LicenseInfoContext.ts | 0 .../src/Unstable_LicenseInfoProvider/LicenseInfoProvider.tsx | 0 .../src/Unstable_LicenseInfoProvider/index.ts | 0 packages/{x-license-pro => x-license}/src/Watermark/Watermark.tsx | 0 packages/{x-license-pro => x-license}/src/Watermark/index.ts | 0 packages/{x-license-pro => x-license}/src/encoding/base64.test.ts | 0 packages/{x-license-pro => x-license}/src/encoding/base64.ts | 0 packages/{x-license-pro => x-license}/src/encoding/md5.test.ts | 0 packages/{x-license-pro => x-license}/src/encoding/md5.ts | 0 .../src/generateLicense/generateLicense.test.ts | 0 .../src/generateLicense/generateLicense.ts | 0 .../{x-license-pro => x-license}/src/generateLicense/index.ts | 0 packages/{x-license-pro => x-license}/src/index.ts | 0 .../{x-license-pro => x-license}/src/useLicenseVerifier/index.ts | 0 .../src/useLicenseVerifier/useLicenseVerifier.test.tsx | 0 .../src/useLicenseVerifier/useLicenseVerifier.ts | 0 packages/{x-license-pro => x-license}/src/utils/index.ts | 0 .../src/utils/licenseErrorMessageUtils.ts | 0 packages/{x-license-pro => x-license}/src/utils/licenseInfo.ts | 0 packages/{x-license-pro => x-license}/src/utils/licenseScope.ts | 0 packages/{x-license-pro => x-license}/src/utils/licenseStatus.ts | 0 packages/{x-license-pro => x-license}/src/utils/licensingModel.ts | 0 packages/{x-license-pro => x-license}/src/verifyLicense/index.ts | 0 .../src/verifyLicense/verifyLicense.test.ts | 0 .../src/verifyLicense/verifyLicense.ts | 0 packages/{x-license-pro => x-license}/tsconfig.build.json | 0 packages/{x-license-pro => x-license}/tsconfig.json | 0 31 files changed, 0 insertions(+), 0 deletions(-) rename packages/{x-license-pro => x-license}/LICENSE (100%) rename packages/{x-license-pro => x-license}/README.md (100%) rename packages/{x-license-pro => x-license}/generateReleaseInfo.js (100%) rename packages/{x-license-pro => x-license}/package.json (100%) rename packages/{x-license-pro => x-license}/src/Unstable_LicenseInfoProvider/LicenseInfoContext.ts (100%) rename packages/{x-license-pro => x-license}/src/Unstable_LicenseInfoProvider/LicenseInfoProvider.tsx (100%) rename packages/{x-license-pro => x-license}/src/Unstable_LicenseInfoProvider/index.ts (100%) rename packages/{x-license-pro => x-license}/src/Watermark/Watermark.tsx (100%) rename packages/{x-license-pro => x-license}/src/Watermark/index.ts (100%) rename packages/{x-license-pro => x-license}/src/encoding/base64.test.ts (100%) rename packages/{x-license-pro => x-license}/src/encoding/base64.ts (100%) rename packages/{x-license-pro => x-license}/src/encoding/md5.test.ts (100%) rename packages/{x-license-pro => x-license}/src/encoding/md5.ts (100%) rename packages/{x-license-pro => x-license}/src/generateLicense/generateLicense.test.ts (100%) rename packages/{x-license-pro => x-license}/src/generateLicense/generateLicense.ts (100%) rename packages/{x-license-pro => x-license}/src/generateLicense/index.ts (100%) rename packages/{x-license-pro => x-license}/src/index.ts (100%) rename packages/{x-license-pro => x-license}/src/useLicenseVerifier/index.ts (100%) rename packages/{x-license-pro => x-license}/src/useLicenseVerifier/useLicenseVerifier.test.tsx (100%) rename packages/{x-license-pro => x-license}/src/useLicenseVerifier/useLicenseVerifier.ts (100%) rename packages/{x-license-pro => x-license}/src/utils/index.ts (100%) rename packages/{x-license-pro => x-license}/src/utils/licenseErrorMessageUtils.ts (100%) rename packages/{x-license-pro => x-license}/src/utils/licenseInfo.ts (100%) rename packages/{x-license-pro => x-license}/src/utils/licenseScope.ts (100%) rename packages/{x-license-pro => x-license}/src/utils/licenseStatus.ts (100%) rename packages/{x-license-pro => x-license}/src/utils/licensingModel.ts (100%) rename packages/{x-license-pro => x-license}/src/verifyLicense/index.ts (100%) rename packages/{x-license-pro => x-license}/src/verifyLicense/verifyLicense.test.ts (100%) rename packages/{x-license-pro => x-license}/src/verifyLicense/verifyLicense.ts (100%) rename packages/{x-license-pro => x-license}/tsconfig.build.json (100%) rename packages/{x-license-pro => x-license}/tsconfig.json (100%) diff --git a/packages/x-license-pro/LICENSE b/packages/x-license/LICENSE similarity index 100% rename from packages/x-license-pro/LICENSE rename to packages/x-license/LICENSE diff --git a/packages/x-license-pro/README.md b/packages/x-license/README.md similarity index 100% rename from packages/x-license-pro/README.md rename to packages/x-license/README.md diff --git a/packages/x-license-pro/generateReleaseInfo.js b/packages/x-license/generateReleaseInfo.js similarity index 100% rename from packages/x-license-pro/generateReleaseInfo.js rename to packages/x-license/generateReleaseInfo.js diff --git a/packages/x-license-pro/package.json b/packages/x-license/package.json similarity index 100% rename from packages/x-license-pro/package.json rename to packages/x-license/package.json diff --git a/packages/x-license-pro/src/Unstable_LicenseInfoProvider/LicenseInfoContext.ts b/packages/x-license/src/Unstable_LicenseInfoProvider/LicenseInfoContext.ts similarity index 100% rename from packages/x-license-pro/src/Unstable_LicenseInfoProvider/LicenseInfoContext.ts rename to packages/x-license/src/Unstable_LicenseInfoProvider/LicenseInfoContext.ts diff --git a/packages/x-license-pro/src/Unstable_LicenseInfoProvider/LicenseInfoProvider.tsx b/packages/x-license/src/Unstable_LicenseInfoProvider/LicenseInfoProvider.tsx similarity index 100% rename from packages/x-license-pro/src/Unstable_LicenseInfoProvider/LicenseInfoProvider.tsx rename to packages/x-license/src/Unstable_LicenseInfoProvider/LicenseInfoProvider.tsx diff --git a/packages/x-license-pro/src/Unstable_LicenseInfoProvider/index.ts b/packages/x-license/src/Unstable_LicenseInfoProvider/index.ts similarity index 100% rename from packages/x-license-pro/src/Unstable_LicenseInfoProvider/index.ts rename to packages/x-license/src/Unstable_LicenseInfoProvider/index.ts diff --git a/packages/x-license-pro/src/Watermark/Watermark.tsx b/packages/x-license/src/Watermark/Watermark.tsx similarity index 100% rename from packages/x-license-pro/src/Watermark/Watermark.tsx rename to packages/x-license/src/Watermark/Watermark.tsx diff --git a/packages/x-license-pro/src/Watermark/index.ts b/packages/x-license/src/Watermark/index.ts similarity index 100% rename from packages/x-license-pro/src/Watermark/index.ts rename to packages/x-license/src/Watermark/index.ts diff --git a/packages/x-license-pro/src/encoding/base64.test.ts b/packages/x-license/src/encoding/base64.test.ts similarity index 100% rename from packages/x-license-pro/src/encoding/base64.test.ts rename to packages/x-license/src/encoding/base64.test.ts diff --git a/packages/x-license-pro/src/encoding/base64.ts b/packages/x-license/src/encoding/base64.ts similarity index 100% rename from packages/x-license-pro/src/encoding/base64.ts rename to packages/x-license/src/encoding/base64.ts diff --git a/packages/x-license-pro/src/encoding/md5.test.ts b/packages/x-license/src/encoding/md5.test.ts similarity index 100% rename from packages/x-license-pro/src/encoding/md5.test.ts rename to packages/x-license/src/encoding/md5.test.ts diff --git a/packages/x-license-pro/src/encoding/md5.ts b/packages/x-license/src/encoding/md5.ts similarity index 100% rename from packages/x-license-pro/src/encoding/md5.ts rename to packages/x-license/src/encoding/md5.ts diff --git a/packages/x-license-pro/src/generateLicense/generateLicense.test.ts b/packages/x-license/src/generateLicense/generateLicense.test.ts similarity index 100% rename from packages/x-license-pro/src/generateLicense/generateLicense.test.ts rename to packages/x-license/src/generateLicense/generateLicense.test.ts diff --git a/packages/x-license-pro/src/generateLicense/generateLicense.ts b/packages/x-license/src/generateLicense/generateLicense.ts similarity index 100% rename from packages/x-license-pro/src/generateLicense/generateLicense.ts rename to packages/x-license/src/generateLicense/generateLicense.ts diff --git a/packages/x-license-pro/src/generateLicense/index.ts b/packages/x-license/src/generateLicense/index.ts similarity index 100% rename from packages/x-license-pro/src/generateLicense/index.ts rename to packages/x-license/src/generateLicense/index.ts diff --git a/packages/x-license-pro/src/index.ts b/packages/x-license/src/index.ts similarity index 100% rename from packages/x-license-pro/src/index.ts rename to packages/x-license/src/index.ts diff --git a/packages/x-license-pro/src/useLicenseVerifier/index.ts b/packages/x-license/src/useLicenseVerifier/index.ts similarity index 100% rename from packages/x-license-pro/src/useLicenseVerifier/index.ts rename to packages/x-license/src/useLicenseVerifier/index.ts diff --git a/packages/x-license-pro/src/useLicenseVerifier/useLicenseVerifier.test.tsx b/packages/x-license/src/useLicenseVerifier/useLicenseVerifier.test.tsx similarity index 100% rename from packages/x-license-pro/src/useLicenseVerifier/useLicenseVerifier.test.tsx rename to packages/x-license/src/useLicenseVerifier/useLicenseVerifier.test.tsx diff --git a/packages/x-license-pro/src/useLicenseVerifier/useLicenseVerifier.ts b/packages/x-license/src/useLicenseVerifier/useLicenseVerifier.ts similarity index 100% rename from packages/x-license-pro/src/useLicenseVerifier/useLicenseVerifier.ts rename to packages/x-license/src/useLicenseVerifier/useLicenseVerifier.ts diff --git a/packages/x-license-pro/src/utils/index.ts b/packages/x-license/src/utils/index.ts similarity index 100% rename from packages/x-license-pro/src/utils/index.ts rename to packages/x-license/src/utils/index.ts diff --git a/packages/x-license-pro/src/utils/licenseErrorMessageUtils.ts b/packages/x-license/src/utils/licenseErrorMessageUtils.ts similarity index 100% rename from packages/x-license-pro/src/utils/licenseErrorMessageUtils.ts rename to packages/x-license/src/utils/licenseErrorMessageUtils.ts diff --git a/packages/x-license-pro/src/utils/licenseInfo.ts b/packages/x-license/src/utils/licenseInfo.ts similarity index 100% rename from packages/x-license-pro/src/utils/licenseInfo.ts rename to packages/x-license/src/utils/licenseInfo.ts diff --git a/packages/x-license-pro/src/utils/licenseScope.ts b/packages/x-license/src/utils/licenseScope.ts similarity index 100% rename from packages/x-license-pro/src/utils/licenseScope.ts rename to packages/x-license/src/utils/licenseScope.ts diff --git a/packages/x-license-pro/src/utils/licenseStatus.ts b/packages/x-license/src/utils/licenseStatus.ts similarity index 100% rename from packages/x-license-pro/src/utils/licenseStatus.ts rename to packages/x-license/src/utils/licenseStatus.ts diff --git a/packages/x-license-pro/src/utils/licensingModel.ts b/packages/x-license/src/utils/licensingModel.ts similarity index 100% rename from packages/x-license-pro/src/utils/licensingModel.ts rename to packages/x-license/src/utils/licensingModel.ts diff --git a/packages/x-license-pro/src/verifyLicense/index.ts b/packages/x-license/src/verifyLicense/index.ts similarity index 100% rename from packages/x-license-pro/src/verifyLicense/index.ts rename to packages/x-license/src/verifyLicense/index.ts diff --git a/packages/x-license-pro/src/verifyLicense/verifyLicense.test.ts b/packages/x-license/src/verifyLicense/verifyLicense.test.ts similarity index 100% rename from packages/x-license-pro/src/verifyLicense/verifyLicense.test.ts rename to packages/x-license/src/verifyLicense/verifyLicense.test.ts diff --git a/packages/x-license-pro/src/verifyLicense/verifyLicense.ts b/packages/x-license/src/verifyLicense/verifyLicense.ts similarity index 100% rename from packages/x-license-pro/src/verifyLicense/verifyLicense.ts rename to packages/x-license/src/verifyLicense/verifyLicense.ts diff --git a/packages/x-license-pro/tsconfig.build.json b/packages/x-license/tsconfig.build.json similarity index 100% rename from packages/x-license-pro/tsconfig.build.json rename to packages/x-license/tsconfig.build.json diff --git a/packages/x-license-pro/tsconfig.json b/packages/x-license/tsconfig.json similarity index 100% rename from packages/x-license-pro/tsconfig.json rename to packages/x-license/tsconfig.json From cdbdb50c3d85df599d4f564c492bfeb8390a6ea5 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Mon, 5 Feb 2024 13:44:39 +0100 Subject: [PATCH 2/7] update package name --- .codesandbox/ci.json | 4 ++-- .eslintrc.js | 2 +- babel.config.js | 4 ++-- docs/babel.config.js | 2 +- docs/data/introduction/licensing/licensing.md | 12 ++++++------ docs/pages/_app.js | 2 +- docs/scripts/createXTypeScriptProjects.ts | 8 ++++---- packages/grid/x-data-grid-premium/package.json | 2 +- .../src/DataGridPremium/DataGridPremium.tsx | 2 +- packages/grid/x-data-grid-premium/src/index.ts | 2 +- .../src/tests/license.DataGridPremium.test.tsx | 2 +- .../grid/x-data-grid-premium/tsconfig.build.json | 2 +- packages/grid/x-data-grid-pro/package.json | 2 +- .../x-data-grid-pro/src/DataGridPro/DataGridPro.tsx | 2 +- packages/grid/x-data-grid-pro/src/index.ts | 2 +- .../src/tests/license.DataGridPro.test.tsx | 2 +- packages/grid/x-data-grid-pro/tsconfig.build.json | 2 +- packages/x-charts/tsconfig.build.json | 2 +- packages/x-date-pickers-pro/package.json | 2 +- .../src/DateRangeCalendar/DateRangeCalendar.tsx | 2 +- .../src/DateRangePickerDay/DateRangePickerDay.tsx | 2 +- packages/x-date-pickers-pro/src/index.ts | 2 +- .../useDesktopRangePicker/useDesktopRangePicker.tsx | 2 +- .../useMobileRangePicker/useMobileRangePicker.tsx | 2 +- packages/x-date-pickers-pro/tsconfig.build.json | 2 +- packages/x-license/README.md | 2 +- packages/x-license/package.json | 4 ++-- .../useLicenseVerifier/useLicenseVerifier.test.tsx | 2 +- scripts/sizeSnapshot/webpack.config.js | 9 +++------ test/regressions/index.js | 2 +- test/utils/mochaHooks.js | 2 +- tsconfig.json | 4 ++-- webpackBaseConfig.js | 2 +- 33 files changed, 47 insertions(+), 50 deletions(-) diff --git a/.codesandbox/ci.json b/.codesandbox/ci.json index f067fef9c95ec..87dccbd29834a 100644 --- a/.codesandbox/ci.json +++ b/.codesandbox/ci.json @@ -3,7 +3,7 @@ "installCommand": "install:codesandbox", "node": "18", "packages": [ - "packages/x-license-pro", + "packages/x-license", "packages/grid/x-data-grid", "packages/grid/x-data-grid-pro", "packages/grid/x-data-grid-premium", @@ -14,7 +14,7 @@ "packages/x-tree-view" ], "publishDirectory": { - "@mui/x-license-pro": "packages/x-license-pro/build", + "@mui/x-license": "packages/x-license/build", "@mui/x-data-grid": "packages/grid/x-data-grid/build", "@mui/x-data-grid-pro": "packages/grid/x-data-grid-pro/build", "@mui/x-data-grid-premium": "packages/grid/x-data-grid-premium/build", diff --git a/.eslintrc.js b/.eslintrc.js index 823e51ac43da9..3d1c7318c4195 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -158,6 +158,6 @@ module.exports = { buildPackageRestrictedImports('@mui/x-data-grid-generator', 'grid/x-data-grid-generator'), buildPackageRestrictedImports('@mui/x-pickers', 'x-pickers'), buildPackageRestrictedImports('@mui/x-pickers-pro', 'x-pickers-pro'), - buildPackageRestrictedImports('@mui/x-license-pro', 'x-license-pro'), + buildPackageRestrictedImports('@mui/x-license', 'x-license'), ], }; diff --git a/babel.config.js b/babel.config.js index 45a9cc8bb34ff..9fb8f2ed5c4ba 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,5 +1,5 @@ const path = require('path'); -const generateReleaseInfo = require('./packages/x-license-pro/generateReleaseInfo'); +const generateReleaseInfo = require('./packages/x-license/generateReleaseInfo'); function resolveAliasPath(relativeToBabelConf) { const resolvedPath = path.relative(process.cwd(), path.resolve(__dirname, relativeToBabelConf)); @@ -11,7 +11,7 @@ const defaultAlias = { '@mui/x-data-grid-generator': resolveAliasPath('./packages/grid/x-data-grid-generator/src'), '@mui/x-data-grid-pro': resolveAliasPath('./packages/grid/x-data-grid-pro/src'), '@mui/x-data-grid-premium': resolveAliasPath('./packages/grid/x-data-grid-premium/src'), - '@mui/x-license-pro': resolveAliasPath('./packages/x-license-pro/src'), + '@mui/x-license': resolveAliasPath('./packages/x-license/src'), '@mui/x-date-pickers': resolveAliasPath('./packages/x-date-pickers/src'), '@mui/x-date-pickers-pro': resolveAliasPath('./packages/x-date-pickers-pro/src'), '@mui/x-charts': resolveAliasPath('./packages/x-charts/src'), diff --git a/docs/babel.config.js b/docs/babel.config.js index 44face6ddf1ae..bd75265cabde0 100644 --- a/docs/babel.config.js +++ b/docs/babel.config.js @@ -10,7 +10,7 @@ const alias = { '@mui/x-date-pickers-pro': '../packages/x-date-pickers-pro/src', '@mui/x-charts': '../packages/x-charts/src', '@mui/x-tree-view': '../packages/x-tree-view/src', - '@mui/x-license-pro': '../packages/x-license-pro/src', + '@mui/x-license': '../packages/x-license/src', '@mui/docs': '../node_modules/@mui/monorepo/packages/mui-docs/src', '@mui/markdown': '../node_modules/@mui/monorepo/packages/markdown', '@mui/monorepo': '../node_modules/@mui/monorepo', diff --git a/docs/data/introduction/licensing/licensing.md b/docs/data/introduction/licensing/licensing.md index bb0d60c079c89..97436b7302853 100644 --- a/docs/data/introduction/licensing/licensing.md +++ b/docs/data/introduction/licensing/licensing.md @@ -137,11 +137,11 @@ If this isn't possible, please contact sales@mui.com to request a compatible lic ### How to install the key -The license key depends on a package called `@mui/x-license-{plan}` that validates whether or not it's active. +The license key depends on a package called `@mui/x-license` that validates whether or not it's active. Once you have your license key, import the `LicenseInfo` method from that package and call the `setLicenseKey()` function: ```jsx -import { LicenseInfo } from '@mui/x-license-pro'; +import { LicenseInfo } from '@mui/x-license'; LicenseInfo.setLicenseKey('YOUR_LICENSE_KEY'); ``` @@ -164,7 +164,7 @@ When using Next.js App Router, you have multiple options to install the license ```tsx 'use client'; -import { LicenseInfo } from '@mui/x-license-pro'; +import { LicenseInfo } from '@mui/x-license'; LicenseInfo.setLicenseKey('YOUR_LICENSE_KEY'); ``` @@ -173,7 +173,7 @@ LicenseInfo.setLicenseKey('YOUR_LICENSE_KEY'); ```tsx 'use client'; -import { LicenseInfo } from '@mui/x-license-pro'; +import { LicenseInfo } from '@mui/x-license'; LicenseInfo.setLicenseKey('YOUR_LICENSE_KEY'); @@ -204,7 +204,7 @@ export default function RootLayout(props: { children: React.ReactNode }) { When using Next.js pages, a great place to call `setLicenseKey` is in [`_app.js`](https://nextjs.org/docs/pages/building-your-application/routing/custom-app). ```tsx -import { LicenseInfo } from '@mui/x-license-pro'; +import { LicenseInfo } from '@mui/x-license'; LicenseInfo.setLicenseKey('YOUR_LICENSE_KEY'); @@ -225,7 +225,7 @@ The license key is validated on the server and client side so you must expose th To do this, you need to prefix the environment variables with `NEXT_PUBLIC_` as explained in the [Next.js documentation](https://nextjs.org/docs/app/building-your-application/configuring/environment-variables#bundling-environment-variables-for-the-browser): ```tsx -import { LicenseInfo } from '@mui/x-license-pro'; +import { LicenseInfo } from '@mui/x-license'; LicenseInfo.setLicenseKey(process.env.NEXT_PUBLIC_MUI_X_LICENSE_KEY); ``` diff --git a/docs/pages/_app.js b/docs/pages/_app.js index 56aaa444f278f..514da6bb6e2f1 100644 --- a/docs/pages/_app.js +++ b/docs/pages/_app.js @@ -18,7 +18,7 @@ import DocsStyledEngineProvider from 'docs/src/modules/utils/StyledEngineProvide import { pathnameToLanguage } from 'docs/src/modules/utils/helpers'; import createEmotionCache from 'docs/src/createEmotionCache'; import findActivePage from 'docs/src/modules/utils/findActivePage'; -import { LicenseInfo } from '@mui/x-license-pro'; +import { LicenseInfo } from '@mui/x-license'; import getProductInfoFromUrl from 'docs/src/modules/utils/getProductInfoFromUrl'; // Remove the license warning from demonstration purposes diff --git a/docs/scripts/createXTypeScriptProjects.ts b/docs/scripts/createXTypeScriptProjects.ts index 94239b95fe9a1..5fa2d813bd922 100644 --- a/docs/scripts/createXTypeScriptProjects.ts +++ b/docs/scripts/createXTypeScriptProjects.ts @@ -29,7 +29,7 @@ export interface XTypeScriptProject extends Omit { } export type XProjectNames = - | 'x-license-pro' + | 'x-license' | 'x-data-grid' | 'x-data-grid-pro' | 'x-data-grid-premium' @@ -117,10 +117,10 @@ export const createXTypeScriptProjects = () => { const projects: XTypeScriptProjects = new Map(); projects.set( - 'x-license-pro', + 'x-license', createXTypeScriptProject({ - name: 'x-license-pro', - rootPath: path.join(workspaceRoot, 'packages/x-license-pro'), + name: 'x-license', + rootPath: path.join(workspaceRoot, 'packages/x-license'), entryPointPath: 'src/index.ts', documentationFolderName: 'license', }), diff --git a/packages/grid/x-data-grid-premium/package.json b/packages/grid/x-data-grid-premium/package.json index f73cb63df8184..f500783663e27 100644 --- a/packages/grid/x-data-grid-premium/package.json +++ b/packages/grid/x-data-grid-premium/package.json @@ -48,7 +48,7 @@ "@mui/utils": "^5.15.7", "@mui/x-data-grid": "7.0.0-beta.1", "@mui/x-data-grid-pro": "7.0.0-beta.1", - "@mui/x-license-pro": "7.0.0-beta.0", + "@mui/x-license": "7.0.0-beta.0", "@types/format-util": "^1.0.4", "clsx": "^2.1.0", "exceljs": "^4.4.0", diff --git a/packages/grid/x-data-grid-premium/src/DataGridPremium/DataGridPremium.tsx b/packages/grid/x-data-grid-premium/src/DataGridPremium/DataGridPremium.tsx index e4958093925cb..6faff1711057a 100644 --- a/packages/grid/x-data-grid-premium/src/DataGridPremium/DataGridPremium.tsx +++ b/packages/grid/x-data-grid-premium/src/DataGridPremium/DataGridPremium.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import PropTypes from 'prop-types'; -import { useLicenseVerifier, Watermark } from '@mui/x-license-pro'; +import { useLicenseVerifier, Watermark } from '@mui/x-license'; import { GridBody, GridFooterPlaceholder, diff --git a/packages/grid/x-data-grid-premium/src/index.ts b/packages/grid/x-data-grid-premium/src/index.ts index f1a22a200ad24..c84acb31a2e50 100644 --- a/packages/grid/x-data-grid-premium/src/index.ts +++ b/packages/grid/x-data-grid-premium/src/index.ts @@ -1,6 +1,6 @@ import './typeOverloads'; -export { LicenseInfo } from '@mui/x-license-pro'; +export { LicenseInfo } from '@mui/x-license'; export * from '@mui/x-data-grid/components'; export * from '@mui/x-data-grid-pro/components'; export * from '@mui/x-data-grid/constants'; diff --git a/packages/grid/x-data-grid-premium/src/tests/license.DataGridPremium.test.tsx b/packages/grid/x-data-grid-premium/src/tests/license.DataGridPremium.test.tsx index f1b698277677a..52bd05723a498 100644 --- a/packages/grid/x-data-grid-premium/src/tests/license.DataGridPremium.test.tsx +++ b/packages/grid/x-data-grid-premium/src/tests/license.DataGridPremium.test.tsx @@ -3,7 +3,7 @@ import addYears from 'date-fns/addYears'; import { expect } from 'chai'; import { createRenderer, screen, waitFor } from '@mui-internal/test-utils'; import { DataGridPremium } from '@mui/x-data-grid-premium'; -import { generateLicense, LicenseInfo } from '@mui/x-license-pro'; +import { generateLicense, LicenseInfo } from '@mui/x-license'; describe(' - License', () => { const { render } = createRenderer(); diff --git a/packages/grid/x-data-grid-premium/tsconfig.build.json b/packages/grid/x-data-grid-premium/tsconfig.build.json index 7ce260c259230..04b7831a9a041 100644 --- a/packages/grid/x-data-grid-premium/tsconfig.build.json +++ b/packages/grid/x-data-grid-premium/tsconfig.build.json @@ -13,7 +13,7 @@ "references": [ { "path": "../x-data-grid/tsconfig.build.json" }, { "path": "../x-data-grid-pro/tsconfig.build.json" }, - { "path": "../../x-license-pro/tsconfig.build.json" } + { "path": "../../x-license/tsconfig.build.json" } ], "include": ["src/**/*.ts*", "../../../node_modules/@mui/material/themeCssVarsAugmentation"], "exclude": ["src/**/*.spec.ts*", "src/**/*.test.ts*"] diff --git a/packages/grid/x-data-grid-pro/package.json b/packages/grid/x-data-grid-pro/package.json index acb1211be650e..3bbc089783c55 100644 --- a/packages/grid/x-data-grid-pro/package.json +++ b/packages/grid/x-data-grid-pro/package.json @@ -47,7 +47,7 @@ "@mui/system": "^5.15.7", "@mui/utils": "^5.15.7", "@mui/x-data-grid": "7.0.0-beta.1", - "@mui/x-license-pro": "7.0.0-beta.0", + "@mui/x-license": "7.0.0-beta.0", "@types/format-util": "^1.0.4", "clsx": "^2.1.0", "prop-types": "^15.8.1", diff --git a/packages/grid/x-data-grid-pro/src/DataGridPro/DataGridPro.tsx b/packages/grid/x-data-grid-pro/src/DataGridPro/DataGridPro.tsx index b6623f1c4d26e..84d961f742727 100644 --- a/packages/grid/x-data-grid-pro/src/DataGridPro/DataGridPro.tsx +++ b/packages/grid/x-data-grid-pro/src/DataGridPro/DataGridPro.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import PropTypes from 'prop-types'; -import { useLicenseVerifier, Watermark } from '@mui/x-license-pro'; +import { useLicenseVerifier, Watermark } from '@mui/x-license'; import { GridBody, GridFooterPlaceholder, diff --git a/packages/grid/x-data-grid-pro/src/index.ts b/packages/grid/x-data-grid-pro/src/index.ts index 42a811cf261f1..01a4d74a6428a 100644 --- a/packages/grid/x-data-grid-pro/src/index.ts +++ b/packages/grid/x-data-grid-pro/src/index.ts @@ -1,6 +1,6 @@ import './typeOverloads'; -export { LicenseInfo } from '@mui/x-license-pro'; +export { LicenseInfo } from '@mui/x-license'; export * from '@mui/x-data-grid/components'; export * from '@mui/x-data-grid/constants'; export * from '@mui/x-data-grid/hooks'; diff --git a/packages/grid/x-data-grid-pro/src/tests/license.DataGridPro.test.tsx b/packages/grid/x-data-grid-pro/src/tests/license.DataGridPro.test.tsx index 66e8ea2677ace..73fe3acb94451 100644 --- a/packages/grid/x-data-grid-pro/src/tests/license.DataGridPro.test.tsx +++ b/packages/grid/x-data-grid-pro/src/tests/license.DataGridPro.test.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { expect } from 'chai'; import { createRenderer, screen, waitFor } from '@mui-internal/test-utils'; import { DataGridPro } from '@mui/x-data-grid-pro'; -import { LicenseInfo } from '@mui/x-license-pro'; +import { LicenseInfo } from '@mui/x-license'; describe(' - License', () => { const { render } = createRenderer(); diff --git a/packages/grid/x-data-grid-pro/tsconfig.build.json b/packages/grid/x-data-grid-pro/tsconfig.build.json index 2f16f7689a735..388cabbecf572 100644 --- a/packages/grid/x-data-grid-pro/tsconfig.build.json +++ b/packages/grid/x-data-grid-pro/tsconfig.build.json @@ -12,7 +12,7 @@ }, "references": [ { "path": "../x-data-grid/tsconfig.build.json" }, - { "path": "../../x-license-pro/tsconfig.build.json" } + { "path": "../../x-license/tsconfig.build.json" } ], "include": ["src/**/*.ts*", "../../../node_modules/@mui/material/themeCssVarsAugmentation"], "exclude": ["src/**/*.spec.ts*", "src/**/*.test.ts*"] diff --git a/packages/x-charts/tsconfig.build.json b/packages/x-charts/tsconfig.build.json index 9a57c648d7749..019fe2e46dfe7 100644 --- a/packages/x-charts/tsconfig.build.json +++ b/packages/x-charts/tsconfig.build.json @@ -10,7 +10,7 @@ "outDir": "build", "rootDir": "./src" }, - "references": [{ "path": "../x-license-pro/tsconfig.build.json" }], + "references": [{ "path": "../x-license/tsconfig.build.json" }], "include": ["src/**/*.ts*", "../../node_modules/@mui/material/themeCssVarsAugmentation"], "exclude": ["src/**/*.spec.ts*", "src/**/*.test.ts*", "src/tests/**/*"] } diff --git a/packages/x-date-pickers-pro/package.json b/packages/x-date-pickers-pro/package.json index c0bbca565a567..8e4e528ce50f3 100644 --- a/packages/x-date-pickers-pro/package.json +++ b/packages/x-date-pickers-pro/package.json @@ -47,7 +47,7 @@ "@mui/system": "^5.15.7", "@mui/utils": "^5.15.7", "@mui/x-date-pickers": "7.0.0-beta.1", - "@mui/x-license-pro": "7.0.0-beta.0", + "@mui/x-license": "7.0.0-beta.0", "clsx": "^2.1.0", "prop-types": "^15.8.1", "react-transition-group": "^4.4.5" diff --git a/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.tsx b/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.tsx index bd573303ca85b..ec2f22372bd90 100644 --- a/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.tsx +++ b/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.tsx @@ -6,7 +6,7 @@ import useMediaQuery from '@mui/material/useMediaQuery'; import { resolveComponentProps, useSlotProps } from '@mui/base/utils'; import { styled, useThemeProps } from '@mui/material/styles'; import { unstable_composeClasses as composeClasses } from '@mui/utils'; -import { Watermark } from '@mui/x-license-pro'; +import { Watermark } from '@mui/x-license'; import { PickersCalendarHeader, PickersCalendarHeaderProps, diff --git a/packages/x-date-pickers-pro/src/DateRangePickerDay/DateRangePickerDay.tsx b/packages/x-date-pickers-pro/src/DateRangePickerDay/DateRangePickerDay.tsx index a7609833e7466..29c0be8863b86 100644 --- a/packages/x-date-pickers-pro/src/DateRangePickerDay/DateRangePickerDay.tsx +++ b/packages/x-date-pickers-pro/src/DateRangePickerDay/DateRangePickerDay.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import clsx from 'clsx'; -import { useLicenseVerifier } from '@mui/x-license-pro'; +import { useLicenseVerifier } from '@mui/x-license'; import { alpha, styled, useThemeProps } from '@mui/material/styles'; import { unstable_composeClasses as composeClasses } from '@mui/utils'; import { useUtils } from '@mui/x-date-pickers/internals'; diff --git a/packages/x-date-pickers-pro/src/index.ts b/packages/x-date-pickers-pro/src/index.ts index 84bd43757e4fd..4644fd2bed955 100644 --- a/packages/x-date-pickers-pro/src/index.ts +++ b/packages/x-date-pickers-pro/src/index.ts @@ -1,4 +1,4 @@ -export { LicenseInfo } from '@mui/x-license-pro'; +export { LicenseInfo } from '@mui/x-license'; export * from '@mui/x-date-pickers'; export * from './DateRangePickerDay'; diff --git a/packages/x-date-pickers-pro/src/internals/hooks/useDesktopRangePicker/useDesktopRangePicker.tsx b/packages/x-date-pickers-pro/src/internals/hooks/useDesktopRangePicker/useDesktopRangePicker.tsx index b7f2c73c90729..52bf5c8e3e0d5 100644 --- a/packages/x-date-pickers-pro/src/internals/hooks/useDesktopRangePicker/useDesktopRangePicker.tsx +++ b/packages/x-date-pickers-pro/src/internals/hooks/useDesktopRangePicker/useDesktopRangePicker.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { useSlotProps } from '@mui/base/utils'; -import { useLicenseVerifier } from '@mui/x-license-pro'; +import { useLicenseVerifier } from '@mui/x-license'; import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider'; import { PickersLayout, PickersLayoutSlotProps } from '@mui/x-date-pickers/PickersLayout'; import { diff --git a/packages/x-date-pickers-pro/src/internals/hooks/useMobileRangePicker/useMobileRangePicker.tsx b/packages/x-date-pickers-pro/src/internals/hooks/useMobileRangePicker/useMobileRangePicker.tsx index 7db23cf2c4a4d..7acf65d0aa523 100644 --- a/packages/x-date-pickers-pro/src/internals/hooks/useMobileRangePicker/useMobileRangePicker.tsx +++ b/packages/x-date-pickers-pro/src/internals/hooks/useMobileRangePicker/useMobileRangePicker.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { useSlotProps } from '@mui/base/utils'; -import { useLicenseVerifier } from '@mui/x-license-pro'; +import { useLicenseVerifier } from '@mui/x-license'; import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider'; import { PickersLayout, PickersLayoutSlotProps } from '@mui/x-date-pickers/PickersLayout'; import { diff --git a/packages/x-date-pickers-pro/tsconfig.build.json b/packages/x-date-pickers-pro/tsconfig.build.json index 0f80aaf556fe2..ae3fe2fae517f 100644 --- a/packages/x-date-pickers-pro/tsconfig.build.json +++ b/packages/x-date-pickers-pro/tsconfig.build.json @@ -12,7 +12,7 @@ }, "references": [ { "path": "../x-date-pickers/tsconfig.build.json" }, - { "path": "../x-license-pro/tsconfig.build.json" } + { "path": "../x-license/tsconfig.build.json" } ], "include": [ "./src/**/*.ts*", diff --git a/packages/x-license/README.md b/packages/x-license/README.md index 50637606a8362..da852b345392e 100644 --- a/packages/x-license/README.md +++ b/packages/x-license/README.md @@ -1,3 +1,3 @@ -# @mui/x-license-pro +# @mui/x-license Package used by all MUI X to validate license. diff --git a/packages/x-license/package.json b/packages/x-license/package.json index a5af0141425c0..989bb92c6f762 100644 --- a/packages/x-license/package.json +++ b/packages/x-license/package.json @@ -1,5 +1,5 @@ { - "name": "@mui/x-license-pro", + "name": "@mui/x-license", "version": "7.0.0-beta.0", "description": "MUI X License verification", "author": "MUI Team", @@ -32,7 +32,7 @@ "repository": { "type": "git", "url": "https://github.com/mui/mui-x.git", - "directory": "packages/x-license-pro" + "directory": "packages/x-license" }, "dependencies": { "@babel/runtime": "^7.23.9", diff --git a/packages/x-license/src/useLicenseVerifier/useLicenseVerifier.test.tsx b/packages/x-license/src/useLicenseVerifier/useLicenseVerifier.test.tsx index 903041728166c..9aaa3bfc713b0 100644 --- a/packages/x-license/src/useLicenseVerifier/useLicenseVerifier.test.tsx +++ b/packages/x-license/src/useLicenseVerifier/useLicenseVerifier.test.tsx @@ -6,7 +6,7 @@ import { LicenseInfo, generateLicense, Unstable_LicenseInfoProvider as LicenseInfoProvider, -} from '@mui/x-license-pro'; +} from '@mui/x-license'; import { sharedLicenseStatuses } from './useLicenseVerifier'; import { generateReleaseInfo } from '../verifyLicense'; diff --git a/scripts/sizeSnapshot/webpack.config.js b/scripts/sizeSnapshot/webpack.config.js index b2a07570ad87c..316aadc855610 100644 --- a/scripts/sizeSnapshot/webpack.config.js +++ b/scripts/sizeSnapshot/webpack.config.js @@ -20,8 +20,8 @@ async function getWebpackEntries() { path: 'packages/grid/x-data-grid/build/index-esm.js', }, { - name: '@mui/x-license-pro', - path: 'packages/x-license-pro/build/esm/index.js', + name: '@mui/x-license', + path: 'packages/x-license/build/esm/index.js', }, ]; } @@ -74,10 +74,7 @@ module.exports = async function webpackConfig(webpack, environment) { workspaceRoot, 'packages/grid/x-data-grid-premium/build/index-esm.js', ), - '@mui/x-license-pro': path.join( - workspaceRoot, - 'packages/x-license-pro/build/esm/index.js', - ), + '@mui/x-license': path.join(workspaceRoot, 'packages/x-license/build/esm/index.js'), }, }, entry: { [entry.name]: path.join(workspaceRoot, entry.path) }, diff --git a/test/regressions/index.js b/test/regressions/index.js index 8c15137e78e93..2c621503bd037 100644 --- a/test/regressions/index.js +++ b/test/regressions/index.js @@ -1,7 +1,7 @@ import * as React from 'react'; import * as ReactDOM from 'react-dom/client'; import { BrowserRouter as Router, Routes, Route, Link } from 'react-router-dom'; -import { LicenseInfo } from '@mui/x-license-pro'; +import { LicenseInfo } from '@mui/x-license'; import TestViewer from 'test/regressions/TestViewer'; import { useFakeTimers } from 'sinon'; import { Globals } from '@react-spring/web'; diff --git a/test/utils/mochaHooks.js b/test/utils/mochaHooks.js index a0d197dae9ab3..db01b1e91dffe 100644 --- a/test/utils/mochaHooks.js +++ b/test/utils/mochaHooks.js @@ -1,5 +1,5 @@ import sinon from 'sinon'; -import { LicenseInfo } from '@mui/x-license-pro'; +import { LicenseInfo } from '@mui/x-license'; import { unstable_resetCleanupTracking as unstable_resetCleanupTrackingDataGrid } from '@mui/x-data-grid'; import { unstable_resetCleanupTracking as unstable_resetCleanupTrackingDataGridPro } from '@mui/x-data-grid-pro'; import { unstable_resetCleanupTracking as unstable_resetCleanupTrackingTreeView } from '@mui/x-tree-view'; diff --git a/tsconfig.json b/tsconfig.json index b429ed81bc638..4278740bf3e32 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -24,8 +24,8 @@ "@mui/x-charts/*": ["./packages/x-charts/src/*"], "@mui/x-tree-view": ["./packages/x-tree-view/src"], "@mui/x-tree-view/*": ["./packages/x-tree-view/src/*"], - "@mui/x-license-pro": ["./packages/x-license-pro/src"], - "@mui/x-license-pro/*": ["./packages/x-license-pro/src/*"], + "@mui/x-license": ["./packages/x-license/src"], + "@mui/x-license/*": ["./packages/x-license/src/*"], "@mui-internal/test-utils": ["./node_modules/@mui/monorepo/packages/test-utils/src"], "@mui-internal/test-utils/*": ["./node_modules/@mui/monorepo/packages/test-utils/src/*"], "@mui-internal/api-docs-builder": ["./node_modules/@mui/monorepo/packages/api-docs-builder"], diff --git a/webpackBaseConfig.js b/webpackBaseConfig.js index 69baa5018cb6f..a0f8c26d94e7d 100644 --- a/webpackBaseConfig.js +++ b/webpackBaseConfig.js @@ -21,7 +21,7 @@ module.exports = { '@mui/x-date-pickers-pro': path.resolve(__dirname, './packages/x-date-pickers-pro/src'), '@mui/x-charts': path.resolve(__dirname, './packages/x-charts/src'), '@mui/x-tree-view': path.resolve(__dirname, './packages/x-tree-view/src'), - '@mui/x-license-pro': path.resolve(__dirname, './packages/x-license-pro/src'), + '@mui/x-license': path.resolve(__dirname, './packages/x-license/src'), '@mui/markdown': path.resolve(__dirname, './node_modules/@mui/monorepo/packages/markdown'), '@mui/material-nextjs': path.resolve( __dirname, From ddb6a198f7b321e61d5a57925f3722957e09c1bd Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Mon, 5 Feb 2024 13:58:38 +0100 Subject: [PATCH 3/7] update migration guides --- .../migration-data-grid-v6.md | 20 +++++++++++++++++++ .../migration-pickers-v6.md | 16 +++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/docs/data/migration/migration-data-grid-v6/migration-data-grid-v6.md b/docs/data/migration/migration-data-grid-v6/migration-data-grid-v6.md index 907ccdf3398a3..a8d8840ff8304 100644 --- a/docs/data/migration/migration-data-grid-v6/migration-data-grid-v6.md +++ b/docs/data/migration/migration-data-grid-v6/migration-data-grid-v6.md @@ -19,6 +19,10 @@ In `package.json`, change the version of the data grid package to `next`. ```diff -"@mui/x-data-grid": "6.x.x", +"@mui/x-data-grid": "next", +-"@mui/x-data-grid-pro": "6.x.x", ++"@mui/x-data-grid-pro": "next", +-"@mui/x-data-grid-premium": "6.x.x", ++"@mui/x-data-grid-premium": "next", ``` Since v7 is a major release, it contains changes that affect the public API. @@ -31,6 +35,22 @@ To have the option of using the latest API from `@mui/material`, the package pee It is a change in minor version only, so it should not cause any breaking changes. Please update your `@mui/material` package to this or a newer version. +## Update the license package + +If you're using the commerical versions of the Data Grid ([Pro](/x/introduction/licensing/#pro-plan) and [Premium](/x/introduction/licensing/#premium-plan) plans), you need to update the license package to the latest version. + +```diff +-"@mui/x-license-pro": "6.x.x", ++"@mui/x-license": "next", +``` + +Note that the license package has been renamed to `@mui/x-license` and you also need to update the import path: + +```diff +-import { LicenseInfo } from '@mui/x-license-pro'; ++import { LicenseInfo } from '@mui/x-license'; +``` + ## Run codemods The `preset-safe` codemod will automatically adjust the bulk of your code to account for breaking changes in v7. diff --git a/docs/data/migration/migration-pickers-v6/migration-pickers-v6.md b/docs/data/migration/migration-pickers-v6/migration-pickers-v6.md index f2e4b8386a3fc..dd16298d77b86 100644 --- a/docs/data/migration/migration-pickers-v6/migration-pickers-v6.md +++ b/docs/data/migration/migration-pickers-v6/migration-pickers-v6.md @@ -31,6 +31,22 @@ To have the option of using the latest API from `@mui/material`, the package pee It is a change in minor version only, so it should not cause any breaking changes. Please update your `@mui/material` package to this or a newer version. +## Update the license package + +If you're using the commerical version of the pickers ([Pro](/x/introduction/licensing/#pro-plan) plan), you need to update the license package to the latest version. + +```diff +-"@mui/x-license-pro": "6.x.x", ++"@mui/x-license": "next", +``` + +Note that the license package has been renamed to `@mui/x-license` and you also need to update the import path: + +```diff +-import { LicenseInfo } from '@mui/x-license-pro'; ++import { LicenseInfo } from '@mui/x-license'; +``` + ## Run codemods The `preset-safe` codemod will automatically adjust the bulk of your code to account for breaking changes in v7. You can run `v7.0.0/pickers/preset-safe` targeting only Date and Time Pickers or `v7.0.0/preset-safe` to target Data Grid as well. From 3c48a6fb6c71a815a9447904e49447506c45b4b3 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Mon, 5 Feb 2024 20:12:28 +0100 Subject: [PATCH 4/7] update migration guide --- .../migration-data-grid-v6/migration-data-grid-v6.md | 12 ++++++------ .../migration-pickers-v6/migration-pickers-v6.md | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/data/migration/migration-data-grid-v6/migration-data-grid-v6.md b/docs/data/migration/migration-data-grid-v6/migration-data-grid-v6.md index a8d8840ff8304..ffe987fef67e3 100644 --- a/docs/data/migration/migration-data-grid-v6/migration-data-grid-v6.md +++ b/docs/data/migration/migration-data-grid-v6/migration-data-grid-v6.md @@ -37,18 +37,18 @@ Please update your `@mui/material` package to this or a newer version. ## Update the license package -If you're using the commerical versions of the Data Grid ([Pro](/x/introduction/licensing/#pro-plan) and [Premium](/x/introduction/licensing/#premium-plan) plans), you need to update the license package to the latest version. +If you're using the commerical version of the Data Grid ([Pro](/x/introduction/licensing/#pro-plan) and [Premium](/x/introduction/licensing/#premium-plan) plans), you need to update the import path: ```diff --"@mui/x-license-pro": "6.x.x", -+"@mui/x-license": "next", +-import { LicenseInfo } from '@mui/x-license-pro'; ++import { LicenseInfo } from '@mui/x-license'; ``` -Note that the license package has been renamed to `@mui/x-license` and you also need to update the import path: +If you have `@mui/x-license-pro` in the `dependencies` section of your `package.json`, update the license package to the latest version: ```diff --import { LicenseInfo } from '@mui/x-license-pro'; -+import { LicenseInfo } from '@mui/x-license'; +-"@mui/x-license-pro": "6.x.x", ++"@mui/x-license": "next", ``` ## Run codemods diff --git a/docs/data/migration/migration-pickers-v6/migration-pickers-v6.md b/docs/data/migration/migration-pickers-v6/migration-pickers-v6.md index dd16298d77b86..e0b0fece301c8 100644 --- a/docs/data/migration/migration-pickers-v6/migration-pickers-v6.md +++ b/docs/data/migration/migration-pickers-v6/migration-pickers-v6.md @@ -33,18 +33,18 @@ Please update your `@mui/material` package to this or a newer version. ## Update the license package -If you're using the commerical version of the pickers ([Pro](/x/introduction/licensing/#pro-plan) plan), you need to update the license package to the latest version. +If you're using the commerical version of the pickers ([Pro](/x/introduction/licensing/#pro-plan) plan), you need to update the import path: ```diff --"@mui/x-license-pro": "6.x.x", -+"@mui/x-license": "next", +-import { LicenseInfo } from '@mui/x-license-pro'; ++import { LicenseInfo } from '@mui/x-license'; ``` -Note that the license package has been renamed to `@mui/x-license` and you also need to update the import path: +If you have `@mui/x-license-pro` in the `dependencies` section of your `package.json`, update the license package to the latest version: ```diff --import { LicenseInfo } from '@mui/x-license-pro'; -+import { LicenseInfo } from '@mui/x-license'; +-"@mui/x-license-pro": "6.x.x", ++"@mui/x-license": "next", ``` ## Run codemods From 5fa60dd496cd136b060abfb46c253695e29c1fbc Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Mon, 5 Feb 2024 20:13:13 +0100 Subject: [PATCH 5/7] fix typo --- .../migration/migration-data-grid-v6/migration-data-grid-v6.md | 2 +- .../data/migration/migration-pickers-v6/migration-pickers-v6.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/data/migration/migration-data-grid-v6/migration-data-grid-v6.md b/docs/data/migration/migration-data-grid-v6/migration-data-grid-v6.md index ffe987fef67e3..9bfbca85c1f6a 100644 --- a/docs/data/migration/migration-data-grid-v6/migration-data-grid-v6.md +++ b/docs/data/migration/migration-data-grid-v6/migration-data-grid-v6.md @@ -37,7 +37,7 @@ Please update your `@mui/material` package to this or a newer version. ## Update the license package -If you're using the commerical version of the Data Grid ([Pro](/x/introduction/licensing/#pro-plan) and [Premium](/x/introduction/licensing/#premium-plan) plans), you need to update the import path: +If you're using the commercial version of the Data Grid ([Pro](/x/introduction/licensing/#pro-plan) and [Premium](/x/introduction/licensing/#premium-plan) plans), you need to update the import path: ```diff -import { LicenseInfo } from '@mui/x-license-pro'; diff --git a/docs/data/migration/migration-pickers-v6/migration-pickers-v6.md b/docs/data/migration/migration-pickers-v6/migration-pickers-v6.md index e0b0fece301c8..48d493ceb8077 100644 --- a/docs/data/migration/migration-pickers-v6/migration-pickers-v6.md +++ b/docs/data/migration/migration-pickers-v6/migration-pickers-v6.md @@ -33,7 +33,7 @@ Please update your `@mui/material` package to this or a newer version. ## Update the license package -If you're using the commerical version of the pickers ([Pro](/x/introduction/licensing/#pro-plan) plan), you need to update the import path: +If you're using the commercial version of the pickers ([Pro](/x/introduction/licensing/#pro-plan) plan), you need to update the import path: ```diff -import { LicenseInfo } from '@mui/x-license-pro'; From c138090d0455ecfa3062997a07f558f9e42316d3 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Mon, 5 Feb 2024 20:16:04 +0100 Subject: [PATCH 6/7] docs:api --- scripts/{x-license-pro.exports.json => x-license.exports.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename scripts/{x-license-pro.exports.json => x-license.exports.json} (100%) diff --git a/scripts/x-license-pro.exports.json b/scripts/x-license.exports.json similarity index 100% rename from scripts/x-license-pro.exports.json rename to scripts/x-license.exports.json From aedd02251f4d268ac312462e1fec466d8ddda5c9 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Tue, 6 Feb 2024 10:55:34 +0100 Subject: [PATCH 7/7] apply review suggestions from Lukas --- .../migration-data-grid-v6/migration-data-grid-v6.md | 2 +- .../migration/migration-pickers-v6/migration-pickers-v6.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/data/migration/migration-data-grid-v6/migration-data-grid-v6.md b/docs/data/migration/migration-data-grid-v6/migration-data-grid-v6.md index 8072603ef1bee..8ec34302b4d7a 100644 --- a/docs/data/migration/migration-data-grid-v6/migration-data-grid-v6.md +++ b/docs/data/migration/migration-data-grid-v6/migration-data-grid-v6.md @@ -44,7 +44,7 @@ If you're using the commercial version of the Data Grid ([Pro](/x/introduction/l +import { LicenseInfo } from '@mui/x-license'; ``` -If you have `@mui/x-license-pro` in the `dependencies` section of your `package.json`, update the license package to the latest version: +If you have `@mui/x-license-pro` in the `dependencies` section of your `package.json`, rename and update the license package to the latest version: ```diff -"@mui/x-license-pro": "6.x.x", diff --git a/docs/data/migration/migration-pickers-v6/migration-pickers-v6.md b/docs/data/migration/migration-pickers-v6/migration-pickers-v6.md index 48d493ceb8077..794dd85eb3684 100644 --- a/docs/data/migration/migration-pickers-v6/migration-pickers-v6.md +++ b/docs/data/migration/migration-pickers-v6/migration-pickers-v6.md @@ -33,14 +33,14 @@ Please update your `@mui/material` package to this or a newer version. ## Update the license package -If you're using the commercial version of the pickers ([Pro](/x/introduction/licensing/#pro-plan) plan), you need to update the import path: +If you're using the commercial version of the Pickers ([Pro](/x/introduction/licensing/#pro-plan) plan), you need to update the import path: ```diff -import { LicenseInfo } from '@mui/x-license-pro'; +import { LicenseInfo } from '@mui/x-license'; ``` -If you have `@mui/x-license-pro` in the `dependencies` section of your `package.json`, update the license package to the latest version: +If you have `@mui/x-license-pro` in the `dependencies` section of your `package.json`, rename and update the license package to the latest version: ```diff -"@mui/x-license-pro": "6.x.x",