Move build config into a subfolder

Author: pimterry

.gitignore

@@ -5,3 +5,4 @@ dist/
 httptoolkit-server/
 appveyor-tools/
 .playwright/
+httptoolkit-server.tar.gz

electron-builder.config.cjs build-setup/electron-builder.config.cjselectron-builder.config.cjs renamed to build-setup/electron-builder.config.cjs

@@ -1,7 +1,7 @@
 // This config just re-exposes the config from package.json, but
 // disables code signing & notarization for PR builds where it won't work.
 
-const packageJson = require('./package.json');
+const packageJson = require('../package.json');
 
 const unsignedMode = process.env.ENABLE_SIGNING !== 'true';
 

setup-server.ts build-setup/setup-server.tssetup-server.ts renamed to build-setup/setup-server.ts

@@ -9,7 +9,7 @@ import * as semver from 'semver';
 import targz from 'targz';
 import { execSync } from 'child_process';
 
-import packageJson from './package.json' with { type: 'json' };
+import packageJson from '../package.json' with { type: 'json' };
 
 const extractTarGz = promisify(targz.decompress);
 
@@ -18,17 +18,19 @@ const deleteDir = (p: string) => fs.rm(p, { recursive: true, force: true });
 
 const requiredServerVersion = 'v' + packageJson.config['httptoolkit-server-version'];
 
+const serverDir = path.join(import.meta.dirname, '..', 'httptoolkit-server');
+
 // For local testing of the desktop app, we need to pull the latest server and unpack it.
 // This real prod server will then be used with the real prod web UI, but this local desktop app.
 async function setUpLocalEnv() {
-    const serverExists = await canAccess('./httptoolkit-server/package.json');
+    const serverExists = await canAccess(path.join(serverDir, 'package.json'))
     const serverVersion = serverExists
-        ? JSON.parse(readFileSync('./httptoolkit-server/package.json').toString()).version
+        ? JSON.parse(readFileSync(path.join(serverDir, 'package.json')).toString()).version
         : null;
 
     if (!serverVersion || semver.neq(serverVersion, requiredServerVersion)) {
-        if (serverExists) await deleteDir('./httptoolkit-server');
-        await insertServer(import.meta.dirname, os.platform(), os.arch());
+        if (serverExists) await deleteDir(serverDir);
+        await insertServer(path.join(import.meta.dirname, '..'), os.platform(), os.arch());
         console.log('Server setup completed.');
     } else {
         console.log('Correct server already downloaded.');
@@ -39,7 +41,7 @@ async function setUpLocalEnv() {
         // caused by https://github.com/nodejs/node-gyp/commit/b9ddcd5bbd93b05b03674836b6ebdae2c2e74c8c,
         // we manually remove node_gyp_bins subdirectories. Done by shell just
         // because it's a quick easy fix:
-        execSync('find httptoolkit-server/node_modules -type d -name node_gyp_bins -prune -exec rm -r {} \\;');
+        execSync(`find "${serverDir}/node_modules" -type d -name node_gyp_bins -prune -exec rm -r {} \\;`);
     }
 }
 

skip-server.ts build-setup/skip-server.tsskip-server.ts renamed to build-setup/skip-server.ts

@@ -8,7 +8,7 @@ const deleteDir = (p: string) => fs.rm(p, { recursive: true, force: true });
 // This lets us edit both and the desktop together. We do this by creating a fake server,
 // which doesn't exit, but otherwise does nothing.
 async function setUpDevEnv() {
-    const serverFolder = path.join(import.meta.dirname, 'httptoolkit-server');
+    const serverFolder = path.join(import.meta.dirname, '..', 'httptoolkit-server');
     const serverExists = await canAccess(serverFolder);
 
     if (serverExists) await deleteDir(serverFolder);

strip-preload-map.ts build-setup/strip-preload-map.tsstrip-preload-map.ts renamed to build-setup/strip-preload-map.ts

@@ -20,5 +20,5 @@ function removeSourceMapAnnotation(filePath: string): void {
 // We have to strip the source map comment from here, otherwise when it loads
 // in Chrome, it tries to get preload.js.map from the real server, leaving
 // us with an annoying error because that's never going to work.
-const filePath = path.join(import.meta.dirname, 'build', 'preload.cjs');
+const filePath = path.join(import.meta.dirname, '..', 'build', 'preload.cjs');
 removeSourceMapAnnotation(filePath);

package.json

@@ -9,14 +9,14 @@
   "main": "build/index.js",
   "scripts": {
     "postinstall": "electron-builder install-app-deps",
-    "server:setup": "tsx ./setup-server.ts",
+    "server:setup": "tsx ./build-setup/setup-server.ts",
     "build": "npm run build:src && npm run build:electron",
     "build:src": "tsc",
-    "postbuild:src": "tsx ./strip-preload-map.ts",
-    "build:electron": "npm run server:setup && electron-builder build --config electron-builder.config.cjs",
+    "postbuild:src": "tsx ./build-setup/strip-preload-map.ts",
+    "build:electron": "npm run server:setup && electron-builder build --config ./build-setup/electron-builder.config.cjs",
     "build:dir-only": "npm run server:setup && electron-builder --dir",
     "start": "npm run server:setup && npm run start:app",
-    "start:dev": "tsx ./skip-server.ts && cross-env HTK_DEV=true APP_URL='http://localhost:8080' npm run start:app",
+    "start:dev": "tsx ./build-setup/skip-server.ts && cross-env HTK_DEV=true APP_URL='http://localhost:8080' npm run start:app",
     "start:app": "tsc-watch --onSuccess \"electron .\"",
     "test": "npm run server:setup && npm run build:src && playwright test"
   },