From aa548d0ada7b8b7d02ea243282fd67772398f2e7 Mon Sep 17 00:00:00 2001 From: Jack Kavanagh Date: Tue, 8 Mar 2022 22:15:55 +0100 Subject: [PATCH] remove hot loader (#4553) --- packages/insomnia-app/app/global.d.ts | 5 - .../insomnia-app/app/ui/css/layout/base.less | 16 -- packages/insomnia-app/app/ui/index.tsx | 4 +- packages/insomnia-app/package-lock.json | 139 ------------------ packages/insomnia-app/package.json | 3 - .../webpack/webpack.config.base.ts | 4 - 6 files changed, 1 insertion(+), 170 deletions(-) diff --git a/packages/insomnia-app/app/global.d.ts b/packages/insomnia-app/app/global.d.ts index c4629bab2d..4a28b8439a 100644 --- a/packages/insomnia-app/app/global.d.ts +++ b/packages/insomnia-app/app/global.d.ts @@ -54,8 +54,3 @@ interface Window { showItemInFolder: (fullPath: string) => void; }; } - -// needed for @hot-loader/react-dom in order for TypeScript to build -declare const __REACT_DEVTOOLS_GLOBAL_HOOK__: undefined | { - checkDCE: Function; -}; diff --git a/packages/insomnia-app/app/ui/css/layout/base.less b/packages/insomnia-app/app/ui/css/layout/base.less index 0b535337ec..eea9ad37b0 100644 --- a/packages/insomnia-app/app/ui/css/layout/base.less +++ b/packages/insomnia-app/app/ui/css/layout/base.less @@ -835,19 +835,3 @@ strong { text-decoration: underline; } -.react-hot-loader-error-overlay > div { - position: fixed; - left: 0; - top: 0; - bottom: 0; - right: 0; - z-index: 9999999; - max-height: none !important; - - button { - border: 2px solid black; - margin: 0.2em; - font-size: 0.8em; - padding: 0.2em 0.5em; - } -} diff --git a/packages/insomnia-app/app/ui/index.tsx b/packages/insomnia-app/app/ui/index.tsx index d6a366df5d..b1cb144df3 100644 --- a/packages/insomnia-app/app/ui/index.tsx +++ b/packages/insomnia-app/app/ui/index.tsx @@ -2,7 +2,6 @@ import { ipcRenderer } from 'electron'; import React from 'react'; import ReactDOM from 'react-dom'; -import { hot } from 'react-hot-loader'; import { Provider } from 'react-redux'; import * as styledComponents from 'styled-components'; @@ -39,10 +38,9 @@ document.title = getAppLongName(); const store = await initStore(); const render = App => { - const TheHottestApp = hot(module)(App); ReactDOM.render( - + , document.getElementById('root'), ); diff --git a/packages/insomnia-app/package-lock.json b/packages/insomnia-app/package-lock.json index 5c29709b7f..4a4b8dd712 100644 --- a/packages/insomnia-app/package-lock.json +++ b/packages/insomnia-app/package-lock.json @@ -11,7 +11,6 @@ "dependencies": { "@getinsomnia/node-libcurl": "2.3.4-3", "@hapi/hawk": "^8.0.0", - "@hot-loader/react-dom": "^16.8.6", "@stoplight/spectral": "^5.9.0", "analytics-node": "^6.0.0", "aws4": "^1.9.0", @@ -153,7 +152,6 @@ "license-checker": "^25.0.1", "ncp": "^2.0.0", "prompt-run": "^1.4.5", - "react-hot-loader": "^4.13.0", "redux-mock-store": "^1.5.4", "source-map-loader": "^1.0.0", "style-loader": "^0.23.1", @@ -5314,20 +5312,6 @@ "@hapi/topo": "^5.0.0" } }, - "node_modules/@hot-loader/react-dom": { - "version": "16.13.0", - "resolved": "https://registry.npmjs.org/@hot-loader/react-dom/-/react-dom-16.13.0.tgz", - "integrity": "sha512-lJZrmkucz2MrQJTQtJobx5MICXcfQvKihszqv655p557HPi0hMOWxrNpiHv3DWD8ugNWjtWcVWqRnFvwsHq1mQ==", - "dependencies": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1", - "prop-types": "^15.6.2", - "scheduler": "^0.19.0" - }, - "peerDependencies": { - "react": "^16.0.0" - } - }, "node_modules/@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", @@ -13525,12 +13509,6 @@ "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz", "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==" }, - "node_modules/dom-walk": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz", - "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==", - "dev": true - }, "node_modules/domain-browser": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz", @@ -16336,16 +16314,6 @@ "node": ">= 6" } }, - "node_modules/global": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz", - "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==", - "dev": true, - "dependencies": { - "min-document": "^2.19.0", - "process": "^0.11.10" - } - }, "node_modules/global-agent": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz", @@ -22111,15 +22079,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/min-document": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz", - "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=", - "dev": true, - "dependencies": { - "dom-walk": "^0.1.0" - } - }, "node_modules/min-indent": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", @@ -24602,44 +24561,6 @@ "react": "^16.8.0 || ^17" } }, - "node_modules/react-hot-loader": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.13.0.tgz", - "integrity": "sha512-JrLlvUPqh6wIkrK2hZDfOyq/Uh/WeVEr8nc7hkn2/3Ul0sx1Kr5y4kOGNacNRoj7RhwLNcQ3Udf1KJXrqc0ZtA==", - "dev": true, - "dependencies": { - "fast-levenshtein": "^2.0.6", - "global": "^4.3.0", - "hoist-non-react-statics": "^3.3.0", - "loader-utils": "^1.1.0", - "prop-types": "^15.6.1", - "react-lifecycles-compat": "^3.0.4", - "shallowequal": "^1.1.0", - "source-map": "^0.7.3" - }, - "engines": { - "node": ">= 6" - }, - "peerDependencies": { - "@types/react": "^15.0.0 || ^16.0.0 || ^17.0.0 ", - "react": "^15.0.0 || ^16.0.0 || ^17.0.0 ", - "react-dom": "^15.0.0 || ^16.0.0 || ^17.0.0 " - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/react-hot-loader/node_modules/source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, "node_modules/react-immutable-proptypes": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/react-immutable-proptypes/-/react-immutable-proptypes-2.1.0.tgz", @@ -35725,17 +35646,6 @@ "@hapi/topo": "^5.0.0" } }, - "@hot-loader/react-dom": { - "version": "16.13.0", - "resolved": "https://registry.npmjs.org/@hot-loader/react-dom/-/react-dom-16.13.0.tgz", - "integrity": "sha512-lJZrmkucz2MrQJTQtJobx5MICXcfQvKihszqv655p557HPi0hMOWxrNpiHv3DWD8ugNWjtWcVWqRnFvwsHq1mQ==", - "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1", - "prop-types": "^15.6.2", - "scheduler": "^0.19.0" - } - }, "@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", @@ -42519,12 +42429,6 @@ } } }, - "dom-walk": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz", - "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==", - "dev": true - }, "domain-browser": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz", @@ -44827,16 +44731,6 @@ "is-glob": "^4.0.1" } }, - "global": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz", - "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==", - "dev": true, - "requires": { - "min-document": "^2.19.0", - "process": "^0.11.10" - } - }, "global-agent": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz", @@ -49334,15 +49228,6 @@ "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz", "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==" }, - "min-document": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz", - "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=", - "dev": true, - "requires": { - "dom-walk": "^0.1.0" - } - }, "min-indent": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", @@ -51355,30 +51240,6 @@ "integrity": "sha512-JBu5TZK3IXzDKw9SuNFwyQFdIx5uGZSmN9QTDsNsDSYdccU/O+43jBUh0zKG4jDc4hiNYYgDw34lLt7qLSeusA==", "requires": {} }, - "react-hot-loader": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.13.0.tgz", - "integrity": "sha512-JrLlvUPqh6wIkrK2hZDfOyq/Uh/WeVEr8nc7hkn2/3Ul0sx1Kr5y4kOGNacNRoj7RhwLNcQ3Udf1KJXrqc0ZtA==", - "dev": true, - "requires": { - "fast-levenshtein": "^2.0.6", - "global": "^4.3.0", - "hoist-non-react-statics": "^3.3.0", - "loader-utils": "^1.1.0", - "prop-types": "^15.6.1", - "react-lifecycles-compat": "^3.0.4", - "shallowequal": "^1.1.0", - "source-map": "^0.7.3" - }, - "dependencies": { - "source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", - "dev": true - } - } - }, "react-immutable-proptypes": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/react-immutable-proptypes/-/react-immutable-proptypes-2.1.0.tgz", diff --git a/packages/insomnia-app/package.json b/packages/insomnia-app/package.json index 07764c9ba1..adfce3fe72 100644 --- a/packages/insomnia-app/package.json +++ b/packages/insomnia-app/package.json @@ -40,7 +40,6 @@ "dev-server-port": 3334 }, "packedDependencies": [ - "@hot-loader/react-dom", "class-autobind-decorator", "classnames", "codemirror", @@ -80,7 +79,6 @@ "dependencies": { "@getinsomnia/node-libcurl": "2.3.4-3", "@hapi/hawk": "^8.0.0", - "@hot-loader/react-dom": "^16.8.6", "@stoplight/spectral": "^5.9.0", "analytics-node": "^6.0.0", "aws4": "^1.9.0", @@ -247,7 +245,6 @@ "license-checker": "^25.0.1", "ncp": "^2.0.0", "prompt-run": "^1.4.5", - "react-hot-loader": "^4.13.0", "redux-mock-store": "^1.5.4", "source-map-loader": "^1.0.0", "style-loader": "^0.23.1", diff --git a/packages/insomnia-app/webpack/webpack.config.base.ts b/packages/insomnia-app/webpack/webpack.config.base.ts index 1e7c3c51e7..a9461750b7 100644 --- a/packages/insomnia-app/webpack/webpack.config.base.ts +++ b/packages/insomnia-app/webpack/webpack.config.base.ts @@ -55,12 +55,8 @@ const configuration: Configuration = { }, resolve: { alias: { - // Create aliases for react-hot-loader - // https://github.com/gaearon/react-hot-loader/tree/92961be0b44260d3d3f1b8864aa699766572a67c#linking - 'react-hot-loader': path.resolve(path.join(__dirname, '../node_modules/react-hot-loader')), react: path.resolve(path.join(__dirname, '../node_modules/react')), 'styled-components': path.resolve(path.join(__dirname, '../node_modules/styled-components')), - 'react-dom': path.resolve(path.join(__dirname, '../node_modules/@hot-loader/react-dom')), }, extensions: ['.js', '.json', '.ts', '.tsx'], mainFields: ['webpack', 'browser', 'web', 'browserify', ['jam', 'main'], 'main'],