From 4227201eb1615c16f1fe8d548b899e1d8ee8f43f Mon Sep 17 00:00:00 2001 From: NogsMPLS Date: Mon, 16 Nov 2015 19:02:52 -0600 Subject: [PATCH 1/6] adding cross-env command to npm start scripts for windows compatibility. --- docs/package.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/package.json b/docs/package.json index 45b253e1..0168ce5a 100644 --- a/docs/package.json +++ b/docs/package.json @@ -4,7 +4,7 @@ "description": "Documentation for React Toolbox", "author": "React Toolbox Team (http://github.com/react-toolbox)", "scripts": { - "start": "node ./server", + "start": "cross-env NODE_ENV=development UV_THREADPOOL_SIZE=100 node ./server", "build": "cross-env NODE_ENV=production UV_THREADPOOL_SIZE=100 webpack --config ./webpack.config.production --colors --profile --progress", "deploy": "gh-pages -d build" }, diff --git a/package.json b/package.json index afe15b55..5d705e01 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ ], "main": "./lib", "scripts": { - "start": "node ./server", + "start": "cross-env NODE_ENV=development UV_THREADPOOL_SIZE=100 node ./server", "lint": "eslint ./ --ext .js,.jsx", "babel": "babel ./components --out-dir ./lib", "sass": "cpx './components/**/*.scss' ./lib", From fe7b4d50f28b91fd2907c0a0375d9ded92975f05 Mon Sep 17 00:00:00 2001 From: NogsMPLS Date: Mon, 16 Nov 2015 19:04:43 -0600 Subject: [PATCH 2/6] removing UV_THREADPOOL_SIZE set, now executed from npm start script. --- docs/server.js | 2 -- server.js | 2 -- 2 files changed, 4 deletions(-) diff --git a/docs/server.js b/docs/server.js index c355af21..146b6d97 100644 --- a/docs/server.js +++ b/docs/server.js @@ -1,5 +1,3 @@ -process.env.UV_THREADPOOL_SIZE = 100; - const path = require('path'); const express = require('express'); const webpack = require('webpack'); diff --git a/server.js b/server.js index 98d389f3..faac4f9a 100644 --- a/server.js +++ b/server.js @@ -1,5 +1,3 @@ -process.env.UV_THREADPOOL_SIZE = 100; - const path = require('path'); const express = require('express'); const webpack = require('webpack'); From 9c4c5894d471d3e31464a635fd345eb8f7a41606 Mon Sep 17 00:00:00 2001 From: "@soyjavi" Date: Tue, 17 Nov 2015 09:42:42 +0700 Subject: [PATCH 3/6] Added bumped to a npm command --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 61b83bad..aa40ad84 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,8 @@ "prebuild": "npm run clean", "prepublish": "npm run build", "test": "cross-env NODE_ENV=test karma start", - "test:watch": "cross-env NODE_ENV=test karma start --no-single-run" + "test:watch": "cross-env NODE_ENV=test karma start --no-single-run", + "release": "bumped release patch" }, "bugs": { "url": "https://github.com/react-toolbox/react-toolbox/issues", From e408f957abea6e1c8898a16e9e306d28a9399294 Mon Sep 17 00:00:00 2001 From: "@soyjavi" Date: Tue, 17 Nov 2015 09:43:10 +0700 Subject: [PATCH 4/6] Revert "Added bumped to a npm command" This reverts commit 9c4c5894d471d3e31464a635fd345eb8f7a41606. --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index aa40ad84..61b83bad 100644 --- a/package.json +++ b/package.json @@ -27,8 +27,7 @@ "prebuild": "npm run clean", "prepublish": "npm run build", "test": "cross-env NODE_ENV=test karma start", - "test:watch": "cross-env NODE_ENV=test karma start --no-single-run", - "release": "bumped release patch" + "test:watch": "cross-env NODE_ENV=test karma start --no-single-run" }, "bugs": { "url": "https://github.com/react-toolbox/react-toolbox/issues", From 94c874746b12049ed57fd5d58b5b598307d98531 Mon Sep 17 00:00:00 2001 From: "@soyjavi" Date: Tue, 17 Nov 2015 09:44:05 +0700 Subject: [PATCH 5/6] Bumped such as NPM Commands --- package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index afe15b55..0dffab5e 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,9 @@ "prebuild": "npm run clean", "prepublish": "npm run build", "test": "cross-env NODE_ENV=test karma start", - "test:watch": "cross-env NODE_ENV=test karma start --no-single-run" + "test:watch": "cross-env NODE_ENV=test karma start --no-single-run", + "release": "bumped release", + "patch": "bumped release patch" }, "bugs": { "url": "https://github.com/react-toolbox/react-toolbox/issues", From 98f2920bf4088902a661b5e712148b0a5f3282ee Mon Sep 17 00:00:00 2001 From: "@soyjavi" Date: Tue, 17 Nov 2015 09:49:25 +0700 Subject: [PATCH 6/6] Patch: Placeholder in --- components/date_picker/index.jsx | 7 ++++++- components/date_picker/readme.md | 1 + package.json | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/components/date_picker/index.jsx b/components/date_picker/index.jsx index 028976c8..1490edee 100644 --- a/components/date_picker/index.jsx +++ b/components/date_picker/index.jsx @@ -10,9 +10,14 @@ class DatePicker extends React.Component { maxDate: React.PropTypes.object, minDate: React.PropTypes.object, onChange: React.PropTypes.func, + placeholder: React.PropTypes.string, value: React.PropTypes.object }; + static defaultProps = { + placeholder: 'Choose a date' + }; + state = { active: false }; @@ -40,7 +45,7 @@ class DatePicker extends React.Component {