diff --git a/client/package.json b/client/package.json index 08181f3e..5a073a54 100644 --- a/client/package.json +++ b/client/package.json @@ -8,14 +8,14 @@ "axios": "^0.18.0", "cross-env": "^5.1.3", "glamor": "^2.20.40", - "glamorous": "^4.11.6", + "glamorous": "^4.12.3", "history": "^4.7.2", "prop-types": "^15.6.0", - "query-string": "^5.0.1", - "react": "^16.2.0", - "react-dom": "^16.2.0", + "query-string": "^6.0.0", + "react": "^16.3.1", + "react-dom": "^16.3.1", "react-router-dom": "^4.2.2", - "serve": "^6.4.11" + "serve": "^6.5.5" }, "scripts": { "start": "cross-env serve -s build --port $CLIENT_PORT", @@ -29,9 +29,10 @@ ] }, "devDependencies": { + "jest-dom": "^1.0.0", "jest-glamor-react": "^4.2.0", - "react-scripts": "^2.0.0-next.47d2d941", - "react-testing-library": "^1.9.1", + "react-scripts": "2.0.0-next.b2fd8db8", + "react-testing-library": "^2.1.1", "til-shared": "file:../shared" }, "browserslist": { diff --git a/client/test/til-client-test-utils.js b/client/test/til-client-test-utils.js index ff175888..459d2d16 100644 --- a/client/test/til-client-test-utils.js +++ b/client/test/til-client-test-utils.js @@ -2,6 +2,7 @@ import React from 'react' import {Router} from 'react-router-dom' import {render, wait, Simulate} from 'react-testing-library' import {createMemoryHistory} from 'history' +import 'jest-dom/extend-expect' import * as generate from 'til-shared/generate' function renderWithRouter(ui, {route = '/', ...renderOptions} = {}) { diff --git a/other/configuration/calculator.solution/package.json b/other/configuration/calculator.solution/package.json index 6439a395..65824f04 100644 --- a/other/configuration/calculator.solution/package.json +++ b/other/configuration/calculator.solution/package.json @@ -27,21 +27,21 @@ "babel-plugin-transform-object-rest-spread": "^6.26.0", "babel-preset-env": "^1.6.1", "babel-preset-react": "^6.24.1", - "css-loader": "^0.28.10", + "css-loader": "^0.28.11", "cypress": "^2.1.0", "file-loader": "^1.1.11", "identity-obj-proxy": "^3.0.0", - "jest": "^22.4.2", + "jest": "^22.4.3", "npm-run-all": "^4.1.2", - "serve": "^6.5.3", - "style-loader": "^0.20.2", - "webpack": "^4.1.1", - "webpack-cli": "^2.0.10", - "webpack-dev-server": "^3.1.0" + "serve": "^6.5.5", + "style-loader": "^0.20.3", + "webpack": "^4.5.0", + "webpack-cli": "^2.0.14", + "webpack-dev-server": "^3.1.3" }, "dependencies": { - "react": "^16.2.0", - "react-dom": "^16.2.0", + "react": "^16.3.1", + "react-dom": "^16.3.1", "react-loadable": "^5.3.1", "react-point": "^3.0.1" }, diff --git a/other/configuration/calculator/package.json b/other/configuration/calculator/package.json index e83ac997..3f053a66 100644 --- a/other/configuration/calculator/package.json +++ b/other/configuration/calculator/package.json @@ -18,17 +18,17 @@ "babel-plugin-transform-object-rest-spread": "^6.26.0", "babel-preset-env": "^1.6.1", "babel-preset-react": "^6.24.1", - "css-loader": "^0.28.10", + "css-loader": "^0.28.11", "file-loader": "^1.1.11", - "serve": "^6.5.3", - "style-loader": "^0.20.2", - "webpack": "^4.1.1", - "webpack-cli": "^2.0.10", - "webpack-dev-server": "^3.1.0" + "serve": "^6.5.5", + "style-loader": "^0.20.3", + "webpack": "^4.5.0", + "webpack-cli": "^2.0.14", + "webpack-dev-server": "^3.1.3" }, "dependencies": { - "react": "^16.2.0", - "react-dom": "^16.2.0", + "react": "^16.3.1", + "react-dom": "^16.3.1", "react-loadable": "^5.3.1", "react-point": "^3.0.1" }, diff --git a/package.json b/package.json index 2b8f6e92..fe969e42 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "lint": "eslint . --cache --cache-location node_modules/.cache/eslint", "validate": "concurrently --names \"lint,test:run,test:e2e\" --prefix \"[{name}]\" --prefix-colors \"bgGreen.reset.bold,bgBlue.reset.bold,bgRed.reset.bold\" \"npm run lint --silent\" \"npm run test:run --silent\" \"npm run test:e2e:run --silent\"", "precommit": "lint-staged && npm run --silent validate", - "clean": "rimraf node_modules ./shared/node_modules ./client/node_modules ./server/node_modules", + "clean": "rimraf node_modules ./shared/node_modules ./client/node_modules ./server/node_modules ./other/configuration/calculator/node_modules ./other/configuration/calculator.solution/node_modules", "setup": "node ./scripts/verify && node ./scripts/install && npm run validate && node ./scripts/autofill-feedback-email.js" }, "devDependencies": { @@ -53,18 +53,18 @@ "faker": "^4.1.0", "fs-extra": "^5.0.0", "husky": "^0.14.3", - "inquirer": "^5.1.0", + "inquirer": "^5.2.0", "is-ci": "^1.1.0", "jest": "^22.1.2", - "lint-staged": "^6.1.1", + "lint-staged": "^7.0.4", "lodash.omit": "^4.5.0", "node": "^8.9.4", "npm-run-all": "^4.1.2", - "prettier": "^1.10.2", - "react": "^16.2.0", - "react-dom": "^16.2.0", - "react-test-renderer": "^16.2.0", - "replace-in-file": "^3.1.0", + "prettier": "^1.12.0", + "react": "^16.3.1", + "react-dom": "^16.3.1", + "react-test-renderer": "^16.3.1", + "replace-in-file": "^3.4.0", "rimraf": "^2.6.2" }, "lint-staged": { diff --git a/server/package.json b/server/package.json index 800374a5..0fe444d9 100644 --- a/server/package.json +++ b/server/package.json @@ -22,7 +22,7 @@ "express": "^4.16.2", "express-async-errors": "^2.1.0", "express-jwt": "^5.3.0", - "jsonwebtoken": "^8.1.1", + "jsonwebtoken": "^8.2.1", "lodash": "^4.17.4", "loglevel": "^1.6.1", "passport": "^0.4.0", @@ -54,6 +54,6 @@ "babel-plugin-transform-object-rest-spread": "^6.26.0", "babel-preset-env": "^1.6.1", "babel-register": "^6.26.0", - "nodemon": "^1.15.1" + "nodemon": "^1.17.3" } } diff --git a/shared/package.json b/shared/package.json index 325d3417..e02372e2 100644 --- a/shared/package.json +++ b/shared/package.json @@ -5,7 +5,7 @@ "main": "./index", "dependencies": { "faker": "^4.1.0", - "jsonwebtoken": "^8.1.1", + "jsonwebtoken": "^8.2.1", "lodash.omit": "^4.5.0" } }