Skip to content

Commit

Permalink
Merge pull request mui#707 from dmtrKovalenko/develop
Browse files Browse the repository at this point in the history
🎉 1.0.0
  • Loading branch information
dmtrKovalenko authored Oct 25, 2018
2 parents d480ea4 + d7c0a43 commit 56eb58e
Show file tree
Hide file tree
Showing 235 changed files with 8,164 additions and 9,521 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ logs
npm-debug.log*
yarn-debug.log*
yarn-error.log*
.firebase/

# coverage
coverage
Expand Down
27 changes: 8 additions & 19 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,15 @@ language: node_js
node_js:
- "8"

env:
- UTILS=date-fns
- UTILS=moment
- UTILS=luxon

before_install:
- cd lib

script: npm run test && npx codecov

jobs:
include:
- stage: codecov
script: npx codecov

- stage: typescript
script: npm run typescript

- stage: build
script: npm run build && size-limit
env:
- CMD='test:date-fns'
- CMD='test:luxon'
- CMD='test:moment'
- CMD='build:analyze'
- CMD='lint'

- stage: lint
script: npm run lint
script: npm run $CMD
after_script: npx codecov
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[![Bundle Size](https://img.shields.io/badge/gzip-14.7%20KB-brightgreen.svg)](https://unpkg.com/[email protected]/dist/material-ui-pickers.cjs.js)
[![Build Status](https://api.travis-ci.org/dmtrKovalenko/material-ui-pickers.svg?branch=master)](https://travis-ci.org/dmtrKovalenko/material-ui-pickers)
[![npm package](https://img.shields.io/npm/types/material-ui-pickers.svg)](https://www.npmjs.org/package/material-ui-pickers)
> Components, that implements material design date and time pickers for material-ui v1
> Accessible, customizable, delightful date & time pickers for @material-ui/core
### Installation
Available as npm package.
Expand All @@ -26,10 +26,10 @@ npm i luxon
Then teach pickers which library to use with `MuiPickerUtilsProvider`. This component takes a utils property, and makes it available down the React tree thanks to React context. It should preferably be used at the root of your component tree.

```jsx
import MomentUtils from 'material-ui-pickers/utils/moment-utils';
import DateFnsUtils from 'material-ui-pickers/utils/date-fns-utils';
import LuxonUtils from 'material-ui-pickers/utils/luxon-utils';
import MuiPickersUtilsProvider from 'material-ui-pickers/utils/MuiPickersUtilsProvider';
import MomentUtils from 'material-ui-pickers/moment-utils';
import DateFnsUtils from 'material-ui-pickers/date-fns-utils';
import LuxonUtils from 'material-ui-pickers/luxon-utils';
import { MuiPickersUtilsProvider } from 'material-ui-pickers';

function App() {
return (
Expand Down
5 changes: 2 additions & 3 deletions docs/config/paths.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ function ensureSlash(path, needsSlash) {
return path.substr(path, path.length - 1);
} else if (!hasSlash && needsSlash) {
return `${path}/`;
} else {
return path;
}
return path;
}

const getPublicUrl = appPackageJson =>
Expand Down Expand Up @@ -47,7 +46,7 @@ module.exports = {
appIndexJs: resolveApp('src/index.js'),
appPackageJson: resolveApp('package.json'),
appSrc: resolveApp('src'),
libSrc: resolveApp('../lib/src'),
libSrc: resolveApp('../lib/build'),
yarnLockFile: resolveApp('yarn.lock'),
testsSetup: resolveApp('src/setupTests.js'),
appNodeModules: resolveApp('node_modules'),
Expand Down
48 changes: 30 additions & 18 deletions docs/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"@babel/plugin-proposal-class-properties": "^7.1.0",
"@babel/preset-env": "^7.1.0",
"@babel/preset-react": "^7.0.0",
"@material-ui/core": "^3.1.1",
"@material-ui/core": "^3.3.1",
"autoprefixer": "7.1.6",
"babel-core": "6.26.0",
"babel-eslint": "7.2.3",
Expand Down
2 changes: 1 addition & 1 deletion docs/patrons.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"about":"","created":"2015-08-16T23:30:46+00:00","email":"[email protected]","facebook":null,"first_name":"Olivier","full_name":"Olivier","gender":0,"image_url":"https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/1003328/2a4cb816e19644b09a8fdb6ebecc9c50/1?token-time=2145916800&token-hash=0DiJJn-f5LwYfD7yO9lOTXY7xzn0X3DTDjEDzCzpN0g%3D","is_email_verified":false,"last_name":"","social_connections":{"deviantart":null,"discord":null,"facebook":null,"spotify":null,"twitch":null,"twitter":null,"youtube":null},"thumb_url":"https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/1003328/2a4cb816e19644b09a8fdb6ebecc9c50/1?token-time=2145916800&token-hash=oNRQ9Iavfo7uMWKD4Nv0KZ265oFU1daoy7oqZlvH8BQ%3D","twitch":null,"twitter":"olivtassinari","url":"https://www.patreon.com/oliviertassinari","vanity":"oliviertassinari","youtube":null},{"about":null,"created":"2018-06-25T08:04:29+00:00","email":"[email protected]","facebook":null,"first_name":"Paul","full_name":"Paul Brandt","gender":0,"image_url":"https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/11934057/26f642fffedb4c6197f2dc318c00aafa/1?token-time=2145916800&token-hash=e_Oz096kXeRvqz-xpdU6tRsyhQMIUP3SKrmUGe_ty-E%3D","is_email_verified":true,"last_name":"Brandt","social_connections":{"deviantart":null,"discord":null,"facebook":null,"spotify":null,"twitch":null,"twitter":null,"youtube":null},"thumb_url":"https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/11934057/26f642fffedb4c6197f2dc318c00aafa/1?token-time=2145916800&token-hash=rJqG8xl-8Dz_W2zJLz3sR6Cj7AP2QsnwFLkbw5R2pgs%3D","twitch":null,"twitter":null,"url":"https://www.patreon.com/P4ulBr4ndt","vanity":"P4ulBr4ndt","youtube":null},{"about":null,"created":"2018-08-02T01:46:34+00:00","email":"[email protected]","facebook":null,"first_name":"Mohamed","full_name":"Mohamed Turco","gender":0,"image_url":"https://c8.patreon.com/2/200/12676333","is_email_verified":true,"last_name":"Turco","social_connections":{"deviantart":null,"discord":null,"facebook":null,"spotify":null,"twitch":null,"twitter":null,"youtube":null},"thumb_url":"https://c8.patreon.com/2/100/12676333","twitch":null,"twitter":null,"url":"https://www.patreon.com/user?u=12676333","vanity":null,"youtube":null}]
[{"about":"","created":"2015-08-16T23:30:46+00:00","default_country_code":"GB","email":"[email protected]","facebook":null,"first_name":"Olivier","full_name":"Olivier Tassinari","gender":0,"image_url":"https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/1003328/2a4cb816e19644b09a8fdb6ebecc9c50/1?token-time=2145916800&token-hash=0DiJJn-f5LwYfD7yO9lOTXY7xzn0X3DTDjEDzCzpN0g%3D","is_email_verified":false,"last_name":"Tassinari","social_connections":{"deviantart":null,"discord":null,"facebook":null,"reddit":null,"spotify":null,"twitch":null,"twitter":null,"youtube":null},"thumb_url":"https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/1003328/2a4cb816e19644b09a8fdb6ebecc9c50/1?token-time=2145916800&token-hash=oNRQ9Iavfo7uMWKD4Nv0KZ265oFU1daoy7oqZlvH8BQ%3D","twitch":null,"twitter":"olivtassinari","url":"https://www.patreon.com/oliviertassinari","vanity":"oliviertassinari","youtube":null},{"about":null,"created":"2018-06-25T08:04:29+00:00","default_country_code":"DE","email":"[email protected]","facebook":null,"first_name":"Paul","full_name":"Paul Brandt","gender":0,"image_url":"https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/11934057/26f642fffedb4c6197f2dc318c00aafa/1?token-time=2145916800&token-hash=e_Oz096kXeRvqz-xpdU6tRsyhQMIUP3SKrmUGe_ty-E%3D","is_email_verified":true,"last_name":"Brandt","social_connections":{"deviantart":null,"discord":null,"facebook":null,"reddit":null,"spotify":null,"twitch":null,"twitter":null,"youtube":null},"thumb_url":"https://c10.patreonusercontent.com/3/eyJoIjoxMDAsInciOjEwMH0%3D/patreon-media/p/user/11934057/26f642fffedb4c6197f2dc318c00aafa/1?token-time=2145916800&token-hash=rJqG8xl-8Dz_W2zJLz3sR6Cj7AP2QsnwFLkbw5R2pgs%3D","twitch":null,"twitter":null,"url":"https://www.patreon.com/P4ulBr4ndt","vanity":"P4ulBr4ndt","youtube":null},{"about":null,"created":"2018-08-02T01:46:34+00:00","default_country_code":"US","email":"[email protected]","facebook":null,"first_name":"Mohamed","full_name":"Mohamed Turco","gender":0,"image_url":"https://c8.patreon.com/2/200/12676333","is_email_verified":true,"last_name":"Turco","social_connections":{"deviantart":null,"discord":null,"facebook":null,"reddit":null,"spotify":null,"twitch":null,"twitter":null,"youtube":null},"thumb_url":"https://c8.patreon.com/2/100/12676333","twitch":null,"twitter":null,"url":"https://www.patreon.com/user?u=12676333","vanity":null,"youtube":null}]
Loading

0 comments on commit 56eb58e

Please sign in to comment.