From 75c7f9ea7154ad063f12459c9cb6e52b7e716b0c Mon Sep 17 00:00:00 2001
From: siriwatknp <siriwatkunaporn@gmail.com>
Date: Thu, 4 Jul 2024 10:15:38 +0700
Subject: [PATCH 1/7] remove deprecations

---
 .../mui-joy/src/styles/CssVarsProvider.tsx    | 27 +++---------------
 .../src/styles/CssVarsProvider.tsx            | 28 +++----------------
 2 files changed, 8 insertions(+), 47 deletions(-)

diff --git a/packages/mui-joy/src/styles/CssVarsProvider.tsx b/packages/mui-joy/src/styles/CssVarsProvider.tsx
index 2daeaa8dc1fece..a6e3df2150eb77 100644
--- a/packages/mui-joy/src/styles/CssVarsProvider.tsx
+++ b/packages/mui-joy/src/styles/CssVarsProvider.tsx
@@ -9,11 +9,10 @@ import type { SupportedColorScheme } from './types';
 import THEME_ID from './identifier';
 import { defaultConfig } from '../InitColorSchemeScript/InitColorSchemeScript';
 
-const {
-  CssVarsProvider,
-  useColorScheme,
-  getInitColorSchemeScript: deprecatedGetInitColorSchemeScript,
-} = createCssVarsProvider<SupportedColorScheme, typeof THEME_ID>({
+const { CssVarsProvider, useColorScheme, getInitColorSchemeScript } = createCssVarsProvider<
+  SupportedColorScheme,
+  typeof THEME_ID
+>({
   themeId: THEME_ID,
   theme: defaultTheme,
   attribute: defaultConfig.attribute,
@@ -25,22 +24,4 @@ const {
   },
 });
 
-let warnedInitScriptOnce = false;
-
-const getInitColorSchemeScript: typeof deprecatedGetInitColorSchemeScript = (params) => {
-  if (!warnedInitScriptOnce) {
-    console.warn(
-      [
-        'MUI: The getInitColorSchemeScript function has been deprecated.',
-        '',
-        "You should use `import InitColorSchemeScript from '@mui/joy/InitColorSchemeScript'`",
-        'and replace the function call with `<InitColorSchemeScript />` instead.',
-      ].join('\n'),
-    );
-
-    warnedInitScriptOnce = true;
-  }
-  return deprecatedGetInitColorSchemeScript(params);
-};
-
 export { CssVarsProvider, useColorScheme, getInitColorSchemeScript };
diff --git a/packages/mui-material/src/styles/CssVarsProvider.tsx b/packages/mui-material/src/styles/CssVarsProvider.tsx
index 9824ae6e225d81..be8b6f06727690 100644
--- a/packages/mui-material/src/styles/CssVarsProvider.tsx
+++ b/packages/mui-material/src/styles/CssVarsProvider.tsx
@@ -16,11 +16,10 @@ import { defaultConfig } from '../InitColorSchemeScript/InitColorSchemeScript';
 
 const defaultTheme = experimental_extendTheme();
 
-const {
-  CssVarsProvider,
-  useColorScheme,
-  getInitColorSchemeScript: deprecatedGetInitColorSchemeScript,
-} = createCssVarsProvider<SupportedColorScheme, typeof THEME_ID>({
+const { CssVarsProvider, useColorScheme, getInitColorSchemeScript } = createCssVarsProvider<
+  SupportedColorScheme,
+  typeof THEME_ID
+>({
   themeId: THEME_ID,
   theme: defaultTheme,
   attribute: defaultConfig.attribute,
@@ -45,25 +44,6 @@ const {
   excludeVariablesFromRoot,
 });
 
-let warnedInitScriptOnce = false;
-
-// TODO: remove in v7
-const getInitColorSchemeScript: typeof deprecatedGetInitColorSchemeScript = (params) => {
-  if (!warnedInitScriptOnce) {
-    console.warn(
-      [
-        'MUI: The getInitColorSchemeScript function has been deprecated.',
-        '',
-        "You should use `import InitColorSchemeScript from '@mui/material/InitColorSchemeScript'`",
-        'and replace the function call with `<InitColorSchemeScript />` instead.',
-      ].join('\n'),
-    );
-
-    warnedInitScriptOnce = true;
-  }
-  return deprecatedGetInitColorSchemeScript(params);
-};
-
 export {
   useColorScheme,
   getInitColorSchemeScript,

From 52188765c62a715c847132d58e785a662ca4643c Mon Sep 17 00:00:00 2001
From: siriwatknp <siriwatkunaporn@gmail.com>
Date: Thu, 4 Jul 2024 10:17:27 +0700
Subject: [PATCH 2/7] revert InitColorScheme usage

---
 docs/pages/_document.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/pages/_document.js b/docs/pages/_document.js
index c2ffa343a34cf4..a800959e8aa63b 100644
--- a/docs/pages/_document.js
+++ b/docs/pages/_document.js
@@ -5,8 +5,8 @@ import { ServerStyleSheets as JSSServerStyleSheets } from '@mui/styles';
 import { ServerStyleSheet } from 'styled-components';
 import Document, { Html, Head, Main, NextScript } from 'next/document';
 import GlobalStyles from '@mui/material/GlobalStyles';
-import MuiInitColorSchemeScript from '@mui/material/InitColorSchemeScript';
-import JoyInitColorSchemeScript from '@mui/joy/InitColorSchemeScript';
+import { getInitColorSchemeScript as getMuiInitColorSchemeScript } from '@mui/material/styles';
+import { getInitColorSchemeScript as getJoyInitColorSchemeScript } from '@mui/joy/styles';
 import { pathnameToLanguage } from 'docs/src/modules/utils/helpers';
 import createEmotionCache from 'docs/src/createEmotionCache';
 import { getMetaThemeColor } from '@mui/docs/branding';
@@ -173,8 +173,8 @@ export default class MyDocument extends Document {
           />
         </Head>
         <body>
-          <MuiInitColorSchemeScript defaultMode="system" />
-          <JoyInitColorSchemeScript defaultMode="system" />
+          {getMuiInitColorSchemeScript({ defaultMode: 'system' })}
+          {getJoyInitColorSchemeScript({ defaultMode: 'system' })}
           <Main />
           <script
             // eslint-disable-next-line react/no-danger

From 0795bdd4cac833313af05ddd00a4c8df369ed0dd Mon Sep 17 00:00:00 2001
From: siriwatknp <siriwatkunaporn@gmail.com>
Date: Fri, 5 Jul 2024 10:54:05 +0700
Subject: [PATCH 3/7] revert _document

---
 docs/pages/_document.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/pages/_document.js b/docs/pages/_document.js
index a800959e8aa63b..c2ffa343a34cf4 100644
--- a/docs/pages/_document.js
+++ b/docs/pages/_document.js
@@ -5,8 +5,8 @@ import { ServerStyleSheets as JSSServerStyleSheets } from '@mui/styles';
 import { ServerStyleSheet } from 'styled-components';
 import Document, { Html, Head, Main, NextScript } from 'next/document';
 import GlobalStyles from '@mui/material/GlobalStyles';
-import { getInitColorSchemeScript as getMuiInitColorSchemeScript } from '@mui/material/styles';
-import { getInitColorSchemeScript as getJoyInitColorSchemeScript } from '@mui/joy/styles';
+import MuiInitColorSchemeScript from '@mui/material/InitColorSchemeScript';
+import JoyInitColorSchemeScript from '@mui/joy/InitColorSchemeScript';
 import { pathnameToLanguage } from 'docs/src/modules/utils/helpers';
 import createEmotionCache from 'docs/src/createEmotionCache';
 import { getMetaThemeColor } from '@mui/docs/branding';
@@ -173,8 +173,8 @@ export default class MyDocument extends Document {
           />
         </Head>
         <body>
-          {getMuiInitColorSchemeScript({ defaultMode: 'system' })}
-          {getJoyInitColorSchemeScript({ defaultMode: 'system' })}
+          <MuiInitColorSchemeScript defaultMode="system" />
+          <JoyInitColorSchemeScript defaultMode="system" />
           <Main />
           <script
             // eslint-disable-next-line react/no-danger

From 1a0595c4bb7669f50ee1a2df3ef78fb4feaf5ce6 Mon Sep 17 00:00:00 2001
From: siriwatknp <siriwatkunaporn@gmail.com>
Date: Fri, 5 Jul 2024 11:36:00 +0700
Subject: [PATCH 4/7] add @deprecated

---
 packages/mui-joy/src/styles/CssVarsProvider.tsx | 17 ++++++++++++++++-
 .../mui-material/src/styles/CssVarsProvider.tsx | 11 +++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/packages/mui-joy/src/styles/CssVarsProvider.tsx b/packages/mui-joy/src/styles/CssVarsProvider.tsx
index a6e3df2150eb77..a55754c63cc5b9 100644
--- a/packages/mui-joy/src/styles/CssVarsProvider.tsx
+++ b/packages/mui-joy/src/styles/CssVarsProvider.tsx
@@ -24,4 +24,19 @@ const { CssVarsProvider, useColorScheme, getInitColorSchemeScript } = createCssV
   },
 });
 
-export { CssVarsProvider, useColorScheme, getInitColorSchemeScript };
+export {
+  CssVarsProvider,
+  useColorScheme,
+  /**
+   * @deprecated use `InitColorSchemeScript` instead
+   *
+   * ```diff
+   * - import { getInitColorSchemeScript } from '@mui/joy/styles';
+   * + import InitColorSchemeScript from '@mui/joy/InitColorSchemeScript';
+   *
+   * - getInitColorSchemeScript();
+   * + <InitColorSchemeScript />;
+   * ```
+   */
+  getInitColorSchemeScript,
+};
diff --git a/packages/mui-material/src/styles/CssVarsProvider.tsx b/packages/mui-material/src/styles/CssVarsProvider.tsx
index be8b6f06727690..3ecec59041d844 100644
--- a/packages/mui-material/src/styles/CssVarsProvider.tsx
+++ b/packages/mui-material/src/styles/CssVarsProvider.tsx
@@ -46,6 +46,17 @@ const { CssVarsProvider, useColorScheme, getInitColorSchemeScript } = createCssV
 
 export {
   useColorScheme,
+  /**
+   * @deprecated use `InitColorSchemeScript` instead
+   *
+   * ```diff
+   * - import { getInitColorSchemeScript } from '@mui/material/styles';
+   * + import InitColorSchemeScript from '@mui/material/InitColorSchemeScript';
+   *
+   * - getInitColorSchemeScript();
+   * + <InitColorSchemeScript />;
+   * ```
+   */
   getInitColorSchemeScript,
   CssVarsProvider as Experimental_CssVarsProvider,
 };

From 81ffca3a7448419b4b7e7afb83361a095d0da540 Mon Sep 17 00:00:00 2001
From: Andrew Cherniavskyi <andrew@mui.com>
Date: Fri, 5 Jul 2024 11:57:39 +0200
Subject: [PATCH 5/7] improve jsdoc in IDE

---
 .../mui-joy/src/styles/CssVarsProvider.tsx    | 39 +++++++++----------
 .../src/styles/CssVarsProvider.tsx            | 38 +++++++++---------
 2 files changed, 37 insertions(+), 40 deletions(-)

diff --git a/packages/mui-joy/src/styles/CssVarsProvider.tsx b/packages/mui-joy/src/styles/CssVarsProvider.tsx
index a55754c63cc5b9..6a607165d1e068 100644
--- a/packages/mui-joy/src/styles/CssVarsProvider.tsx
+++ b/packages/mui-joy/src/styles/CssVarsProvider.tsx
@@ -9,10 +9,11 @@ import type { SupportedColorScheme } from './types';
 import THEME_ID from './identifier';
 import { defaultConfig } from '../InitColorSchemeScript/InitColorSchemeScript';
 
-const { CssVarsProvider, useColorScheme, getInitColorSchemeScript } = createCssVarsProvider<
-  SupportedColorScheme,
-  typeof THEME_ID
->({
+const {
+  CssVarsProvider,
+  useColorScheme,
+  getInitColorSchemeScript: getInitColorSchemeScriptSystem,
+} = createCssVarsProvider<SupportedColorScheme, typeof THEME_ID>({
   themeId: THEME_ID,
   theme: defaultTheme,
   attribute: defaultConfig.attribute,
@@ -24,19 +25,17 @@ const { CssVarsProvider, useColorScheme, getInitColorSchemeScript } = createCssV
   },
 });
 
-export {
-  CssVarsProvider,
-  useColorScheme,
-  /**
-   * @deprecated use `InitColorSchemeScript` instead
-   *
-   * ```diff
-   * - import { getInitColorSchemeScript } from '@mui/joy/styles';
-   * + import InitColorSchemeScript from '@mui/joy/InitColorSchemeScript';
-   *
-   * - getInitColorSchemeScript();
-   * + <InitColorSchemeScript />;
-   * ```
-   */
-  getInitColorSchemeScript,
-};
+/**
+ * @deprecated use `InitColorSchemeScript` instead
+ *
+ * ```diff
+ * - import { getInitColorSchemeScript } from '@mui/joy/styles';
+ * + import InitColorSchemeScript from '@mui/joy/InitColorSchemeScript';
+ *
+ * - getInitColorSchemeScript();
+ * + <InitColorSchemeScript />;
+ * ```
+ */
+export const getInitColorSchemeScript = getInitColorSchemeScriptSystem;
+
+export { CssVarsProvider, useColorScheme };
diff --git a/packages/mui-material/src/styles/CssVarsProvider.tsx b/packages/mui-material/src/styles/CssVarsProvider.tsx
index 3ecec59041d844..5378f7aa4a69cb 100644
--- a/packages/mui-material/src/styles/CssVarsProvider.tsx
+++ b/packages/mui-material/src/styles/CssVarsProvider.tsx
@@ -16,10 +16,11 @@ import { defaultConfig } from '../InitColorSchemeScript/InitColorSchemeScript';
 
 const defaultTheme = experimental_extendTheme();
 
-const { CssVarsProvider, useColorScheme, getInitColorSchemeScript } = createCssVarsProvider<
-  SupportedColorScheme,
-  typeof THEME_ID
->({
+const {
+  CssVarsProvider,
+  useColorScheme,
+  getInitColorSchemeScript: getInitColorSchemeScriptSystem,
+} = createCssVarsProvider<SupportedColorScheme, typeof THEME_ID>({
   themeId: THEME_ID,
   theme: defaultTheme,
   attribute: defaultConfig.attribute,
@@ -44,19 +45,16 @@ const { CssVarsProvider, useColorScheme, getInitColorSchemeScript } = createCssV
   excludeVariablesFromRoot,
 });
 
-export {
-  useColorScheme,
-  /**
-   * @deprecated use `InitColorSchemeScript` instead
-   *
-   * ```diff
-   * - import { getInitColorSchemeScript } from '@mui/material/styles';
-   * + import InitColorSchemeScript from '@mui/material/InitColorSchemeScript';
-   *
-   * - getInitColorSchemeScript();
-   * + <InitColorSchemeScript />;
-   * ```
-   */
-  getInitColorSchemeScript,
-  CssVarsProvider as Experimental_CssVarsProvider,
-};
+/**
+ * @deprecated Use `InitColorSchemeScript` instead
+ * ```diff
+ * - import { getInitColorSchemeScript } from '@mui/material/styles';
+ * + import InitColorSchemeScript from '@mui/material/InitColorSchemeScript';
+ *
+ * - getInitColorSchemeScript();
+ * + <InitColorSchemeScript />;
+ * ```
+ */
+export const getInitColorSchemeScript = getInitColorSchemeScriptSystem;
+
+export { useColorScheme, CssVarsProvider as Experimental_CssVarsProvider };

From 3d3ba237e362fada143a4ba605b7bad5dfc03aa8 Mon Sep 17 00:00:00 2001
From: siriwatknp <siriwatkunaporn@gmail.com>
Date: Fri, 5 Jul 2024 17:31:09 +0700
Subject: [PATCH 6/7] trigger build


From 936f5549c236a962b594895ac5844a492f805cbb Mon Sep 17 00:00:00 2001
From: siriwatknp <siriwatkunaporn@gmail.com>
Date: Fri, 5 Jul 2024 17:44:48 +0700
Subject: [PATCH 7/7] change pnpm to v4

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 24255495324d9b..4d885bf990425b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
           # fetch all tags which are required for `pnpm release:changelog`
           fetch-depth: 0
       - name: Set up pnpm
-        uses: pnpm/action-setup@d882d12c64e032187b2edb46d3a0d003b7a43598 # v2.4.0
+        uses: pnpm/action-setup@v4
       - name: Use Node.js 18.x
         uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
         with: