fix issues

Author: chrisbreiding

packages/driver/cypress/plugins/server.js

@@ -10,7 +10,8 @@ const multer = require('multer')
 const upload = multer({ dest: 'cypress/_test-output/' })
 
 const PATH_TO_SERVER_PKG = path.dirname(require.resolve('@packages/server'))
-const PATH_TO_RUNNER_PKG = path.dirname(require.resolve('@packages/runner'))
+const { getPathToDist } = require('@packages/resolve-dist')
+
 const httpPorts = [3500, 3501]
 const httpsPort = 3502
 
@@ -183,9 +184,7 @@ const createApp = (port) => {
 
   app.get('/cypress_multidomain_runner.js', (req, res) => {
     res.type('application/javascript')
-    res.sendFile(path.join('dist', 'cypress_multidomain_runner.js'), {
-      root: path.join(PATH_TO_RUNNER_PKG, '..'),
-    })
+    res.sendFile(getPathToDist('runner', 'cypress_multidomain_runner.js'))
   })
 
   let _var = ''

packages/driver/src/cypress/cy.ts

@@ -25,7 +25,7 @@ import $Timers from '../cy/timers'
 import $Timeouts from '../cy/timeouts'
 import $Retries from '../cy/retries'
 import $Stability from '../cy/stability'
-import $Overrides from '../cy/overrides'
+import * as $Overrides from '../cy/overrides'
 import $Snapshots from '../cy/snapshots'
 import { $Command } from './command'
 import $CommandQueue from './command_queue'