Merge branch 'master' into rework-moves

.eslintrc

@@ -10,8 +10,6 @@
     "plugin:react/recommended",
     "plugin:@typescript-eslint/recommended",
     "prettier",
-    "prettier/react",
-    "prettier/@typescript-eslint",
     "plugin:array-func/all"
   ],
   "globals": {

babel.config.js

@@ -42,7 +42,7 @@ module.exports = function (api) {
   } else {
     // In dev, compile TS with babel
     plugins.push(
-      'react-hot-loader/babel',
+      'react-refresh/babel',
       ['@babel/proposal-class-properties', { loose: true }],
       '@babel/proposal-object-rest-spread',
       [

config/webpack.js

@@ -21,6 +21,7 @@ const svgToMiniDataURI = require('mini-svg-data-uri');
 const marked = require('marked');
 const renderer = new marked.Renderer();
 const _ = require('lodash');
+const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
 
 const Visualizer = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 
@@ -467,11 +468,7 @@ module.exports = (env) => {
       })
     );
 
-    config.module.rules.push({
-      test: /\.jsx?$/,
-      include: /node_modules/,
-      use: ['react-hot-loader/webpack'],
-    });
+    config.plugins.push(new ReactRefreshWebpackPlugin({ overlay: false }));
   } else {
     // env.beta and env.release
     config.plugins.push(

docs/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 * You can once again select how much of a stackable item to move, by editing the amount in the move popup before clicking a move button. Holding shift during drag no longer allows you to select the amount - you must do it from the buttons in the popup.
 
+## 6.54.0 <span class="changelog-date">(2021-02-28)</span>
+
 ## 6.53.0 <span class="changelog-date">(2021-02-21)</span>
 
 * Pulling from postmaster, applying loadouts, moving searches, moving individual items, and more are now cancel-able. Click the "cancel" button in the notification to prevent any further actions.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dim",
-  "version": "6.53.0",
+  "version": "6.54.0",
   "description": "An item manager for Destiny.",
   "main": "app/index.html",
   "scripts": {
@@ -60,6 +60,7 @@
     "@babel/preset-env": "^7.3.1",
     "@babel/preset-react": "^7.0.0",
     "@packtracker/webpack-plugin": "^2.0.0",
+    "@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
     "@sentry/cli": "^1.30.4",
     "@testing-library/react": "^11.0.2",
     "@types/circuit-breaker-js": "^0.0.1",
@@ -98,7 +99,7 @@
     "css-loader": "^5.0.0",
     "css-modules-typescript-loader": "^4.0.0",
     "eslint": "^7.0.0",
-    "eslint-config-prettier": "^7.1.0",
+    "eslint-config-prettier": "^8.1.0",
     "eslint-plugin-array-func": "^3.1.7",
     "eslint-plugin-jsx-a11y": "^6.3.1",
     "eslint-plugin-lodash": "^7.1.0",
@@ -113,7 +114,7 @@
     "grunt": "^1.0.2",
     "grunt-cli": "^1.2.0",
     "grunt-rsync": "^3.0.0",
-    "html-loader": "^1.0.0",
+    "html-loader": "^2.1.0",
     "html-webpack-plugin": "^5.0.0",
     "husky": "^4.0.6",
     "i18next-scanner": "delphiactual/i18next-scanner",
@@ -134,6 +135,7 @@
     "prettier-plugin-organize-imports": "^1.1.1",
     "pretty-quick": "^3.0.0",
     "raw-loader": "^4.0.0",
+    "react-refresh": "^0.9.0",
     "react-test-renderer": "^17.0.1",
     "sass-loader": "^11.0.1",
     "source-map-loader": "^2.0.1",
@@ -193,7 +195,6 @@
     "react-dom": "^17.0.1",
     "react-dropzone": "^11.0.1",
     "react-hammerjs": "^1.0.1",
-    "react-hot-loader": "^4.3.3",
     "react-redux": "^7.0.0-beta.1",
     "react-router": "^5.1.2",
     "react-router-dom": "^5.1.2",

src/app/Root.tsx

@@ -4,7 +4,6 @@ import React from 'react';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 import { DndProvider } from 'react-dnd-multi-backend';
 import { TouchBackend } from 'react-dnd-touch-backend';
-import { hot } from 'react-hot-loader/root';
 import { Provider } from 'react-redux';
 import { BrowserRouter as Router } from 'react-router-dom';
 import App from './App';
@@ -31,4 +30,4 @@ function Root() {
   );
 }
 
-export default hot(Root);
+export default Root;

src/app/dim-ui/RichDestinyText.tsx

@@ -1,4 +1,4 @@
-import rT from 'data/d2/objective-richTexts.ts';
+import rT from 'data/d2/objective-richTexts';
 import dmgStasis from 'destiny-icons/beyond_light/stasis.svg';
 import overload from 'destiny-icons/breakers/overload.svg';
 import pierce from 'destiny-icons/breakers/pierce.svg';

src/app/item-popup/SocketDetails.tsx

@@ -243,8 +243,8 @@ function SocketDetails({
   const modListRef = useRef<HTMLDivElement>(null);
   useEffect(() => {
     if (modListRef.current) {
-      const firstElement = modListRef.current.querySelector("[tabIndex='0']")! as HTMLDivElement;
-      firstElement?.focus();
+      const firstElement = modListRef.current.querySelector("[tabIndex='0']")!;
+      (firstElement as HTMLInputElement)?.focus();
     }
   }, []);
 

src/app/search/SearchBar.m.scss

@@ -99,7 +99,6 @@
   font-size: 10px !important;
   margin-top: 4px;
   color: #999;
-  color: #999;
   padding: 0 2px;
   cursor: pointer;
   visibility: hidden;