From 5f0b5fcc63794337de21ca869d84fd6a8b92ac04 Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Sun, 29 Aug 2021 15:56:16 -0400 Subject: [PATCH] refactor(trace): remove settle-promise --- .../package.json | 3 +-- .../src/react-error-overlay/utils/mapper.ts | 3 +-- .../src/settle-promise.ts | 3 --- tsconfig.base.json | 2 +- yarn.lock | 8 -------- 5 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 packages/redux-devtools-inspector-monitor-trace-tab/src/settle-promise.ts diff --git a/packages/redux-devtools-inspector-monitor-trace-tab/package.json b/packages/redux-devtools-inspector-monitor-trace-tab/package.json index 8f23f413..521d9711 100644 --- a/packages/redux-devtools-inspector-monitor-trace-tab/package.json +++ b/packages/redux-devtools-inspector-monitor-trace-tab/package.json @@ -32,8 +32,7 @@ "@types/chrome": "^0.0.154", "anser": "^1.4.10", "html-entities": "^2.3.2", - "redux-devtools-themes": "^1.0.0", - "settle-promise": "^1.0.0" + "redux-devtools-themes": "^1.0.0" }, "devDependencies": { "@redux-devtools/core": "^3.9.0", diff --git a/packages/redux-devtools-inspector-monitor-trace-tab/src/react-error-overlay/utils/mapper.ts b/packages/redux-devtools-inspector-monitor-trace-tab/src/react-error-overlay/utils/mapper.ts index d172e0c1..5977c742 100644 --- a/packages/redux-devtools-inspector-monitor-trace-tab/src/react-error-overlay/utils/mapper.ts +++ b/packages/redux-devtools-inspector-monitor-trace-tab/src/react-error-overlay/utils/mapper.ts @@ -8,7 +8,6 @@ import StackFrame from './stack-frame'; import { getSourceMap } from './getSourceMap'; import { getLinesAround } from './getLinesAround'; -import { settle } from 'settle-promise'; /** * Enhances a set of StackFrames with their original positions and code (when available). @@ -31,7 +30,7 @@ async function map( } files.push(fileName); }); - await settle( + await Promise.allSettled( files.map(async (fileName) => { const fileSource = await fetch(fileName).then((r) => r.text()); const map = await getSourceMap(fileName, fileSource); diff --git a/packages/redux-devtools-inspector-monitor-trace-tab/src/settle-promise.ts b/packages/redux-devtools-inspector-monitor-trace-tab/src/settle-promise.ts deleted file mode 100644 index 4168e22b..00000000 --- a/packages/redux-devtools-inspector-monitor-trace-tab/src/settle-promise.ts +++ /dev/null @@ -1,3 +0,0 @@ -declare module 'settle-promise' { - export function settle(promises: Promise[]): Promise; -} diff --git a/tsconfig.base.json b/tsconfig.base.json index 55204414..c8a61568 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -1,6 +1,6 @@ { "compilerOptions": { - "target": "es2018", + "target": "es2020", "module": "commonjs", "declaration": true, "strict": true, diff --git a/yarn.lock b/yarn.lock index 42f445ca..7d413db4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5082,7 +5082,6 @@ __metadata: react-test-renderer: ^16.14.0 redux: ^4.1.1 redux-devtools-themes: ^1.0.0 - settle-promise: ^1.0.0 peerDependencies: "@redux-devtools/inspector-monitor": ^1.0.0 "@types/react": ^16.3.0 || ^17.0.0 @@ -26977,13 +26976,6 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"settle-promise@npm:^1.0.0": - version: 1.0.0 - resolution: "settle-promise@npm:1.0.0" - checksum: e23f35a9eff783f801dc57b5b57ebeb9170bf8033afa8da0af4107f233da197ac6f2470c8c796d7cbc57c75182f48b8192a463a3fa32fdf00e2cda1d3f2258b3 - languageName: node - linkType: hard - "sha.js@npm:^2.4.0, sha.js@npm:^2.4.11, sha.js@npm:^2.4.8": version: 2.4.11 resolution: "sha.js@npm:2.4.11"