From 0e6b62a8aac838860339ea85ccba1f333a23960e Mon Sep 17 00:00:00 2001 From: AlexKVal Date: Sun, 12 Apr 2015 18:54:36 +0300 Subject: [PATCH 1/7] [fixed] typo validates based -> validation is based --- docs/examples/Input.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/examples/Input.js b/docs/examples/Input.js index b9c4437ff8..2ec06532ea 100644 --- a/docs/examples/Input.js +++ b/docs/examples/Input.js @@ -27,7 +27,7 @@ const ExampleInput = React.createClass({ value={this.state.value} placeholder='Enter text' label='Working example with validation' - help='Validates based on string length.' + help='Validation is based on string length.' bsStyle={this.validationState()} hasFeedback ref='input' From af1e0c9969b7f56705e017992a4fd9c06e5d062a Mon Sep 17 00:00:00 2001 From: AlexKVal Date: Mon, 13 Apr 2015 15:12:05 +0300 Subject: [PATCH 2/7] Bump eslint version to 0.19.0 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index db8a43e1f5..c1d81a10c0 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "colors": "^1.0.3", "css-loader": "^0.9.1", "es5-shim": "^4.1.0", - "eslint": "^0.18.0", + "eslint": "^0.19.0", "eslint-plugin-react": "^2.1.0", "express": "^4.12.3", "extract-text-webpack-plugin": "^0.3.8", @@ -84,4 +84,4 @@ "dependencies": { "classnames": "^1.1.4" } -} \ No newline at end of file +} From 21117997fde12f2e400da54facff6c438736a1f4 Mon Sep 17 00:00:00 2001 From: AlexKVal Date: Mon, 13 Apr 2015 15:39:28 +0300 Subject: [PATCH 3/7] [fixed] Remove unused variables. --- docs/build.js | 2 +- docs/server.js | 1 - docs/src/NavMain.js | 2 +- ie8/server.js | 1 - tools/amd/build.js | 2 +- tools/build.js | 2 -- tools/dist/build.js | 3 +-- tools/lib/build.js | 3 +-- tools/release-scripts/changelog.js | 2 +- tools/release-scripts/pre-conditions.js | 2 +- tools/release-scripts/release.js | 2 +- tools/release-scripts/repo-release.js | 2 +- tools/release-scripts/tag-and-publish.js | 2 +- tools/release-scripts/test.js | 2 +- tools/release-scripts/version-bump.js | 2 +- 15 files changed, 12 insertions(+), 18 deletions(-) diff --git a/docs/build.js b/docs/build.js index 942995a5d8..09fd145dfd 100644 --- a/docs/build.js +++ b/docs/build.js @@ -5,7 +5,7 @@ import routes from './src/Routes'; import Root from './src/Root'; import fsp from 'fs-promise'; import { copy } from '../tools/fs-utils'; -import { exec, spawn } from 'child-process-promise'; +import { exec } from 'child-process-promise'; const repoRoot = path.resolve(__dirname, '../'); const docsBuilt = path.join(repoRoot, 'docs-built'); diff --git a/docs/server.js b/docs/server.js index 6093bc0565..8953f6c09c 100644 --- a/docs/server.js +++ b/docs/server.js @@ -1,7 +1,6 @@ import React from 'react'; import express from 'express'; import path from 'path'; -import url from 'url'; import webpack from 'webpack'; import webpackMiddleware from 'webpack-dev-middleware'; import webpackConfigBuilder from '../webpack/webpack.config'; diff --git a/docs/src/NavMain.js b/docs/src/NavMain.js index 4ec0218027..a91beb2a6d 100644 --- a/docs/src/NavMain.js +++ b/docs/src/NavMain.js @@ -1,5 +1,5 @@ import React from 'react'; -import Router, { Link } from 'react-router'; +import { Link } from 'react-router'; import Navbar from '../../src/Navbar'; import Nav from '../../src/Nav'; diff --git a/ie8/server.js b/ie8/server.js index 0796f23bff..da4fdd2a7c 100644 --- a/ie8/server.js +++ b/ie8/server.js @@ -1,4 +1,3 @@ -import React from 'react'; import express from 'express'; import path from 'path'; import webpack from 'webpack'; diff --git a/tools/amd/build.js b/tools/amd/build.js index 7d06d527d2..94919f78e6 100644 --- a/tools/amd/build.js +++ b/tools/amd/build.js @@ -2,7 +2,7 @@ import _ from 'lodash'; import path from 'path'; import fsp from 'fs-promise'; import { copy } from '../fs-utils'; -import { exec, spawn } from 'child-process-promise'; +import { exec } from 'child-process-promise'; const repoRoot = path.resolve(__dirname, '../../'); const amd = path.join(repoRoot, 'amd'); diff --git a/tools/build.js b/tools/build.js index 0873cfac2c..13051de53b 100644 --- a/tools/build.js +++ b/tools/build.js @@ -7,7 +7,6 @@ import lib from './lib/build'; import docs from '../docs/build'; import dist from './dist/build'; import { copy } from './fs-utils'; -import { exec, spawn } from 'child-process-promise'; import yargs from 'yargs'; @@ -48,4 +47,3 @@ export default function Build(noExitOnFailure) { return result; } } - diff --git a/tools/dist/build.js b/tools/dist/build.js index e3a15536e3..9ad329f37f 100644 --- a/tools/dist/build.js +++ b/tools/dist/build.js @@ -1,6 +1,5 @@ import path from 'path'; -import fsp from 'fs-promise'; -import { exec, spawn } from 'child-process-promise'; +import { exec } from 'child-process-promise'; const repoRoot = path.resolve(__dirname, '../../'); const dist = path.join(repoRoot, 'dist'); diff --git a/tools/lib/build.js b/tools/lib/build.js index 01adeb9164..3281a33be1 100644 --- a/tools/lib/build.js +++ b/tools/lib/build.js @@ -1,7 +1,6 @@ import from 'colors'; import path from 'path'; -import fsp from 'fs-promise'; -import { exec, spawn } from 'child-process-promise'; +import { exec } from 'child-process-promise'; const repoRoot = path.resolve(__dirname, '../../'); const lib = path.join(repoRoot, 'lib'); diff --git a/tools/release-scripts/changelog.js b/tools/release-scripts/changelog.js index b1f67ea6c0..232e6381ba 100644 --- a/tools/release-scripts/changelog.js +++ b/tools/release-scripts/changelog.js @@ -1,6 +1,6 @@ import from 'colors'; import path from 'path'; -import { exec, spawn } from 'child-process-promise'; +import { exec } from 'child-process-promise'; export default (repoRoot, version) => { return exec(`node_modules/.bin/changelog -t v${version}`) diff --git a/tools/release-scripts/pre-conditions.js b/tools/release-scripts/pre-conditions.js index 8d727f628a..4129d8b92e 100644 --- a/tools/release-scripts/pre-conditions.js +++ b/tools/release-scripts/pre-conditions.js @@ -1,5 +1,5 @@ import from 'colors'; -import { exec, spawn } from 'child-process-promise'; +import { exec } from 'child-process-promise'; function ensureClean() { return exec('git diff-index --name-only HEAD --') diff --git a/tools/release-scripts/release.js b/tools/release-scripts/release.js index 45b07e3bfd..413f47376a 100644 --- a/tools/release-scripts/release.js +++ b/tools/release-scripts/release.js @@ -2,7 +2,7 @@ import path from 'path'; import yargs from 'yargs'; -import { exec, spawn } from 'child-process-promise'; +import { exec } from 'child-process-promise'; import preConditions from './pre-conditions'; import versionBump from './version-bump'; diff --git a/tools/release-scripts/repo-release.js b/tools/release-scripts/repo-release.js index e798fe8bf9..b990a7b0dc 100644 --- a/tools/release-scripts/repo-release.js +++ b/tools/release-scripts/repo-release.js @@ -1,7 +1,7 @@ import from 'colors'; import path from 'path'; import fsp from 'fs-promise'; -import { exec, spawn } from 'child-process-promise'; +import { exec } from 'child-process-promise'; import { copy } from '../fs-utils'; const repoRoot = path.resolve(__dirname, '../../'); diff --git a/tools/release-scripts/tag-and-publish.js b/tools/release-scripts/tag-and-publish.js index 4dc3fcaf28..50692cc521 100644 --- a/tools/release-scripts/tag-and-publish.js +++ b/tools/release-scripts/tag-and-publish.js @@ -1,4 +1,4 @@ -import { exec, spawn } from 'child-process-promise'; +import { exec } from 'child-process-promise'; export default (version) => { console.log('Releasing: '.cyan + 'npm module'.green); diff --git a/tools/release-scripts/test.js b/tools/release-scripts/test.js index c5658877ab..f3ff17c37a 100644 --- a/tools/release-scripts/test.js +++ b/tools/release-scripts/test.js @@ -1,5 +1,5 @@ import from 'colors'; -import { exec, spawn } from 'child-process-promise'; +import { exec } from 'child-process-promise'; function test() { console.log('Running: '.cyan + 'tests'.green); diff --git a/tools/release-scripts/version-bump.js b/tools/release-scripts/version-bump.js index 785b3e262f..1afd44e81f 100644 --- a/tools/release-scripts/version-bump.js +++ b/tools/release-scripts/version-bump.js @@ -2,7 +2,7 @@ import from 'colors'; import path from 'path'; import fsp from 'fs-promise'; import semver from 'semver'; -import { exec, spawn } from 'child-process-promise'; +import { exec } from 'child-process-promise'; export default function(repoRoot, { preid, type }) { const packagePath = path.join(repoRoot, 'package.json'); From 20b608ff9b6352aa5ecaf3eefc875bc54b8a30ca Mon Sep 17 00:00:00 2001 From: AlexKVal Date: Mon, 13 Apr 2015 15:45:35 +0300 Subject: [PATCH 4/7] [fixed] Add missed semicolons. --- docs/src/CodeMirror.client.js | 2 +- docs/src/CodeMirror.js | 2 +- docs/src/Routes.js | 2 +- tools/fs-utils.js | 2 +- tools/release-scripts/changelog.js | 2 +- tools/release-scripts/repo-release.js | 2 +- tools/release-scripts/tag-and-publish.js | 2 +- webpack/strategies/development.js | 2 +- webpack/strategies/docs.js | 2 +- webpack/strategies/ie8.js | 2 +- webpack/strategies/optimize.js | 2 +- webpack/strategies/test.js | 2 +- webpack/webpack.config.js | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/src/CodeMirror.client.js b/docs/src/CodeMirror.client.js index aa52214e94..04af815082 100644 --- a/docs/src/CodeMirror.client.js +++ b/docs/src/CodeMirror.client.js @@ -9,4 +9,4 @@ import from './CodeMirror.css'; export default { IS_NODE: false, CodeMirror -} +}; diff --git a/docs/src/CodeMirror.js b/docs/src/CodeMirror.js index a318163149..1639c02d51 100644 --- a/docs/src/CodeMirror.js +++ b/docs/src/CodeMirror.js @@ -1,4 +1,4 @@ export default { IS_NODE: true, CodeMirror: {} -} +}; diff --git a/docs/src/Routes.js b/docs/src/Routes.js index 73e61b6b14..a17d356c4d 100644 --- a/docs/src/Routes.js +++ b/docs/src/Routes.js @@ -17,4 +17,4 @@ export default ( -) +); diff --git a/tools/fs-utils.js b/tools/fs-utils.js index 13652b449a..b066408bc5 100644 --- a/tools/fs-utils.js +++ b/tools/fs-utils.js @@ -36,4 +36,4 @@ function copy(src, dest, options) { export default { copy -} +}; diff --git a/tools/release-scripts/changelog.js b/tools/release-scripts/changelog.js index 232e6381ba..5d4af17e9f 100644 --- a/tools/release-scripts/changelog.js +++ b/tools/release-scripts/changelog.js @@ -6,4 +6,4 @@ export default (repoRoot, version) => { return exec(`node_modules/.bin/changelog -t v${version}`) .then(() => exec(`git add ${path.join(repoRoot, 'CHANGELOG.md')}`)) .then(() => console.log('Generated Changelog'.cyan)); -} +}; diff --git a/tools/release-scripts/repo-release.js b/tools/release-scripts/repo-release.js index b990a7b0dc..5f5b635c6a 100644 --- a/tools/release-scripts/repo-release.js +++ b/tools/release-scripts/repo-release.js @@ -30,4 +30,4 @@ export default (repo, srcFolder, tmpFolder, version) => { .then(() => exec(`cd ${tmpFolder} && git push --tags`)) .then(() => exec(`rimraf ${tmpFolder}`)) .then(() => console.log('Released: '.cyan + repo.green)); -} +}; diff --git a/tools/release-scripts/tag-and-publish.js b/tools/release-scripts/tag-and-publish.js index 50692cc521..bdee1f8672 100644 --- a/tools/release-scripts/tag-and-publish.js +++ b/tools/release-scripts/tag-and-publish.js @@ -8,4 +8,4 @@ export default (version) => { .then(() => exec(`git push --tags`)) .then(() => exec('npm publish')) .then(() => console.log('Released: '.cyan + 'npm module'.green)); -} +}; diff --git a/webpack/strategies/development.js b/webpack/strategies/development.js index 35504f006c..7cf0dd997f 100644 --- a/webpack/strategies/development.js +++ b/webpack/strategies/development.js @@ -10,4 +10,4 @@ export default (config, options) => { } return config; -} +}; diff --git a/webpack/strategies/docs.js b/webpack/strategies/docs.js index 465a022662..27be46bc32 100644 --- a/webpack/strategies/docs.js +++ b/webpack/strategies/docs.js @@ -52,4 +52,4 @@ export default (config, options) => { } return config; -} +}; diff --git a/webpack/strategies/ie8.js b/webpack/strategies/ie8.js index 04e5d34de3..0a320c98df 100644 --- a/webpack/strategies/ie8.js +++ b/webpack/strategies/ie8.js @@ -23,4 +23,4 @@ export default (config, options) => { } return config; -} +}; diff --git a/webpack/strategies/optimize.js b/webpack/strategies/optimize.js index f8a59466b1..d01447d287 100644 --- a/webpack/strategies/optimize.js +++ b/webpack/strategies/optimize.js @@ -12,4 +12,4 @@ export default (config, options) => { } return config; -} +}; diff --git a/webpack/strategies/test.js b/webpack/strategies/test.js index 62d7c31c58..09eb0e247d 100644 --- a/webpack/strategies/test.js +++ b/webpack/strategies/test.js @@ -15,4 +15,4 @@ export default (config, options) => { } return config; -} +}; diff --git a/webpack/webpack.config.js b/webpack/webpack.config.js index a95e313c4d..1fc658afa6 100644 --- a/webpack/webpack.config.js +++ b/webpack/webpack.config.js @@ -60,4 +60,4 @@ export default (options) => { return strategies.reduce((conf, strategy) => { return strategy(conf, options); }, config); -} +}; From 276c2bc7ad70927dd88bd93f0e35c0ac9a515e62 Mon Sep 17 00:00:00 2001 From: Yann Plantevin Date: Fri, 17 Apr 2015 16:07:10 +0200 Subject: [PATCH 5/7] [fixed] ProgressBar percentage issue when stacked Using stacked ProgressBar with a maximum superior to 100 could lead to rounding issues that made the bar incomplete. See issue #396 for mor details on the error --- src/ProgressBar.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ProgressBar.js b/src/ProgressBar.js index 0b981070c8..d80e92b174 100644 --- a/src/ProgressBar.js +++ b/src/ProgressBar.js @@ -27,7 +27,8 @@ const ProgressBar = React.createClass({ }, getPercentage(now, min, max) { - return Math.ceil((now - min) / (max - min) * 100); + let roundPrecision = 1000; + return Math.round(((now - min) / (max - min) * 100) * roundPrecision) / roundPrecision; }, render() { From ecde13b73415f025cac15fbb77c9204d894d86c4 Mon Sep 17 00:00:00 2001 From: AlexKVal Date: Tue, 14 Apr 2015 21:53:23 +0300 Subject: [PATCH 6/7] Bump babel-eslint to 3.0.1 Dev dependency. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c1d81a10c0..e6d60675d3 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "devDependencies": { "babel": "^4.7.0", "babel-core": "^4.7.4", - "babel-eslint": "^2.0.2", + "babel-eslint": "^3.0.1", "babel-loader": "^4.1.0", "bootstrap": "^3.3.4", "brfs": "^1.4.0", From a58eab59ee6eb1a16c5e879f09c00379e5d59760 Mon Sep 17 00:00:00 2001 From: AlexKVal Date: Tue, 14 Apr 2015 18:53:25 +0300 Subject: [PATCH 7/7] [fixed] Fix 'import from' => 'import' Babel is more strict now as for `import` syntax. According to https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/import Import an entire module for side effects only, without importing any bindings. import "my-module.js"; --- docs/client.js | 10 +++++----- docs/src/CodeMirror.client.js | 9 ++++----- ie8/src.js | 2 +- test/index.js | 2 +- tools/build.js | 2 +- tools/lib/build.js | 2 +- tools/release-scripts/changelog.js | 2 +- tools/release-scripts/pre-conditions.js | 2 +- tools/release-scripts/repo-release.js | 2 +- tools/release-scripts/test.js | 2 +- tools/release-scripts/version-bump.js | 2 +- 11 files changed, 18 insertions(+), 19 deletions(-) diff --git a/docs/client.js b/docs/client.js index 2ffda6e943..e3680ee13d 100644 --- a/docs/client.js +++ b/docs/client.js @@ -1,9 +1,9 @@ -import from 'bootstrap/less/bootstrap.less'; -import from './assets/docs.css'; -import from './assets/style.css'; +import 'bootstrap/less/bootstrap.less'; +import './assets/docs.css'; +import './assets/style.css'; -import from './assets/carousel.png'; -import from './assets/logo.png'; +import './assets/carousel.png'; +import './assets/logo.png'; import React from 'react'; import Router from 'react-router'; diff --git a/docs/src/CodeMirror.client.js b/docs/src/CodeMirror.client.js index 04af815082..ee811bb38c 100644 --- a/docs/src/CodeMirror.client.js +++ b/docs/src/CodeMirror.client.js @@ -1,10 +1,9 @@ import CodeMirror from 'codemirror'; -import from 'codemirror/mode/javascript/javascript'; +import 'codemirror/mode/javascript/javascript'; -import from 'codemirror/theme/solarized.css'; -import from 'codemirror/lib/codemirror.css'; -//import from '../vendor/codemirror/syntax.css'; -import from './CodeMirror.css'; +import 'codemirror/theme/solarized.css'; +import 'codemirror/lib/codemirror.css'; +import './CodeMirror.css'; export default { IS_NODE: false, diff --git a/ie8/src.js b/ie8/src.js index 75836e1e12..e8edfd5f13 100644 --- a/ie8/src.js +++ b/ie8/src.js @@ -16,7 +16,7 @@ import Popover from '../src/Popover'; import Carousel from '../src/Carousel'; import CarouselItem from '../src/CarouselItem'; -import from './assets/carousel.png'; +import './assets/carousel.png'; const dropdownInstance = ( diff --git a/test/index.js b/test/index.js index 399534d547..221efcee06 100644 --- a/test/index.js +++ b/test/index.js @@ -1,3 +1,3 @@ -import from 'es5-shim'; +import 'es5-shim'; const testsContext = require.context('.', true, /Spec$/); testsContext.keys().forEach(testsContext); diff --git a/tools/build.js b/tools/build.js index 13051de53b..8a66546ddc 100644 --- a/tools/build.js +++ b/tools/build.js @@ -1,6 +1,6 @@ /* eslint no-process-exit: 0 */ -import from 'colors'; +import 'colors'; import path from 'path'; import bower from './amd/build'; import lib from './lib/build'; diff --git a/tools/lib/build.js b/tools/lib/build.js index 3281a33be1..3451f8e105 100644 --- a/tools/lib/build.js +++ b/tools/lib/build.js @@ -1,4 +1,4 @@ -import from 'colors'; +import 'colors'; import path from 'path'; import { exec } from 'child-process-promise'; diff --git a/tools/release-scripts/changelog.js b/tools/release-scripts/changelog.js index 5d4af17e9f..d1bac60d8b 100644 --- a/tools/release-scripts/changelog.js +++ b/tools/release-scripts/changelog.js @@ -1,4 +1,4 @@ -import from 'colors'; +import 'colors'; import path from 'path'; import { exec } from 'child-process-promise'; diff --git a/tools/release-scripts/pre-conditions.js b/tools/release-scripts/pre-conditions.js index 4129d8b92e..67a2410ac5 100644 --- a/tools/release-scripts/pre-conditions.js +++ b/tools/release-scripts/pre-conditions.js @@ -1,4 +1,4 @@ -import from 'colors'; +import 'colors'; import { exec } from 'child-process-promise'; function ensureClean() { diff --git a/tools/release-scripts/repo-release.js b/tools/release-scripts/repo-release.js index 5f5b635c6a..d8347bd6ec 100644 --- a/tools/release-scripts/repo-release.js +++ b/tools/release-scripts/repo-release.js @@ -1,4 +1,4 @@ -import from 'colors'; +import 'colors'; import path from 'path'; import fsp from 'fs-promise'; import { exec } from 'child-process-promise'; diff --git a/tools/release-scripts/test.js b/tools/release-scripts/test.js index f3ff17c37a..393d58a025 100644 --- a/tools/release-scripts/test.js +++ b/tools/release-scripts/test.js @@ -1,4 +1,4 @@ -import from 'colors'; +import 'colors'; import { exec } from 'child-process-promise'; function test() { diff --git a/tools/release-scripts/version-bump.js b/tools/release-scripts/version-bump.js index 1afd44e81f..c3dffd594e 100644 --- a/tools/release-scripts/version-bump.js +++ b/tools/release-scripts/version-bump.js @@ -1,4 +1,4 @@ -import from 'colors'; +import 'colors'; import path from 'path'; import fsp from 'fs-promise'; import semver from 'semver';