Skip to content

Commit 887d28b

Browse files
Merge branch 'release/3.1.0'
2 parents a5e7f9b + 9167089 commit 887d28b

File tree

6 files changed

+23
-23
lines changed

6 files changed

+23
-23
lines changed

.eslintrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"indent": ["error", "tab"],
66
"linebreak-style": "off",
77
"no-tabs": "off",
8-
"react/jsx-filename-extension": "off"
8+
"react/jsx-filename-extension": "off",
9+
"react/jsx-props-no-spreading": "off"
910
}
1011
}

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: node_js
22
node_js:
33
- "node"
4-
- "8"
4+
- "10"
55
env:
66
global:
77
- SAUCE_USERNAME=wimpyprogrammer

karma-ci.conf.babel.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,23 @@ const browsersToTest = {
1919
platform: 'Windows 10',
2020
version: 'latest',
2121
},
22-
sl_win10_ie11: {
22+
sl_win10_edge15: {
2323
base: 'SauceLabs',
24-
browserName: 'internet explorer',
24+
browserName: 'MicrosoftEdge',
2525
platform: 'Windows 10',
26-
version: '11.103',
26+
version: '15.15063',
2727
},
28-
sl_win10_edge16: {
28+
sl_win10_edge: {
2929
base: 'SauceLabs',
3030
browserName: 'MicrosoftEdge',
3131
platform: 'Windows 10',
32-
version: '16.16299',
32+
version: 'latest-1',
3333
},
34-
sl_mac1013_: {
34+
sl_mac1013_safari: {
3535
base: 'SauceLabs',
3636
browserName: 'safari',
3737
platform: 'macOS 10.13',
38-
version: '11.1',
38+
version: 'latest-1',
3939
},
4040
};
4141

karma-local.conf.babel.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ const localConfig = merge({
1313
},
1414
}, commonConfig);
1515

16-
export default config => config.set(localConfig);
16+
export default (config) => config.set(localConfig);

package.json

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
{
22
"name": "react-responsive-breakpoints",
3-
"version": "3.0.1",
3+
"version": "3.1.0",
44
"description": "A higher-order React component to translate CSS breakpoints into properties",
55
"main": "lib/index.js",
66
"files": [
77
"lib/**/!(*.spec).js"
88
],
99
"engines": {
10-
"node": ">=8"
10+
"node": ">=10"
1111
},
1212
"scripts": {
1313
"build": "npm run clean && babel src --out-dir lib",
1414
"clean": "rimraf lib",
1515
"install-react": "enzyme-adapter-react-install 16 || echo \"ignoring install errors\"",
16-
"lint": "eslint ./",
16+
"lint": "eslint ./ --report-unused-disable-directives",
1717
"test": "cross-env NODE_ENV=test karma start karma-local.conf.js",
1818
"test:ci": "cross-env NODE_ENV=test karma start karma-ci.conf.js",
1919
"travisci": "npm run install-react && npm run lint && npm run test:ci && codecov && npx snyk test",
20-
"publish-please": "npm run build && publish-please",
21-
"prepublish": "publish-please guard"
20+
"publish-please": "npm run build && npx publish-please",
21+
"prepublish": "npx publish-please guard"
2222
},
2323
"repository": {
2424
"type": "git",
@@ -46,22 +46,21 @@
4646
"enzyme": "^3.8.0",
4747
"enzyme-adapter-react-16": "^1.7.1",
4848
"enzyme-adapter-react-helper": "^1.3.1",
49-
"eslint": "^5.3.0",
50-
"eslint-config-airbnb": "^17.1.0",
49+
"eslint": "^7.8.1",
50+
"eslint-config-airbnb": "^18.2.0",
5151
"eslint-plugin-import": "^2.14.0",
5252
"eslint-plugin-jsx-a11y": "^6.1.1",
5353
"eslint-plugin-react": "^7.11.1",
54-
"karma": "^4.0.1",
55-
"karma-coverage": "^1.1.1",
54+
"karma": "^5.2.0",
55+
"karma-coverage": "^2.0.3",
5656
"karma-mocha": "^2.0.1",
5757
"karma-mocha-reporter": "^2.2.4",
58-
"karma-sauce-launcher": "^1.2.0",
58+
"karma-sauce-launcher": "^4.1.5",
5959
"karma-viewport": "^1.0.0",
60-
"karma-webpack": "^3.0.5",
60+
"karma-webpack": "^4.0.2",
6161
"lodash.merge": "^4.6.0",
6262
"lodash.once": "^4.1.1",
6363
"mocha": "^6.0.2",
64-
"publish-please": "^5.4.3",
6564
"react": "*",
6665
"react-dom": "*",
6766
"react-test-renderer": "*",

src/withBreakpointsCustom.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ describe('withBreakpointsCustom throttles updates', () => {
178178
const OuterComponent = withBreakpointsCustom({ onRecalculateBreakpoints }, InnerComponent);
179179
shallow(<OuterComponent />);
180180

181-
[200, 205, 210, 215].forEach(width => resizeWindowToWidth(width));
181+
[200, 205, 210, 215].forEach((width) => resizeWindowToWidth(width));
182182

183183
const assertions = () => {
184184
// Some browsers may throttle successive resizes to a single event. Otherwise

0 commit comments

Comments
 (0)