Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[core] Upgrade preval #11958

Merged
merged 1 commit into from
Jun 23, 2018
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
4 changes: 2 additions & 2 deletions .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
},
"docs-development": {
"plugins": [
"./scripts/material-ui-babel-preval",
"babel-plugin-preval",
[
"module-resolver",
{
Expand All @@ -48,7 +48,7 @@
},
"docs-production": {
"plugins": [
"./scripts/material-ui-babel-preval",
"babel-plugin-preval",
[
"module-resolver",
{
Expand Down
2 changes: 1 addition & 1 deletion docs/src/modules/utils/findPages.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { findPages } from './find';
import { findPages } from 'docs/src/modules/utils/find';

const pages = findPages({
front: true,
Expand Down
4 changes: 3 additions & 1 deletion docs/src/pages/style/typography/typography.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ components: Typography

# Typography

Use typography to present your design and content as clearly and efficiently as possible.

Too many type sizes and styles at once can spoil any layout.
A [typographic scale](https://material.io/design/typography/#type-scale) has a limited set of type sizes that work well together along with the layout grid.

Expand Down Expand Up @@ -42,7 +44,7 @@ Material-UI default typography configuration only relies on 300, 400 and 500 fon

{{"demo": "pages/style/typography/Types.js"}}

## CSS in JS
## Theme

In some situation you might not be able to use the `Typography` component.
Hopefully, you might be able to take advantage of the [`typography`](/customization/default-theme?expend-path=$.typography) keys of the theme.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"babel-loader": "8.0.0-beta.2",
"babel-plugin-istanbul": "^4.1.5",
"babel-plugin-module-resolver": "^3.0.0",
"babel-plugin-preval": "^1.6.4",
"babel-plugin-preval": "^2.0.0",
"babel-plugin-react-remove-properties": "^0.2.5",
"babel-plugin-transform-dev-warning": "^0.1.0",
"babel-plugin-transform-react-constant-elements": "^6.23.0",
Expand Down
24 changes: 0 additions & 24 deletions scripts/get-replacement.js

This file was deleted.

213 changes: 0 additions & 213 deletions scripts/material-ui-babel-preval.js

This file was deleted.

16 changes: 7 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1879,7 +1879,7 @@ babel-plugin-istanbul@^4.1.5:
istanbul-lib-instrument "^1.10.1"
test-exclude "^4.2.1"

babel-plugin-macros@^2.0.0:
babel-plugin-macros@^2.2.2:
version "2.2.2"
resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.2.2.tgz#049c93f4b934453688a6ec38bba529c55bf0fa1f"
dependencies:
Expand All @@ -1895,14 +1895,12 @@ babel-plugin-module-resolver@^3.0.0:
reselect "^3.0.1"
resolve "^1.4.0"

babel-plugin-preval@^1.6.4:
version "1.6.4"
resolved "https://registry.yarnpkg.com/babel-plugin-preval/-/babel-plugin-preval-1.6.4.tgz#96febe8172b3ca6c3d03ed96eeb0382ba4b18056"
babel-plugin-preval@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/babel-plugin-preval/-/babel-plugin-preval-2.0.0.tgz#7e30dce715d7e6d8e22e9ca81d029522f1fc4c8a"
dependencies:
babel-plugin-macros "^2.0.0"
babel-register "^6.26.0"
babylon "^6.18.0"
require-from-string "^2.0.1"
babel-plugin-macros "^2.2.2"
require-from-string "^2.0.2"

babel-plugin-react-remove-properties@^0.2.5:
version "0.2.5"
Expand Down Expand Up @@ -9285,7 +9283,7 @@ require-directory@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"

require-from-string@^2.0.1:
require-from-string@^2.0.1, require-from-string@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"

Expand Down