Skip to content

Commit

Permalink
Merge branch 'next' into website-header-product-menu
Browse files Browse the repository at this point in the history
  • Loading branch information
danilo-leal committed Jun 13, 2024
2 parents 31b3856 + 0171518 commit a972b2e
Show file tree
Hide file tree
Showing 699 changed files with 22,173 additions and 15,023 deletions.
9 changes: 6 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
const path = require('path');
const { rules: baseStyleRules } = require('eslint-config-airbnb-base/rules/style');

const OneLevelImportMessage = [
'Prefer one level nested imports to avoid bundling everything in dev mode or breaking CJS/ESM split.',
Expand All @@ -12,6 +11,8 @@ const forbidCreateStylesMessage =
'`createStyles` will lead to inlined, at-compile-time-resolved type-imports. ' +
'See https://github.com/microsoft/TypeScript/issues/36097#issuecomment-578324386 for more information';

const ENABLE_REACT_COMPILER_PLUGIN = false;

module.exports = {
root: true, // So parent files don't get applied
env: {
Expand All @@ -35,6 +36,7 @@ module.exports = {
'eslint-plugin-react-hooks',
'@typescript-eslint/eslint-plugin',
'eslint-plugin-filenames',
...(ENABLE_REACT_COMPILER_PLUGIN ? ['eslint-plugin-react-compiler'] : []),
],
settings: {
'import/resolver': {
Expand Down Expand Up @@ -182,8 +184,7 @@ module.exports = {
'react/jsx-no-target-blank': ['error', { allowReferrer: true }],

'no-restricted-syntax': [
// See https://github.com/eslint/eslint/issues/9192 for why it's needed
...baseStyleRules['no-restricted-syntax'],
'error',
{
message:
"Do not import default or named exports from React. Use a namespace import (import * as React from 'react';) instead.",
Expand Down Expand Up @@ -219,6 +220,7 @@ module.exports = {

'react/jsx-no-useless-fragment': ['error', { allowExpressions: true }],
'lines-around-directive': 'off',
...(ENABLE_REACT_COMPILER_PLUGIN ? { 'react-compiler/react-compiler': 'error' } : {}),
},
overrides: [
{
Expand Down Expand Up @@ -471,6 +473,7 @@ module.exports = {
rules: {
'import/no-default-export': 'error',
'import/prefer-default-export': 'off',
...(ENABLE_REACT_COMPILER_PLUGIN ? { 'react-compiler/react-compiler': 'off' } : {}),
},
},
{
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
uses: github/codeql-action/init@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
with:
languages: typescript
config-file: ./.github/codeql/codeql-config.yml
Expand All @@ -30,4 +30,4 @@ jobs:
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
uses: github/codeql-action/analyze@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: Upload to code-scanning
uses: github/codeql-action/upload-sarif@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
uses: github/codeql-action/upload-sarif@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
with:
sarif_file: results.sarif
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,4 @@ docs/public/static/blog/feed/*
# vale downloaded config
.github/styles/
.nx/cache
.nx/workspace-data
76 changes: 76 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,81 @@
# [Versions](https://mui.com/versions/)

## v6.0.0-alpha.11

<!-- generated comparing v6.0.0-alpha.10..next -->

_Jun 11, 2024_

A big thanks to the 18 contributors who made this release possible.

### `@mui/material@6.0.0-alpha.11`

- &#8203;<!-- 38 -->[Autocomplete] Shouldn't resize when hovering (#42452) @ZeeshanTamboli
- &#8203;<!-- 37 -->[Chip] Fix focus issue related with the Escape event (#41578) @shrilsharma
- &#8203;<!-- 12 -->[Grid] Fix support for CSS variables (#42574) @oliviertassinari
- &#8203;<!-- 11 -->[InputBase] Use `globalCss` for Pigment integration (#42431) @siriwatknp
- &#8203;<!-- 10 -->Change React.ReactElement type from `any` to `unknown` (#42473) @sai6855
- &#8203;<!-- 09 -->Integrate `extendSxProp` adapter (#42543) @siriwatknp
- &#8203;<!-- 08 -->[Tab] Fix applying `iconWrapper` styles from theme and update its description (#42549) @sai6855
- &#8203;<!-- 08 -->[pigment-css] Add `stringifyTheme` for Pigment CSS integration (#42476) @siriwatknp

### `@mui/system@6.0.0-alpha.11`

- &#8203;<!-- 11 -->[Grid] Remove `disableEqualOverflow` by using `gap` (#42526) @DiegoAndai
- &#8203;<!-- 07 -->[useMediaQuery] Drop Safari < 14 support (#42464) @aarongarciah

### `@mui/utils@6.0.0-alpha.11`

- &#8203;<!-- 04 -->Allow passing `NaN` as `defaultValue` to `useControlled` (#41559) @iammminzzy

### `@mui/codemod@6.0.0-alpha.11`

- &#8203;<!-- 39 -->Improve styled and sx prop transformation (#42598) @siriwatknp
- &#8203;<!-- 36 -->Support more cases for sx-prop transformation (#42527) @siriwatknp

### `@mui/private-theming@6.0.0-alpha.11`

- &#8203;<!-- 09 -->Fix issues reported by react compiler in `mui-private-theming` components (#42619) @sai6855

### Docs

- &#8203;<!-- 31 -->Add `theme.applyStyles` and migrate docs (#42498) @siriwatknp
- &#8203;<!-- 29 -->Fix dashboard template console error (#42594) @oliviertassinari
- &#8203;<!-- 28 -->Migrate system props to `sx` prop (#42475) @siriwatknp
- &#8203;<!-- 27 -->[material-ui]Fix duplicated sentence (#42521) @alexfauquette
- &#8203;<!-- 22 -->[Grid] Fix docs spacing (#42573) @oliviertassinari
- &#8203;<!-- 21 -->[joy-ui] Add Next.js App Router instructions on how to prevent flickering (#42514) @devnyxie
- &#8203;<!-- 20 -->[joy-ui] Fix HTML tag without preformatting (#42525) @jacobmoshipco
- &#8203;<!-- 19 -->[material-ui] Add docs for complementary stepper components (#41900) @anle9650
- &#8203;<!-- 18 -->[material-ui] Fix typo on Sign-in/Sign-up templates (#42605) @zanivan
- &#8203;<!-- 17 -->[material-ui] Add container queries docs (#42434) @siriwatknp
- &#8203;<!-- 16 -->[material-ui] Fix ESLint error in Stepper demo (#42559) @aarongarciah
- &#8203;<!-- 15 -->[material-ui] Shorten useMediaQuery subheading (#42561) @aarongarciah
- &#8203;<!-- 14 -->[material-ui] Add a Refine example project (#42461) @necatiozmen

### Core

- &#8203;<!-- 39 -->[website] Move the `React Engineer - X` role to future roles (#42532) @DanailH
- &#8203;<!-- 35 -->[core] Allow `for..of` loops (#42600) @michaldudak
- &#8203;<!-- 34 -->[core] Add comment about Object.js @oliviertassinari
- &#8203;<!-- 33 -->[core] Disable eslint-plugin-react-compiler for Base (#42563) @aarongarciah
- &#8203;<!-- 33 -->[core] Group Pigment CSS dependencies (#42174) @siriwatknp
- &#8203;<!-- 32 -->[core] Configure eslint-plugin-react-compiler (#42555) @aarongarciah
- &#8203;<!-- 31 -->[core] Skip charts animation for visual regression test (#42530) @alexfauquette
- &#8203;<!-- 26 -->[docs-infra] Simplify click header (#42593) @oliviertassinari
- &#8203;<!-- 25 -->[docs-infra] Add configurable jsdoc host variable (#42472) @tonygravell
- &#8203;<!-- 25 -->[docs-infra] Add the Base UI logo with copy functionality (#42446) @danilo-leal
- &#8203;<!-- 24 -->[docs-infra] Prevent link anchor when selecting text (#41994) @alexfauquette
- &#8203;<!-- 23 -->[docs-infra] Add the Base UI logo with copy functionality (#42446) @danilo-leal
- &#8203;<!-- 13 -->[examples] Remove Pigment CSS examples (#42471) @sai6855
- &#8203;<!-- 06 -->[test] Restore pnpm tc command (#42572) @oliviertassinari
- &#8203;<!-- 05 -->[test] Restore testing internal packages (#42519) @michaldudak
- &#8203;<!-- 03 -->[website] Close Developer Advocate / Content Engineer role @oliviertassinari
- &#8203;<!-- 02 -->[website] Remove blank line @oliviertassinari
- &#8203;<!-- 01 -->[website] Fix mobile layout shift @oliviertassinari

All contributors of this release in alphabetical order: @aarongarciah, @alexfauquette, @anle9650, @DanailH, @danilo-leal, @devnyxie, @DiegoAndai, @iammminzzy, @jacobmoshipco, @michaldudak, @necatiozmen, @oliviertassinari, @sai6855, @shrilsharma, @siriwatknp, @tonygravell, @zanivan, @ZeeshanTamboli

## v6.0.0-alpha.10

<!-- generated comparing v6.0.0-alpha.9..next -->
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": {
"@pigment-css/react": "^0.0.12"
"@pigment-css/react": "^0.0.13"
}
}
3 changes: 2 additions & 1 deletion apps/pigment-css-next-app/next.config.js
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 { extendTheme, stringifyTheme } = require('@mui/material/styles');

/**
* @typedef {import('@pigment-css/nextjs-plugin').PigmentOptions} PigmentOptions
Expand Down Expand Up @@ -95,6 +95,7 @@ const theme = extendTheme({
theme.getColorSchemeSelector = (colorScheme) => {
return `@media (prefers-color-scheme: ${colorScheme})`;
};
theme.toRuntimeSource = stringifyTheme;

function innerNoop() {
return null;
Expand Down
4 changes: 2 additions & 2 deletions apps/pigment-css-next-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"clean": "rimraf .next"
},
"dependencies": {
"@pigment-css/react": "^0.0.12",
"@pigment-css/react": "^0.0.13",
"@mui/utils": "workspace:^",
"@mui/base": "workspace:^",
"@mui/lab": "workspace:^",
Expand All @@ -24,7 +24,7 @@
"next": "latest"
},
"devDependencies": {
"@pigment-css/nextjs-plugin": "^0.0.12",
"@pigment-css/nextjs-plugin": "^0.0.14",
"@types/node": "^20.5.7",
"@types/react": "^18.2.55",
"@types/react-dom": "^18.3.0",
Expand Down
37 changes: 37 additions & 0 deletions apps/pigment-css-next-app/src/app/material-ui/react-paper/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
'use client';
import * as React from 'react';
import Elevation from '../../../../../../docs/data/material/components/paper/Elevation';
import SimplePaper from '../../../../../../docs/data/material/components/paper/SimplePaper';
import SquareCorners from '../../../../../../docs/data/material/components/paper/SquareCorners';
import Variants from '../../../../../../docs/data/material/components/paper/Variants';

export default function Paper() {
return (
<React.Fragment>
<section>
<h2> Elevation</h2>
<div className="demo-container">
<Elevation />
</div>
</section>
<section>
<h2> Simple Paper</h2>
<div className="demo-container">
<SimplePaper />
</div>
</section>
<section>
<h2> Square Corners</h2>
<div className="demo-container">
<SquareCorners />
</div>
</section>
<section>
<h2> Variants</h2>
<div className="demo-container">
<Variants />
</div>
</section>
</React.Fragment>
);
}
142 changes: 142 additions & 0 deletions apps/pigment-css-next-app/src/app/material-ui/react-tabs/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
'use client';
import * as React from 'react';
import AccessibleTabs1 from '../../../../../../docs/data/material/components/tabs/AccessibleTabs1';
import AccessibleTabs2 from '../../../../../../docs/data/material/components/tabs/AccessibleTabs2';
import BasicTabs from '../../../../../../docs/data/material/components/tabs/BasicTabs';
import CenteredTabs from '../../../../../../docs/data/material/components/tabs/CenteredTabs';
import ColorTabs from '../../../../../../docs/data/material/components/tabs/ColorTabs';
import CustomizedTabs from '../../../../../../docs/data/material/components/tabs/CustomizedTabs';
import DisabledTabs from '../../../../../../docs/data/material/components/tabs/DisabledTabs';
import FullWidthTabs from '../../../../../../docs/data/material/components/tabs/FullWidthTabs';
import IconLabelTabs from '../../../../../../docs/data/material/components/tabs/IconLabelTabs';
import IconPositionTabs from '../../../../../../docs/data/material/components/tabs/IconPositionTabs';
import IconTabs from '../../../../../../docs/data/material/components/tabs/IconTabs';
import LabTabs from '../../../../../../docs/data/material/components/tabs/LabTabs';
import NavTabs from '../../../../../../docs/data/material/components/tabs/NavTabs';
import ScrollableTabsButtonAuto from '../../../../../../docs/data/material/components/tabs/ScrollableTabsButtonAuto';
import ScrollableTabsButtonForce from '../../../../../../docs/data/material/components/tabs/ScrollableTabsButtonForce';
import ScrollableTabsButtonPrevent from '../../../../../../docs/data/material/components/tabs/ScrollableTabsButtonPrevent';
import ScrollableTabsButtonVisible from '../../../../../../docs/data/material/components/tabs/ScrollableTabsButtonVisible';
import TabsWrappedLabel from '../../../../../../docs/data/material/components/tabs/TabsWrappedLabel';
import VerticalTabs from '../../../../../../docs/data/material/components/tabs/VerticalTabs';

export default function Tabs() {
return (
<React.Fragment>
<section>
<h2> Accessible Tabs1</h2>
<div className="demo-container">
<AccessibleTabs1 />
</div>
</section>
<section>
<h2> Accessible Tabs2</h2>
<div className="demo-container">
<AccessibleTabs2 />
</div>
</section>
<section>
<h2> Basic Tabs</h2>
<div className="demo-container">
<BasicTabs />
</div>
</section>
<section>
<h2> Centered Tabs</h2>
<div className="demo-container">
<CenteredTabs />
</div>
</section>
<section>
<h2> Color Tabs</h2>
<div className="demo-container">
<ColorTabs />
</div>
</section>
<section>
<h2> Customized Tabs</h2>
<div className="demo-container">
<CustomizedTabs />
</div>
</section>
<section>
<h2> Disabled Tabs</h2>
<div className="demo-container">
<DisabledTabs />
</div>
</section>
<section>
<h2> Full Width Tabs</h2>
<div className="demo-container">
<FullWidthTabs />
</div>
</section>
<section>
<h2> Icon Label Tabs</h2>
<div className="demo-container">
<IconLabelTabs />
</div>
</section>
<section>
<h2> Icon Position Tabs</h2>
<div className="demo-container">
<IconPositionTabs />
</div>
</section>
<section>
<h2> Icon Tabs</h2>
<div className="demo-container">
<IconTabs />
</div>
</section>
<section>
<h2> Lab Tabs</h2>
<div className="demo-container">
<LabTabs />
</div>
</section>
<section>
<h2> Nav Tabs</h2>
<div className="demo-container">
<NavTabs />
</div>
</section>
<section>
<h2> Scrollable Tabs Button Auto</h2>
<div className="demo-container">
<ScrollableTabsButtonAuto />
</div>
</section>
<section>
<h2> Scrollable Tabs Button Force</h2>
<div className="demo-container">
<ScrollableTabsButtonForce />
</div>
</section>
<section>
<h2> Scrollable Tabs Button Prevent</h2>
<div className="demo-container">
<ScrollableTabsButtonPrevent />
</div>
</section>
<section>
<h2> Scrollable Tabs Button Visible</h2>
<div className="demo-container">
<ScrollableTabsButtonVisible />
</div>
</section>
<section>
<h2> Tabs Wrapped Label</h2>
<div className="demo-container">
<TabsWrappedLabel />
</div>
</section>
<section>
<h2> Vertical Tabs</h2>
<div className="demo-container">
<VerticalTabs />
</div>
</section>
</React.Fragment>
);
}
Loading

0 comments on commit a972b2e

Please sign in to comment.