Skip to content

Commit b4677c8

Browse files
committed
Upgrade dependencies and resolve linting errors
Disables a couple rules temporarily to allow for blanket upgrade. These rules will eventually be re-enabled in the future. Resolves #95.
1 parent 57ec033 commit b4677c8

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

.eslintrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,9 @@
1010
"config": "webpack.test.config.js"
1111
}
1212
}
13+
},
14+
"rules": {
15+
"react/destructuring-assignment": "off",
16+
"react/jsx-sort-props": "off"
1317
}
1418
}

gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ const webpackStream = require('webpack-stream');
77
const scsslint = require('gulp-scss-lint');
88
const sass = require('gulp-sass');
99
const autoprefixer = require('gulp-autoprefixer');
10-
const pkg = require('./package.json');
1110
const browserSync = require('browser-sync').create();
11+
const pkg = require('./package.json');
1212
const webpackConfig = require('./webpack.config');
1313
const testWebpackConfig = require('./webpack.test.config');
1414

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@
3737
"chai": "^4.0.0",
3838
"enzyme": "^3.0.0",
3939
"enzyme-adapter-react-16": "^1.0.0",
40-
"eslint": "^4.3.0",
41-
"eslint-config-takiyon-react": "^0.3.0",
40+
"eslint": "^5.2.0",
41+
"eslint-config-takiyon-react": "^0.4.0",
4242
"eslint-import-resolver-webpack": "^0.10.0",
4343
"eslint-plugin-import": "^2.2.0",
4444
"eslint-plugin-jsx-a11y": "^6.0.2",
45-
"eslint-plugin-react": "7.4.0",
45+
"eslint-plugin-react": "^7.10.0",
4646
"gulp": "^3.9.1",
4747
"gulp-autoprefixer": "^5.0.0",
48-
"gulp-eslint": "^4.0.0",
48+
"gulp-eslint": "^5.0.0",
4949
"gulp-header": "^2.0.5",
5050
"gulp-mocha": "^6.0.0",
5151
"gulp-sass": "^4.0.1",
@@ -56,7 +56,7 @@
5656
"react-dom": "^16.0.0",
5757
"react-test-renderer": "^16.0.0",
5858
"webpack": "^4.4.1",
59-
"webpack-stream": "^4.0.0"
59+
"webpack-stream": "^5.0.0"
6060
},
6161
"dependencies": {
6262
"classnames": "^2.2.5",

test/TreeNode.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,9 @@ describe('<TreeNode />', () => {
185185
);
186186

187187
assert.isTrue(wrapper.contains(
188-
<span className="rct-title">Europa</span>,
188+
<span className="rct-title">
189+
Europa
190+
</span>,
189191
));
190192
});
191193
});

0 commit comments

Comments
 (0)