@@ -47,9 +47,10 @@ export async function initRemix({
4747 const appRoot = app . getAppPath ( )
4848 const publicFolder = asAbsolutePath ( publicFolderOption , appRoot )
4949
50- let serverBuild : ServerBuild =
50+ let serverBuild =
5151 typeof serverBuildOption === "string"
52- ? require ( serverBuildOption )
52+ ? // eslint-disable-next-line @typescript-eslint/no-var-requires
53+ ( require ( serverBuildOption ) as ServerBuild )
5354 : serverBuildOption
5455
5556 let [ assetFiles ] = await Promise . all ( [
@@ -63,6 +64,7 @@ export async function initRemix({
6364 ? require . resolve ( serverBuildOption )
6465 : undefined
6566
67+ // eslint-disable-next-line @typescript-eslint/no-misused-promises
6668 protocol . interceptStreamProtocol ( "http" , async ( request , callback ) => {
6769 try {
6870 if ( mode === "development" ) {
@@ -81,7 +83,8 @@ export async function initRemix({
8183 lastBuildTime !== buildTime
8284 ) {
8385 purgeRequireCache ( buildPath )
84- serverBuild = require ( buildPath )
86+ // eslint-disable-next-line @typescript-eslint/no-var-requires
87+ serverBuild = require ( buildPath ) as ServerBuild
8588 lastBuildTime = buildTime
8689 }
8790
@@ -93,10 +96,10 @@ export async function initRemix({
9396 )
9497 } catch ( error ) {
9598 console . warn ( "[remix-electron]" , error )
99+ const { stack, message } = toError ( error )
96100 callback ( {
97101 statusCode : 500 ,
98- // @ts -expect-error
99- data : `<pre>${ error ?. stack || error ?. message || String ( error ) } </pre>` ,
102+ data : `<pre>${ stack || message } </pre>` ,
100103 } )
101104 }
102105 } )
@@ -113,7 +116,7 @@ async function handleRequest(
113116 context : unknown ,
114117) : Promise < Electron . ProtocolResponse > {
115118 return (
116- ( await serveAsset ( request , assetFiles ) ) ??
119+ serveAsset ( request , assetFiles ) ??
117120 ( await serveRemixResponse ( request , requestHandler , context ) )
118121 )
119122}
@@ -125,3 +128,7 @@ function purgeRequireCache(prefix: string) {
125128 }
126129 }
127130}
131+
132+ function toError ( value : unknown ) {
133+ return value instanceof Error ? value : new Error ( String ( value ) )
134+ }
0 commit comments