@mui/x-license 7.7.1 → 7.8.0

package/CHANGELOG.md

@@ -3,6 +3,105 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 7.8.0
+
+_Jun 28, 2024_
+
+We'd like to offer a big thanks to the 10 contributors who made this release possible. Here are some highlights ✨:
+
+- 🛰 Introduce server-side data source for improved server integration in the Data Grid.
+
+  Supports server-side pagination, sorting and filtering on plain and tree data, and automatic caching.
+
+  To enable, provide a `getRows` function to the `unstable_dataSource` prop on the Data Grid component.
+
+  ```tsx
+  const dataSource = {
+    getRows: async (params: GridServerGetRowsParams) => {
+      const data = await fetch(
+        `https://api.example.com/data?${new URLSearchParams({
+          page: params.page,
+          pageSize: params.pageSize,
+          sortModel: JSON.stringify(params.sortModel),
+          filterModel: JSON.stringify(params.filterModel),
+        }).toString()}`,
+      );
+      return {
+        rows: data.rows,
+        totalRows: data.totalRows,
+      };
+    },
+  }
+  <DataGridPro
+    unstable_dataSource={dataSource}
+    {...otherProps}
+  />
+  ```
+
+  See [server-side data documentation](https://mui.com/x/react-data-grid/server-side-data/) for more details.
+
+- 📈 Support Date data on the BarChart component
+- ↕️ Support custom column sort icons on the Data Grid
+- 🖱️ Support modifying the expansion trigger on the Tree View components
+
+<!--/ HIGHLIGHT_ABOVE_SEPARATOR /-->
+
+### Data Grid
+
+#### `@mui/x-data-grid@7.8.0`
+
+- [DataGrid] Add `columnHeaderSortIcon` slot (#13563) @arminmeh
+- [DataGrid] Fix dimensions lag issue after autosize (#13587) @MBilalShafi
+- [DataGrid] Fix print export failure when `hideFooter` option is set (#13034) @tarunrajput
+
+#### `@mui/x-data-grid-pro@7.8.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.8.0`, plus:
+
+- [DataGridPro] Fix multi-sorting indicator being cut off (#13625) @KenanYusuf
+- [DataGridPro] Server-side tree data support (#12317) @MBilalShafi
+
+#### `@mui/x-data-grid-premium@7.8.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.8.0`.
+
+### Date and Time Pickers
+
+#### `@mui/x-date-pickers@7.8.0`
+
+- [fields] Fix section clearing behavior on Android (#13652) @LukasTy
+
+#### `@mui/x-date-pickers-pro@7.8.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.8.0`.
+
+### Charts
+
+#### `@mui/x-charts@7.8.0`
+
+- [charts] Fix line chart props not passing correct event handlers (#13609) @JCQuintas
+- [charts] Support BarChart with `Date` data (#13471) @alexfauquette
+- [charts] Support RTL for y-axis (#13614) @alexfauquette
+- [charts] Use default values instead of non-null assertion to prevent error being thrown (#13637) @JCQuintas
+
+### Tree View
+
+#### `@mui/x-tree-view@7.8.0`
+
+- [TreeView] Add `expansionTrigger` prop (#13533) @noraleonte
+- [TreeView] Support experimental features from plugin's dependencies (#13632) @flaviendelangle
+
+### Docs
+
+- [docs] Add callout for `Luxon` `throwOnInvalid` support (#13621) @LukasTy
+- [docs] Add "Overlays" section to the Data Grid documentation (#13624) @KenanYusuf
+
+### Core
+
+- [core] Add eslint rule to restrict import from `../internals` root (#13633) @JCQuintas
+- [docs-infra] Sync `\_app` folder with monorepo (#13582) @Janpot
+- [license] Allow usage of charts and tree view pro package for old premium licenses (#13619) @flaviendelangle
+
 ## 7.7.1
 
 _Jun 21, 2024_
@@ -44,7 +143,7 @@ Same changes as in `@mui/x-data-grid-pro@7.7.1`.
 - [pickers] Always use the same timezone in the field, the view and the layout components (#13481) @flaviendelangle
 - [pickers] Fix `AdapterDateFnsV3` generated method types (#13464) @alexey-kozlenkov
 - [pickers] Fix controlled `view` behavior (#13552) @LukasTy
-- [TimePicker] Improves RTL verification for the time pickers default views  (#13447) @arthurbalduini
+- [TimePicker] Improves RTL verification for the time pickers default views (#13447) @arthurbalduini
 
 #### `@mui/x-date-pickers-pro@7.7.1` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
 

package/Watermark/Watermark.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { MuiCommercialPackageName } from '../useLicenseVerifier';
+import { MuiCommercialPackageName } from '../utils/commercialPackages';
 interface WatermarkProps {
     packageName: MuiCommercialPackageName;
     releaseInfo: string;

package/index.js

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

package/modern/index.js

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

package/modern/useLicenseVerifier/useLicenseVerifier.js

@@ -4,7 +4,6 @@ import { verifyLicense } from '../verifyLicense/verifyLicense';
 import { LicenseInfo } from '../utils/licenseInfo';
 import { showExpiredAnnualGraceLicenseKeyError, showExpiredAnnualLicenseKeyError, showInvalidLicenseKeyError, showMissingLicenseKeyError, showLicenseKeyPlanMismatchError, showExpiredPackageVersionError, showNotAvailableInInitialProPlanError } from '../utils/licenseErrorMessageUtils';
 import { LICENSE_STATUS } from '../utils/licenseStatus';
-import { extractAcceptedScopes, extractProductScope } from '../utils/licenseScope';
 import MuiLicenseInfoContext from '../Unstable_LicenseInfoProvider/MuiLicenseInfoContext';
 export const sharedLicenseStatuses = {};
 export function useLicenseVerifier(packageName, releaseInfo) {
@@ -18,14 +17,11 @@ export function useLicenseVerifier(packageName, releaseInfo) {
     if (sharedLicenseStatuses[packageName] && sharedLicenseStatuses[packageName].key === licenseKey) {
       return sharedLicenseStatuses[packageName].licenseVerifier;
     }
-    const acceptedScopes = extractAcceptedScopes(packageName);
-    const productScope = extractProductScope(packageName);
     const plan = packageName.includes('premium') ? 'Premium' : 'Pro';
     const licenseStatus = verifyLicense({
       releaseInfo,
       licenseKey,
-      acceptedScopes,
-      productScope
+      packageName
     });
     const fullPackageName = `@mui/${packageName}`;
     if (licenseStatus.status === LICENSE_STATUS.Valid) {

package/modern/utils/commercialPackages.js

@@ -0,0 +1 @@
+export {};

package/modern/utils/licenseScope.js

@@ -1,12 +1,2 @@
 export const LICENSE_SCOPES = ['pro', 'premium'];
-export const PRODUCT_SCOPES = ['data-grid', 'date-pickers', 'charts', 'tree-view'];
-export const PLAN_VERSIONS = ['initial', 'Q3-2024'];
-export const extractProductScope = packageName => {
-  // extract the part between "x-" and "-pro"/"-premium"
-  const regex = /x-(.*?)(-pro|-premium)?$/;
-  const match = packageName.match(regex);
-  return match[1];
-};
-export const extractAcceptedScopes = packageName => {
-  return packageName.includes('premium') ? LICENSE_SCOPES.filter(scope => scope.includes('premium')) : LICENSE_SCOPES;
-};
+export const PLAN_VERSIONS = ['initial', 'Q3-2024'];

package/modern/verifyLicense/verifyLicense.js

@@ -11,7 +11,20 @@ const getDefaultReleaseDate = () => {
 export function generateReleaseInfo(releaseDate = getDefaultReleaseDate()) {
   return base64Encode(releaseDate.getTime().toString());
 }
+function isLicenseScopeSufficient(packageName, licenseScope) {
+  let acceptedScopes;
+  if (packageName.includes('-pro')) {
+    acceptedScopes = ['pro', 'premium'];
+  } else if (packageName.includes('-premium')) {
+    acceptedScopes = ['premium'];
+  } else {
+    acceptedScopes = [];
+  }
+  return acceptedScopes.includes(licenseScope);
+}
 const expiryReg = /^.*EXPIRY=([0-9]+),.*$/;
+const PRO_PACKAGES_AVAILABLE_IN_INITIAL_PRO_PLAN = ['x-data-grid-pro', 'x-date-pickers-pro'];
+
 /**
  * Format: ORDER:${orderNumber},EXPIRY=${expiryTimestamp},KEYVERSION=1
  */
@@ -79,8 +92,7 @@ const decodeLicense = encodedLicense => {
 export function verifyLicense({
   releaseInfo,
   licenseKey,
-  acceptedScopes,
-  productScope
+  packageName
 }) {
   if (!releaseInfo) {
     throw new Error('MUI X: The release information is missing. Not able to validate license.');
@@ -154,19 +166,18 @@ export function verifyLicense({
       status: LICENSE_STATUS.Invalid
     };
   }
-  if (license.planVersion === 'initial') {
-    // 'charts-pro' or 'tree-view-pro' can only be used with a newer license
-    if (productScope === 'charts' || productScope === 'tree-view') {
-      return {
-        status: LICENSE_STATUS.NotAvailableInInitialProPlan
-      };
-    }
-  }
-  if (!acceptedScopes.includes(license.scope)) {
+  if (!isLicenseScopeSufficient(packageName, license.scope)) {
     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)) {
+    return {
+      status: LICENSE_STATUS.NotAvailableInInitialProPlan
+    };
+  }
   return {
     status: LICENSE_STATUS.Valid
   };

package/node/index.js

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

package/node/useLicenseVerifier/useLicenseVerifier.js

@@ -12,7 +12,6 @@ var _verifyLicense = require("../verifyLicense/verifyLicense");
 var _licenseInfo = require("../utils/licenseInfo");
 var _licenseErrorMessageUtils = require("../utils/licenseErrorMessageUtils");
 var _licenseStatus = require("../utils/licenseStatus");
-var _licenseScope = require("../utils/licenseScope");
 var _MuiLicenseInfoContext = _interopRequireDefault(require("../Unstable_LicenseInfoProvider/MuiLicenseInfoContext"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -28,14 +27,11 @@ function useLicenseVerifier(packageName, releaseInfo) {
     if (sharedLicenseStatuses[packageName] && sharedLicenseStatuses[packageName].key === licenseKey) {
       return sharedLicenseStatuses[packageName].licenseVerifier;
     }
-    const acceptedScopes = (0, _licenseScope.extractAcceptedScopes)(packageName);
-    const productScope = (0, _licenseScope.extractProductScope)(packageName);
     const plan = packageName.includes('premium') ? 'Premium' : 'Pro';
     const licenseStatus = (0, _verifyLicense.verifyLicense)({
       releaseInfo,
       licenseKey,
-      acceptedScopes,
-      productScope
+      packageName
     });
     const fullPackageName = `@mui/${packageName}`;
     if (licenseStatus.status === _licenseStatus.LICENSE_STATUS.Valid) {

package/node/utils/commercialPackages.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/node/utils/licenseScope.js

@@ -3,18 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.extractProductScope = exports.extractAcceptedScopes = exports.PRODUCT_SCOPES = exports.PLAN_VERSIONS = exports.LICENSE_SCOPES = void 0;
+exports.PLAN_VERSIONS = exports.LICENSE_SCOPES = void 0;
 const LICENSE_SCOPES = exports.LICENSE_SCOPES = ['pro', 'premium'];
-const PRODUCT_SCOPES = exports.PRODUCT_SCOPES = ['data-grid', 'date-pickers', 'charts', 'tree-view'];
-const PLAN_VERSIONS = exports.PLAN_VERSIONS = ['initial', 'Q3-2024'];
-const extractProductScope = packageName => {
-  // extract the part between "x-" and "-pro"/"-premium"
-  const regex = /x-(.*?)(-pro|-premium)?$/;
-  const match = packageName.match(regex);
-  return match[1];
-};
-exports.extractProductScope = extractProductScope;
-const extractAcceptedScopes = packageName => {
-  return packageName.includes('premium') ? LICENSE_SCOPES.filter(scope => scope.includes('premium')) : LICENSE_SCOPES;
-};
-exports.extractAcceptedScopes = extractAcceptedScopes;
+const PLAN_VERSIONS = exports.PLAN_VERSIONS = ['initial', 'Q3-2024'];

package/node/verifyLicense/verifyLicense.js

@@ -18,7 +18,20 @@ const getDefaultReleaseDate = () => {
 function generateReleaseInfo(releaseDate = getDefaultReleaseDate()) {
   return (0, _base.base64Encode)(releaseDate.getTime().toString());
 }
+function isLicenseScopeSufficient(packageName, licenseScope) {
+  let acceptedScopes;
+  if (packageName.includes('-pro')) {
+    acceptedScopes = ['pro', 'premium'];
+  } else if (packageName.includes('-premium')) {
+    acceptedScopes = ['premium'];
+  } else {
+    acceptedScopes = [];
+  }
+  return acceptedScopes.includes(licenseScope);
+}
 const expiryReg = /^.*EXPIRY=([0-9]+),.*$/;
+const PRO_PACKAGES_AVAILABLE_IN_INITIAL_PRO_PLAN = ['x-data-grid-pro', 'x-date-pickers-pro'];
+
 /**
  * Format: ORDER:${orderNumber},EXPIRY=${expiryTimestamp},KEYVERSION=1
  */
@@ -86,8 +99,7 @@ const decodeLicense = encodedLicense => {
 function verifyLicense({
   releaseInfo,
   licenseKey,
-  acceptedScopes,
-  productScope
+  packageName
 }) {
   if (!releaseInfo) {
     throw new Error('MUI X: The release information is missing. Not able to validate license.');
@@ -161,19 +173,18 @@ function verifyLicense({
       status: _licenseStatus.LICENSE_STATUS.Invalid
     };
   }
-  if (license.planVersion === 'initial') {
-    // 'charts-pro' or 'tree-view-pro' can only be used with a newer license
-    if (productScope === 'charts' || productScope === 'tree-view') {
-      return {
-        status: _licenseStatus.LICENSE_STATUS.NotAvailableInInitialProPlan
-      };
-    }
-  }
-  if (!acceptedScopes.includes(license.scope)) {
+  if (!isLicenseScopeSufficient(packageName, license.scope)) {
     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)) {
+    return {
+      status: _licenseStatus.LICENSE_STATUS.NotAvailableInInitialProPlan
+    };
+  }
   return {
     status: _licenseStatus.LICENSE_STATUS.Valid
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/x-license",
-  "version": "7.7.1",
+  "version": "7.8.0",
   "description": "MUI X License verification",
   "author": "MUI Team",
   "main": "./node/index.js",

package/useLicenseVerifier/index.d.ts

@@ -1,2 +1 @@
 export { useLicenseVerifier } from './useLicenseVerifier';
-export type { MuiCommercialPackageName } from './useLicenseVerifier';

package/useLicenseVerifier/useLicenseVerifier.d.ts

@@ -1,5 +1,5 @@
 import { LicenseStatus } from '../utils/licenseStatus';
-export type MuiCommercialPackageName = 'x-data-grid-pro' | 'x-data-grid-premium' | 'x-date-pickers-pro' | 'x-tree-view-pro' | 'x-charts-pro';
+import { MuiCommercialPackageName } from '../utils/commercialPackages';
 export declare const sharedLicenseStatuses: {
     [packageName in MuiCommercialPackageName]?: {
         key: string | undefined;

package/useLicenseVerifier/useLicenseVerifier.js

@@ -4,7 +4,6 @@ import { verifyLicense } from '../verifyLicense/verifyLicense';
 import { LicenseInfo } from '../utils/licenseInfo';
 import { showExpiredAnnualGraceLicenseKeyError, showExpiredAnnualLicenseKeyError, showInvalidLicenseKeyError, showMissingLicenseKeyError, showLicenseKeyPlanMismatchError, showExpiredPackageVersionError, showNotAvailableInInitialProPlanError } from '../utils/licenseErrorMessageUtils';
 import { LICENSE_STATUS } from '../utils/licenseStatus';
-import { extractAcceptedScopes, extractProductScope } from '../utils/licenseScope';
 import MuiLicenseInfoContext from '../Unstable_LicenseInfoProvider/MuiLicenseInfoContext';
 export const sharedLicenseStatuses = {};
 export function useLicenseVerifier(packageName, releaseInfo) {
@@ -18,14 +17,11 @@ export function useLicenseVerifier(packageName, releaseInfo) {
     if (sharedLicenseStatuses[packageName] && sharedLicenseStatuses[packageName].key === licenseKey) {
       return sharedLicenseStatuses[packageName].licenseVerifier;
     }
-    const acceptedScopes = extractAcceptedScopes(packageName);
-    const productScope = extractProductScope(packageName);
     const plan = packageName.includes('premium') ? 'Premium' : 'Pro';
     const licenseStatus = verifyLicense({
       releaseInfo,
       licenseKey,
-      acceptedScopes,
-      productScope
+      packageName
     });
     const fullPackageName = `@mui/${packageName}`;
     if (licenseStatus.status === LICENSE_STATUS.Valid) {

package/utils/commercialPackages.d.ts

@@ -0,0 +1 @@
+export type MuiCommercialPackageName = 'x-data-grid-pro' | 'x-data-grid-premium' | 'x-date-pickers-pro' | 'x-tree-view-pro' | 'x-charts-pro';

package/utils/commercialPackages.js

@@ -0,0 +1 @@
+export {};

package/utils/index.d.ts

@@ -3,3 +3,4 @@ export * from './licenseInfo';
 export * from './licenseStatus';
 export type { LicenseScope } from './licenseScope';
 export type { LicensingModel } from './licensingModel';
+export type { MuiCommercialPackageName } from './commercialPackages';

package/utils/licenseScope.d.ts

@@ -1,8 +1,4 @@
 export declare const LICENSE_SCOPES: readonly ["pro", "premium"];
-export declare const PRODUCT_SCOPES: readonly ["data-grid", "date-pickers", "charts", "tree-view"];
 export declare const PLAN_VERSIONS: readonly ["initial", "Q3-2024"];
 export type LicenseScope = (typeof LICENSE_SCOPES)[number];
-export type ProductScope = (typeof PRODUCT_SCOPES)[number];
 export type PlanVersion = (typeof PLAN_VERSIONS)[number];
-export declare const extractProductScope: (packageName: string) => ProductScope;
-export declare const extractAcceptedScopes: (packageName: string) => readonly LicenseScope[];

package/utils/licenseScope.js

@@ -1,12 +1,2 @@
 export const LICENSE_SCOPES = ['pro', 'premium'];
-export const PRODUCT_SCOPES = ['data-grid', 'date-pickers', 'charts', 'tree-view'];
-export const PLAN_VERSIONS = ['initial', 'Q3-2024'];
-export const extractProductScope = packageName => {
-  // extract the part between "x-" and "-pro"/"-premium"
-  const regex = /x-(.*?)(-pro|-premium)?$/;
-  const match = packageName.match(regex);
-  return match[1];
-};
-export const extractAcceptedScopes = packageName => {
-  return packageName.includes('premium') ? LICENSE_SCOPES.filter(scope => scope.includes('premium')) : LICENSE_SCOPES;
-};
+export const PLAN_VERSIONS = ['initial', 'Q3-2024'];

package/verifyLicense/verifyLicense.d.ts

@@ -1,11 +1,10 @@
 import { LicenseStatus } from '../utils/licenseStatus';
-import { LicenseScope, ProductScope } from '../utils/licenseScope';
+import { MuiCommercialPackageName } from '../utils/commercialPackages';
 export declare function generateReleaseInfo(releaseDate?: Date): string;
-export declare function verifyLicense({ releaseInfo, licenseKey, acceptedScopes, productScope, }: {
+export declare function verifyLicense({ releaseInfo, licenseKey, packageName, }: {
     releaseInfo: string;
     licenseKey?: string;
-    acceptedScopes: readonly LicenseScope[];
-    productScope: ProductScope;
+    packageName: MuiCommercialPackageName;
 }): {
     status: LicenseStatus;
     meta?: any;

package/verifyLicense/verifyLicense.js

@@ -11,7 +11,20 @@ const getDefaultReleaseDate = () => {
 export function generateReleaseInfo(releaseDate = getDefaultReleaseDate()) {
   return base64Encode(releaseDate.getTime().toString());
 }
+function isLicenseScopeSufficient(packageName, licenseScope) {
+  let acceptedScopes;
+  if (packageName.includes('-pro')) {
+    acceptedScopes = ['pro', 'premium'];
+  } else if (packageName.includes('-premium')) {
+    acceptedScopes = ['premium'];
+  } else {
+    acceptedScopes = [];
+  }
+  return acceptedScopes.includes(licenseScope);
+}
 const expiryReg = /^.*EXPIRY=([0-9]+),.*$/;
+const PRO_PACKAGES_AVAILABLE_IN_INITIAL_PRO_PLAN = ['x-data-grid-pro', 'x-date-pickers-pro'];
+
 /**
  * Format: ORDER:${orderNumber},EXPIRY=${expiryTimestamp},KEYVERSION=1
  */
@@ -79,8 +92,7 @@ const decodeLicense = encodedLicense => {
 export function verifyLicense({
   releaseInfo,
   licenseKey,
-  acceptedScopes,
-  productScope
+  packageName
 }) {
   if (!releaseInfo) {
     throw new Error('MUI X: The release information is missing. Not able to validate license.');
@@ -154,19 +166,18 @@ export function verifyLicense({
       status: LICENSE_STATUS.Invalid
     };
   }
-  if (license.planVersion === 'initial') {
-    // 'charts-pro' or 'tree-view-pro' can only be used with a newer license
-    if (productScope === 'charts' || productScope === 'tree-view') {
-      return {
-        status: LICENSE_STATUS.NotAvailableInInitialProPlan
-      };
-    }
-  }
-  if (!acceptedScopes.includes(license.scope)) {
+  if (!isLicenseScopeSufficient(packageName, license.scope)) {
     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)) {
+    return {
+      status: LICENSE_STATUS.NotAvailableInInitialProPlan
+    };
+  }
   return {
     status: LICENSE_STATUS.Valid
   };