From 4f0e5d20e2e0a1a4b4689b10cc6996da12a60417 Mon Sep 17 00:00:00 2001 From: Joe Haddad Date: Thu, 30 Jul 2020 01:33:03 -0400 Subject: [PATCH 1/2] Strictly type `react-dev-overlay` --- packages/react-dev-overlay/src/client.ts | 4 +- .../src/internal/ReactDevOverlay.tsx | 6 +- .../react-dev-overlay/src/internal/bus.ts | 2 +- .../components/CodeFrame/CodeFrame.tsx | 4 +- .../src/internal/components/Dialog/Dialog.tsx | 7 ++- .../LeftRightDialogHeader.tsx | 22 ++++--- .../internal/components/Overlay/Overlay.tsx | 6 +- .../src/internal/components/ShadowPortal.tsx | 2 +- .../src/internal/container/Errors.tsx | 6 +- .../src/internal/container/RuntimeError.tsx | 6 +- .../src/internal/helpers/launchEditor.ts | 63 +++++++------------ .../src/internal/helpers/nodeStackFrames.ts | 2 +- .../src/internal/helpers/parseStack.ts | 4 +- .../src/internal/helpers/stack-frame.ts | 4 +- .../internal/hooks/use-on-click-outside.ts | 12 ++-- packages/react-dev-overlay/src/middleware.ts | 7 ++- packages/react-dev-overlay/tsconfig.json | 1 + 17 files changed, 74 insertions(+), 84 deletions(-) diff --git a/packages/react-dev-overlay/src/client.ts b/packages/react-dev-overlay/src/client.ts index 52104d0b1439b..fa204341d73f1 100644 --- a/packages/react-dev-overlay/src/client.ts +++ b/packages/react-dev-overlay/src/client.ts @@ -15,7 +15,7 @@ function onUnhandledError(ev: ErrorEvent) { Bus.emit({ type: Bus.TYPE_UNHANDLED_ERROR, reason: error, - frames: parseStack(e.stack), + frames: parseStack(e.stack!), }) } @@ -34,7 +34,7 @@ function onUnhandledRejection(ev: PromiseRejectionEvent) { Bus.emit({ type: Bus.TYPE_UNHANDLED_REJECTION, reason: reason, - frames: parseStack(e.stack), + frames: parseStack(e.stack!), }) } diff --git a/packages/react-dev-overlay/src/internal/ReactDevOverlay.tsx b/packages/react-dev-overlay/src/internal/ReactDevOverlay.tsx index baf04aed7a406..7500e15983246 100644 --- a/packages/react-dev-overlay/src/internal/ReactDevOverlay.tsx +++ b/packages/react-dev-overlay/src/internal/ReactDevOverlay.tsx @@ -41,7 +41,9 @@ function reducer(state: OverlayState, ev: Bus.BusEvent): OverlayState { } } -function ReactDevOverlay({ children }) { +const ReactDevOverlay: React.FunctionComponent = function ReactDevOverlay({ + children, +}) { const [state, dispatch] = React.useReducer< React.Reducer >(reducer, { nextId: 1, buildError: null, errors: [] }) @@ -76,7 +78,7 @@ function ReactDevOverlay({ children }) { {hasBuildError ? ( - + ) : hasRuntimeErrors ? ( ) : undefined} diff --git a/packages/react-dev-overlay/src/internal/bus.ts b/packages/react-dev-overlay/src/internal/bus.ts index b2a4fc213c3e3..ebf32812ab695 100644 --- a/packages/react-dev-overlay/src/internal/bus.ts +++ b/packages/react-dev-overlay/src/internal/bus.ts @@ -45,7 +45,7 @@ function drain() { // event(s) Boolean(handlers.size) ) { - const ev = queue.shift() + const ev = queue.shift()! handlers.forEach((handler) => handler(ev)) } }, 1) diff --git a/packages/react-dev-overlay/src/internal/components/CodeFrame/CodeFrame.tsx b/packages/react-dev-overlay/src/internal/components/CodeFrame/CodeFrame.tsx index 0a333b8e2f127..2c4e31b6809ed 100644 --- a/packages/react-dev-overlay/src/internal/components/CodeFrame/CodeFrame.tsx +++ b/packages/react-dev-overlay/src/internal/components/CodeFrame/CodeFrame.tsx @@ -16,7 +16,7 @@ export const CodeFrame: React.FC = function CodeFrame({ const prefixLength = lines .map((line) => /^>? +\d+ +\| ( *)/.exec(stripAnsi(line))) .filter(Boolean) - .map((v) => v.pop()) + .map((v) => v!.pop()!) .reduce((c, n) => (isNaN(c) ? n.length : Math.min(c, n.length)), NaN) if (prefixLength > 1) { @@ -43,7 +43,7 @@ export const CodeFrame: React.FC = function CodeFrame({ const open = React.useCallback(() => { const params = new URLSearchParams() for (const key in stackFrame) { - params.append(key, (stackFrame[key] ?? '').toString()) + params.append(key, ((stackFrame as any)[key] ?? '').toString()) } self diff --git a/packages/react-dev-overlay/src/internal/components/Dialog/Dialog.tsx b/packages/react-dev-overlay/src/internal/components/Dialog/Dialog.tsx index e1891f9e695ac..e01f36c2c3341 100644 --- a/packages/react-dev-overlay/src/internal/components/Dialog/Dialog.tsx +++ b/packages/react-dev-overlay/src/internal/components/Dialog/Dialog.tsx @@ -14,7 +14,7 @@ const Dialog: React.FC = function Dialog({ onClose, ...props }) { - const [dialog, setDialog] = React.useState(null) + const [dialog, setDialog] = React.useState(null) const onDialog = React.useCallback((node) => { setDialog(node) }, []) @@ -47,8 +47,9 @@ const Dialog: React.FC = function Dialog({ } } - shadowRoot.addEventListener('keydown', handler) - return () => shadowRoot.removeEventListener('keydown', handler) + shadowRoot.addEventListener('keydown', handler as EventListener) + return () => + shadowRoot.removeEventListener('keydown', handler as EventListener) }, [dialog]) return ( diff --git a/packages/react-dev-overlay/src/internal/components/LeftRightDialogHeader/LeftRightDialogHeader.tsx b/packages/react-dev-overlay/src/internal/components/LeftRightDialogHeader/LeftRightDialogHeader.tsx index c1bc4d31fc63d..628f8e725c162 100644 --- a/packages/react-dev-overlay/src/internal/components/LeftRightDialogHeader/LeftRightDialogHeader.tsx +++ b/packages/react-dev-overlay/src/internal/components/LeftRightDialogHeader/LeftRightDialogHeader.tsx @@ -14,9 +14,9 @@ const LeftRightDialogHeader: React.FC = function Lef next, close, }) { - const buttonLeft = React.useRef() - const buttonRight = React.useRef() - const buttonClose = React.useRef() + const buttonLeft = React.useRef(null) + const buttonRight = React.useRef(null) + const buttonClose = React.useRef(null) const [nav, setNav] = React.useState(null) const onNav = React.useCallback((el: HTMLElement) => { @@ -54,16 +54,18 @@ const LeftRightDialogHeader: React.FC = function Lef } } - close() + if (close) { + close() + } } } - root.addEventListener('keydown', handler) + root.addEventListener('keydown', handler as EventListener) if (root !== d) { d.addEventListener('keydown', handler) } return function () { - root.removeEventListener('keydown', handler) + root.removeEventListener('keydown', handler as EventListener) if (root !== d) { d.removeEventListener('keydown', handler) } @@ -83,11 +85,11 @@ const LeftRightDialogHeader: React.FC = function Lef const a = root.activeElement if (previous == null) { - if (a === buttonLeft.current) { + if (buttonLeft.current && a === buttonLeft.current) { buttonLeft.current.blur() } } else if (next == null) { - if (a === buttonRight.current) { + if (buttonRight.current && a === buttonRight.current) { buttonRight.current.blur() } } @@ -142,7 +144,7 @@ const LeftRightDialogHeader: React.FC = function Lef   {children} - {close && ( + {close ? ( - )} + ) : null} ) } diff --git a/packages/react-dev-overlay/src/internal/components/Overlay/Overlay.tsx b/packages/react-dev-overlay/src/internal/components/Overlay/Overlay.tsx index 0c6c4db5d3fa1..3d3bdaae39935 100644 --- a/packages/react-dev-overlay/src/internal/components/Overlay/Overlay.tsx +++ b/packages/react-dev-overlay/src/internal/components/Overlay/Overlay.tsx @@ -1,4 +1,6 @@ +// @ts-ignore import allyDisable from 'ally.js/maintain/disabled' +// @ts-ignore import allyTrap from 'ally.js/maintain/tab-focus' import * as React from 'react' import { lock, unlock } from './body-locker' @@ -17,8 +19,8 @@ const Overlay: React.FC = function Overlay({ } }, []) - const [overlay, setOverlay] = React.useState(null) - const onOverlay = React.useCallback((el: HTMLElement) => { + const [overlay, setOverlay] = React.useState(null) + const onOverlay = React.useCallback((el: HTMLDivElement) => { setOverlay(el) }, []) diff --git a/packages/react-dev-overlay/src/internal/components/ShadowPortal.tsx b/packages/react-dev-overlay/src/internal/components/ShadowPortal.tsx index 8de6d76af8edd..228660da6dadb 100644 --- a/packages/react-dev-overlay/src/internal/components/ShadowPortal.tsx +++ b/packages/react-dev-overlay/src/internal/components/ShadowPortal.tsx @@ -14,7 +14,7 @@ export const ShadowPortal: React.FC = function Portal({ let [, forceUpdate] = React.useState() React.useLayoutEffect(() => { - const ownerDocument = mountNode.current.ownerDocument + const ownerDocument = mountNode.current!.ownerDocument! portalNode.current = ownerDocument.createElement('nextjs-portal') shadowNode.current = portalNode.current.attachShadow({ mode: 'open' }) ownerDocument.body.appendChild(portalNode.current) diff --git a/packages/react-dev-overlay/src/internal/container/Errors.tsx b/packages/react-dev-overlay/src/internal/container/Errors.tsx index d1e0d002ee0c3..63d5e911c2d84 100644 --- a/packages/react-dev-overlay/src/internal/container/Errors.tsx +++ b/packages/react-dev-overlay/src/internal/container/Errors.tsx @@ -209,7 +209,7 @@ export const Errors: React.FC = function Errors({ errors }) { // This component shouldn't be rendered with no errors, but if it is, let's // handle it gracefully by rendering nothing. - if (errors.length < 1) { + if (errors.length < 1 || activeError == null) { return null } @@ -252,14 +252,14 @@ export const Errors: React.FC = function Errors({ errors }) { type="error" aria-labelledby="nextjs__container_errors_label" aria-describedby="nextjs__container_errors_desc" - onClose={!isServerError && minimize} + onClose={isServerError ? undefined : minimize} > 0 ? previous : null} next={activeIdx < readyErrors.length - 1 ? next : null} - close={!isServerError && minimize} + close={isServerError ? undefined : minimize} > {activeIdx + 1} of{' '} diff --git a/packages/react-dev-overlay/src/internal/container/RuntimeError.tsx b/packages/react-dev-overlay/src/internal/container/RuntimeError.tsx index 07cecff277b52..e744355a7d168 100644 --- a/packages/react-dev-overlay/src/internal/container/RuntimeError.tsx +++ b/packages/react-dev-overlay/src/internal/container/RuntimeError.tsx @@ -21,7 +21,7 @@ const CallStackFrame: React.FC<{ const params = new URLSearchParams() for (const key in f) { - params.append(key, (f[key] ?? '').toString()) + params.append(key, ((f as any)[key] ?? '').toString()) } self @@ -134,8 +134,8 @@ const RuntimeError: React.FC = function RuntimeError({ /> ))} ) : undefined} diff --git a/packages/react-dev-overlay/src/internal/helpers/launchEditor.ts b/packages/react-dev-overlay/src/internal/helpers/launchEditor.ts index d76ff558678c9..8efcf9d9e8a57 100644 --- a/packages/react-dev-overlay/src/internal/helpers/launchEditor.ts +++ b/packages/react-dev-overlay/src/internal/helpers/launchEditor.ts @@ -26,9 +26,10 @@ import child_process from 'child_process' import fs from 'fs' import os from 'os' import path from 'path' +// @ts-ignore import shellQuote from 'shell-quote' -function isTerminalEditor(editor) { +function isTerminalEditor(editor: string) { switch (editor) { case 'vi': case 'vim': @@ -135,20 +136,12 @@ const COMMON_EDITORS_WIN = [ // alphanumeric characters, periods, dashes, slashes, and underscores. const WINDOWS_FILE_NAME_ACCESS_LIST = /^([A-Za-z]:[/\\])?(?:[\x2D-9A-Z\\_a-z\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0560-\u0588\u05D0-\u05EA\u05EF-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u0860-\u086A\u08A0-\u08B4\u08B6-\u08BD\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u09FC\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0AF9\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C60\u0C61\u0C80\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D54-\u0D56\u0D5F-\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16F1-\u16F8\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1878\u1880-\u1884\u1887-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1C80-\u1C88\u1C90-\u1CBA\u1CBD-\u1CBF\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2183\u2184\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005\u3006\u3031-\u3035\u303B\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312F\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FEF\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6E5\uA717-\uA71F\uA722-\uA788\uA78B-\uA7B9\uA7F7-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA8FD\uA8FE\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uA9E0-\uA9E4\uA9E6-\uA9EF\uA9FA-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDE80-\uDE9C\uDEA0-\uDED0\uDF00-\uDF1F\uDF2D-\uDF40\uDF42-\uDF49\uDF50-\uDF75\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF]|\uD801[\uDC00-\uDC9D\uDCB0-\uDCD3\uDCD8-\uDCFB\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00\uDE10-\uDE13\uDE15-\uDE17\uDE19-\uDE35\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE4\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2\uDD00-\uDD23\uDF00-\uDF1C\uDF27\uDF30-\uDF45]|\uD804[\uDC03-\uDC37\uDC83-\uDCAF\uDCD0-\uDCE8\uDD03-\uDD26\uDD44\uDD50-\uDD72\uDD76\uDD83-\uDDB2\uDDC1-\uDDC4\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE2B\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEDE\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3D\uDF50\uDF5D-\uDF61]|\uD805[\uDC00-\uDC34\uDC47-\uDC4A\uDC80-\uDCAF\uDCC4\uDCC5\uDCC7\uDD80-\uDDAE\uDDD8-\uDDDB\uDE00-\uDE2F\uDE44\uDE80-\uDEAA\uDF00-\uDF1A]|\uD806[\uDC00-\uDC2B\uDCA0-\uDCDF\uDCFF\uDE00\uDE0B-\uDE32\uDE3A\uDE50\uDE5C-\uDE83\uDE86-\uDE89\uDE9D\uDEC0-\uDEF8]|\uD807[\uDC00-\uDC08\uDC0A-\uDC2E\uDC40\uDC72-\uDC8F\uDD00-\uDD06\uDD08\uDD09\uDD0B-\uDD30\uDD46\uDD60-\uDD65\uDD67\uDD68\uDD6A-\uDD89\uDD98\uDEE0-\uDEF2]|\uD808[\uDC00-\uDF99]|\uD809[\uDC80-\uDD43]|[\uD80C\uD81C-\uD820\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872\uD874-\uD879][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDED0-\uDEED\uDF00-\uDF2F\uDF40-\uDF43\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDE40-\uDE7F\uDF00-\uDF44\uDF50\uDF93-\uDF9F\uDFE0\uDFE1]|\uD821[\uDC00-\uDFF1]|\uD822[\uDC00-\uDEF2]|\uD82C[\uDC00-\uDD1E\uDD70-\uDEFB]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB]|\uD83A[\uDC00-\uDCC4\uDD00-\uDD43]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1\uDEB0-\uDFFF]|\uD87A[\uDC00-\uDFE0]|\uD87E[\uDC00-\uDE1D])+$/ -function addWorkspaceToArgumentsIfExists(args, workspace) { - if (workspace) { - args.unshift(workspace) - } - return args -} - function getArgumentsForLineNumber( - editor, - fileName, - lineNumber, - colNumber, - workspace -) { + editor: string, + fileName: string, + lineNumber: number, + colNumber: number +): string[] { const editorBasename = path.basename(editor).replace(/\.(exe|cmd|bat)$/i, '') switch (editorBasename) { case 'atom': @@ -179,7 +172,7 @@ function getArgumentsForLineNumber( case 'rmate': case 'mate': case 'mine': { - return ['--line', lineNumber, fileName] + return ['--line', lineNumber.toString(), fileName] } case 'code': case 'Code': @@ -187,10 +180,7 @@ function getArgumentsForLineNumber( case 'Code - Insiders': case 'vscodium': case 'VSCodium': { - return addWorkspaceToArgumentsIfExists( - ['-g', fileName + ':' + lineNumber + ':' + colNumber], - workspace - ) + return ['-g', fileName + ':' + lineNumber + ':' + colNumber] } case 'appcode': case 'clion': @@ -209,10 +199,7 @@ function getArgumentsForLineNumber( case 'goland64': case 'rider': case 'rider64': { - return addWorkspaceToArgumentsIfExists( - ['--line', lineNumber, fileName], - workspace - ) + return ['--line', lineNumber.toString(), fileName] } default: { // For all others, drop the lineNumber until we have @@ -223,7 +210,7 @@ function getArgumentsForLineNumber( } } -function guessEditor() { +function guessEditor(): string | null { // Explicit config always wins if (process.env.REACT_EDITOR) { return shellQuote.parse(process.env.REACT_EDITOR) @@ -239,7 +226,7 @@ function guessEditor() { for (let i = 0; i < processNames.length; i++) { const processName = processNames[i] if (output.indexOf(processName) !== -1) { - return [COMMON_EDITORS_MACOS[processName]] + return (COMMON_EDITORS_MACOS as any)[processName] } } } else if (process.platform === 'win32') { @@ -255,7 +242,7 @@ function guessEditor() { const processPath = runningProcesses[i].trim() const processName = path.basename(processPath) if (COMMON_EDITORS_WIN.indexOf(processName) !== -1) { - return [processPath] + return processPath } } } else if (process.platform === 'linux') { @@ -269,7 +256,7 @@ function guessEditor() { for (let i = 0; i < processNames.length; i++) { const processName = processNames[i] if (output.indexOf(processName) !== -1) { - return [COMMON_EDITORS_LINUX[processName]] + return (COMMON_EDITORS_LINUX as any)[processName] as string } } } @@ -279,15 +266,15 @@ function guessEditor() { // Last resort, use old skool env vars if (process.env.VISUAL) { - return [process.env.VISUAL] + return process.env.VISUAL } else if (process.env.EDITOR) { - return [process.env.EDITOR] + return process.env.EDITOR } - return [null] + return null } -function printInstructions(fileName, errorMessage) { +function printInstructions(fileName: string, errorMessage: string | null) { console.log() console.log( chalk.red('Could not open ' + path.basename(fileName) + ' in the editor.') @@ -330,7 +317,8 @@ function launchEditor(fileName: string, lineNumber: number, colNumber: number) { colNumber = 1 } - let [editor, ...args] = guessEditor() + const editor = guessEditor() + let args: string[] = [] if (!editor) { printInstructions(fileName, null) @@ -378,22 +366,15 @@ function launchEditor(fileName: string, lineNumber: number, colNumber: number) { return } - let workspace = null if (lineNumber) { args = args.concat( - getArgumentsForLineNumber( - editor, - fileName, - lineNumber, - colNumber, - workspace - ) + getArgumentsForLineNumber(editor, fileName, lineNumber, colNumber) ) } else { args.push(fileName) } - let p: child_process.ChildProcess + let p: child_process.ChildProcess | undefined = undefined if (process.platform === 'win32') { // On Windows, launch the editor in a shell because spawn can only // launch .exe files. diff --git a/packages/react-dev-overlay/src/internal/helpers/nodeStackFrames.ts b/packages/react-dev-overlay/src/internal/helpers/nodeStackFrames.ts index 41aeec9209cd7..0fa8601873221 100644 --- a/packages/react-dev-overlay/src/internal/helpers/nodeStackFrames.ts +++ b/packages/react-dev-overlay/src/internal/helpers/nodeStackFrames.ts @@ -35,7 +35,7 @@ export function getNodeError(error: Error): Error { n.name = error.name try { - n.stack = parse(error.stack) + n.stack = parse(error.stack!) .map(getFilesystemFrame) .map((f) => { let str = ` at ${f.methodName}` diff --git a/packages/react-dev-overlay/src/internal/helpers/parseStack.ts b/packages/react-dev-overlay/src/internal/helpers/parseStack.ts index f329dd61263cf..7e6c1d1826089 100644 --- a/packages/react-dev-overlay/src/internal/helpers/parseStack.ts +++ b/packages/react-dev-overlay/src/internal/helpers/parseStack.ts @@ -6,14 +6,14 @@ export function parseStack(stack: string): StackFrame[] { const frames = parse(stack) return frames.map((frame) => { try { - const url = new URL(frame.file) + const url = new URL(frame.file!) const res = regexNextStatic.exec(url.pathname) if (res) { const distDir = process.env.__NEXT_DIST_DIR ?.replace(/\\/g, '/') ?.replace(/\/$/, '') if (distDir) { - frame.file = 'file://' + distDir.concat(res.pop()) + frame.file = 'file://' + distDir.concat(res.pop()!) } } } catch {} diff --git a/packages/react-dev-overlay/src/internal/helpers/stack-frame.ts b/packages/react-dev-overlay/src/internal/helpers/stack-frame.ts index fb3cda027cc17..37d3392b288f3 100644 --- a/packages/react-dev-overlay/src/internal/helpers/stack-frame.ts +++ b/packages/react-dev-overlay/src/internal/helpers/stack-frame.ts @@ -47,7 +47,7 @@ export function getOriginalStackFrame( const params = new URLSearchParams() params.append('isServerSide', String(isServerSide)) for (const key in source) { - params.append(key, (source[key] ?? '').toString()) + params.append(key, ((source as any)[key] ?? '').toString()) } const controller = new AbortController() @@ -114,7 +114,7 @@ export function getOriginalStackFrame( export function getFrameSource(frame: StackFrame): string { let str = '' try { - const u = new URL(frame.file) + const u = new URL(frame.file!) // Strip the origin for same-origin scripts. if ( diff --git a/packages/react-dev-overlay/src/internal/hooks/use-on-click-outside.ts b/packages/react-dev-overlay/src/internal/hooks/use-on-click-outside.ts index 8c73686882052..fb2add61d53c1 100644 --- a/packages/react-dev-overlay/src/internal/hooks/use-on-click-outside.ts +++ b/packages/react-dev-overlay/src/internal/hooks/use-on-click-outside.ts @@ -2,10 +2,10 @@ import * as React from 'react' export function useOnClickOutside( el: Node | null, - handler: (e: MouseEvent | TouchEvent) => void + handler: ((e: MouseEvent | TouchEvent) => void) | undefined ) { React.useEffect(() => { - if (el == null) { + if (el == null || handler == null) { return } @@ -19,11 +19,11 @@ export function useOnClickOutside( } const root = el.getRootNode() - root.addEventListener('mousedown', listener) - root.addEventListener('touchstart', listener) + root.addEventListener('mousedown', listener as EventListener) + root.addEventListener('touchstart', listener as EventListener) return function () { - root.removeEventListener('mousedown', listener) - root.removeEventListener('touchstart', listener) + root.removeEventListener('mousedown', listener as EventListener) + root.removeEventListener('touchstart', listener as EventListener) } }, [handler, el]) } diff --git a/packages/react-dev-overlay/src/middleware.ts b/packages/react-dev-overlay/src/middleware.ts index 1b02b9363650d..185e32217bb09 100644 --- a/packages/react-dev-overlay/src/middleware.ts +++ b/packages/react-dev-overlay/src/middleware.ts @@ -10,6 +10,7 @@ import { import { StackFrame } from 'stacktrace-parser' import url from 'url' // eslint-disable-next-line import/no-extraneous-dependencies +// @ts-ignore import webpack from 'webpack' import { getRawSourceMap } from './internal/helpers/getRawSourceMap' import { launchEditor } from './internal/helpers/launchEditor' @@ -112,7 +113,7 @@ function getOverlayMiddleware(options: OverlayMiddlewareOptions) { res: ServerResponse, next: Function ) { - const { pathname, query } = url.parse(req.url, true) + const { pathname, query } = url.parse(req.url!, true) if (pathname === '/__nextjs_original-stack-frame') { const frame = (query as unknown) as StackFrame & { @@ -171,7 +172,7 @@ function getOverlayMiddleware(options: OverlayMiddlewareOptions) { const consumer = await new SourceMapConsumer(source.map()) pos = consumer.originalPositionFor({ line: frameLine, - column: frameColumn, + column: frameColumn ?? 0, }) if (pos.source) { posSourceContent = @@ -215,7 +216,7 @@ function getOverlayMiddleware(options: OverlayMiddlewareOptions) { pos.line ? (codeFrameColumns( posSourceContent, - { start: { line: pos.line, column: pos.column } }, + { start: { line: pos.line, column: pos.column ?? 0 } }, { forceColor: true } ) as string) : null diff --git a/packages/react-dev-overlay/tsconfig.json b/packages/react-dev-overlay/tsconfig.json index 198c585c9b657..747a7eb4f1dae 100644 --- a/packages/react-dev-overlay/tsconfig.json +++ b/packages/react-dev-overlay/tsconfig.json @@ -1,6 +1,7 @@ { "compilerOptions": { "sourceMap": true, + "strict": true, "esModuleInterop": true, "target": "es3", "lib": ["dom"], From 1f14de9ba40fe8c64d0e2ce560f09b21254a6b71 Mon Sep 17 00:00:00 2001 From: Joe Haddad Date: Thu, 30 Jul 2020 02:27:46 -0400 Subject: [PATCH 2/2] Fix typescript --- packages/react-dev-overlay/src/middleware.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/react-dev-overlay/src/middleware.ts b/packages/react-dev-overlay/src/middleware.ts index 185e32217bb09..d55364ff91b31 100644 --- a/packages/react-dev-overlay/src/middleware.ts +++ b/packages/react-dev-overlay/src/middleware.ts @@ -98,6 +98,10 @@ function getOverlayMiddleware(options: OverlayMiddlewareOptions) { const compilation = isServerSide ? options.serverStats()?.compilation : options.stats()?.compilation + if (compilation == null) { + return null + } + const module = [...compilation.modules].find( (searchModule) => searchModule.id === id )