Skip to content

Commit

Permalink
[core] Small changes (mui#22020)
Browse files Browse the repository at this point in the history
  • Loading branch information
oliviertassinari authored Aug 4, 2020
1 parent 30e912b commit e1e8e82
Show file tree
Hide file tree
Showing 53 changed files with 85 additions and 111 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,14 +145,14 @@ jobs:
- run:
name: Lint
command: yarn lint:ci
- run:
name: Lint JSON
command: yarn jsonlint
- run:
name: '`yarn extract-error-codes` changes committed?'
command: |
yarn extract-error-codes
git diff --exit-code
- run:
name: Lint JSON
command: yarn --silent jsonlint
test_types:
<<: *defaults
steps:
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
.idea
.vscode

*.log
.DS_STORE
*.log
/.eslintcache
/docs/.next
/.nyc_output
/coverage
/docs/.next
/docs/export
/examples/**/.cache
/packages/material-ui-codemod/lib
Expand Down
6 changes: 1 addition & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<div align="center">

[React](https://reactjs.org/) components for faster and easier web development. Build your own design system, or start with [Material Design](https://material.io/design/introduction/).
[React](https://reactjs.org/) components for faster and simpler web development. Build your own design system, or start with [Material Design](https://material.io/design/introduction/).

[![npm package](https://img.shields.io/npm/v/@material-ui/core/latest.svg)](https://www.npmjs.com/package/@material-ui/core)
[![npm downloads](https://img.shields.io/npm/dm/@material-ui/core.svg)](https://www.npmjs.com/package/@material-ui/core)
Expand Down Expand Up @@ -59,10 +59,6 @@ Please note that `@next` will only point to pre-releases; to get the latest stab

### Diamond 💎

<p style="display: flex; justify-content: center;">
<a data-ga-event-category="sponsor" data-ga-event-action="logo" data-ga-event-label="sencha" href="https://www.sencha.com/products/extreact/extreact-for-material-ui/?utm_source=materialui&utm_medium=referral&utm_content=product-200429-extreactmaterialui" rel="noopener sponsored" target="_blank" style="margin-right: 16px;"><img height="128" width="128" src="https://material-ui.com/static/in-house/sencha-256x256.png" alt="sencha" title="UI Components for Productive Dev Teams" loading="lazy" /></a>
</p>

Diamond Sponsors are those who have pledged \$1,500/month or more to Material-UI.

### Gold 🏆
Expand Down
2 changes: 1 addition & 1 deletion docs/next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ module.exports = {
},
// required to transpile ../packages/
{
test: /\.(js|mjs|jsx|ts)$/,
test: /\.(js|mjs|tsx|ts)$/,
include: [workspaceRoot],
exclude: /node_modules/,
use: options.defaultLoaders.babel,
Expand Down
4 changes: 2 additions & 2 deletions docs/pages/blog/material-ui-v4-is-out.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description: Material-UI v4 is out 🎉

The core team. May 23, 2019.

> React components for faster and easier web development. Build your own design system, or start with Material Design.
> React components for faster and simpler web development. Build your own design system, or start with Material Design.
Material-UI v4 has finally arrived. We are so excited about this release, as it defines better foundations for the UI components. Thank you to everyone, especially to [the team](/discover-more/team/), and to everyone who's contributed code, issue triage, and support. **Thank you.**

Expand Down Expand Up @@ -214,7 +214,7 @@ The Material Design "v2" announcement caught us by surprise when we released Mat

There are so many new things, we can't be exhaustive. Aside from what we have already announced, you will find:

- A new **strapline** "_React components for faster and easier web development. Build your own design system, or start with Material Design._" that better embodies our mission and emphasize the [customizability potential](https://techcrunch.com/2018/05/08/google-makes-its-material-design-system-easier-to-customize/).
- A new **strapline** "_React components for faster and simpler web development. Build your own design system, or start with Material Design._" that better embodies our mission and emphasize the [customizability potential](https://techcrunch.com/2018/05/08/google-makes-its-material-design-system-easier-to-customize/).
- New [templates](/getting-started/templates/).

![layout](/static/blog/material-ui-v4-is-out/layout.png)
Expand Down
2 changes: 1 addition & 1 deletion docs/src/modules/components/DiamondSponsors.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export default function DiamondSponsors(props) {
<Typography variant="caption" color="textSecondary" display="block" gutterBottom>
{t('diamondSponsors')}
</Typography>
{randomSencha < 0.01 ? (
{randomSencha < 0.001 ? (
<a
data-ga-event-category="sponsor"
data-ga-event-action={spot}
Expand Down
9 changes: 6 additions & 3 deletions docs/src/modules/utils/parseMarkdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,12 @@ ${headers.components
return render(content, {
highlight: prism,
heading: (headingHtml, level) => {
// Small title. No need for an anchor.
// It's reducing the risk of duplicated id and it's fewer elements in the DOM.
if (level >= 4) {
// Main title, no need for an anchor.
// It adds noises to the URL.
//
// Small title, no need for an anchor.
// It reduces the risk of duplicated id and it's fewer elements in the DOM.
if (level === 1 || level >= 4) {
return `<h${level}>${headingHtml}</h${level}>`;
}

Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/company/about/about.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ We're proud not only of the products we make, but also the community and partner

## Our Vision

Our vision is to provide React components for faster and easier web development. [Read more](/discover-more/vision/).
Our vision is to provide React components for faster and simpler web development. [Read more](/discover-more/vision/).

## Our Values

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Material-UI started back in 2014 to unify React and Material Design. Today, Mate
- Type of work: Contractor (long mission, full-time, convertible to an employee position in the future).
- Start date: Immediately.
- Location: Remote (preference for UTC-5 to UTC+4).
- Level: [Senior Engineer or above](https://open.buffer.com/engineering-career-framework/).
- Level: [Senior Engineer or above](https://docs.google.com/spreadsheets/d/1dDdPD-flNXlgZ0E3ZxVvCDx27RFuhVWJrcfcjNu_I8k/edit#gid=0).
- We're a remote company, we prefer asynchronous communication over meetings.
- We work independently, the rest of us won't know what you're doing day-to-day unless you tell us.

Expand Down
6 changes: 1 addition & 5 deletions docs/src/pages/discover-more/backers/backers.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@ The core of Material-UI is a crowd-funded open-source project, licensed under th

### Diamond 💎

<p style="display: flex; justify-content: center;">
<a data-ga-event-category="sponsor" data-ga-event-action="logo" data-ga-event-label="sencha" href="https://www.sencha.com/products/extreact/extreact-for-material-ui/?utm_source=materialui&utm_medium=referral&utm_content=product-200429-extreactmaterialui" rel="noopener sponsored" target="_blank" style="margin-right: 16px;"><img height="128" width="128" src="/static/in-house/sencha-256x256.png" alt="sencha" title="UI Components for Productive Dev Teams" loading="lazy" /></a>
</p>

_2/3 slots available_
_3/3 slots available_

Diamond Sponsors are those who have pledged \$1,500/month or more to Material-UI.
Please contact us at [email protected] to subscribe to this tier.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@

## Official examples

You can find some example projects in the [GitHub repository](https://github.com/mui-org/material-ui) under the [`/examples`](https://github.com/mui-org/material-ui/tree/master/examples) folder:

- [Create React App](https://github.com/mui-org/material-ui/tree/master/examples/create-react-app) ([TypeScript version](https://github.com/mui-org/material-ui/tree/master/examples/create-react-app-with-typescript))
- [Gatsby](https://github.com/mui-org/material-ui/tree/master/examples/gatsby)
- [Next.js](https://github.com/mui-org/material-ui/tree/master/examples/nextjs) ([TypeScript version](https://github.com/mui-org/material-ui/tree/master/examples/nextjs-with-typescript))
- [Preact](https://github.com/mui-org/material-ui/tree/master/examples/preact)
- [CDN](https://github.com/mui-org/material-ui/tree/master/examples/cdn)
- [Plain server-side](https://github.com/mui-org/material-ui/tree/master/examples/ssr)
You can find some example projects in the [GitHub repository](https://github.com/mui-org/material-ui) under the [`/examples`](https://github.com/mui-org/material-ui/tree/next/examples) folder:

- [Create React App](https://github.com/mui-org/material-ui/tree/next/examples/create-react-app) ([TypeScript version](https://github.com/mui-org/material-ui/tree/next/examples/create-react-app-with-typescript))
- [Gatsby](https://github.com/mui-org/material-ui/tree/next/examples/gatsby)
- [Next.js](https://github.com/mui-org/material-ui/tree/next/examples/nextjs) ([TypeScript version](https://github.com/mui-org/material-ui/tree/next/examples/nextjs-with-typescript))
- [Preact](https://github.com/mui-org/material-ui/tree/next/examples/preact)
- [CDN](https://github.com/mui-org/material-ui/tree/next/examples/cdn)
- [Plain server-side](https://github.com/mui-org/material-ui/tree/next/examples/ssr)
- And more

Create React App is an awesome project for learning React.
Have a look at [the alternatives available](https://github.com/facebook/create-react-app/blob/master/README.md#popular-alternatives) to see which project best fits your needs.

The source code for this documentation site is also included in the repository.
This is a slightly more complex project.
Check out the [`/docs`](https://github.com/mui-org/material-ui/tree/master/docs) folder for
Check out the [`/docs`](https://github.com/mui-org/material-ui/tree/next/docs) folder for
build instructions.

## More advanced example projects
Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/getting-started/faq/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ There are many ways to support Material-UI:
- Report bugs or missing features by [creating an issue](https://github.com/mui-org/material-ui/issues/new).
- Review and comment on existing [pull requests](https://github.com/mui-org/material-ui/pulls) and [issues](https://github.com/mui-org/material-ui/issues).
- Help [translate](https://translate.material-ui.com) the documentation.
- [Improve our documentation](https://github.com/mui-org/material-ui/tree/master/docs), fix bugs, or add features by [submitting a pull request](https://github.com/mui-org/material-ui/pulls).
- [Improve our documentation](https://github.com/mui-org/material-ui/tree/next/docs), fix bugs, or add features by [submitting a pull request](https://github.com/mui-org/material-ui/pulls).
- **Support us financially on [OpenCollective](https://opencollective.com/material-ui)**.
If you use Material-UI in a commercial project and would like to support its continued development by becoming a Sponsor, or in a side or hobby project and would like to become a Backer, you can do so through OpenCollective.
All funds donated are managed transparently, and Sponsors receive recognition in the README and on the Material-UI home page.
Expand Down
18 changes: 9 additions & 9 deletions docs/src/pages/getting-started/templates/Templates.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,71 +37,71 @@ function layouts(t) {
src: '/static/images/templates/dashboard.png',
href: '/getting-started/templates/dashboard/',
source:
'https://github.com/mui-org/material-ui/tree/master/docs/src/pages/getting-started/templates/dashboard',
'https://github.com/mui-org/material-ui/tree/next/docs/src/pages/getting-started/templates/dashboard',
},
{
title: t('signInTitle'),
description: t('signInDescr'),
src: '/static/images/templates/sign-in.png',
href: '/getting-started/templates/sign-in/',
source:
'https://github.com/mui-org/material-ui/tree/master/docs/src/pages/getting-started/templates/sign-in',
'https://github.com/mui-org/material-ui/tree/next/docs/src/pages/getting-started/templates/sign-in',
},
{
title: t('signInSideTitle'),
description: t('signInSideDescr'),
src: '/static/images/templates/sign-in-side.png',
href: '/getting-started/templates/sign-in-side/',
source:
'https://github.com/mui-org/material-ui/tree/master/docs/src/pages/getting-started/templates/sign-in-side',
'https://github.com/mui-org/material-ui/tree/next/docs/src/pages/getting-started/templates/sign-in-side',
},
{
title: t('signUpTitle'),
description: t('signUpDescr'),
src: '/static/images/templates/sign-up.png',
href: '/getting-started/templates/sign-up/',
source:
'https://github.com/mui-org/material-ui/tree/master/docs/src/pages/getting-started/templates/sign-up',
'https://github.com/mui-org/material-ui/tree/next/docs/src/pages/getting-started/templates/sign-up',
},
{
title: t('blogTitle'),
description: t('blogDescr'),
src: '/static/images/templates/blog.png',
href: '/getting-started/templates/blog/',
source:
'https://github.com/mui-org/material-ui/tree/master/docs/src/pages/getting-started/templates/blog',
'https://github.com/mui-org/material-ui/tree/next/docs/src/pages/getting-started/templates/blog',
},
{
title: t('checkoutTitle'),
description: t('checkoutDescr'),
src: '/static/images/templates/checkout.png',
href: '/getting-started/templates/checkout/',
source:
'https://github.com/mui-org/material-ui/tree/master/docs/src/pages/getting-started/templates/checkout',
'https://github.com/mui-org/material-ui/tree/next/docs/src/pages/getting-started/templates/checkout',
},
{
title: t('albumTitle'),
description: t('albumDescr'),
src: '/static/images/templates/album.png',
href: '/getting-started/templates/album/',
source:
'https://github.com/mui-org/material-ui/tree/master/docs/src/pages/getting-started/templates/album',
'https://github.com/mui-org/material-ui/tree/next/docs/src/pages/getting-started/templates/album',
},
{
title: t('pricingTitle'),
description: t('pricingDescr'),
src: '/static/images/templates/pricing.png',
href: '/getting-started/templates/pricing/',
source:
'https://github.com/mui-org/material-ui/tree/master/docs/src/pages/getting-started/templates/pricing',
'https://github.com/mui-org/material-ui/tree/next/docs/src/pages/getting-started/templates/pricing',
},
{
title: t('stickyFooterTitle'),
description: t('stickyFooterDescr'),
src: '/static/images/templates/sticky-footer.png',
href: '/getting-started/templates/sticky-footer/',
source:
'https://github.com/mui-org/material-ui/tree/master/docs/src/pages/getting-started/templates/sticky-footer',
'https://github.com/mui-org/material-ui/tree/next/docs/src/pages/getting-started/templates/sticky-footer',
},
];
}
Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/getting-started/templates/album/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Usage

Simply copy the files into your project, or one of the [example applications](https://github.com/mui-org/material-ui/tree/master/examples), and import and use the `Album` component.
Simply copy the files into your project, or one of the [example applications](https://github.com/mui-org/material-ui/tree/next/examples), and import and use the `Album` component.

## Demo

Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/getting-started/templates/blog/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Usage

Simply copy the files into your project, or one of the [example applications](https://github.com/mui-org/material-ui/tree/master/examples), and import and use the `Blog` component.
Simply copy the files into your project, or one of the [example applications](https://github.com/mui-org/material-ui/tree/next/examples), and import and use the `Blog` component.

## Demo

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Usage

Simply copy the files into your project, or one of the [example applications](https://github.com/mui-org/material-ui/tree/master/examples), and import and use the `Checkout` component.
Simply copy the files into your project, or one of the [example applications](https://github.com/mui-org/material-ui/tree/next/examples), and import and use the `Checkout` component.

## Demo

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Usage

Simply copy the files into your project, or one of the [example applications](https://github.com/mui-org/material-ui/tree/master/examples), and import and use the `Dashboard` component.
Simply copy the files into your project, or one of the [example applications](https://github.com/mui-org/material-ui/tree/next/examples), and import and use the `Dashboard` component.

## Demo

Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/getting-started/templates/pricing/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Usage

Simply copy the files into your project, or one of the [example applications](https://github.com/mui-org/material-ui/tree/master/examples), and import and use the `Pricing` component.
Simply copy the files into your project, or one of the [example applications](https://github.com/mui-org/material-ui/tree/next/examples), and import and use the `Pricing` component.

## Demo

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Usage

Simply copy the files into your project, or one of the [example applications](https://github.com/mui-org/material-ui/tree/master/examples), and import and use the `SignInSide` component.
Simply copy the files into your project, or one of the [example applications](https://github.com/mui-org/material-ui/tree/next/examples), and import and use the `SignInSide` component.

## Demo

Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/getting-started/templates/sign-in/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Usage

Simply copy the files into your project, or one of the [example applications](https://github.com/mui-org/material-ui/tree/master/examples), and import and use the `SignIn` component.
Simply copy the files into your project, or one of the [example applications](https://github.com/mui-org/material-ui/tree/next/examples), and import and use the `SignIn` component.

## Demo

Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/getting-started/templates/sign-up/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Usage

Simply copy the files into your project, or one of the [example applications](https://github.com/mui-org/material-ui/tree/master/examples), and import and use the `SignUp` component.
Simply copy the files into your project, or one of the [example applications](https://github.com/mui-org/material-ui/tree/next/examples), and import and use the `SignUp` component.

## Demo

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Usage

Simply copy the files into your project, or one of the [example applications](https://github.com/mui-org/material-ui/tree/master/examples), and import and use the `StickyFooter` component.
Simply copy the files into your project, or one of the [example applications](https://github.com/mui-org/material-ui/tree/next/examples), and import and use the `StickyFooter` component.

## Demo

Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/getting-started/templates/templates.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ title: 9+ Free React Templates

<p class="description">A selection of free react templates to help you get started building your app. The collection contains react dashboard, react admin, and more.</p>

The templates can be combined with one of the [example applications](https://github.com/mui-org/material-ui/tree/master/examples) to form a complete starter.
The templates can be combined with one of the [example applications](https://github.com/mui-org/material-ui/tree/next/examples) to form a complete starter.

Sections of each layout are clearly defined either by comments or use of separate files,
making it simple to extract parts of a page (such as a "hero unit", or footer, for example)
Expand Down
8 changes: 4 additions & 4 deletions docs/src/pages/guides/server-rendering/server-rendering.md
Original file line number Diff line number Diff line change
Expand Up @@ -187,11 +187,11 @@ ReactDOM.hydrate(<Main />, document.querySelector('#root'));

## Reference implementations

We host different reference implementations which you can find in the [GitHub repository](https://github.com/mui-org/material-ui) under the [`/examples`](https://github.com/mui-org/material-ui/tree/master/examples) folder:
We host different reference implementations which you can find in the [GitHub repository](https://github.com/mui-org/material-ui) under the [`/examples`](https://github.com/mui-org/material-ui/tree/next/examples) folder:

- [The reference implementation of this tutorial](https://github.com/mui-org/material-ui/tree/master/examples/ssr)
- [Gatsby](https://github.com/mui-org/material-ui/tree/master/examples/gatsby)
- [Next.js](https://github.com/mui-org/material-ui/tree/master/examples/nextjs) ([TypeScript version](https://github.com/mui-org/material-ui/tree/master/examples/nextjs-with-typescript))
- [The reference implementation of this tutorial](https://github.com/mui-org/material-ui/tree/next/examples/ssr)
- [Gatsby](https://github.com/mui-org/material-ui/tree/next/examples/gatsby)
- [Next.js](https://github.com/mui-org/material-ui/tree/next/examples/nextjs) ([TypeScript version](https://github.com/mui-org/material-ui/tree/next/examples/nextjs-with-typescript))

## Troubleshooting

Expand Down
Loading

0 comments on commit e1e8e82

Please sign in to comment.