Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions .codesandbox/ci.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
"packages/mui-types",
"packages/mui-utils",
"packages-internal/scripts",
"packages/zero-runtime",
"packages/zero-unplugin",
"packages/zero-vite-plugin",
"packages/zero-next-plugin"
"packages/pigment-react",
"packages/pigment-unplugin",
"packages/pigment-vite-plugin",
"packages/pigment-nextjs-plugin"
],
"publishDirectory": {
"@mui/base": "packages/mui-base/build",
Expand All @@ -49,10 +49,10 @@
"@mui/types": "packages/mui-types/build",
"@mui/utils": "packages/mui-utils/build",
"@mui-internal/docs-utils": "packages/docs-utils",
"@mui/zero-runtime": "packages/zero-runtime",
"@mui/zero-unplugin": "packages/zero-unplugin",
"@mui/zero-vite-plugin": "packages/zero-vite-plugin",
"@mui/zero-next-plugin": "packages/zero-next-plugin"
"@pigmentcss/react": "packages/pigment-react",
"@pigmentcss/unplugin": "packages/pigment-unplugin",
"@pigmentcss/vite-plugin": "packages/pigment-vite-plugin",
"@pigmentcss/nextjs-plugin": "packages/pigment-nextjs-plugin"
},
"sandboxes": [
"/examples/material-ui-cra-ts",
Expand Down
12 changes: 6 additions & 6 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
/packages/mui-icons-material/src/*.js
/packages/mui-icons-material/templateSvgIcon.js
/packages/mui-utils/macros/__fixtures__/
/packages/zero-runtime/utils/
/packages/zero-runtime/processors/
/packages/zero-runtime/exports/
/packages/zero-runtime/theme/
/packages/zero-runtime/tests/fixtures/
/packages/zero-next-plugin/loader.js
/packages/pigment-react/utils/
/packages/pigment-react/processors/
/packages/pigment-react/exports/
/packages/pigment-react/theme/
/packages/pigment-react/tests/fixtures/
/packages/pigment-nextjs-plugin/loader.js
# Ignore fixtures
/packages-internal/scripts/typescript-to-proptypes/test/*/*
/test/bundling/fixtures/**/*.fixture.js
Expand Down
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -1193,7 +1193,7 @@ A big thanks to the 17 contributors who made this release possible.

- &#8203;<!-- 09 -->Update peer dep of @mui/material (#39398) @brijeshb42

### `@mui/zero-runtime@0.0.1-alpha.0`
### `@pigmentcss/react@0.0.1-alpha.0`

- &#8203;<!-- 06 -->Implement typings for public runtime API (#39215) @brijeshb42

Expand Down Expand Up @@ -1794,7 +1794,7 @@ A big thanks to the 11 contributors who made this release possible. This release

- [useButton][base-ui] Accept arbitrary props in getRootProps and forward them (#38475) @DiegoAndai

### `@mui/zero-runtime@0.0.1-alpha.1`
### `@pigmentcss/react@0.0.1-alpha.1`

- [system][zero][tag] Add support for sx prop (#38535) @brijeshb42

Expand Down Expand Up @@ -1857,7 +1857,7 @@ A big thanks to the 21 contributors who made this release possible. Here are som
- [ButtonBase] Add ButtonBase component (#38319) @DiegoAndai
- [Input] Add InputBase component (#38392) @mj12albert

### `@mui/zero-runtime@0.0.1-alpha.0`
### `@pigmentcss/react@0.0.1-alpha.0`

- Implementation of styled tag processor for linaria (#38378) @brijeshb42

Expand Down
2 changes: 1 addition & 1 deletion apps/local-ui-lib/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { keyframes, styled } from '@mui/zero-runtime';
import { keyframes, styled } from '@pigmentcss/react';
Copy link
Member

@oliviertassinari oliviertassinari Mar 1, 2024

Choose a reason for hiding this comment

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

When I read this code, I read the project brand name is PigmentCSS but it's not what https://www.notion.so/mui-org/product-System-vs-zero-runtime-brand-and-vision-fbe3f1fe33e94657b30efef24d82c835 says.
The npm package name convention is kebab case so if our brand name is Pigment CSS this would correctly communicate it:

Suggested change
import { keyframes, styled } from '@pigmentcss/react';
import { keyframes, styled } from '@pigment-css/react';

I'm moving this to https://www.notion.so/mui-org/system-npm-package-name-convention-5b0b75983d934c70aab12ae671198d8c. We need to change something, either the brand name of the package name, It doesn't seem coherent right now.

Copy link
Member

Choose a reason for hiding this comment

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

When I read this code, I read the project brand name is PigmentCSS but it's not what https://www.notion.so/mui-org/product-System-vs-zero-runtime-brand-and-vision-fbe3f1fe33e94657b30efef24d82c835 says

I am fine with this.

I'm moving this to https://www.notion.so/mui-org/system-npm-package-name-convention-5b0b75983d934c70aab12ae671198d8c. We need to change something, either the brand name of the package name, It doesn't seem coherent right now.

I think @pigmentcss works just fine.


export const bounceAnim = keyframes({
'from, 20%, 53%, 80%, to': {
Expand Down
2 changes: 1 addition & 1 deletion apps/local-ui-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"version": "0.0.1",
"private": true,
"dependencies": {
"@mui/zero-runtime": "file:../../packages/zero-runtime/build"
"@pigmentcss/react": "file:../../packages/pigment-react"
}
}
2 changes: 1 addition & 1 deletion apps/local-ui-lib/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"extends": "../../tsconfig.json",
"references": [
{
"path": "../../packages/zero-runtime"
"path": "../../packages/pigment-react"
}
]
}
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ Open [http://localhost:3000](http://localhost:3000) with your browser to see the

You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.

If you see and error like package `@mui/zero-runtime` not found, add it as a peer-dependency in `@mui/material`'s `package.json` file and run `pnpm build` and `pnpm install` again. Make sure to not push this change to git.
If you see and error like package `@pigmentcss/react` not found, add it as a peer-dependency in `@mui/material`'s `package.json` file and run `pnpm build` and `pnpm install` again. Make sure to not push this change to git.

### Note

If you are testing changes in zero-runtime packages itself while also running this demo app, start the watch command in a separate terminal to watch and build zero-runtime package files as they change -
If you are testing changes in pigmentcss packages itself while also running this demo app, start the watch command in a separate terminal to watch and build pigmentcss package files as they change -

```bash
pnpm watch:zero
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/* eslint-env node */
// eslint-ignore-next-line import/no-unresolved
const { withZeroPlugin } = require('@mui/zero-next-plugin');
const { withPigment } = require('@pigmentcss/nextjs-plugin');
const { experimental_extendTheme: extendTheme } = require('@mui/material/styles');

/**
* @typedef {import('@mui/zero-next-plugin').ZeroPluginConfig} ZeroPluginConfig
* @typedef {import('@pigmentcss/nextjs-plugin').PigmentOptions} PigmentOptions
*/

const theme = extendTheme({
Expand Down Expand Up @@ -109,9 +109,9 @@ theme.generateCssVars = (colorScheme) => {
};

/**
* @type {ZeroPluginConfig}
* @type {PigmentOptions}
*/
const zeroPluginOptions = {
const pigmentOptions = {
theme,
transformLibraries: ['local-ui-lib'],
sourceMap: true,
Expand All @@ -129,4 +129,4 @@ const nextConfig = {
},
};

module.exports = withZeroPlugin(nextConfig, zeroPluginOptions);
module.exports = withPigment(nextConfig, pigmentOptions);
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"clean": "rimraf .next"
},
"dependencies": {
"@mui/zero-runtime": "file:../../packages/zero-runtime",
"@pigmentcss/react": "file:../../packages/pigment-react",
"@mui/utils": "file:../../packages/mui-utils/build",
"@mui/base": "file:../../packages/mui-base/build",
"@mui/material": "file:../../packages/mui-material/build",
Expand All @@ -23,8 +23,8 @@
"next": "latest"
},
"devDependencies": {
"@mui/zero-unplugin": "file:../../packages/zero-unplugin",
"@mui/zero-next-plugin": "file:../../packages/zero-next-plugin",
"@pigmentcss/unplugin": "file:../../packages/pigment-unplugin",
"@pigmentcss/nextjs-plugin": "file:../../packages/pigment-nextjs-plugin",
"@types/node": "^20.5.7",
"@types/react": "^18.2.55",
"@types/react-dom": "^18.2.19",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable material-ui/no-empty-box */

import { styled } from '@mui/zero-runtime';
import { styled } from '@pigmentcss/react';
import * as React from 'react';
import { Box as MuiBox } from '../../components/Box';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Inter } from 'next/font/google';
import { AppRouterCacheProvider } from '@mui/material-nextjs/v14-appRouter';
import { ThemeProvider } from '@mui/material/styles';
import CssBaseline from '@mui/material/CssBaseline';
import '@mui/zero-runtime/styles.css';
import '@pigmentcss/react/styles.css';
import theme from './theme';

import './globals.css';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { styled } from '@mui/zero-runtime';
import { styled } from '@pigmentcss/react';

const Main = styled('div')(({ theme }) => ({
display: 'flex',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Image from 'next/image';
import { styled, css } from '@mui/zero-runtime';
import { styled, css } from '@pigmentcss/react';
import styles from './page.module.css';

const visuallyHidden = css({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client';
import * as React from 'react';
import { styled } from '@mui/zero-runtime';
import { styled } from '@pigmentcss/react';
import { Button } from 'local-ui-lib';
import Slider from '@/components/Slider/ZeroSlider';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { ExtendTheme } from '@mui/zero-runtime';
import type { ExtendTheme } from '@pigmentcss/react';

declare module '@mui/zero-runtime/theme' {
declare module '@pigmentcss/react/theme' {
interface ThemeTokens {
'max-width': string;
'border-radius': string;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { generateAtomics } from '@mui/zero-runtime';
import { generateAtomics } from '@pigmentcss/react';

const atomics = generateAtomics(({ theme }) => ({
conditions: Object.keys(theme.breakpoints.values).reduce((acc, breakpoint) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
getSliderUtilityClass,
} from '@mui/material/Slider';
import { isHostComponent, useSlotProps } from '@mui/base/utils';
import { styled } from '@mui/zero-runtime';
import { styled } from '@pigmentcss/react';
import { capitalize } from '@mui/material/utils';
import SliderValueLabel from '@mui/material/Slider/SliderValueLabel';
import { useSlider, valueToPercent } from '@mui/base/useSlider';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"path": "../../packages/mui-material/tsconfig.build.json"
},
{
"path": "../../packages/zero-runtime/tsconfig.json"
"path": "../../packages/pigment-react/tsconfig.json"
}
]
}
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ This project is not part of the workspace yet.

You can either run `pnpm build` command to build all the packages, or you need to build, the the minimum -

1. `@mui/zero-runtime`
2. `@mui/zero-vite-plugin`
1. `@pigmentcss/react`
2. `@pigmentcss/vite-plugin`

Make sure you have also run `pnpm release:build` at least once because we also use `@mui/material` and `@mui/system` packages. On subsequent runs, you can only build the above packages using -

Expand All @@ -24,4 +24,4 @@ After building, you can run the project by changing into the directory and then

Optionally, before running the dev server, you can run `pnpm vite optimize --force` if it logged some error during `pnpm vite`.

If you see and error like package `@mui/zero-runtime` not found, add it as a peer-dependency in `@mui/material`'s `package.json` file and run `pnpm build` and `pnpm install` again. Make sure to not push this change to git.
If you see and error like package `@pigmentcss/react` not found, add it as a peer-dependency in `@mui/material`'s `package.json` file and run `pnpm build` and `pnpm install` again. Make sure to not push this change to git.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build": "vite build"
},
"dependencies": {
"@mui/zero-runtime": "file:../../packages/zero-runtime",
"@pigmentcss/react": "file:../../packages/pigment-react",
"@mui/utils": "file:../../packages/mui-utils/build",
"@mui/base": "file:../../packages/mui-base/build",
"@mui/material": "file:../../packages/mui-material/build",
Expand All @@ -27,7 +27,7 @@
"@babel/preset-env": "^7.23.9",
"@babel/preset-react": "^7.23.3",
"@babel/preset-typescript": "^7.23.3",
"@mui/zero-vite-plugin": "file:../../packages/zero-vite-plugin",
"@pigmentcss/vite-plugin": "file:../../packages/pigment-vite-plugin",
"@types/react": "^18.2.55",
"@types/react-dom": "^18.2.19",
"@vitejs/plugin-react": "^4.2.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { styled, generateAtomics } from '@mui/zero-runtime';
import { styled, generateAtomics } from '@pigmentcss/react';
import type { Breakpoint } from '@mui/system';
import { Button, bounceAnim } from 'local-ui-lib';
import Slider from './Slider/ZeroSlider';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { generateAtomics } from '@mui/zero-runtime';
import { generateAtomics } from '@pigmentcss/react';

const atomics = generateAtomics(({ theme }) => ({
conditions: Object.keys(theme.breakpoints.values).reduce((acc, breakpoint) => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { styled } from '@mui/zero-runtime';
import { styled } from '@pigmentcss/react';

const Main = styled('div')(({ theme }) => ({
display: 'flex',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
getSliderUtilityClass,
} from '@mui/material/Slider';
import { isHostComponent, useSlotProps } from '@mui/base/utils';
import { styled } from '@mui/zero-runtime';
import { styled } from '@pigmentcss/react';
import { capitalize } from '@mui/material/utils';
import SliderValueLabel from '@mui/material/Slider/SliderValueLabel';
import { useSlider, valueToPercent } from '@mui/base/useSlider';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { experimental_extendTheme } from '@mui/material/styles';
import '@mui/zero-runtime/theme';
import '@pigmentcss/react/theme';

declare module '@mui/zero-runtime/theme' {
declare module '@pigmentcss/react/theme' {
export interface ThemeArgs {
theme: ReturnType<typeof experimental_extendTheme> & {
applyDarkStyles<T>(obj: T): Record<string, T>;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { styled } from '@mui/zero-runtime';
import { styled } from '@pigmentcss/react';

export function Component() {
return null;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { experimental_extendTheme } from '@mui/material/styles';

declare module '@mui/zero-runtime/theme' {
declare module '@pigmentcss/react/theme' {
interface ThemeArgs {
theme: ReturnType<typeof experimental_extendTheme> & {
applyDarkStyles<T>(obj: T): Record<string, T>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { BrowserRouter as Router, useRoutes } from 'react-router-dom';
import { ThemeProvider, createTheme } from '@mui/material/styles';
import CssBaseline from '@mui/material/CssBaseline';
import routes from '~react-pages';
import '@mui/zero-runtime/styles.css';
import '@pigmentcss/react/styles.css';

function App() {
return <React.Suspense fallback={<p>Loading...</p>}>{useRoutes(routes)}</React.Suspense>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"path": "../../packages/mui-material/tsconfig.build.json"
},
{
"path": "../../packages/zero-runtime/tsconfig.json"
"path": "../../packages/pigment-react/tsconfig.json"
}
]
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { defineConfig, splitVendorChunkPlugin } from 'vite';
import reactPlugin from '@vitejs/plugin-react';
import Pages from 'vite-plugin-pages';
import { zeroVitePlugin as zeroPlugin } from '@mui/zero-vite-plugin';
import { pigment } from '@pigmentcss/vite-plugin';
import { experimental_extendTheme as extendTheme } from '@mui/material/styles';

const theme = extendTheme();
Expand Down Expand Up @@ -34,7 +34,7 @@ theme.generateCssVars = (colorScheme) => {
export default defineConfig({
plugins: [
reactPlugin({ include: /\.(mdx|js|jsx|ts|tsx)$/ }),
zeroPlugin({
pigment({
theme,
transformLibraries: ['local-ui-lib', '@mui/material'],
sourceMap: true,
Expand Down
Loading