Merge b425f52 into 7abf259

app/components/ListItem/tests/index.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { render } from '@testing-library/react';
-import 'jest-dom/extend-expect';
+import '@testing-library/jest-dom/extend-expect';
 
 import ListItem from '../index';
 

internals/generators/component/test.js.hbs

@@ -11,7 +11,7 @@ import { render } from '@testing-library/react';
 {{#if wantMessages}}
 import { IntlProvider } from 'react-intl';
 {{/if}}
-// import 'jest-dom/extend-expect'; // add some helpful assertions
+// import '@testing-library/jest-dom/extend-expect'; // add some helpful assertions
 
 import {{ properCase name }} from '../index';
 {{#if wantMessages}}

internals/generators/container/test.js.hbs

@@ -13,7 +13,7 @@ import { IntlProvider } from 'react-intl';
 {{/if}}
 import { Provider } from 'react-redux';
 import { browserHistory } from 'react-router-dom';
-// import 'jest-dom/extend-expect'; // Add some helpful assertions
+// import '@testing-library/jest-dom/extend-expect'; // Add some helpful assertions
 
 import {{ properCase name }} from '../index';
 {{#if wantMessages}}

internals/webpack/webpack.base.babel.js

@@ -52,7 +52,6 @@ module.exports = options => ({
             options: {
               // Inline files smaller than 10 kB
               limit: 10 * 1024,
-              noquotes: true,
             },
           },
         ],

jest.config.js

@@ -24,7 +24,7 @@ module.exports = {
   setupFilesAfterEnv: [
     '<rootDir>/internals/testing/test-bundler.js',
     '@testing-library/react/cleanup-after-each',
-    'jest-dom/extend-expect',
+    '@testing-library/jest-dom/extend-expect',
   ],
   testRegex: 'tests/.*\\.test\\.js$',
   snapshotSerializers: [],

package.json

@@ -45,7 +45,7 @@
     "prettify": "prettier --write"
   },
   "lint-staged": {
-    "*.js": [
+    "*.{js,jsx}": [
       "npm run lint:eslint:fix",
       "git add --force"
     ],
@@ -61,7 +61,7 @@
   "dependencies": {
     "chalk": "2.4.2",
     "compression": "1.7.4",
-    "connected-react-router": "6.4.0",
+    "connected-react-router": "6.5.0",
     "cross-env": "5.2.0",
     "express": "4.17.1",
     "fontfaceobserver": "2.1.0",
@@ -80,45 +80,46 @@
     "react-intl": "2.9.0",
     "react-redux": "7.1.0",
     "react-router-dom": "5.0.1",
-    "redux": "4.0.1",
-    "redux-saga": "1.0.4",
+    "redux": "4.0.2",
+    "redux-saga": "1.0.5",
     "reselect": "4.0.0",
     "sanitize.css": "10.0.0",
     "styled-components": "4.3.2"
   },
   "devDependencies": {
-    "@babel/cli": "7.4.4",
-    "@babel/core": "7.4.5",
-    "@babel/plugin-proposal-class-properties": "7.4.4",
+    "@babel/cli": "7.5.0",
+    "@babel/core": "7.5.0",
+    "@babel/plugin-proposal-class-properties": "7.5.0",
     "@babel/plugin-syntax-dynamic-import": "7.2.0",
-    "@babel/plugin-transform-modules-commonjs": "7.4.4",
-    "@babel/plugin-transform-react-constant-elements": "7.2.0",
+    "@babel/plugin-transform-modules-commonjs": "7.5.0",
+    "@babel/plugin-transform-react-constant-elements": "7.5.0",
     "@babel/plugin-transform-react-inline-elements": "7.2.0",
-    "@babel/preset-env": "7.4.5",
+    "@babel/preset-env": "7.5.2",
     "@babel/preset-react": "7.0.0",
     "@babel/register": "7.4.4",
+    "@testing-library/jest-dom": "4.0.0",
     "@testing-library/react": "8.0.4",
     "add-asset-html-webpack-plugin": "3.1.3",
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "10.0.2",
     "babel-loader": "8.0.6",
     "babel-plugin-dynamic-import-node": "2.3.0",
     "babel-plugin-lodash": "3.3.4",
-    "babel-plugin-react-intl": "3.3.3",
-    "babel-plugin-styled-components": "1.10.4",
+    "babel-plugin-react-intl": "4.0.0",
+    "babel-plugin-styled-components": "1.10.6",
     "babel-plugin-transform-react-remove-prop-types": "0.4.24",
     "circular-dependency-plugin": "5.0.2",
     "compare-versions": "3.5.0",
     "compression-webpack-plugin": "3.0.0",
     "coveralls": "3.0.4",
     "css-loader": "3.0.0",
     "eslint": "6.0.1",
-    "eslint-config-airbnb": "17.1.0",
-    "eslint-config-airbnb-base": "13.1.0",
+    "eslint-config-airbnb": "17.1.1",
+    "eslint-config-airbnb-base": "13.2.0",
     "eslint-config-prettier": "6.0.0",
     "eslint-import-resolver-webpack": "0.11.1",
     "eslint-plugin-import": "2.18.0",
-    "eslint-plugin-jsx-a11y": "6.2.1",
+    "eslint-plugin-jsx-a11y": "6.2.3",
     "eslint-plugin-prettier": "3.1.0",
     "eslint-plugin-react": "7.14.2",
     "eslint-plugin-react-hooks": "1.6.1",
@@ -129,10 +130,9 @@
     "image-webpack-loader": "5.0.0",
     "imports-loader": "0.8.0",
     "jest-cli": "24.8.0",
-    "jest-dom": "3.5.0",
     "jest-styled-components": "6.3.3",
     "jest-watch-typeahead": "0.3.1",
-    "lint-staged": "8.2.1",
+    "lint-staged": "9.1.0",
     "ngrok": "3.2.1",
     "node-plop": "0.19.0",
     "null-loader": "3.0.0",
@@ -149,10 +149,10 @@
     "stylelint-config-recommended": "2.2.0",
     "stylelint-config-styled-components": "0.1.1",
     "stylelint-processor-styled-components": "1.8.0",
-    "svg-url-loader": "2.3.3",
+    "svg-url-loader": "3.0.0",
     "terser-webpack-plugin": "1.3.0",
     "url-loader": "2.0.1",
-    "webpack": "4.35.0",
+    "webpack": "4.35.3",
     "webpack-cli": "3.3.5",
     "webpack-dev-middleware": "3.7.0",
     "webpack-hot-middleware": "2.25.0",