Fix overrides for terminal scripting interception

Author: pimterry

package.json

@@ -118,7 +118,9 @@
       "@oclif/plugin-help",
       "@oclif/plugin-update",
       "registry-js",
-      "win-version-info"
+      "win-version-info",
+      "global-agent",
+      "global-tunnel-ng"
     ],
     "update": {
       "s3": {

src/interceptors/terminal/terminal-env-overrides.ts

@@ -4,7 +4,12 @@ import { HttpsPathOptions } from 'mockttp/dist/util/tls';
 
 const PATH_VAR_SEPARATOR = process.platform === 'win32' ? ';' : ':';
 
-const OVERRIDES_DIR = path.join(__dirname, '..', '..', '..', 'overrides');
+const OVERRIDES_DIR = path.join(
+    process.env.HTK_IS_BUNDLED
+        ? path.join(__dirname, '..')
+        : path.join(__dirname, '..', '..', '..'),
+    'overrides'
+);
 const OVERRIDE_RUBYGEMS_PATH = path.join(OVERRIDES_DIR, 'gems');
 const OVERRIDE_PYTHONPATH = path.join(OVERRIDES_DIR, 'pythonpath');
 

webpack.config.js

@@ -63,7 +63,9 @@ module.exports = {
                 include: OUTPUT_DIR,
                 validate: true
             })
-            : { apply: () => {} }
+            : { apply: () => {} },
+        // Used to e.g. fix the relative path to the overrides directory
+        new webpack.EnvironmentPlugin({ HTK_IS_BUNDLED: true })
     ],
     resolve: {
         extensions: [ '.tsx', '.ts', '.js' ]