Merge branch 'release/2.0.0'

Author: wimpyprogrammer

.gitignore

@@ -67,3 +67,4 @@ puphpet/
 
 # VisualStudioCode
 .vscode/*
+artifacts/

.travis.yml

@@ -1,7 +1,7 @@
 language: node_js
 node_js:
   - "node"
-  - "4"
+  - "6"
 env:
   global:
     - SAUCE_USERNAME=wimpyprogrammer
@@ -14,8 +14,6 @@ addons:
   artifacts:
     paths:
     - artifacts/
-  jwt:
-    secure: DI9J+mvFZNvINUcq//aq1+HtWlWcphVTaSAmifQ1DYAKcQ8nEXaQYds1Fzu0yeW2KfAH6rWxNsdmHIPkgzJxP50lXyuUYVKisU1y0jVpkKQSZBNB6hTRNSJxVk7ZqPDa78/zfUuiVUszUuTIBymFod3yq1zYdwJ8eUQmc25tTZ2GcmfAUmsO1qt48nFopxSgeVaduzm5fdvB8nkn+mEFWBBlICgPX0h4RVMzt6ozlX57iwvqVppErCphHuelOXcUQXmOUPIPN/MAR04ia8XBTYTh48ZrbI9RRxMJFfbnUiCDyPXKsznPgBGnQUFpFYIFSVYShz1i/j7h+jSvHDI0xorAviY/u0tWwa+qn+cOWaQFfSu4wkdcwDjpvkTKdY87Hi+uyzToyo1oNN479O907u4sRHNWHx3q6uquzEFm79K1XR3zK1AE4ElIlRa10GXiYS3vH1rUx1oUQVZJiEkwy+Vrl8pAp1Gwpq/lJpqj/Ps2C1LDPBX7c9tP7+R5sOM7pRGuhPK3zTqxelPoZ88urHGIPCnIN9O+8rjgOK1yqSWVufz29Y/wuvwvD7y+Uz99asyxS5HoqNrorcrQdEPznv3GoDU/gOZHMqTJWmbqkuHVU4T8lVvqgAIdfYzaXrzttpKCgeF5+jP3ThS358l+86c76XXf7eLWxHWU84LSr6Q=
   sauce_connect: true
 before_install:
   - nvm install-latest-npm
@@ -26,3 +24,6 @@ script:
 after_script:
   - find artifacts/ -name "*.log"
   - cat artifacts/sauce_connect.log
+cache:
+  directories:
+    - node_modules

README.md

@@ -1,5 +1,7 @@
 # react-responsive-breakpoints
 
+[![npm package](https://badge.fury.io/js/react-responsive-breakpoints.svg)](https://badge.fury.io/js/react-responsive-breakpoints)
+![node version](https://img.shields.io/node/v/react-responsive-breakpoints.svg)
 [![Build Status](https://travis-ci.org/wimpyprogrammer/react-responsive-breakpoints.svg?branch=feature%2Fautomated-builds)](https://travis-ci.org/wimpyprogrammer/react-responsive-breakpoints)
 [![codecov](https://codecov.io/gh/wimpyprogrammer/react-responsive-breakpoints/branch/master/graph/badge.svg)](https://codecov.io/gh/wimpyprogrammer/react-responsive-breakpoints)
 [![Known Vulnerabilities](https://snyk.io/test/github/wimpyprogrammer/react-responsive-breakpoints/badge.svg)](https://snyk.io/test/github/wimpyprogrammer/react-responsive-breakpoints)

artifacts/README.md

@@ -0,0 +1,3 @@
+This directory is required for Sauce Connect to generate a log file.
+
+It's contents are excluded from source control.

karma-ci.conf.babel.js

@@ -35,7 +35,7 @@ const browsersToTest = {
 		base: 'SauceLabs',
 		browserName: 'safari',
 		platform: 'macOS 10.13',
-		version: '11.0',
+		version: '11.1',
 	},
 };
 

karma-common.conf.js

@@ -3,11 +3,11 @@ module.exports = (
 		frameworks: ['mocha', 'viewport'],
 
 		files: [
-			'src/**/*.js',
+			'test-setup.js',
 		],
 
 		preprocessors: {
-			'src/**/*.js': ['webpack'],
+			'test-setup.js': ['webpack'],
 		},
 
 		reporters: ['mocha', 'coverage'],
@@ -24,15 +24,26 @@ module.exports = (
 
 		webpack: {
 
+			mode: 'development',
+
 			resolve: {
 				alias: {
 					'react/addons': `${__dirname}/node_modules/react/dist/react-with-addons.js`,
 				},
 			},
 
 			module: {
-				loaders: [
-					{ test: /\.js$/, loader: 'babel-loader', exclude: /node_modules/ },
+				rules: [
+					{
+						test: /\.js$/,
+						include: [
+							`${__dirname}/src/`,
+							`${__dirname}/node_modules/sinon/`,
+						],
+						use: {
+							loader: 'babel-loader',
+						},
+					},
 				],
 			},
 

package.json

@@ -1,11 +1,14 @@
 {
   "name": "react-responsive-breakpoints",
-  "version": "1.0.1",
+  "version": "2.0.0",
   "description": "A higher-order React component to translate CSS breakpoints into properties",
   "main": "lib/index.js",
   "files": [
     "lib/**/!(*.spec).js"
   ],
+  "engines": {
+    "node": ">=6"
+  },
   "scripts": {
     "build": "npm run clean && babel src --out-dir lib",
     "clean": "rimraf lib",
@@ -33,44 +36,45 @@
     "lodash.throttle": "^4.1.1"
   },
   "devDependencies": {
-    "ajv": "^5.5.2",
+    "airbnb-js-shims": "^2.1.0",
     "babel-cli": "^6.26.0",
+    "babel-core": "^6.0.0",
     "babel-loader": "^7.1.2",
     "babel-plugin-istanbul": "^4.1.5",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-react": "^6.24.1",
     "babel-register": "^6.26.0",
     "chai": "^4.1.2",
-    "codecov": "^3.0.0",
+    "codecov": "^3.0.1",
     "cross-env": "^5.0.5",
     "dirty-chai": "^2.0.1",
-    "enzyme": "^3.3.0",
-    "enzyme-adapter-react-16": "^1.1.0",
-    "enzyme-adapter-react-helper": "^1.2.2",
-    "eslint": "^4.6.1",
-    "eslint-config-airbnb": "^16.1.0",
-    "eslint-plugin-import": "^2.7.0",
-    "eslint-plugin-jsx-a11y": "^6.0.3",
-    "eslint-plugin-react": "^7.3.0",
-    "karma": "^2.0.0",
+    "enzyme": "^3.5.0",
+    "enzyme-adapter-react-16": "^1.3.0",
+    "enzyme-adapter-react-helper": "^1.3.0",
+    "eslint": "^5.3.0",
+    "eslint-config-airbnb": "^17.1.0",
+    "eslint-plugin-import": "^2.14.0",
+    "eslint-plugin-jsx-a11y": "^6.1.1",
+    "eslint-plugin-react": "^7.11.1",
+    "karma": "^3.0.0",
     "karma-coverage": "^1.1.1",
     "karma-mocha": "^1.3.0",
     "karma-mocha-reporter": "^2.2.4",
     "karma-sauce-launcher": "^1.2.0",
-    "karma-viewport": "^0.4.2",
-    "karma-webpack": "^2.0.4",
+    "karma-viewport": "^1.0.0",
+    "karma-webpack": "^3.0.0",
     "lodash.merge": "^4.6.0",
     "lodash.once": "^4.1.1",
-    "mocha": "^4.0.1",
-    "publish-please": "^2.3.1",
+    "mocha": "^5.0.0",
+    "publish-please": "^3.2.0",
     "react": "*",
     "react-dom": "*",
     "react-test-renderer": "*",
     "rimraf": "^2.6.2",
-    "sinon": "^4.1.3",
-    "sinon-chai": "^2.13.0",
-    "webpack": "^3.6.0"
+    "sinon": "^6.0.1",
+    "sinon-chai": "^3.2.0",
+    "webpack": "^4.16.5"
   },
   "peerDependencies": {
     "react": "*"

src/index.js

@@ -1,4 +1,4 @@
-import withBreakpointsCustom from './withBreakpointsCustom';
+const withBreakpointsCustom = require('./withBreakpointsCustom').default;
 
 module.exports = {
 	withBreakpointsCustom,

src/withBreakpointsCustom.spec.js

@@ -9,7 +9,6 @@ import sinonChai from 'sinon-chai';
 import once from 'lodash.once';
 
 import withBreakpointsCustom from './withBreakpointsCustom';
-import '../test-setup';
 
 const customStylesId = 'karma-test-styles';
 let isWindowResized = false;
@@ -56,7 +55,7 @@ const InnerComponent = () => <div />;
 const sandbox = sinon.createSandbox();
 
 afterEach((done) => {
-	sandbox.reset();
+	sandbox.resetHistory();
 
 	if (isWindowResized) {
 		viewport.reset();

test-setup.js

@@ -1,4 +1,10 @@
 /* eslint-env mocha */
 import configure from 'enzyme-adapter-react-helper';
 
+// ES2015 polyfills for Sinon and Enzyme
+import 'airbnb-js-shims/target/es2015';
+
 configure();
+
+const testsContext = require.context('./src/', true, /\.spec\.js$/);
+testsContext.keys().forEach(testsContext);