Skip to content

Commit 5ca051b

Browse files
committed
Merge pull request react-bootstrap#512 from AlexKVal/eslint19
[fixed] Update eslint dev dependency and fix new warnings.
2 parents f167c13 + 20b608f commit 5ca051b

26 files changed

Lines changed: 27 additions & 33 deletions

docs/build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import routes from './src/Routes';
55
import Root from './src/Root';
66
import fsp from 'fs-promise';
77
import { copy } from '../tools/fs-utils';
8-
import { exec, spawn } from 'child-process-promise';
8+
import { exec } from 'child-process-promise';
99

1010
const repoRoot = path.resolve(__dirname, '../');
1111
const docsBuilt = path.join(repoRoot, 'docs-built');

docs/server.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import React from 'react';
22
import express from 'express';
33
import path from 'path';
4-
import url from 'url';
54
import webpack from 'webpack';
65
import webpackMiddleware from 'webpack-dev-middleware';
76
import webpackConfigBuilder from '../webpack/webpack.config';

docs/src/CodeMirror.client.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ import from './CodeMirror.css';
99
export default {
1010
IS_NODE: false,
1111
CodeMirror
12-
}
12+
};

docs/src/CodeMirror.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
export default {
22
IS_NODE: true,
33
CodeMirror: {}
4-
}
4+
};

docs/src/NavMain.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import Router, { Link } from 'react-router';
2+
import { Link } from 'react-router';
33
import Navbar from '../../src/Navbar';
44
import Nav from '../../src/Nav';
55

docs/src/Routes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ export default (
1717
<Route name='getting-started' path='getting-started.html' handler={GettingStartedPage} />
1818
<Route name='components' path='components.html' handler={ComponentsPage} />
1919
</Route>
20-
)
20+
);

ie8/server.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import React from 'react';
21
import express from 'express';
32
import path from 'path';
43
import webpack from 'webpack';

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"colors": "^1.0.3",
4747
"css-loader": "^0.9.1",
4848
"es5-shim": "^4.1.0",
49-
"eslint": "^0.18.0",
49+
"eslint": "^0.19.0",
5050
"eslint-plugin-react": "^2.1.0",
5151
"express": "^4.12.3",
5252
"extract-text-webpack-plugin": "^0.3.8",
@@ -84,4 +84,4 @@
8484
"dependencies": {
8585
"classnames": "^1.1.4"
8686
}
87-
}
87+
}

tools/amd/build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import _ from 'lodash';
22
import path from 'path';
33
import fsp from 'fs-promise';
44
import { copy } from '../fs-utils';
5-
import { exec, spawn } from 'child-process-promise';
5+
import { exec } from 'child-process-promise';
66

77
const repoRoot = path.resolve(__dirname, '../../');
88
const amd = path.join(repoRoot, 'amd');

tools/build.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import lib from './lib/build';
77
import docs from '../docs/build';
88
import dist from './dist/build';
99
import { copy } from './fs-utils';
10-
import { exec, spawn } from 'child-process-promise';
1110

1211
import yargs from 'yargs';
1312

@@ -48,4 +47,3 @@ export default function Build(noExitOnFailure) {
4847
return result;
4948
}
5049
}
51-

0 commit comments

Comments
 (0)