Merge branch 'master' into docs/charts-histogram-recipe

Author: alexfauquette

docs/data/charts/content-security-policy/content-security-policy.md

@@ -28,7 +28,7 @@ See the [MDN Web Docs](https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/
 ## Setting up a CSP
 
 MUI X Charts depends on Material UI.
-Follow Material UI's [CSP implementation guide](/material-ui/guides/content-security-policy/#how-does-one-implement-csp) to set up a CSP.
+Follow Material UI's [CSP implementation guide](/material-ui/guides/content-security-policy/) to set up a CSP.
 
 ### CSP for exporting charts
 

packages/x-data-grid-premium/src/tests/license.DataGridPremium.test.tsx

@@ -1,7 +1,8 @@
 import { createRenderer, screen } from '@mui/internal-test-utils';
 import { DataGridPremium } from '@mui/x-data-grid-premium';
 import { LicenseInfo } from '@mui/x-license';
-import { TEST_LICENSE_KEY_PRO, clearLicenseStatusCache } from '@mui/x-license/internals';
+import { clearLicenseStatusCache } from '@mui/x-license/internals';
+import { TEST_LICENSE_KEY_PRO } from '@mui/x-license/test-keys';
 
 describe('<DataGridPremium /> - License', () => {
   const { render } = createRenderer();

packages/x-license/package.json

@@ -46,7 +46,8 @@
   },
   "exports": {
     ".": "./src/index.ts",
-    "./internals": "./src/internals/index.ts"
+    "./internals": "./src/internals/index.ts",
+    "./test-keys": "./src/test-keys.ts"
   },
   "imports": {
     "#formatErrorMessage": "@mui/x-internals/formatErrorMessage"

packages/x-license/src/internals/index.ts

@@ -13,4 +13,3 @@ export {
   clearLicenseStatusCache,
 } from '../useLicenseVerifier/useLicenseVerifier';
 export * from '../verifyLicense/verifyLicense';
-export * from '../test-keys';

packages/x-scheduler-premium/src/event-calendar-premium/tests/license.EventCalendarPremium.test.tsx

@@ -1,7 +1,8 @@
 import { screen } from '@mui/internal-test-utils';
 import { EventCalendarPremium } from '@mui/x-scheduler-premium/event-calendar-premium';
 import { LicenseInfo } from '@mui/x-license';
-import { TEST_LICENSE_KEY_PRO, clearLicenseStatusCache } from '@mui/x-license/internals';
+import { clearLicenseStatusCache } from '@mui/x-license/internals';
+import { TEST_LICENSE_KEY_PRO } from '@mui/x-license/test-keys';
 import {
   createSchedulerRenderer,
   DEFAULT_TESTING_VISIBLE_DATE,

packages/x-scheduler-premium/src/event-timeline-premium/tests/license.EventTimelinePremium.test.tsx

@@ -1,7 +1,8 @@
 import { screen } from '@mui/internal-test-utils';
 import { EventTimelinePremium } from '@mui/x-scheduler-premium/event-timeline-premium';
 import { LicenseInfo } from '@mui/x-license';
-import { TEST_LICENSE_KEY_PRO, clearLicenseStatusCache } from '@mui/x-license/internals';
+import { clearLicenseStatusCache } from '@mui/x-license/internals';
+import { TEST_LICENSE_KEY_PRO } from '@mui/x-license/test-keys';
 import {
   createSchedulerRenderer,
   DEFAULT_TESTING_VISIBLE_DATE,

pnpm-lock.yaml

@@ -71,6 +71,8 @@ export default defineConfig(async () => {
       ...treeViewComponents,
       '@mui/x-tree-view-pro',
       ...treeViewProComponents,
+      '@mui/x-license',
+      '@mui/x-license/internals',
     ],
     upload: !!process.env.CI,
     replace: {

test/bundle-size/bundle-size-checker.config.mjs

@@ -13,6 +13,7 @@
     "@mui/x-charts-premium": "workspace:^",
     "@mui/x-date-pickers": "workspace:^",
     "@mui/x-date-pickers-pro": "workspace:^",
+    "@mui/x-license": "workspace:^",
     "@mui/x-tree-view": "workspace:^",
     "@mui/x-tree-view-pro": "workspace:^"
   }

test/bundle-size/package.json

@@ -2,7 +2,7 @@ import * as React from 'react';
 import * as ReactDOM from 'react-dom/client';
 import { BrowserRouter as Router, Routes, Route, Link } from 'react-router';
 import { LicenseInfo } from '@mui/x-license';
-import { TEST_LICENSE_KEY_PREMIUM } from '@mui/x-license/internals';
+import { TEST_LICENSE_KEY_PREMIUM } from '@mui/x-license/test-keys';
 import TestViewer from './TestViewer';
 
 LicenseInfo.setLicenseKey(TEST_LICENSE_KEY_PREMIUM);