diff --git a/devtools/client/performance-new/package.json b/devtools/client/performance-new/package.json index ecfc4166618b..907bdde24444 100644 --- a/devtools/client/performance-new/package.json +++ b/devtools/client/performance-new/package.json @@ -7,10 +7,9 @@ }, "license": "MPL-2.0", "devDependencies": { - "@types/react": "^16.9.10", "@types/react-dom-factories": "^1.0.2", - "@types/react-redux": "^7.1.5", + "@types/react-redux": "^7.1.18", "@types/redux": "^3.6.0", - "typescript": "^3.8.3" + "typescript": "^4.3.5" } } diff --git a/devtools/client/performance-new/popup/panel.jsm.js b/devtools/client/performance-new/popup/panel.jsm.js index 9109d01484e8..c9c37d20ac26 100644 --- a/devtools/client/performance-new/popup/panel.jsm.js +++ b/devtools/client/performance-new/popup/panel.jsm.js @@ -58,10 +58,16 @@ function selectElementsInPanelview(panelview) { return element; } + // Forcefully cast the window to the type ChromeWindow. + /** @type {any} */ + const chromeWindowAny = document.defaultView; + /** @type {ChromeWindow} */ + const chromeWindow = chromeWindowAny; + return { document, panelview, - window: /** @type {ChromeWindow} */ (document.defaultView), + window: chromeWindow, inactive: getElementById("PanelUI-profiler-inactive"), active: getElementById("PanelUI-profiler-active"), locked: getElementById("PanelUI-profiler-locked"), diff --git a/devtools/client/performance-new/yarn.lock b/devtools/client/performance-new/yarn.lock index 5f9ef4f4af5d..ea21bc13f5ae 100644 --- a/devtools/client/performance-new/yarn.lock +++ b/devtools/client/performance-new/yarn.lock @@ -22,17 +22,17 @@ dependencies: "@types/react" "*" -"@types/react-redux@^7.1.5": - version "7.1.5" - resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.5.tgz#c7a528d538969250347aa53c52241051cf886bd3" - integrity sha512-ZoNGQMDxh5ENY7PzU7MVonxDzS1l/EWiy8nUhDqxFqUZn4ovboCyvk4Djf68x6COb7vhGTKjyjxHxtFdAA5sUA== +"@types/react-redux@^7.1.18": + version "7.1.18" + resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.18.tgz#2bf8fd56ebaae679a90ebffe48ff73717c438e04" + integrity sha512-9iwAsPyJ9DLTRH+OFeIrm9cAbIj1i2ANL3sKQFATqnPWRbg+jEFXyZOKHiQK/N86pNRXbb4HRxAxo0SIX1XwzQ== dependencies: "@types/hoist-non-react-statics" "^3.3.0" "@types/react" "*" hoist-non-react-statics "^3.3.0" redux "^4.0.0" -"@types/react@*", "@types/react@^16.9.10": +"@types/react@*": version "16.9.10" resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.10.tgz#87c2a7cd715d293c42fe73510eec42cba3ee8210" integrity sha512-J1sinqwBCzazC+DOmbwRc96pNf0KBOVkefV5DVfLX9qiHdltfFH2BUqc36UYcYSU5tIrZtaaVMAx4JwOq5/Q/g== @@ -89,7 +89,7 @@ symbol-observable@^1.2.0: resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== -typescript@^3.8.3: - version "3.8.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061" - integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w== +typescript@^4.3.5: + version "4.3.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4" + integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==