Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Aug 7, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/pigment-css-next-app/next.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this part of the root cause that the CI fails?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, you changed to v5.


/**
* @typedef {import('@pigment-css/nextjs-plugin').PigmentOptions} PigmentOptions
Expand Down
10 changes: 2 additions & 8 deletions apps/pigment-css-next-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Comment on lines +13 to +14
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you change to 6.0.0-beta.2 if the latest beta fails.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It does not make sense to use v5.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

beta.2 also has the same issue.

"local-ui-lib": "workspace:^",
"react": "^18.3.1",
"react-dom": "^18.3.1",
Expand Down
6 changes: 3 additions & 3 deletions packages/pigment-css-react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/pigment-css-react/src/processors/generateAtomics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}`]: {
Expand Down
2 changes: 1 addition & 1 deletion packages/pigment-css-react/src/utils/processCssObject.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
4 changes: 2 additions & 2 deletions packages/pigment-css-unplugin/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/pigment-css-vite-plugin/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
1,189 changes: 482 additions & 707 deletions pnpm-lock.yaml
View file
Open in desktop

Large diffs are not rendered by default.

Loading