@mui/x-license 7.16.0 → 7.18.0

package/CHANGELOG.md

@@ -3,6 +3,186 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 7.18.0
+
+_Sep 20, 2024_
+
+We'd like to offer a big thanks to the 14 contributors who made this release possible. Here are some highlights ✨:
+
+- 💫 Support [Row spanning](https://mui.com/x/react-data-grid/row-spanning/) on the Data Grid that automatically merges the consecutive cells in a column based on the cell value
+
+  <img width="600" src="https://github.com/user-attachments/assets/d32ec936-d238-4c92-9e1a-af6788d74cdf" alt="data grid row spanning" />
+
+- ⏰ Support `date-fns` v4 (#14673) @LukasTy
+- 🎉 Add option for Pickers to change the order of displayed years (#11780) @thomasmoon
+- 🐞 Bugfixes
+- 📚 Documentation improvements
+
+<!--/ HIGHLIGHT_ABOVE_SEPARATOR /-->
+
+### Data Grid
+
+#### `@mui/x-data-grid@7.18.0`
+
+- [DataGrid] Add default reset value in row edit mode (#14050) @michelengelen
+- [DataGrid] Add `columnGroupHeaderHeight` prop for sizing column group headers (#14637) @KenanYusuf
+- [DataGrid] Fix `document` reference when the grid is rendered in a popup window (#14649) @arminmeh
+- [DataGrid] Remove `minFirstColumn` from `GetHeadersParams` interface (#14450) @k-rajat19
+- [DataGrid] Row spanning (#14124) @MBilalShafi
+
+#### `@mui/x-data-grid-pro@7.18.0` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
+
+Same changes as in `@mui/x-data-grid@7.18.0`, plus:
+
+- [DataGridPro] Fix `onRowsScrollEnd` being triggered instantly when bottom pinned row is present (#14602) @arminmeh
+- [DataGridPro] Fix header filters rendering issue for `isEmpty` and `isNotEmpty` filter operators (#14493) @k-rajat19
+- [DataGridPro] Fix pinned columns in RTL mode (#14586) @KenanYusuf
+
+#### `@mui/x-data-grid-premium@7.18.0` [![premium](https://mui.com/r/x-premium-svg)](https://mui.com/r/x-premium-svg-link 'Premium plan')
+
+Same changes as in `@mui/x-data-grid-pro@7.18.0`.
+
+### Date and Time Pickers
+
+#### `@mui/x-date-pickers@7.18.0`
+
+- [pickers] Add option to change the order of displayed years (#11780) @thomasmoon
+- [pickers] Support `date-fns` v4 (#14673) @LukasTy
+
+#### `@mui/x-date-pickers-pro@7.18.0` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
+
+Same changes as in `@mui/x-date-pickers@7.18.0`.
+
+### Charts
+
+#### `@mui/x-charts@7.18.0`
+
+- [charts] Add a `PolarProvider` to manage polar axes (#14642) @alexfauquette
+- [charts] Fix `LineChart` animation being stuck with initial drawing area value (#14553) @JCQuintas
+- [charts] Fix legend slot typing (#14657) @alexfauquette
+- [charts] Pass the axis index to extremum getter (#14641) @alexfauquette
+- [charts] Provide hooks to create custom tooltip (#14377) @alexfauquette
+
+#### `@mui/x-charts-pro@7.0.0-beta.1` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
+
+Same changes as in `@mui/x-charts@7.18.0`.
+
+### Tree View
+
+#### `@mui/x-tree-view@7.18.0`
+
+- [TreeView] Add `"use client"` directive to every public component and hook (#14579) @flaviendelangle
+
+### Docs
+
+- [docs] Add `groupingValueGetter` callout in column definition docs (#14599) @michelengelen
+- [docs] Clean v6 => v7 migration guide (#14652) @flaviendelangle
+- [docs] Copy `vale-action.yml` from main repo @oliviertassinari
+- [docs] Edit the Pickers Getting started doc (#14555) @samuelsycamore
+- [docs] Fix TypeScript capitalization @oliviertassinari
+- [docs] Fix Vale error @oliviertassinari
+- [docs] Make the migration guide diff a bit easier to read @oliviertassinari
+- [docs] Report Vale at warning level (#14660) @oliviertassinari
+- [docs] Warn about the `valueGetter` and `valueFormatter` signature change (#14613) @cherniavskii
+- [docs] Polish code formatting (#14603) @oliviertassinari
+- [test] Spy on `observe` method to avoid flaky wait for a callback (#14640) @arminmeh
+
+### Core
+
+- [core] Fix 301 link to Next.js and git diff @oliviertassinari
+- [core] Fix failing CI on `master` (#14644) @cherniavskii
+- [core] Fix `package.json` repository rule @oliviertassinari
+- [core] MUI X repository moved to a new location @oliviertassinari
+- [docs-infra] Strengthen CSP (#14581) @oliviertassinari
+- [license] Finish renaming of LicensingModel (#14615) @oliviertassinari
+
+## 7.17.0
+
+_Sep 13, 2024_
+
+We'd like to offer a big thanks to the 12 contributors who made this release possible. Here are some highlights ✨:
+
+- 📊 Charts performance improvement
+- 🧑‍💻 New Data Grid [custom columns demo](https://mui.com/x/react-data-grid/custom-columns/#full-example)
+- 🐞 Bugfixes
+- 📚 Documentation improvements
+- 🌍 Improve Hungarian (hu-HU) locale on the Data Grid
+
+<!--/ HIGHLIGHT_ABOVE_SEPARATOR /-->
+
+### Data Grid
+
+#### `@mui/x-data-grid@7.17.0`
+
+- [DataGrid] Add "does not equal" and "does not contain" filter operators (#14489) @KenanYusuf
+- [DataGrid] Add demo to the "Custom columns" page that does not use generator (#13695) @arminmeh
+- [DataGrid] Fix Voice Over reading the column name twice (#14482) @arminmeh
+- [DataGrid] Fix bug in CRUD example (#14513) @michelengelen
+- [DataGrid] Fix failing jsdom tests caused by `:has()` selectors (#14559) @KenanYusuf
+- [DataGrid] Refactor string operator filter functions (#14564) @KenanYusuf
+- [l10n] Improve Hungarian (hu-HU) locale (#14506) @ntamas
+
+#### `@mui/x-data-grid-pro@7.17.0` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
+
+Same changes as in `@mui/x-data-grid@7.17.0`.
+
+#### `@mui/x-data-grid-premium@7.17.0` [![premium](https://mui.com/r/x-premium-svg)](https://mui.com/r/x-premium-svg-link 'Premium plan')
+
+Same changes as in `@mui/x-data-grid-pro@7.17.0`.
+
+### Date and Time Pickers
+
+#### `@mui/x-date-pickers@7.17.0`
+
+- [fields] Improve `useSplitFieldProps` and make it public (#14514) @flaviendelangle
+- [pickers] Improve clear action label (#14243) @oliviertassinari
+- [pickers] Add `"use client"` directive to every public component and hook (#14562) @flaviendelangle
+- [pickers] Allow custom fields to validate the value (#14486) @flaviendelangle
+- [pickers] Stop using utils in locales (#14505) @flaviendelangle
+
+#### `@mui/x-date-pickers-pro@7.17.0` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
+
+Same changes as in `@mui/x-date-pickers@7.17.0`, plus:
+
+- [DateRangePicker] Fix `currentMonthCalendarPosition` not scrolling to future sibling (#14442) @GMchris
+
+### Charts
+
+#### `@mui/x-charts@7.17.0`
+
+- [charts] Add `"use client"` directive to every public component and hook (#14578) @flaviendelangle
+- [charts] Allow `onItemClick` on the `Legend` component (#14231) @JCQuintas
+- [charts] Fix `onAxisClick` with `layout='horizontal'` (#14547) @alexfauquette
+- [charts] Replace `path` with `circle` for performance improvement (#14518) @alexfauquette
+
+#### `@mui/x-charts-pro@7.0.0-beta.1` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
+
+Same changes as in `@mui/x-charts@7.17.0`.
+
+### Tree View
+
+#### `@mui/x-tree-view@7.17.0`
+
+- [TreeView] Make `useTreeItem2` stable (#14498) @flaviendelangle
+
+### Docs
+
+- [docs] Add missing callout on "Imperative API" tree view sections (#14503) @flaviendelangle
+- [docs] Fix broken redirection to MUI X v5 @oliviertassinari
+- [docs] Fix multiple `console.error` messages on `charts` docs (#14554) @JCQuintas
+- [docs] Fixed typo in Row Grouping recipes (#14549) @Miodini
+- [docs] Match title with blog posts @oliviertassinari
+
+### Core
+
+- [core] Move warning methods to `@mui/x-internals` (#14528) @k-rajat19
+- [core] Sync with core release flow @oliviertassinari
+- [code-infra] Fix charts benchmark workflow (#14573) @JCQuintas
+- [docs-infra] Type interface API pages (#14138) @alexfauquette
+- [infra] Create `ESLint plugins` renovate group (#14574) @LukasTy
+- [license] Clean-up terminology to match codebase (#14531) @oliviertassinari
+- [test] Remove dead `act()` logic (#14529) @oliviertassinari
+
 ## 7.16.0
 
 _Sep 5, 2024_
@@ -108,7 +288,7 @@ We'd like to offer a big thanks to the 8 contributors who made this release poss
 
 - 💫 Support Material UI v6 (`@mui/material@6`) peer dependency (#14142) @cherniavskii
 
-You can now use MUI X components with either v5 or v6 of `@mui/material` package 🎉
+You can now use MUI X components with either v5 or v6 of `@mui/material` package 🎉
 
 - 🐞 Bugfixes
 
@@ -153,7 +333,7 @@ Same changes as in `@mui/x-charts@7.15.0`, plus:
 
 - [docs] Fix sentence case `h2` @oliviertassinari
 - [docs] Clarify contribution guide references @oliviertassinari
-- [docs] Fix Stack Overflow issue canned response @oliviertassinari
+- [docs] Fix Stack Overflow issue canned response @oliviertassinari
 - [docs] Fix outdated link to support page @oliviertassinari
 - [docs] Fix use of Material UI @oliviertassinari
 - [docs] Update deprecated props in docs (#14295) @JCQuintas
@@ -411,7 +591,7 @@ The [Pro plan](https://mui.com/x/introduction/licensing/#pro-plan) is receiving
 
 As always, every feature released as part of the MIT plan will remain free and MIT licensed forever.
 
-This expansion of the Pro plan comes with some adjustments to our pricing strategy. Learn more about those in the [Upcoming changes to MUI X pricing in 2024](https://mui.com/blog/mui-x-sep-2024-price-update/) blog post.
+This expansion of the Pro plan comes with some adjustments to our pricing strategy. Learn more about those in the [Upcoming changes to MUI X pricing in 2024](https://mui.com/blog/mui-x-sep-2024-price-update/) blog post.
 
 ### Highlights
 
@@ -476,7 +656,7 @@ Same changes as in `@mui/x-date-pickers@7.12.0`.
 #### `@mui/x-charts@7.12.0`
 
 - [charts] Fix incorrect `axisId` prop being allowed in xAxis/yAxis config. Use `id` instead. (#13986) @JCQuintas
-- [charts] Use vendor to have Common JS bundle working out of the box (#13608) @alexfauquette
+- [charts] Use vendor to have CommonJS bundle working out of the box (#13608) @alexfauquette
 - [charts] Divide the `SeriesProvider` to use in filtering (#14026) @JCQuintas
 
 ### Tree View

package/generateLicense/generateLicense.d.ts

@@ -1,12 +1,10 @@
-import { LicenseScope, PlanVersion } from '../utils/licenseScope';
-import { LicensingModel } from '../utils/licensingModel';
+import { PlanScope, PlanVersion } from '../utils/plan';
+import { LicenseModel } from '../utils/licenseModel';
 export interface LicenseDetails {
-    orderNumber: string;
     expiryDate: Date;
-    scope?: LicenseScope;
-    planScope?: LicenseScope;
-    licenseModel?: LicensingModel;
-    licensingModel?: LicensingModel;
+    licenseModel?: LicenseModel;
+    orderNumber: string;
+    planScope?: PlanScope;
     planVersion: PlanVersion;
 }
 export declare function generateLicense(details: LicenseDetails): string;

package/generateLicense/generateLicense.js

@@ -1,21 +1,13 @@
 import { md5 } from "../encoding/md5.js";
 import { base64Encode } from "../encoding/base64.js";
-import { LICENSE_SCOPES } from "../utils/licenseScope.js";
-import { LICENSING_MODELS } from "../utils/licensingModel.js";
+import { PLAN_SCOPES } from "../utils/plan.js";
+import { LICENSE_MODELS } from "../utils/licenseModel.js";
 const licenseVersion = '2';
 function getClearLicenseString(details) {
-  // TODO remove
-  if (details.licensingModel) {
-    details.licenseModel = details.licensingModel;
-  }
-  // TODO remove
-  if (details.scope) {
-    details.planScope = details.scope;
-  }
-  if (details.planScope && !LICENSE_SCOPES.includes(details.planScope)) {
+  if (details.planScope && !PLAN_SCOPES.includes(details.planScope)) {
     throw new Error('MUI X: Invalid scope');
   }
-  if (details.licenseModel && !LICENSING_MODELS.includes(details.licenseModel)) {
+  if (details.licenseModel && !LICENSE_MODELS.includes(details.licenseModel)) {
     throw new Error('MUI X: Invalid licensing model');
   }
   const keyParts = [`O=${details.orderNumber}`, `E=${details.expiryDate.getTime()}`, `S=${details.planScope}`, `LM=${details.licenseModel}`, `PV=${details.planVersion}`, `KV=${licenseVersion}`];

package/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-license v7.16.0
+ * @mui/x-license v7.18.0
  *
  * @license MUI X Commercial
  * This source code is licensed under the commercial license found in the

package/modern/generateLicense/generateLicense.js

@@ -1,21 +1,13 @@
 import { md5 } from "../encoding/md5.js";
 import { base64Encode } from "../encoding/base64.js";
-import { LICENSE_SCOPES } from "../utils/licenseScope.js";
-import { LICENSING_MODELS } from "../utils/licensingModel.js";
+import { PLAN_SCOPES } from "../utils/plan.js";
+import { LICENSE_MODELS } from "../utils/licenseModel.js";
 const licenseVersion = '2';
 function getClearLicenseString(details) {
-  // TODO remove
-  if (details.licensingModel) {
-    details.licenseModel = details.licensingModel;
-  }
-  // TODO remove
-  if (details.scope) {
-    details.planScope = details.scope;
-  }
-  if (details.planScope && !LICENSE_SCOPES.includes(details.planScope)) {
+  if (details.planScope && !PLAN_SCOPES.includes(details.planScope)) {
     throw new Error('MUI X: Invalid scope');
   }
-  if (details.licenseModel && !LICENSING_MODELS.includes(details.licenseModel)) {
+  if (details.licenseModel && !LICENSE_MODELS.includes(details.licenseModel)) {
     throw new Error('MUI X: Invalid licensing model');
   }
   const keyParts = [`O=${details.orderNumber}`, `E=${details.expiryDate.getTime()}`, `S=${details.planScope}`, `LM=${details.licenseModel}`, `PV=${details.planVersion}`, `KV=${licenseVersion}`];

package/modern/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-license v7.16.0
+ * @mui/x-license v7.18.0
  *
  * @license MUI X Commercial
  * This source code is licensed under the commercial license found in the

package/{utils/licensingModel.js → modern/utils/licenseModel.js}

@@ -1,4 +1,4 @@
-export const LICENSING_MODELS = [
+export const LICENSE_MODELS = [
 /**
  * A license is outdated if the current version of the software was released after the expiry date of the license.
  * But the license can be used indefinitely with an older version of the software.
@@ -10,6 +10,8 @@ export const LICENSING_MODELS = [
  */
 'annual',
 /**
- * TODO 2025 remove, legacy name of annual.
+ * Legacy. The previous name for 'annual'.
+ * Can be removed once old license keys generated with 'subscription' are no longer supported.
+ * To support for a while. We need more years of backward support and we sell multi year licenses.
  */
 'subscription'];

package/modern/utils/plan.js

@@ -0,0 +1,2 @@
+export const PLAN_SCOPES = ['pro', 'premium'];
+export const PLAN_VERSIONS = ['initial', 'Q3-2024'];

package/modern/verifyLicense/verifyLicense.js

@@ -1,8 +1,8 @@
 import { base64Decode, base64Encode } from "../encoding/base64.js";
 import { md5 } from "../encoding/md5.js";
 import { LICENSE_STATUS } from "../utils/licenseStatus.js";
-import { LICENSE_SCOPES } from "../utils/licenseScope.js";
-import { LICENSING_MODELS } from "../utils/licensingModel.js";
+import { PLAN_SCOPES } from "../utils/plan.js";
+import { LICENSE_MODELS } from "../utils/licenseModel.js";
 const getDefaultReleaseDate = () => {
   const today = new Date();
   today.setHours(0, 0, 0, 0);
@@ -11,7 +11,7 @@ const getDefaultReleaseDate = () => {
 export function generateReleaseInfo(releaseDate = getDefaultReleaseDate()) {
   return base64Encode(releaseDate.getTime().toString());
 }
-function isLicenseScopeSufficient(packageName, licenseScope) {
+function isPlanScopeSufficient(packageName, planScope) {
   let acceptedScopes;
   if (packageName.includes('-pro')) {
     acceptedScopes = ['pro', 'premium'];
@@ -20,7 +20,7 @@ function isLicenseScopeSufficient(packageName, licenseScope) {
   } else {
     acceptedScopes = [];
   }
-  return acceptedScopes.includes(licenseScope);
+  return acceptedScopes.includes(planScope);
 }
 const expiryReg = /^.*EXPIRY=([0-9]+),.*$/;
 const PRO_PACKAGES_AVAILABLE_IN_INITIAL_PRO_PLAN = ['x-data-grid-pro', 'x-date-pickers-pro'];
@@ -39,29 +39,29 @@ const decodeLicenseVersion1 = license => {
     expiryTimestamp = null;
   }
   return {
-    scope: 'pro',
-    licensingModel: 'perpetual',
+    planScope: 'pro',
+    licenseModel: 'perpetual',
     expiryTimestamp,
     planVersion: 'initial'
   };
 };
 
 /**
- * Format: O=${orderNumber},E=${expiryTimestamp},S=${scope},LM=${licensingModel},PV=${planVersion},KV=2`;
+ * Format: O=${orderNumber},E=${expiryTimestamp},S=${planScope},LM=${licenseModel},PV=${planVersion},KV=2`;
  */
 const decodeLicenseVersion2 = license => {
   const licenseInfo = {
-    scope: null,
-    licensingModel: null,
+    planScope: null,
+    licenseModel: null,
     expiryTimestamp: null,
     planVersion: 'initial'
   };
   license.split(',').map(token => token.split('=')).filter(el => el.length === 2).forEach(([key, value]) => {
     if (key === 'S') {
-      licenseInfo.scope = value;
+      licenseInfo.planScope = value;
     }
     if (key === 'LM') {
-      licenseInfo.licensingModel = value;
+      licenseInfo.licenseModel = value;
     }
     if (key === 'E') {
       const expiryTimestamp = parseInt(value, 10);
@@ -116,7 +116,7 @@ export function verifyLicense({
       status: LICENSE_STATUS.Invalid
     };
   }
-  if (license.licensingModel == null || !LICENSING_MODELS.includes(license.licensingModel)) {
+  if (license.licenseModel == null || !LICENSE_MODELS.includes(license.licenseModel)) {
     console.error('MUI X: Error checking license. Licensing model not found or invalid!');
     return {
       status: LICENSE_STATUS.Invalid
@@ -128,7 +128,7 @@ export function verifyLicense({
       status: LICENSE_STATUS.Invalid
     };
   }
-  if (license.licensingModel === 'perpetual' || process.env.NODE_ENV === 'production') {
+  if (license.licenseModel === 'perpetual' || process.env.NODE_ENV === 'production') {
     const pkgTimestamp = parseInt(base64Decode(releaseInfo), 10);
     if (Number.isNaN(pkgTimestamp)) {
       throw new Error('MUI X: The release information is invalid. Not able to validate license.');
@@ -138,7 +138,7 @@ export function verifyLicense({
         status: LICENSE_STATUS.ExpiredVersion
       };
     }
-  } else if (license.licensingModel === 'subscription' || license.licensingModel === 'annual') {
+  } else if (license.licenseModel === 'subscription' || license.licenseModel === 'annual') {
     if (new Date().getTime() > license.expiryTimestamp) {
       if (
       // 30 days grace
@@ -160,20 +160,20 @@ export function verifyLicense({
       };
     }
   }
-  if (license.scope == null || !LICENSE_SCOPES.includes(license.scope)) {
-    console.error('MUI X: Error checking license. scope not found or invalid!');
+  if (license.planScope == null || !PLAN_SCOPES.includes(license.planScope)) {
+    console.error('MUI X: Error checking license. planScope not found or invalid!');
     return {
       status: LICENSE_STATUS.Invalid
     };
   }
-  if (!isLicenseScopeSufficient(packageName, license.scope)) {
+  if (!isPlanScopeSufficient(packageName, license.planScope)) {
     return {
       status: LICENSE_STATUS.OutOfScope
     };
   }
 
   // 'charts-pro' or 'tree-view-pro' can only be used with a newer Pro license
-  if (license.planVersion === 'initial' && license.scope === 'pro' && !PRO_PACKAGES_AVAILABLE_IN_INITIAL_PRO_PLAN.includes(packageName)) {
+  if (license.planVersion === 'initial' && license.planScope === 'pro' && !PRO_PACKAGES_AVAILABLE_IN_INITIAL_PRO_PLAN.includes(packageName)) {
     return {
       status: LICENSE_STATUS.NotAvailableInInitialProPlan
     };

package/node/generateLicense/generateLicense.js

@@ -6,22 +6,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.generateLicense = generateLicense;
 var _md = require("../encoding/md5");
 var _base = require("../encoding/base64");
-var _licenseScope = require("../utils/licenseScope");
-var _licensingModel = require("../utils/licensingModel");
+var _plan = require("../utils/plan");
+var _licenseModel = require("../utils/licenseModel");
 const licenseVersion = '2';
 function getClearLicenseString(details) {
-  // TODO remove
-  if (details.licensingModel) {
-    details.licenseModel = details.licensingModel;
-  }
-  // TODO remove
-  if (details.scope) {
-    details.planScope = details.scope;
-  }
-  if (details.planScope && !_licenseScope.LICENSE_SCOPES.includes(details.planScope)) {
+  if (details.planScope && !_plan.PLAN_SCOPES.includes(details.planScope)) {
     throw new Error('MUI X: Invalid scope');
   }
-  if (details.licenseModel && !_licensingModel.LICENSING_MODELS.includes(details.licenseModel)) {
+  if (details.licenseModel && !_licenseModel.LICENSE_MODELS.includes(details.licenseModel)) {
     throw new Error('MUI X: Invalid licensing model');
   }
   const keyParts = [`O=${details.orderNumber}`, `E=${details.expiryDate.getTime()}`, `S=${details.planScope}`, `LM=${details.licenseModel}`, `PV=${details.planVersion}`, `KV=${licenseVersion}`];

package/node/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-license v7.16.0
+ * @mui/x-license v7.18.0
  *
  * @license MUI X Commercial
  * This source code is licensed under the commercial license found in the

package/node/utils/{licensingModel.js → licenseModel.js}

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.LICENSING_MODELS = void 0;
-const LICENSING_MODELS = exports.LICENSING_MODELS = [
+exports.LICENSE_MODELS = void 0;
+const LICENSE_MODELS = exports.LICENSE_MODELS = [
 /**
  * A license is outdated if the current version of the software was released after the expiry date of the license.
  * But the license can be used indefinitely with an older version of the software.
@@ -16,6 +16,8 @@ const LICENSING_MODELS = exports.LICENSING_MODELS = [
  */
 'annual',
 /**
- * TODO 2025 remove, legacy name of annual.
+ * Legacy. The previous name for 'annual'.
+ * Can be removed once old license keys generated with 'subscription' are no longer supported.
+ * To support for a while. We need more years of backward support and we sell multi year licenses.
  */
 'subscription'];

package/node/utils/{licenseScope.js → plan.js}

@@ -3,6 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.PLAN_VERSIONS = exports.LICENSE_SCOPES = void 0;
-const LICENSE_SCOPES = exports.LICENSE_SCOPES = ['pro', 'premium'];
+exports.PLAN_VERSIONS = exports.PLAN_SCOPES = void 0;
+const PLAN_SCOPES = exports.PLAN_SCOPES = ['pro', 'premium'];
 const PLAN_VERSIONS = exports.PLAN_VERSIONS = ['initial', 'Q3-2024'];

package/node/verifyLicense/verifyLicense.js

@@ -8,8 +8,8 @@ exports.verifyLicense = verifyLicense;
 var _base = require("../encoding/base64");
 var _md = require("../encoding/md5");
 var _licenseStatus = require("../utils/licenseStatus");
-var _licenseScope = require("../utils/licenseScope");
-var _licensingModel = require("../utils/licensingModel");
+var _plan = require("../utils/plan");
+var _licenseModel = require("../utils/licenseModel");
 const getDefaultReleaseDate = () => {
   const today = new Date();
   today.setHours(0, 0, 0, 0);
@@ -18,7 +18,7 @@ const getDefaultReleaseDate = () => {
 function generateReleaseInfo(releaseDate = getDefaultReleaseDate()) {
   return (0, _base.base64Encode)(releaseDate.getTime().toString());
 }
-function isLicenseScopeSufficient(packageName, licenseScope) {
+function isPlanScopeSufficient(packageName, planScope) {
   let acceptedScopes;
   if (packageName.includes('-pro')) {
     acceptedScopes = ['pro', 'premium'];
@@ -27,7 +27,7 @@ function isLicenseScopeSufficient(packageName, licenseScope) {
   } else {
     acceptedScopes = [];
   }
-  return acceptedScopes.includes(licenseScope);
+  return acceptedScopes.includes(planScope);
 }
 const expiryReg = /^.*EXPIRY=([0-9]+),.*$/;
 const PRO_PACKAGES_AVAILABLE_IN_INITIAL_PRO_PLAN = ['x-data-grid-pro', 'x-date-pickers-pro'];
@@ -46,29 +46,29 @@ const decodeLicenseVersion1 = license => {
     expiryTimestamp = null;
   }
   return {
-    scope: 'pro',
-    licensingModel: 'perpetual',
+    planScope: 'pro',
+    licenseModel: 'perpetual',
     expiryTimestamp,
     planVersion: 'initial'
   };
 };
 
 /**
- * Format: O=${orderNumber},E=${expiryTimestamp},S=${scope},LM=${licensingModel},PV=${planVersion},KV=2`;
+ * Format: O=${orderNumber},E=${expiryTimestamp},S=${planScope},LM=${licenseModel},PV=${planVersion},KV=2`;
  */
 const decodeLicenseVersion2 = license => {
   const licenseInfo = {
-    scope: null,
-    licensingModel: null,
+    planScope: null,
+    licenseModel: null,
     expiryTimestamp: null,
     planVersion: 'initial'
   };
   license.split(',').map(token => token.split('=')).filter(el => el.length === 2).forEach(([key, value]) => {
     if (key === 'S') {
-      licenseInfo.scope = value;
+      licenseInfo.planScope = value;
     }
     if (key === 'LM') {
-      licenseInfo.licensingModel = value;
+      licenseInfo.licenseModel = value;
     }
     if (key === 'E') {
       const expiryTimestamp = parseInt(value, 10);
@@ -123,7 +123,7 @@ function verifyLicense({
       status: _licenseStatus.LICENSE_STATUS.Invalid
     };
   }
-  if (license.licensingModel == null || !_licensingModel.LICENSING_MODELS.includes(license.licensingModel)) {
+  if (license.licenseModel == null || !_licenseModel.LICENSE_MODELS.includes(license.licenseModel)) {
     console.error('MUI X: Error checking license. Licensing model not found or invalid!');
     return {
       status: _licenseStatus.LICENSE_STATUS.Invalid
@@ -135,7 +135,7 @@ function verifyLicense({
       status: _licenseStatus.LICENSE_STATUS.Invalid
     };
   }
-  if (license.licensingModel === 'perpetual' || process.env.NODE_ENV === 'production') {
+  if (license.licenseModel === 'perpetual' || process.env.NODE_ENV === 'production') {
     const pkgTimestamp = parseInt((0, _base.base64Decode)(releaseInfo), 10);
     if (Number.isNaN(pkgTimestamp)) {
       throw new Error('MUI X: The release information is invalid. Not able to validate license.');
@@ -145,7 +145,7 @@ function verifyLicense({
         status: _licenseStatus.LICENSE_STATUS.ExpiredVersion
       };
     }
-  } else if (license.licensingModel === 'subscription' || license.licensingModel === 'annual') {
+  } else if (license.licenseModel === 'subscription' || license.licenseModel === 'annual') {
     if (new Date().getTime() > license.expiryTimestamp) {
       if (
       // 30 days grace
@@ -167,20 +167,20 @@ function verifyLicense({
       };
     }
   }
-  if (license.scope == null || !_licenseScope.LICENSE_SCOPES.includes(license.scope)) {
-    console.error('MUI X: Error checking license. scope not found or invalid!');
+  if (license.planScope == null || !_plan.PLAN_SCOPES.includes(license.planScope)) {
+    console.error('MUI X: Error checking license. planScope not found or invalid!');
     return {
       status: _licenseStatus.LICENSE_STATUS.Invalid
     };
   }
-  if (!isLicenseScopeSufficient(packageName, license.scope)) {
+  if (!isPlanScopeSufficient(packageName, license.planScope)) {
     return {
       status: _licenseStatus.LICENSE_STATUS.OutOfScope
     };
   }
 
   // 'charts-pro' or 'tree-view-pro' can only be used with a newer Pro license
-  if (license.planVersion === 'initial' && license.scope === 'pro' && !PRO_PACKAGES_AVAILABLE_IN_INITIAL_PRO_PLAN.includes(packageName)) {
+  if (license.planVersion === 'initial' && license.planScope === 'pro' && !PRO_PACKAGES_AVAILABLE_IN_INITIAL_PRO_PLAN.includes(packageName)) {
     return {
       status: _licenseStatus.LICENSE_STATUS.NotAvailableInInitialProPlan
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/x-license",
-  "version": "7.16.0",
+  "version": "7.18.0",
   "description": "MUI X License verification",
   "author": "MUI Team",
   "main": "./node/index.js",
@@ -20,7 +20,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/mui/mui-x.git",
+    "url": "git+https://github.com/mui/mui-x.git",
     "directory": "packages/x-license"
   },
   "dependencies": {

package/utils/index.d.ts

@@ -1,6 +1,6 @@
 export * from './licenseErrorMessageUtils';
 export * from './licenseInfo';
 export * from './licenseStatus';
-export type { LicenseScope } from './licenseScope';
-export type { LicensingModel } from './licensingModel';
+export type { PlanScope } from './plan';
+export type { LicenseModel } from './licenseModel';
 export type { MuiCommercialPackageName } from './commercialPackages';

package/utils/licenseModel.d.ts

@@ -0,0 +1,2 @@
+export declare const LICENSE_MODELS: readonly ["perpetual", "annual", "subscription"];
+export type LicenseModel = (typeof LICENSE_MODELS)[number];

package/{modern/utils/licensingModel.js → utils/licenseModel.js}

@@ -1,4 +1,4 @@
-export const LICENSING_MODELS = [
+export const LICENSE_MODELS = [
 /**
  * A license is outdated if the current version of the software was released after the expiry date of the license.
  * But the license can be used indefinitely with an older version of the software.
@@ -10,6 +10,8 @@ export const LICENSING_MODELS = [
  */
 'annual',
 /**
- * TODO 2025 remove, legacy name of annual.
+ * Legacy. The previous name for 'annual'.
+ * Can be removed once old license keys generated with 'subscription' are no longer supported.
+ * To support for a while. We need more years of backward support and we sell multi year licenses.
  */
 'subscription'];

package/utils/{licenseScope.d.ts → plan.d.ts}

@@ -1,4 +1,4 @@
-export declare const LICENSE_SCOPES: readonly ["pro", "premium"];
+export declare const PLAN_SCOPES: readonly ["pro", "premium"];
 export declare const PLAN_VERSIONS: readonly ["initial", "Q3-2024"];
-export type LicenseScope = (typeof LICENSE_SCOPES)[number];
+export type PlanScope = (typeof PLAN_SCOPES)[number];
 export type PlanVersion = (typeof PLAN_VERSIONS)[number];

package/utils/plan.js

@@ -0,0 +1,2 @@
+export const PLAN_SCOPES = ['pro', 'premium'];
+export const PLAN_VERSIONS = ['initial', 'Q3-2024'];

package/verifyLicense/verifyLicense.js

@@ -1,8 +1,8 @@
 import { base64Decode, base64Encode } from "../encoding/base64.js";
 import { md5 } from "../encoding/md5.js";
 import { LICENSE_STATUS } from "../utils/licenseStatus.js";
-import { LICENSE_SCOPES } from "../utils/licenseScope.js";
-import { LICENSING_MODELS } from "../utils/licensingModel.js";
+import { PLAN_SCOPES } from "../utils/plan.js";
+import { LICENSE_MODELS } from "../utils/licenseModel.js";
 const getDefaultReleaseDate = () => {
   const today = new Date();
   today.setHours(0, 0, 0, 0);
@@ -11,7 +11,7 @@ const getDefaultReleaseDate = () => {
 export function generateReleaseInfo(releaseDate = getDefaultReleaseDate()) {
   return base64Encode(releaseDate.getTime().toString());
 }
-function isLicenseScopeSufficient(packageName, licenseScope) {
+function isPlanScopeSufficient(packageName, planScope) {
   let acceptedScopes;
   if (packageName.includes('-pro')) {
     acceptedScopes = ['pro', 'premium'];
@@ -20,7 +20,7 @@ function isLicenseScopeSufficient(packageName, licenseScope) {
   } else {
     acceptedScopes = [];
   }
-  return acceptedScopes.includes(licenseScope);
+  return acceptedScopes.includes(planScope);
 }
 const expiryReg = /^.*EXPIRY=([0-9]+),.*$/;
 const PRO_PACKAGES_AVAILABLE_IN_INITIAL_PRO_PLAN = ['x-data-grid-pro', 'x-date-pickers-pro'];
@@ -39,29 +39,29 @@ const decodeLicenseVersion1 = license => {
     expiryTimestamp = null;
   }
   return {
-    scope: 'pro',
-    licensingModel: 'perpetual',
+    planScope: 'pro',
+    licenseModel: 'perpetual',
     expiryTimestamp,
     planVersion: 'initial'
   };
 };
 
 /**
- * Format: O=${orderNumber},E=${expiryTimestamp},S=${scope},LM=${licensingModel},PV=${planVersion},KV=2`;
+ * Format: O=${orderNumber},E=${expiryTimestamp},S=${planScope},LM=${licenseModel},PV=${planVersion},KV=2`;
  */
 const decodeLicenseVersion2 = license => {
   const licenseInfo = {
-    scope: null,
-    licensingModel: null,
+    planScope: null,
+    licenseModel: null,
     expiryTimestamp: null,
     planVersion: 'initial'
   };
   license.split(',').map(token => token.split('=')).filter(el => el.length === 2).forEach(([key, value]) => {
     if (key === 'S') {
-      licenseInfo.scope = value;
+      licenseInfo.planScope = value;
     }
     if (key === 'LM') {
-      licenseInfo.licensingModel = value;
+      licenseInfo.licenseModel = value;
     }
     if (key === 'E') {
       const expiryTimestamp = parseInt(value, 10);
@@ -116,7 +116,7 @@ export function verifyLicense({
       status: LICENSE_STATUS.Invalid
     };
   }
-  if (license.licensingModel == null || !LICENSING_MODELS.includes(license.licensingModel)) {
+  if (license.licenseModel == null || !LICENSE_MODELS.includes(license.licenseModel)) {
     console.error('MUI X: Error checking license. Licensing model not found or invalid!');
     return {
       status: LICENSE_STATUS.Invalid
@@ -128,7 +128,7 @@ export function verifyLicense({
       status: LICENSE_STATUS.Invalid
     };
   }
-  if (license.licensingModel === 'perpetual' || process.env.NODE_ENV === 'production') {
+  if (license.licenseModel === 'perpetual' || process.env.NODE_ENV === 'production') {
     const pkgTimestamp = parseInt(base64Decode(releaseInfo), 10);
     if (Number.isNaN(pkgTimestamp)) {
       throw new Error('MUI X: The release information is invalid. Not able to validate license.');
@@ -138,7 +138,7 @@ export function verifyLicense({
         status: LICENSE_STATUS.ExpiredVersion
       };
     }
-  } else if (license.licensingModel === 'subscription' || license.licensingModel === 'annual') {
+  } else if (license.licenseModel === 'subscription' || license.licenseModel === 'annual') {
     if (new Date().getTime() > license.expiryTimestamp) {
       if (
       // 30 days grace
@@ -160,20 +160,20 @@ export function verifyLicense({
       };
     }
   }
-  if (license.scope == null || !LICENSE_SCOPES.includes(license.scope)) {
-    console.error('MUI X: Error checking license. scope not found or invalid!');
+  if (license.planScope == null || !PLAN_SCOPES.includes(license.planScope)) {
+    console.error('MUI X: Error checking license. planScope not found or invalid!');
     return {
       status: LICENSE_STATUS.Invalid
     };
   }
-  if (!isLicenseScopeSufficient(packageName, license.scope)) {
+  if (!isPlanScopeSufficient(packageName, license.planScope)) {
     return {
       status: LICENSE_STATUS.OutOfScope
     };
   }
 
   // 'charts-pro' or 'tree-view-pro' can only be used with a newer Pro license
-  if (license.planVersion === 'initial' && license.scope === 'pro' && !PRO_PACKAGES_AVAILABLE_IN_INITIAL_PRO_PLAN.includes(packageName)) {
+  if (license.planVersion === 'initial' && license.planScope === 'pro' && !PRO_PACKAGES_AVAILABLE_IN_INITIAL_PRO_PLAN.includes(packageName)) {
     return {
       status: LICENSE_STATUS.NotAvailableInInitialProPlan
     };

package/modern/utils/licenseScope.js

@@ -1,2 +0,0 @@
-export const LICENSE_SCOPES = ['pro', 'premium'];
-export const PLAN_VERSIONS = ['initial', 'Q3-2024'];

package/utils/licenseScope.js

@@ -1,2 +0,0 @@
-export const LICENSE_SCOPES = ['pro', 'premium'];
-export const PLAN_VERSIONS = ['initial', 'Q3-2024'];

package/utils/licensingModel.d.ts

@@ -1,2 +0,0 @@
-export declare const LICENSING_MODELS: readonly ["perpetual", "annual", "subscription"];
-export type LicensingModel = (typeof LICENSING_MODELS)[number];