Skip to content

Commit

Permalink
Merge pull request #3 from material-next/fix-ci
Browse files Browse the repository at this point in the history
[core] Green build
  • Loading branch information
oliviertassinari authored Dec 1, 2017
2 parents d9095c1 + a294364 commit 197ff5c
Show file tree
Hide file tree
Showing 101 changed files with 131 additions and 127 deletions.
10 changes: 5 additions & 5 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ coverage
flow
flow-typed
/packages/*/lib
/packages/material-ui-icons/test/fixtures
/packages/material-ui-icons/src
/packages/material-ui-icons/tpl
/packages/material-ui-icons/build
/packages/material-ui-codemod/src/*/*.spec*
/packages/material-next-icons/test/fixtures
/packages/material-next-icons/src
/packages/material-next-icons/tpl
/packages/material-next-icons/build
/packages/material-next-codemod/src/*/*.spec*
/examples/create-react-app/build
/.git
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ module.exports = {
'react/default-props-match-prop-types': 'off', // Buggy
'react/jsx-curly-brace-presence': 'off', // Buggy

'@material-next/core/docgen-ignore-before-comment': 'error',
'material-next/docgen-ignore-before-comment': 'error',

'mocha/handle-done-callback': 'error',
'mocha/no-exclusive-tests': 'error',
Expand Down
5 changes: 2 additions & 3 deletions .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@ esproposal.class_instance_fields=enable
module.file_ext=.js
module.file_ext=.md
module.name_mapper='.*\.\(html\|css\|svg\|png\|jpg\|gif\)$' -> '<PROJECT_ROOT>/flow/stubs/url-loader.js'
module.name_mapper='^material-ui\/\(.*\)$' -> '<PROJECT_ROOT>/src/\1'
module.name_mapper='^material-ui-docs\/\(.*\)$' -> '<PROJECT_ROOT>/docs/\1'
module.name_mapper='^material-ui-icons\/\(.*\)$' -> '<PROJECT_ROOT>/packages/material-ui-icons/src/\1'
module.name_mapper='^@material-next\/core\/\(.*\)$' -> '<PROJECT_ROOT>/src/\1'
module.name_mapper='^@material-next\/icons\/\(.*\)$' -> '<PROJECT_ROOT>/packages/material-next-icons/src/\1'

module.ignore_non_literal_requires=true
module.system.node.resolve_dirname=node_modules
Expand Down
5 changes: 0 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,3 @@ build
node_modules
package-lock.json
*.log

# Editor files
.idea
.vscode

30 changes: 15 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
#### Note

For *how-to* questions and other non-issues,
please use [StackOverflow](http://stackoverflow.com/questions/tagged/material-ui)
instead of Github issues. There is a StackOverflow tag called "material-ui"
please use [StackOverflow](http://stackoverflow.com/questions/tagged/material-next)
instead of Github issues. There is a StackOverflow tag called "material-next"
that you can use to tag your questions.

# [Material-Next@v1-beta](https://material-ui-next.com/)
[![npm package](https://img.shields.io/npm/v/material-next/master.svg)](https://www.npmjs.org/package/material-ui)
[![CircleCI](https://img.shields.io/circleci/project/github/material-next/material-next/v1-beta.svg)](https://circleci.com/gh/material-next/material-next/tree/v1-beta)
# [Material-Next](https://material-ui-next.com/)
[![npm package](https://img.shields.io/npm/v/@material-next/core/master.svg)](https://www.npmjs.org/package/@material-next/core)
[![CircleCI](https://img.shields.io/circleci/project/github/material-next/material-next/master.svg)](https://circleci.com/gh/material-next/material-next/tree/master)
[![Gitter](https://img.shields.io/badge/gitter-join%20chat-f81a65.svg)](https://gitter.im/callemall/material-ui?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Coverage Status](https://img.shields.io/codecov/c/github/material-next/material-next/v1-beta.svg)](https://codecov.io/gh/material-next/material-next/branch/v1-beta)
[![Coverage Status](https://img.shields.io/codecov/c/github/material-next/material-next/master.svg)](https://codecov.io/gh/material-next/material-next/branch/master)
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/1320/badge)](https://bestpractices.coreinfrastructure.org/projects/1320)

[![PeerDependencies](https://img.shields.io/david/peer/material-next/material-next.svg)](https://david-dm.org/material-next/material-next#info=peerDependencies&view=list)
Expand All @@ -20,22 +20,22 @@ that you can use to tag your questions.
> Material-Next is a set of [React](http://facebook.github.io/react/) components that implement
[Google's Material Design](https://www.google.com/design/spec/material-design/introduction.html) specification.

## We've moved!
## This is a fork

We've moved the repo from `callemall/material-ui` to `material-next/material-next`. [Find out more](https://medium.com/call-em-all/material-ui-the-move-to-a-sustainable-open-source-project-5261d07b5067) from [@callemall/haicea](https://github.com/hai-cea).
We've have forked the repo from `mui-org/material-ui` to `material-next/material-next`. [Find out more](https://medium.com/).

## Installation

Material-Next is available as an [npm package](https://www.npmjs.org/package/material-ui).
Material-Next is available as an [npm package](https://www.npmjs.org/package/@material-next/core).

**Stable channel**
```sh
npm install material-ui
npm install --save @material-next/core
```

**Pre-release channel**
```sh
npm install material-ui@next
npm install --save @material-next/core@next
```

Please note that `@next` will only point to pre-releases; to get the latest stable release use `@latest` instead.
Expand Down Expand Up @@ -63,15 +63,15 @@ render(<App />, document.querySelector('#app'));
## Examples

Are you looking for an example project to get started?
[We host some](https://github.com/material-next/material-next/blob/v1-beta/docs/src/pages/getting-started/example-projects.md).
[We host some](https://github.com/material-next/material-next/blob/master/docs/src/pages/getting-started/example-projects.md).

## Documentation

Check out our [documentation website](https://material-ui-next.com/).

## Contributing

We'd greatly appreciate any [contribution](https://github.com/material-next/material-next/blob/v1-beta/CONTRIBUTING.md) you make. :)
We'd greatly appreciate any [contribution](https://github.com/material-next/material-next/blob/master/CONTRIBUTING.md) you make. :)

## Changelog

Expand All @@ -80,7 +80,7 @@ Please read the [changelog](https://github.com/material-next/material-next/relea

## Roadmap

The future plans and high priority features and enhancements can be found in the [ROADMAP.md](https://github.com/material-next/material-next/blob/v1-beta/ROADMAP.md) file.
The future plans and high priority features and enhancements can be found in the [ROADMAP.md](https://github.com/material-next/material-next/blob/master/ROADMAP.md) file.

## Thanks

Expand All @@ -91,4 +91,4 @@ Thank you to [BrowserStack](https://www.browserstack.com/) for providing the inf
## License

This project is licensed under the terms of the
[MIT license](https://github.com/material-next/material-next/blob/v1-beta/LICENSE).
[MIT license](https://github.com/material-next/material-next/blob/master/LICENSE).
3 changes: 2 additions & 1 deletion docs/src/modules/components/AppDrawer.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ function reduceChildRoutes(props, activePage, items, childPage, index) {
return items;
}

const GITHUB_RELEASE_BASE_URL = 'https://github.com/@material-next/core/@material-next/core/releases/tag/';
const GITHUB_RELEASE_BASE_URL =
'https://github.com/@material-next/core/@material-next/core/releases/tag/';

function AppDrawer(props: Object, context: Object) {
const { classes, className, disablePermanent, mobileOpen, onRequestClose } = props;
Expand Down
4 changes: 3 additions & 1 deletion docs/src/modules/components/AppFooter.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ function AppFooter(props: Object) {
<Grid item xs={12} sm={6}>
<ul className={classes.list}>
<li className={classes.listItem}>
<Link href="https://github.com/@material-next/core/@material-next/core/tree/v1-beta">GitHub</Link>
<Link href="https://github.com/@material-next/core/@material-next/core/tree/v1-beta">
GitHub
</Link>
</li>
<li className={classes.listItem}>
<Link href="https://twitter.com/MaterialNext">Twitter</Link>
Expand Down
3 changes: 2 additions & 1 deletion docs/src/modules/components/MarkdownDocs.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ const styles = {
};

const demoRegexp = /^demo='(.*)'$/;
const SOURCE_CODE_ROOT_URL = 'https://github.com/@material-next/core/@material-next/core/tree/v1-beta';
const SOURCE_CODE_ROOT_URL =
'https://github.com/@material-next/core/@material-next/core/tree/v1-beta';

type InjectedProps = {
classes: Object,
Expand Down
3 changes: 2 additions & 1 deletion docs/src/modules/utils/generateMarkdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import recast from 'recast';
import kebabCase from 'lodash/kebabCase';
import { pageToTitle } from './helpers';

const SOURCE_CODE_ROOT_URL = 'https://github.com/@material-next/core/@material-next/core/tree/v1-beta';
const SOURCE_CODE_ROOT_URL =
'https://github.com/@material-next/core/@material-next/core/tree/v1-beta';

function generateHeader(reactAPI) {
return ['---', `filename: ${reactAPI.filename}`, '---'].join('\n');
Expand Down
4 changes: 2 additions & 2 deletions docs/src/pages/discover-more/vision.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Material-Next’s Vision

Our vision is to provide an elegant implementation of the [Material Design guidelines](https://material.io/guidelines/) and more.
Our vision is to provide an elegant React implementation of the [Material Design guidelines](https://material.io/guidelines/) **that can be customized to fully match your brand**.

The Material Design guidelines are an incredible starting point, but they do not provide guidance on all aspects or needs of an application. In addition to the guidelines-specific implementation, we want Material-Next to become whatever is generally useful for application development, all in the spirit of the Material Design guidelines.

Therefore, Material-Next will be not only be an implementation of the Material Design guidelines, but a general use UI library of components that are needed by many. This generalized use doesn't imply any other design methodology. It also means we will have components or combinations that are simply not addressed in the design guidelines.

We will focus on providing all the low-level tools needed to build a rich user-interface with React. Once we implement the Material design specification (which is a bar set quite high), you should be able to take advantage of it for you own business with any style customization needed. We want to see companies succeeding using Material-Next in a way that matches their brand. We don't want them to feel that their UI simply looks like another Google product.
We will focus on providing all the low-level tools needed to build a rich user-interface with React. Once we implement the Material design specification (which is a bar set quite high), you should be able to take advantage of it for you own business with any style customization needed. We want to see companies succeeding using Material-Next in a way that matches their brand, close to the material philosophie or not. We don't want them to feel that their UI simply looks like another Google product.

From a developer's point of view, we want Material-Next to:
- Deliver on fully encapsulated / composable React components.
Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/getting-started/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Material-Next is available as an [npm package](https://www.npmjs.org/package/@ma
To install and save in your `package.json` dependencies, run:

```
npm install @material-next/core --save
npm install --save @material-next/core
```

## Roboto Font
Expand Down
4 changes: 2 additions & 2 deletions docs/webpackBaseConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ module.exports = {
],
resolve: {
alias: {
'material-next': path.resolve(__dirname, '../src'),
'@material-next/icons': path.resolve(__dirname, '../packages/@material-next/icons/src'),
'@material-next/core': path.resolve(__dirname, '../src'),
'@material-next/icons': path.resolve(__dirname, '../packages/material-next-icons/src'),
docs: path.resolve(__dirname, '../docs'),
},
},
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"private": true,
"author": "Material-Next Team",
"version": "1.0.0-beta.22",
"description": "React components that implement Google's Material Design.",
"description": "Extensible React components that implement Material Design UI.",
"main": "./src/index.js",
"keywords": [
"react",
Expand Down Expand Up @@ -123,7 +123,7 @@
"eslint-plugin-flowtype": "^2.39.1",
"eslint-plugin-import": "^2.8.0",
"eslint-plugin-jsx-a11y": "^6.0.2",
"eslint-plugin-material-ui": "file:packages/eslint-plugin-material-ui",
"eslint-plugin-material-next": "file:packages/eslint-plugin-material-next",
"eslint-plugin-mocha": "^4.11.0",
"eslint-plugin-prettier": "^2.3.1",
"eslint-plugin-react": "^7.4.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,5 @@
"test": "../../node_modules/mocha/bin/_mocha -- tests/lib/**/*.js",
"lint": "../../node_modules/eslint/bin/eslint.js --rulesdir ../.. --ext .js lib tests && echo \"eslint: no lint errors\""
},
"engines": {
"node": ">=0.10.0"
},
"license": "MIT"
}
2 changes: 1 addition & 1 deletion pages/api/app-bar.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ This property accepts the following keys:
- `colorAccent`

Have a look at [overriding with classes](/customization/overrides#overriding-with-classes) section
and the [implementation of the component](https://github.com/material-next/material-next/tree/v1-beta/src/AppBar/AppBar.js)
and the [implementation of the component](https://github.com/@material-next/core/@material-next/core/tree/v1-beta/src/AppBar/AppBar.js)
for more detail.

If using the `overrides` key of the theme as documented
Expand Down
2 changes: 1 addition & 1 deletion pages/api/avatar.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ This property accepts the following keys:
- `img`

Have a look at [overriding with classes](/customization/overrides#overriding-with-classes) section
and the [implementation of the component](https://github.com/material-next/material-next/tree/v1-beta/src/Avatar/Avatar.js)
and the [implementation of the component](https://github.com/@material-next/core/@material-next/core/tree/v1-beta/src/Avatar/Avatar.js)
for more detail.

If using the `overrides` key of the theme as documented
Expand Down
2 changes: 1 addition & 1 deletion pages/api/badge.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This property accepts the following keys:
- `colorAccent`

Have a look at [overriding with classes](/customization/overrides#overriding-with-classes) section
and the [implementation of the component](https://github.com/material-next/material-next/tree/v1-beta/src/Badge/Badge.js)
and the [implementation of the component](https://github.com/@material-next/core/@material-next/core/tree/v1-beta/src/Badge/Badge.js)
for more detail.

If using the `overrides` key of the theme as documented
Expand Down
2 changes: 1 addition & 1 deletion pages/api/bottom-navigation-button.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ This property accepts the following keys:
- `icon`

Have a look at [overriding with classes](/customization/overrides#overriding-with-classes) section
and the [implementation of the component](https://github.com/material-next/material-next/tree/v1-beta/src/BottomNavigation/BottomNavigationButton.js)
and the [implementation of the component](https://github.com/@material-next/core/@material-next/core/tree/v1-beta/src/BottomNavigation/BottomNavigationButton.js)
for more detail.

If using the `overrides` key of the theme as documented
Expand Down
2 changes: 1 addition & 1 deletion pages/api/bottom-navigation.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ This property accepts the following keys:
- `root`

Have a look at [overriding with classes](/customization/overrides#overriding-with-classes) section
and the [implementation of the component](https://github.com/material-next/material-next/tree/v1-beta/src/BottomNavigation/BottomNavigation.js)
and the [implementation of the component](https://github.com/@material-next/core/@material-next/core/tree/v1-beta/src/BottomNavigation/BottomNavigation.js)
for more detail.

If using the `overrides` key of the theme as documented
Expand Down
2 changes: 1 addition & 1 deletion pages/api/button-base.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ This property accepts the following keys:
- `disabled`

Have a look at [overriding with classes](/customization/overrides#overriding-with-classes) section
and the [implementation of the component](https://github.com/material-next/material-next/tree/v1-beta/src/ButtonBase/ButtonBase.js)
and the [implementation of the component](https://github.com/@material-next/core/@material-next/core/tree/v1-beta/src/ButtonBase/ButtonBase.js)
for more detail.

If using the `overrides` key of the theme as documented
Expand Down
2 changes: 1 addition & 1 deletion pages/api/button.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ This property accepts the following keys:
- `fab`

Have a look at [overriding with classes](/customization/overrides#overriding-with-classes) section
and the [implementation of the component](https://github.com/material-next/material-next/tree/v1-beta/src/Button/Button.js)
and the [implementation of the component](https://github.com/@material-next/core/@material-next/core/tree/v1-beta/src/Button/Button.js)
for more detail.

If using the `overrides` key of the theme as documented
Expand Down
2 changes: 1 addition & 1 deletion pages/api/card-actions.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ This property accepts the following keys:
- `action`

Have a look at [overriding with classes](/customization/overrides#overriding-with-classes) section
and the [implementation of the component](https://github.com/material-next/material-next/tree/v1-beta/src/Card/CardActions.js)
and the [implementation of the component](https://github.com/@material-next/core/@material-next/core/tree/v1-beta/src/Card/CardActions.js)
for more detail.

If using the `overrides` key of the theme as documented
Expand Down
2 changes: 1 addition & 1 deletion pages/api/card-content.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ This property accepts the following keys:
- `root`

Have a look at [overriding with classes](/customization/overrides#overriding-with-classes) section
and the [implementation of the component](https://github.com/material-next/material-next/tree/v1-beta/src/Card/CardContent.js)
and the [implementation of the component](https://github.com/@material-next/core/@material-next/core/tree/v1-beta/src/Card/CardContent.js)
for more detail.

If using the `overrides` key of the theme as documented
Expand Down
2 changes: 1 addition & 1 deletion pages/api/card-header.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ This property accepts the following keys:
- `subheader`

Have a look at [overriding with classes](/customization/overrides#overriding-with-classes) section
and the [implementation of the component](https://github.com/material-next/material-next/tree/v1-beta/src/Card/CardHeader.js)
and the [implementation of the component](https://github.com/@material-next/core/@material-next/core/tree/v1-beta/src/Card/CardHeader.js)
for more detail.

If using the `overrides` key of the theme as documented
Expand Down
2 changes: 1 addition & 1 deletion pages/api/card-media.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ This property accepts the following keys:
- `rootMedia`

Have a look at [overriding with classes](/customization/overrides#overriding-with-classes) section
and the [implementation of the component](https://github.com/material-next/material-next/tree/v1-beta/src/Card/CardMedia.js)
and the [implementation of the component](https://github.com/@material-next/core/@material-next/core/tree/v1-beta/src/Card/CardMedia.js)
for more detail.

If using the `overrides` key of the theme as documented
Expand Down
2 changes: 1 addition & 1 deletion pages/api/checkbox.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ This property accepts the following keys:
- `disabled`

Have a look at [overriding with classes](/customization/overrides#overriding-with-classes) section
and the [implementation of the component](https://github.com/material-next/material-next/tree/v1-beta/src/Checkbox/Checkbox.js)
and the [implementation of the component](https://github.com/@material-next/core/@material-next/core/tree/v1-beta/src/Checkbox/Checkbox.js)
for more detail.

If using the `overrides` key of the theme as documented
Expand Down
2 changes: 1 addition & 1 deletion pages/api/chip.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ This property accepts the following keys:
- `deleteIcon`

Have a look at [overriding with classes](/customization/overrides#overriding-with-classes) section
and the [implementation of the component](https://github.com/material-next/material-next/tree/v1-beta/src/Chip/Chip.js)
and the [implementation of the component](https://github.com/@material-next/core/@material-next/core/tree/v1-beta/src/Chip/Chip.js)
for more detail.

If using the `overrides` key of the theme as documented
Expand Down
2 changes: 1 addition & 1 deletion pages/api/circular-progress.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ This property accepts the following keys:
- `circleIndeterminate`

Have a look at [overriding with classes](/customization/overrides#overriding-with-classes) section
and the [implementation of the component](https://github.com/material-next/material-next/tree/v1-beta/src/Progress/CircularProgress.js)
and the [implementation of the component](https://github.com/@material-next/core/@material-next/core/tree/v1-beta/src/Progress/CircularProgress.js)
for more detail.

If using the `overrides` key of the theme as documented
Expand Down
2 changes: 1 addition & 1 deletion pages/api/collapse.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ This property accepts the following keys:
- `wrapperInner`

Have a look at [overriding with classes](/customization/overrides#overriding-with-classes) section
and the [implementation of the component](https://github.com/material-next/material-next/tree/v1-beta/src/transitions/Collapse.js)
and the [implementation of the component](https://github.com/@material-next/core/@material-next/core/tree/v1-beta/src/transitions/Collapse.js)
for more detail.

If using the `overrides` key of the theme as documented
Expand Down
Loading

0 comments on commit 197ff5c

Please sign in to comment.