Skip to content

Commit

Permalink
Merge pull request react-bootstrap#512 from AlexKVal/eslint19
Browse files Browse the repository at this point in the history
[fixed] Update eslint dev dependency and fix new warnings.
  • Loading branch information
mtscout6 committed Apr 16, 2015
2 parents f167c13 + 20b608f commit 5ca051b
Show file tree
Hide file tree
Showing 26 changed files with 27 additions and 33 deletions.
2 changes: 1 addition & 1 deletion docs/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
1 change: 0 additions & 1 deletion docs/server.js
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion docs/src/CodeMirror.client.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ import from './CodeMirror.css';
export default {
IS_NODE: false,
CodeMirror
}
};
2 changes: 1 addition & 1 deletion docs/src/CodeMirror.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export default {
IS_NODE: true,
CodeMirror: {}
}
};
2 changes: 1 addition & 1 deletion docs/src/NavMain.js
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
2 changes: 1 addition & 1 deletion docs/src/Routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ export default (
<Route name='getting-started' path='getting-started.html' handler={GettingStartedPage} />
<Route name='components' path='components.html' handler={ComponentsPage} />
</Route>
)
);
1 change: 0 additions & 1 deletion ie8/server.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from 'react';
import express from 'express';
import path from 'path';
import webpack from 'webpack';
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -84,4 +84,4 @@
"dependencies": {
"classnames": "^1.1.4"
}
}
}
2 changes: 1 addition & 1 deletion tools/amd/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 0 additions & 2 deletions tools/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -48,4 +47,3 @@ export default function Build(noExitOnFailure) {
return result;
}
}

3 changes: 1 addition & 2 deletions tools/dist/build.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
2 changes: 1 addition & 1 deletion tools/fs-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ function copy(src, dest, options) {

export default {
copy
}
};
3 changes: 1 addition & 2 deletions tools/lib/build.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
4 changes: 2 additions & 2 deletions tools/release-scripts/changelog.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
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}`)
.then(() => exec(`git add ${path.join(repoRoot, 'CHANGELOG.md')}`))
.then(() => console.log('Generated Changelog'.cyan));
}
};
2 changes: 1 addition & 1 deletion tools/release-scripts/pre-conditions.js
Original file line number Diff line number Diff line change
@@ -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 --')
Expand Down
2 changes: 1 addition & 1 deletion tools/release-scripts/release.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 2 additions & 2 deletions tools/release-scripts/repo-release.js
Original file line number Diff line number Diff line change
@@ -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, '../../');
Expand Down Expand Up @@ -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));
}
};
4 changes: 2 additions & 2 deletions tools/release-scripts/tag-and-publish.js
Original file line number Diff line number Diff line change
@@ -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);
Expand All @@ -8,4 +8,4 @@ export default (version) => {
.then(() => exec(`git push --tags`))
.then(() => exec('npm publish'))
.then(() => console.log('Released: '.cyan + 'npm module'.green));
}
};
2 changes: 1 addition & 1 deletion tools/release-scripts/test.js
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
2 changes: 1 addition & 1 deletion tools/release-scripts/version-bump.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion webpack/strategies/development.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ export default (config, options) => {
}

return config;
}
};
2 changes: 1 addition & 1 deletion webpack/strategies/docs.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ export default (config, options) => {
}

return config;
}
};
2 changes: 1 addition & 1 deletion webpack/strategies/ie8.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ export default (config, options) => {
}

return config;
}
};
2 changes: 1 addition & 1 deletion webpack/strategies/optimize.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ export default (config, options) => {
}

return config;
}
};
2 changes: 1 addition & 1 deletion webpack/strategies/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ export default (config, options) => {
}

return config;
}
};
2 changes: 1 addition & 1 deletion webpack/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ export default (options) => {
return strategies.reduce((conf, strategy) => {
return strategy(conf, options);
}, config);
}
};

0 comments on commit 5ca051b

Please sign in to comment.