[core] Temporarily fallback to v5 of Material UI (#198)

mui · Aug 7, 2024 · 534e148 · 534e148
1 parent 794b443
commit 534e148
Show file tree

Hide file tree

Showing 8 changed files with 494 additions and 725 deletions.
diff --git a/apps/pigment-css-next-app/next.config.js b/apps/pigment-css-next-app/next.config.js
@@ -1,7 +1,7 @@
 /* eslint-env node */
 // eslint-ignore-next-line import/no-unresolved
 const { withPigment } = require('@pigment-css/nextjs-plugin');
-const { extendTheme } = require('@mui/material/styles');
+const { experimental_extendTheme: extendTheme } = require('@mui/material/styles');
 
 /**
  * @typedef {import('@pigment-css/nextjs-plugin').PigmentOptions} PigmentOptions

diff --git a/apps/pigment-css-next-app/package.json b/apps/pigment-css-next-app/package.json
@@ -10,14 +10,8 @@
   },
   "dependencies": {
     "@pigment-css/react": "workspace:^",
-    "@mui/utils": "next",
-    "@mui/base": "next",
-    "@mui/lab": "next",
-    "@mui/material": "next",
-    "@mui/system": "next",
-    "@mui/material-nextjs": "next",
-    "@mui/icons-material": "next",
-    "@emotion/cache": "latest",
+    "@mui/material": "^5.16.6",
+    "@mui/material-nextjs": "^5.16.6",
     "local-ui-lib": "workspace:^",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

diff --git a/packages/pigment-css-react/package.json b/packages/pigment-css-react/package.json
@@ -43,9 +43,9 @@
     "@emotion/styled": "^11.11.5",
     "@mui/system": "^6.0.0-alpha.6",
     "@mui/utils": "^6.0.0-alpha.6",
-    "@wyw-in-js/processor-utils": "^0.5.3",
-    "@wyw-in-js/shared": "^0.5.3",
-    "@wyw-in-js/transform": "^0.5.3",
+    "@wyw-in-js/processor-utils": "^0.5.4",
+    "@wyw-in-js/shared": "^0.5.4",
+    "@wyw-in-js/transform": "^0.5.4",
     "clsx": "^2.1.0",
     "cssesc": "^3.0.0",
     "csstype": "^3.1.3",

diff --git a/packages/pigment-css-react/src/processors/generateAtomics.ts b/packages/pigment-css-react/src/processors/generateAtomics.ts
@@ -67,7 +67,7 @@ export class GenerateAtomicsProcessor extends BaseProcessor {
 
       classes.forEach(({ className, css: cssObject }) => {
         const emotionClass = css(cssObject as CSSInterpolation);
-        const cssText = cache.registered[emotionClass];
+        const cssText = cache.registered[emotionClass] as string;
 
         const rules: Rules = {
           [`.${className}`]: {

diff --git a/packages/pigment-css-react/src/utils/processCssObject.ts b/packages/pigment-css-react/src/utils/processCssObject.ts
@@ -12,5 +12,5 @@ export function processCssObject(
     // so for Pigment CSS users, the shorthand `sx` prop is not supported yet.
     (skipSx ? cssObj : themeArgs?.theme?.unstable_sx?.(cssObj) || cssObj) as CSSObject;
   const className = css(processedObj);
-  return cache.registered[className];
+  return cache.registered[className] as string;
 }
diff --git a/packages/pigment-css-unplugin/package.json b/packages/pigment-css-unplugin/package.json
@@ -32,8 +32,8 @@
   "dependencies": {
     "@babel/core": "^7.24.4",
     "@pigment-css/react": "workspace:^",
-    "@wyw-in-js/shared": "^0.5.3",
-    "@wyw-in-js/transform": "^0.5.3",
+    "@wyw-in-js/shared": "^0.5.4",
+    "@wyw-in-js/transform": "^0.5.4",
     "babel-plugin-define-var": "^0.1.0",
     "unplugin": "^1.7.1"
   },

diff --git a/packages/pigment-css-vite-plugin/package.json b/packages/pigment-css-vite-plugin/package.json
@@ -31,8 +31,8 @@
     "@babel/core": "^7.24.4",
     "@babel/preset-typescript": "^7.24.1",
     "@pigment-css/react": "workspace:^",
-    "@wyw-in-js/shared": "^0.5.3",
-    "@wyw-in-js/transform": "^0.5.3",
+    "@wyw-in-js/shared": "^0.5.4",
+    "@wyw-in-js/transform": "^0.5.4",
     "babel-plugin-define-var": "^0.1.0"
   },
   "devDependencies": {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml