Bump deps and fix webpack dev mode

package.json

@@ -29,7 +29,7 @@
     "e2e": "yarn --cwd ./tests-e2e test",
     "test": "jest",
     "test:watch": "yarn test --watch",
-    "lint": "eslint --ext js,ts,tsx --fix --quiet .",
+    "lint": "eslint --ext js,ts,tsx --fix .",
     "lint:check": "eslint --ext js,ts,tsx --quiet .",
     "prettier": "prettier --write \"{packages/**/*,tests-e2e/**/*,jest/**/*,config/**/*,*}.{js,ts,tsx,json,md,scss,css}\"",
     "prettier:check": "prettier --check \"{packages/**/*,tests-e2e/**/*,jest/**/*,config/**/*,*}.{js,ts,tsx,json,md,scss,css}\"",
@@ -43,7 +43,7 @@
     "build:install": "yarn install",
     "build:webpack": "NODE_ENV=production webpack --colors -p --bail",
     "build:quiet": "yarn run clean && yarn run build:webpack --quiet",
-    "build:dll": "node ./packages/scripts/build-dll.js",
+    "build:dll": "babel-node --extensions '.ts,.d.ts' ./packages/scripts/build-dll.ts",
     "build:serve": "http-server --proxy https://dev.account.ely.by ./build",
     "sb": "APP_ENV=storybook start-storybook -p 9009 --ci",
     "sb:build": "APP_ENV=storybook build-storybook"
@@ -56,12 +56,10 @@
   },
   "lint-staged": {
     "*.{json,scss,css,md}": [
-      "prettier --write",
+      "prettier --write"
-      "git add"
     ],
     "*.{js,ts,tsx}": [
-      "eslint --fix --quiet",
+      "eslint --fix"
-      "git add"
     ]
   },
   "jest": {
@@ -87,13 +85,11 @@
       "^.+\\.[tj]sx?$": "babel-jest"
     }
   },
-  "resolutions": {
-    "@types/node": "^12.0.0"
-  },
   "dependencies": {
-    "react": "^16.12.0",
+    "react": "^16.13.1",
-    "react-dom": "^16.12.0",
+    "react-dom": "^16.13.1",
     "react-intl": "^3.11.0",
+    "react-hot-loader": "^4.12.18",
     "regenerator-runtime": "^0.13.3"
   },
   "devDependencies": {
@@ -119,61 +115,61 @@
     "@babel/preset-react": "^7.8.3",
     "@babel/preset-typescript": "^7.8.3",
     "@babel/runtime-corejs3": "^7.8.3",
-    "@storybook/addon-actions": "^5.3.4",
+    "@storybook/addon-actions": "^5.3.18",
-    "@storybook/addon-links": "^5.3.4",
+    "@storybook/addon-links": "^5.3.18",
-    "@storybook/addon-viewport": "^5.3.4",
+    "@storybook/addon-viewport": "^5.3.18",
-    "@storybook/addons": "^5.3.4",
+    "@storybook/addons": "^5.3.18",
-    "@storybook/react": "^5.3.4",
+    "@storybook/react": "^5.3.18",
-    "@types/jest": "^24.9.0",
+    "@types/jest": "^25.2.3",
-    "@types/sinon": "^7.5.1",
+    "@types/sinon": "^9.0.3",
-    "@typescript-eslint/eslint-plugin": "^2.16.0",
+    "@typescript-eslint/eslint-plugin": "^2.34.0",
-    "@typescript-eslint/parser": "^2.16.0",
+    "@typescript-eslint/parser": "^2.34.0",
     "babel-loader": "^8.0.0",
     "babel-plugin-react-intl": "^5.1.16",
-    "core-js": "3.6.4",
+    "core-js": "3.6.5",
     "csp-webpack-plugin": "^2.0.2",
-    "css-loader": "^3.4.2",
+    "css-loader": "^3.5.3",
     "cssnano": "^4.1.10",
     "dotenv": "^8.2.0",
     "eager-imports-webpack-plugin": "^1.0.0",
-    "eslint": "^6.8.0",
+    "eslint": "^7.0.0",
-    "eslint-config-prettier": "^6.9.0",
+    "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-jsdoc": "^20.3.1",
+    "eslint-plugin-jsdoc": "^25.4.2",
-    "eslint-plugin-prettier": "^3.1.2",
+    "eslint-plugin-prettier": "^3.1.3",
-    "eslint-plugin-react": "^7.18.0",
+    "eslint-plugin-react": "^7.20.0",
     "exports-loader": "^0.7.0",
-    "file-loader": "^5.0.2",
+    "file-loader": "^6.0.0",
-    "html-loader": "^0.5.5",
+    "html-loader": "^1.1.0",
-    "html-webpack-plugin": "^3.2.0",
+    "html-webpack-plugin": "^4.3.0",
-    "husky": "^4.0.10",
+    "husky": "^4.2.5",
     "identity-obj-proxy": "^3.0.0",
     "imports-loader": "^0.8.0",
-    "jest": "^24.9.0",
+    "jest": "^26.0.1",
-    "jest-watch-typeahead": "^0.4.2",
+    "jest-watch-typeahead": "^0.6.0",
     "json-loader": "^0.5.4",
-    "lint-staged": "^9.5.0",
+    "lint-staged": "^10.2.4",
-    "loader-utils": "^1.0.0",
+    "loader-utils": "^2.0.0",
     "mini-css-extract-plugin": "^0.9.0",
-    "node-sass": "^4.13.0",
+    "node-sass": "^4.14.1",
     "postcss-import": "^12.0.1",
     "postcss-loader": "^3.0.0",
-    "postcss-scss": "^2.0.0",
+    "postcss-scss": "^2.1.1",
     "prettier": "^1.19.1",
-    "raw-loader": "^4.0.0",
+    "raw-loader": "^4.0.1",
-    "react-test-renderer": "^16.12.0",
+    "react-test-renderer": "^16.13.1",
     "sass-loader": "^8.0.2",
-    "sinon": "^8.0.4",
+    "sinon": "^9.0.2",
-    "sitemap-webpack-plugin": "^0.6.0",
+    "sitemap-webpack-plugin": "^0.8.0",
-    "speed-measure-webpack-plugin": "^1.3.1",
+    "speed-measure-webpack-plugin": "^1.3.3",
     "storybook-addon-intl": "^2.4.1",
-    "style-loader": "~1.1.2",
+    "style-loader": "~1.2.1",
     "typescript": "^3.7.4",
-    "unexpected": "^11.12.1",
+    "unexpected": "^11.14.0",
     "unexpected-sinon": "^10.5.1",
-    "url-loader": "^3.0.0",
+    "url-loader": "^4.1.0",
-    "wait-on": "^3.3.0",
+    "wait-on": "^5.0.0",
     "webpack": "^4.41.5",
-    "webpack-bundle-analyzer": "^3.6.0",
+    "webpack-bundle-analyzer": "^3.8.0",
     "webpack-cli": "^3.3.10",
     "webpack-dev-server": "^3.10.1",
     "webpackbar": "^4.0.0"

packages/app/index.ejs

@@ -14,6 +14,8 @@
         <link rel="shortcut icon" href="<%= htmlWebpackPlugin.files.favicon %>">
     <% } %>
 
+    <%= htmlWebpackPlugin.tags.headTags %>
+
     <script nonce="edge-must-die">
         if (/Edge\/(must die)?/.test(navigator.userAgent)) {
             // Edge has a broken fetch implementation, so forcing the polyfill
@@ -31,10 +33,6 @@
 
 <%= require('app/first-render').default %>
 
-<% for (var css in htmlWebpackPlugin.files.css) { %>
-    <link href="<%= htmlWebpackPlugin.files.css[css] %>" rel="stylesheet">
-<% } %>
-
 <% if (htmlWebpackPlugin.options.scripts) {
     htmlWebpackPlugin.options.scripts.forEach(function(scriptSrc) {
     %>
@@ -43,8 +41,6 @@
     });
 } %>
 
-<% for (var chunk in htmlWebpackPlugin.files.chunks) { %>
+<%= htmlWebpackPlugin.tags.bodyTags %>
-    <script src="<%= htmlWebpackPlugin.files.chunks[chunk].entry %>"></script>
-<% } %>
 </body>
 </html>

packages/app/package.json

@@ -2,50 +2,49 @@
   "name": "app",
   "version": "1.0.0",
   "dependencies": {
-    "@formatjs/intl-pluralrules": "^1.5.0",
+    "@formatjs/intl-pluralrules": "^1.5.9",
-    "@formatjs/intl-relativetimeformat": "^4.5.7",
+    "@formatjs/intl-relativetimeformat": "^4.5.16",
-    "@hot-loader/react-dom": "^16.11.0",
+    "@hot-loader/react-dom": "^16.13.0",
-    "@types/react": "^16.9.17",
+    "@types/react": "^16.9.35",
-    "@types/react-redux": "^7.1.6",
+    "@types/react-redux": "^7.1.9",
-    "@types/react-router-dom": "^5.1.3",
+    "@types/react-router-dom": "^5.1.5",
-    "clsx": "^1.0.4",
+    "clsx": "^1.1.0",
-    "copy-to-clipboard": "^3.0.8",
+    "copy-to-clipboard": "^3.3.1",
     "debounce": "^1.0.0",
-    "flag-icon-css": "^3.4.5",
+    "flag-icon-css": "^3.4.6",
     "intl": "^1.2.5",
     "promise.prototype.finally": "3.1.2",
     "prop-types": "^15.6.2",
     "raf": "^3.4.1",
     "raven-js": "^3.27.0",
-    "react": "^16.12.0",
+    "react": "^16.13.1",
-    "react-dom": "^16.12.0",
+    "react-dom": "^16.13.1",
-    "react-helmet-async": "^1.0.4",
+    "react-helmet-async": "^1.0.6",
-    "react-hot-loader": "^4.12.18",
     "react-intl": "^3.11.0",
     "react-motion": "^0.5.0",
-    "react-redux": "^7.1.3",
+    "react-redux": "^7.2.0",
-    "react-router-dom": "^5.1.2",
+    "react-router-dom": "^5.2.0",
     "react-textarea-autosize": "^7.1.2",
-    "react-transition-group": "^4.3.0",
+    "react-transition-group": "^4.4.1",
     "redux": "^4.0.5",
     "redux-localstorage": "^0.4.1",
     "redux-thunk": "^2.0.0",
-    "url-search-params-polyfill": "^7.0.1",
+    "url-search-params-polyfill": "^8.1.0",
     "webfontloader": "^1.6.26",
     "whatwg-fetch": "^3.0.0"
   },
   "devDependencies": {
     "@types/debounce": "^1.2.0",
-    "@types/enzyme": "^3.8.0",
+    "@types/enzyme": "^3.10.5",
     "@types/intl": "^1.2.0",
-    "@types/promise.prototype.finally": "^2.0.3",
+    "@types/promise.prototype.finally": "^2.0.4",
     "@types/raf": "^3.4.0",
-    "@types/react-dom": "^16.9.4",
+    "@types/react-dom": "^16.9.8",
-    "@types/react-helmet": "^5.0.15",
+    "@types/react-helmet": "^6.0.0",
     "@types/react-motion": "^0.0.29",
-    "@types/react-transition-group": "^4.2.3",
+    "@types/react-transition-group": "^4.2.4",
-    "@types/webfontloader": "^1.6.29",
+    "@types/webfontloader": "^1.6.30",
-    "@types/webpack-env": "^1.15.0",
+    "@types/webpack-env": "^1.15.2",
     "enzyme": "^3.8.0",
     "enzyme-adapter-react-16": "^1.15.1"
   }

packages/app/services/localStorage.ts

@@ -18,15 +18,20 @@ export function hasStorage(): boolean {
 }
 
 class DummyStorage implements Storage {
-  [name: string]: any;
+  // FIXME: we can't use this declaration because it breaks react-hot-loader/babel
+  // [key: string]: any;
 
-  readonly length: number;
+  get length() {
+    return Object.keys(this).length;
+  }
 
   getItem(key: string): string | null {
+    // @ts-ignore
     return this[key] || null;
   }
 
   setItem(key: string, value: string): void {
+    // @ts-ignore
     this[key] = value;
   }
 

packages/scripts/package.json

@@ -11,18 +11,18 @@
   "license": "ISC",
   "dependencies": {
     "@babel/node": "^7.8.3",
-    "@types/mkdirp": "^0.5.2",
+    "@types/mkdirp": "^1.0.0",
     "@types/progress": "^2.0.3",
-    "chalk": "^3.0.0",
+    "chalk": "^4.0.0",
     "crowdin-api": "^4.0.0",
     "glob": "^7.1.6",
-    "iso-639-1": "^2.1.0",
+    "iso-639-1": "^2.1.3",
-    "mkdirp": "^0.5.1",
+    "mkdirp": "^1.0.4",
     "multi-progress": "^2.0.0",
     "prompt": "^1.0.0",
     "utility-types": "^3.10.0"
   },
   "devDependencies": {
-    "@types/webpack": "^4.41.12"
+    "@types/webpack": "^4.41.13"
   }
 }

packages/webpack-utils/package.json

@@ -6,7 +6,7 @@
   "author": "",
   "dependencies": {
     "glob": "^7.1.6",
-    "loader-utils": "^1.0.0",
+    "loader-utils": "^2.0.0",
     "webfonts-generator": "0.3.5"
   }
 }

tests-e2e/cypress/plugins/index.js

@@ -19,7 +19,7 @@
 // };
 const wp = require('@cypress/webpack-preprocessor');
 
-// for some reason loader can not locate babel.config. So we
+// for some reason loader can not locate babel.config. So we load it manually
 const config = require('../../../babel.config');
 
 module.exports = on => {

tests-e2e/package.json

@@ -12,7 +12,7 @@
   "license": "UNLICENSED",
   "private": true,
   "dependencies": {
-    "@cypress/webpack-preprocessor": "^4.1.1",
+    "@cypress/webpack-preprocessor": "^5.4.1",
-    "cypress": "^3.8.2"
+    "cypress": "^4.5.0"
   }
 }