Skip to content

Commit bb5ae49

Browse files
[core] Run prettier on the JSON sources (#21556)
1 parent 64427dc commit bb5ae49

File tree

10 files changed

+37
-46
lines changed

10 files changed

+37
-46
lines changed

.eslintignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
/.git
2-
/docs/.next
32
/coverage
3+
/docs/.next
44
/docs/export
55
/examples/create-react-app*/src/serviceWorker.js
66
/examples/gatsby/public/
77
/examples/preact/config
88
/examples/preact/scripts
9+
/framer/Material-UI.framerfx/design/document.json
910
/packages/babel-plugin-unwrap-createStyles/test/__fixtures__/
1011
/packages/material-ui-codemod/lib
1112
/packages/material-ui-codemod/src/*/*.test
1213
/packages/material-ui-codemod/src/*/*.test.js
1314
/packages/material-ui-icons/fixtures
14-
/packages/material-ui-icons/src
1515
/packages/material-ui-icons/legacy
16+
/packages/material-ui-icons/src
1617
/packages/material-ui-icons/templateSvgIcon.js
1718
# Ignore fixtures
1819
/packages/typescript-to-proptypes/test/**/*.js

docs/notifications.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
"title": "Sketch",
1616
"text": "<a style=\"color: inherit;\" target=\"_blank\" rel=\"noopener\" href=\"https://twitter.com/MaterialUI/status/1244519729978437633\">Introducing Material-UI for Sketch</a>. Today, we’re excited to introduce the Sketch symbols 💎 for Material-UI."
1717
}
18-
]
18+
]

docs/public/static/error-codes.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
"5": "Material-UI: The color provided to augmentColor(color) is invalid.\n`color.main` should be a string, but `%s` was provided instead.\n\nDid you intend to use one of the following approaches?\n\nimport { green } from \"@material-ui/core/colors\";\n\nconst theme1 = createMuiTheme({ palette: {\n primary: green,\n} });\n\nconst theme2 = createMuiTheme({ palette: {\n primary: { main: green[500] },\n} });",
77
"6": "Material-UI: Unsupported non-unitless line height with grid alignment.\nUse unitless line heights instead.",
88
"7": "Material-UI: capitalize(string) expects a string argument."
9-
}
9+
}

docs/src/pages/components/grid-list/tslint.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
"rules": {
44
"no-relative-import-in-test": false
55
}
6-
}
6+
}

docs/src/pages/customization/transitions/TransitionHover.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
import React from 'react';
22
import styled, { ThemeProvider } from 'styled-components';
33
import NoSsr from '@material-ui/core/NoSsr';
4-
import { createMuiTheme, ThemeProvider as MuiThemeProvider } from '@material-ui/core/styles';
4+
import {
5+
createMuiTheme,
6+
ThemeProvider as MuiThemeProvider,
7+
} from '@material-ui/core/styles';
58
import { deepPurple } from '@material-ui/core/colors';
69
import Avatar from '@material-ui/core/Avatar';
710

docs/src/pages/customization/transitions/transitions.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88

99
#### Arguments
1010

11-
1. `props` (*String* | *String[]*): Defaults to `['all']`. Provides a CSS property, or a list of CSS properties that should be transitioned.
12-
2. `options` (*Object* [optional]):
13-
- `options.duration` (*String* | *Number* [optional]): Defaults to `theme.transitions.duration.standard`. Provides the duration of the transition.
14-
- `options.easing` (*String* [optional]): Defaults to `theme.transitions.easing.easeInOut`. Provides the easing for the transition.
15-
- `options.delay` (*String* | *Number* [optional]): Defaults to `0`. Provides the delay for the transition.
11+
1. `props` (_String_ | _String[]_): Defaults to `['all']`. Provides a CSS property, or a list of CSS properties that should be transitioned.
12+
2. `options` (_Object_ [optional]):
13+
14+
- `options.duration` (_String_ | _Number_ [optional]): Defaults to `theme.transitions.duration.standard`. Provides the duration of the transition.
15+
- `options.easing` (_String_ [optional]): Defaults to `theme.transitions.easing.easeInOut`. Provides the easing for the transition.
16+
- `options.delay` (_String_ | _Number_ [optional]): Defaults to `0`. Provides the delay for the transition.
1617

1718
#### Returns
1819

@@ -32,7 +33,7 @@ theme.transitions.create(['background-color', 'transform']);
3233

3334
#### Arguments
3435

35-
1. `height` (*Number*): The height of the component.
36+
1. `height` (_Number_): The height of the component.
3637

3738
#### Returns
3839

@@ -79,10 +80,11 @@ const theme = createMuiTheme({
7980
easeIn: 'cubic-bezier(0.4, 0, 1, 1)',
8081
// The sharp curve is used by objects that may return to the screen at any time.
8182
sharp: 'cubic-bezier(0.4, 0, 0.6, 1)',
82-
},
83+
},
8384
},
8485
});
8586
```
8687

8788
## References
89+
8890
Check out the [Transitions](/components/transitions/) page to explore the transition components that are included with Material-UI.
Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
{
22
"compilerOptions": {
33
"target": "es5",
4-
"lib": [
5-
"dom",
6-
"dom.iterable",
7-
"esnext"
8-
],
4+
"lib": ["dom", "dom.iterable", "esnext"],
95
"allowJs": true,
106
"skipLibCheck": true,
117
"esModuleInterop": true,
@@ -19,7 +15,5 @@
1915
"noEmit": true,
2016
"jsx": "preserve"
2117
},
22-
"include": [
23-
"src"
24-
]
18+
"include": ["src"]
2519
}

examples/nextjs-with-typescript/tsconfig.json

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
"allowJs": true,
44
"allowSyntheticDefaultImports": true,
55
"jsx": "preserve",
6-
"lib": [
7-
"dom",
8-
"es2017"
9-
],
6+
"lib": ["dom", "es2017"],
107
"module": "esnext",
118
"moduleResolution": "node",
129
"noEmit": true,
@@ -23,12 +20,6 @@
2320
"resolveJsonModule": true,
2421
"isolatedModules": true
2522
},
26-
"exclude": [
27-
"node_modules"
28-
],
29-
"include": [
30-
"next-env.d.ts",
31-
"**/*.ts",
32-
"**/*.tsx"
33-
]
23+
"exclude": ["node_modules"],
24+
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"]
3425
}
Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
2-
"compilerOptions": {
3-
"target": "es2015",
4-
"lib": ["es2015", "dom"],
5-
"module": "commonjs",
6-
"jsx": "react",
7-
"outDir": "build",
8-
"sourceMap": false,
9-
"declaration": false,
10-
"resolveJsonModule": true,
11-
"noImplicitAny": false
12-
},
13-
"exclude": ["node_modules", "build"]
2+
"compilerOptions": {
3+
"target": "es2015",
4+
"lib": ["es2015", "dom"],
5+
"module": "commonjs",
6+
"jsx": "react",
7+
"outDir": "build",
8+
"sourceMap": false,
9+
"declaration": false,
10+
"resolveJsonModule": true,
11+
"noImplicitAny": false
12+
},
13+
"exclude": ["node_modules", "build"]
1414
}

scripts/prettier.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function runPrettier(options) {
2929
.filter((notEmpty) => notEmpty);
3030

3131
const files = glob
32-
.sync('**/*.{js,md,tsx,ts}', {
32+
.sync('**/*.{js,md,tsx,ts,json}', {
3333
ignore: [
3434
'**/node_modules/**',
3535
// these are auto-generated

0 commit comments

Comments
 (0)