Skip to content

Commit

Permalink
Merge commit 'ca5ac1450792c3c6c68bb2d26c6e0f05678c33f6' of https://gi…
Browse files Browse the repository at this point in the history
  • Loading branch information
gitstart committed Sep 6, 2023
2 parents c798917 + ca5ac14 commit 9e05405
Show file tree
Hide file tree
Showing 213 changed files with 2,312 additions and 1,388 deletions.
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@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@a09933a12a80f87b87005513f0abb1494c27a716 # v2.21.4
uses: github/codeql-action/init@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2.21.5
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@a09933a12a80f87b87005513f0abb1494c27a716 # v2.21.4
uses: github/codeql-action/analyze@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2.21.5
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@a09933a12a80f87b87005513f0abb1494c27a716 # v2.21.4
uses: github/codeql-action/upload-sarif@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2.21.5
with:
sarif_file: results.sarif
93 changes: 92 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,96 @@
# [Versions](https://mui.com/versions/)

## 5.14.8

<!-- generated comparing v5.14.7..master -->

_Sep 5, 2023_

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

### `@mui/[email protected]`

- &#8203;<!-- 53 -->ImageItemList fix incorrect (below) rendering (#38452) @omriklein
- &#8203;<!-- 42 -->[Button] Add demo for file upload (#38786) @anle9650
- &#8203;<!-- 12 -->[Slider] Add missing classes for `Slider` `InputLabel` `InputBase` `Radio` (#38401) @sai6855
- &#8203;<!-- 11 -->[Select] Merge slotProps.paper with internal Paper props (#38703) @michaldudak
- &#8203;<!-- 09 -->[Tabs] Fix `ref` type (#38717) @ZeeshanTamboli
- &#8203;<!-- 08 -->[TabScrollButton] Extend ButtonBase types (#38719) @ZeeshanTamboli

### `@mui/[email protected]`

- &#8203;<!-- 50 -->[Autocomplete] Type multiple values with readonly arrays. (#38253) @pcorpet
- &#8203;<!-- 07 -->[TextField] Fix unstable height of memoized multiline TextField component (#37135) @amal-qb

### `@mui/[email protected]`

- &#8203;<!-- 53 -->[Accordion] Fix incorrect display of classname (#38695) @sai6855
- &#8203;<!-- 51 -->[AspectRatio] Correct `ratio` prop description (#38743) @sai6855
- &#8203;<!-- 43 -->[Button] Fix disablity of button (#38673) @sai6855
- &#8203;<!-- 35 -->[design] Stray design tweaks to components (#38476) @zanivan
- &#8203;<!-- 05 -->[Typography] Added position only when Skeleton is a direct child (#38799) @siriwatknp

### `@mui/[email protected]`

- &#8203;<!-- 06 -->[TreeView] Use Tree View from MUI X in the lab (#38261) @flaviendelangle
- &#8203;<!-- 13 -->[LoadingButton] Fix HTML rule button > div forbidden nesting (#38584) @oliviertassinari

### `@mui/[email protected]`

- &#8203;<!-- 11 -->[system] Fix the inconsistent types of the `mergeBreakpointsInOrder` function (#38749) @imevanc
- &#8203;<!-- 10 -->[system] Fix maxWidth incorrectly resolving breakpoints with non-pixel units (#38633) @mj12albert
- &#8203;<!-- 05 -->[typescript] Introduce \*OwnProps interfaces for components (#36798) @szalonna

### Docs

- &#8203;<!-- 52 -->Update changelog (#38704) @mj12albert
- &#8203;<!-- 49 -->[docs][Autocomplete] Require referentially stable value (#38734) @michaldudak
- &#8203;<!-- 48 -->[docs][base-ui] Add type parameter to the button in prepareForSlot demo (#38640) @michaldudak
- &#8203;<!-- 47 -->[docs][base-ui] Fix the broken image in the Tailwind CSS guide (#38721) @michaldudak
- &#8203;<!-- 46 -->[docs][base-ui]: Working With Tailwind Guide - revises example code to avoid import errors (#38693) @christophermorin
- &#8203;<!-- 45 -->[docs][base] Add Tailwind CSS + plain CSS demo on the Menu page (#38618) @alisasanib
- &#8203;<!-- 44 -->[blog] Clearer blog release title @oliviertassinari
- &#8203;<!-- 43 -->[blog] Add a post for the Tree View migration (#38407) @flaviendelangle
- &#8203;<!-- 34 -->[docs] Fix broken links to Next.js docs (#38764) @ruflair
- &#8203;<!-- 33 -->[docs] Trim trailing whitespace (#38793) @oliviertassinari
- &#8203;<!-- 32 -->[docs] Fix a typo in lab-tree-view-to-mui-x.md @mbrookes
- &#8203;<!-- 31 -->[docs] Clean up not used Usage files (#38715) @danilo-leal
- &#8203;<!-- 30 -->[docs] Improve theme builder exceptions (#38709) @jyash97
- &#8203;<!-- 29 -->[docs] Polish Slider demos (#38759) @oliviertassinari
- &#8203;<!-- 28 -->[docs] Fix Joy UI docs link regression (#38761) @oliviertassinari
- &#8203;<!-- 27 -->[docs] Fix typo @oliviertassinari
- &#8203;<!-- 26 -->[docs] Fix e.g. typo (#38748) @oliviertassinari
- &#8203;<!-- 25 -->[docs] Fix Next.js pages router example redirect link (#38750) @sai6855
- &#8203;<!-- 24 -->[docs] Fix SEO issue broken links @oliviertassinari
- &#8203;<!-- 23 -->[docs] Improve SSR example reference (#38651) @oliviertassinari
- &#8203;<!-- 17 -->[docs][joy-ui] Integrate a count-up feature to the Linear Progress (#38738) @anon-phantom
- &#8203;<!-- 16 -->[docs][joy-ui] Fix Link's `overlay` prop demo (#38702) @danilo-leal
- &#8203;<!-- 15 -->[docs][joy-ui] Polish the Stack page (#38623) @danilo-leal
- &#8203;<!-- 14 -->[docs][material-ui] Adjust simple Slide demo (#38646) @rajgop1

### Core

- &#8203;<!-- 43 -->[core] Re-add nx and setup build caching (#38752) @brijeshb42
- &#8203;<!-- 41 -->[core] Remove dead code seoTitle @oliviertassinari
- &#8203;<!-- 40 -->[core] Use immutable refs (#38762) @oliviertassinari
- &#8203;<!-- 39 -->[core] Rework `typescript-to-proptypes` to share the AST parsing with `parseStyles` (#38517) @flaviendelangle
- &#8203;<!-- 38 -->[core] Fix CI @oliviertassinari
- &#8203;<!-- 37 -->[core] Remove unnecessary `@types/webpack` package (#38720) @ZeeshanTamboli
- &#8203;<!-- 36 -->[core] Remove duplicate prop @oliviertassinari

- &#8203;<!-- 22 -->[docs-infra] Fix mobile display in CodeSandbox (#38767) @oliviertassinari
- &#8203;<!-- 21 -->[docs-infra] Remove legacy GA (#37579) @alexfauquette
- &#8203;<!-- 20 -->[docs-infra] Fix emotion :first-child console log (#38690) @oliviertassinari
- &#8203;<!-- 19 -->[docs-infra] Fix leaking callout content (#38712) @danilo-leal
- &#8203;<!-- 18 -->[docs-infra] Remove emoji from callouts (#38694) @danilo-leal

- &#8203;<!-- 04 -->[website] Fix out of date discount value @oliviertassinari
- &#8203;<!-- 03 -->[website] Fix out-of-date label on Toolpad (#38744) @bharatkashyap
- &#8203;<!-- 02 -->[website] Fine-tune branding buttons box shadows (#38731) @danilo-leal
- &#8203;<!-- 01 -->[website] Fix pricing table style (#38681) @alexfauquette

All contributors of this release in alphabetical order: @alexfauquette, @alisasanib, @amal-qb, @anle9650, @anon-phantom, @bharatkashyap, @brijeshb42, @christophermorin, @danilo-leal, @flaviendelangle, @imevanc, @jyash97, @mbrookes, @michaldudak, @mj12albert, @oliviertassinari, @omriklein, @pcorpet, @rajgop1, @ruflair, @sai6855, @siriwatknp, @szalonna, @zanivan, @ZeeshanTamboli

## 5.14.7

<!-- generated comparing v5.14.6..master -->
Expand Down Expand Up @@ -1380,7 +1471,7 @@ _Apr 11, 2023_

A big thanks to the 9 contributors who made this release possible. Here are some highlights ✨:

- 💫 Added [theme scope](https://mui.com/material-ui/guides/styled-engine/#theme-scoping) for using multiple design systems (#36664) @siriwatknp
- 💫 Added [theme scope](https://mui.com/material-ui/guides/theme-scoping/) for using multiple design systems (#36664) @siriwatknp
- 🐛 bug fixes and 📚 documentation improvements.

### `@mui/[email protected]`
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ npm install @mui/system @emotion/react @emotion/styled
yarn add @mui/system @emotion/react @emotion/styled
```

Or if you want to use `styled-components` as a styling engine:
Or if you want to use styled-components as the styling engine:

**npm:**

Expand All @@ -112,7 +112,7 @@ npm install @mui/material @mui/styled-engine-sc styled-components
yarn add @mui/material @mui/styled-engine-sc styled-components
```

Visit our [`styled-engine` guide](https://mui.com/material-ui/guides/styled-engine/) for more information about how to configure `styled-components` as the style engine.
Visit our [styled-components guide](https://mui.com/material-ui/guides/styled-components/) for more information on configuration.

## Sponsors

Expand Down
2 changes: 1 addition & 1 deletion apps/zero-runtime-vite-app/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ You can either run `yarn release:build` command to build all the packages, or yo
Make sure you have also run `yarn release:build` at least once because we also use `@mui/material` and `@mui/system` packages. On subsequent runs, you can only build the above 2 packages using -

```bash
yarn build:zero
yarn build
```

After building, you can run the project by changing into the directory and then
Expand Down
12 changes: 6 additions & 6 deletions apps/zero-runtime-vite-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
"react-dom": "^18.2.0"
},
"devDependencies": {
"@babel/core": "^7.22.10",
"@linaria/vite": "^4.5.4",
"@mui/utils": "^5.14.6",
"@mui/material": "^5.14.6",
"@mui/zero-tag-processor": "file:../../packages/zero-tag-processor/build",
"@types/babel__core": "^7.20.1",
"@mui/utils": "^5.14.8",
"@mui/material": "^5.14.8",
"@mui/zero-vite-plugin": "file:../../packages/zero-vite-plugin/build",
"@vitejs/plugin-react": "^4.0.4",
"vite": "4.4.9"
},
"resolutions": {
"@mui/zero-tag-processor": "file:../../packages/zero-tag-processor/build"
}
}
82 changes: 10 additions & 72 deletions apps/zero-runtime-vite-app/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import { defineConfig, splitVendorChunkPlugin, type PluginOption } from 'vite';
import { defineConfig, splitVendorChunkPlugin } from 'vite';
import reactPlugin from '@vitejs/plugin-react';
import linaria from '@linaria/vite';
import { zeroVitePlugin } from '@mui/zero-vite-plugin';
import { createTheme } from '@mui/material/styles';
import { generateCss } from '@mui/zero-tag-processor/generateCss';
import { transformAsync } from '@babel/core';

const theme = createTheme();
// @TODO - Make this part of the main package
Expand All @@ -18,73 +16,13 @@ theme.applyDarkStyles = function applyDarkStyles(obj) {

const varPrefix = 'app';

function muiZeroVitePlugin(): PluginOption {
function injectMUITokensPlugin(): PluginOption {
return {
name: 'vite-mui-theme-injection-plugin',
load(id) {
if (id.endsWith('@mui/zero-runtime/styles.css')) {
return {
code: generateCss(
{
cssVariablesPrefix: varPrefix,
themeArgs: {
theme,
},
},
{},
),
map: null,
};
}
return null;
},
};
}
const extensions = ['.ts', '.tsx', '.js', '.jsx', '.mts', '.mjs', '.cts', '.cjs', '.mtsx'];

function intermediateBabelPlugin(): PluginOption {
return {
name: 'vite-intermediate-plugin',
async transform(code, id) {
const [filename] = id.split('?');
if (
!filename.includes('zero-runtime-vite-app/src') ||
!extensions.some((ext) => filename.endsWith(ext))
) {
return null;
}
const result = await transformAsync(code, {
filename,
babelrc: false,
configFile: false,
plugins: [['@mui/zero-tag-processor/pre-linaria-plugin']],
});
return {
code: result?.code ?? code,
map: result?.map,
};
},
};
}

// @TODO - Expect most of these from users of the plugin.
const linariaPlugin = linaria({
displayName: false,
sourceMap: true,
// @ts-ignore
cssVariablesPrefix: varPrefix,
themeArgs: {
theme,
},
babelOptions: {
plugins: ['@babel/plugin-syntax-jsx'],
},
});

return [injectMUITokensPlugin(), intermediateBabelPlugin(), linariaPlugin];
}

export default defineConfig({
plugins: [muiZeroVitePlugin(), reactPlugin(), splitVendorChunkPlugin()],
plugins: [
zeroVitePlugin({
cssVariablesPrefix: varPrefix,
theme,
}),
reactPlugin(),
splitVendorChunkPlugin(),
],
});
Loading

0 comments on commit 9e05405

Please sign in to comment.