diff --git a/tools/lib/esbuildConfig.js b/tools/lib/esbuildConfig.js
index ae68822a58..d369a3fd60 100644
--- a/tools/lib/esbuildConfig.js
+++ b/tools/lib/esbuildConfig.js
@@ -1,8 +1,9 @@
 import fs from "fs/promises";
 import babel from "@babel/core";
 import babelPluginSyntaxTypescript from "@babel/plugin-syntax-typescript";
-import babelPluginSportFunctions from "../babel-plugin-sport-functions/index.cjs";
-import { getSport } from "./buildFuncs.js";
+import babelPluginSportFunctions from "../babel-plugin-sport-functions/index.js";
+import getSport from "./getSport.js";
+import path from "path";
 
 const babelCache = {};
 
@@ -10,49 +11,43 @@ const babelCache = {};
 const pluginSportFunctions = nodeEnv => ({
 	name: "sport-functions",
 	setup(build) {
-		build.onLoad({ filter: /\.tsx?$/, namespace: "file" }, async args => {
+		build.onResolve({ filter: /\..{1,}Sport/ }, async args => {
+			return {
+				path: path.join(args.resolveDir, args.path) + ".ts",
+				namespace: "by-sport",
+			};
+		});
+
+		build.onLoad({ filter: /\.tsx?$/, namespace: "by-sport" }, async args => {
 			const { mtimeMs } = await fs.stat(args.path);
 			if (babelCache[args.path] && babelCache[args.path].mtimeMs === mtimeMs) {
 				return babelCache[args.path].result;
 			}
 
-			const isTSX = args.path.endsWith("tsx");
-
-			const loader = isTSX ? "tsx" : "ts";
+			const loader = args.path.endsWith("tsx") ? "tsx" : "ts";
 
 			const text = await fs.readFile(args.path, "utf8");
 
 			// result is undefined if no match, meaning just do normal stuff
-			let result;
-			if (
-				text.includes("bySport") ||
-				(nodeEnv === "production" && text.includes("isSport"))
-			) {
-				const contents = (
-					await babel.transformAsync(text, {
-						babelrc: false,
-						configFile: false,
-						sourceMaps: "inline",
-						plugins: [
-							[babelPluginSyntaxTypescript, { isTSX }],
-							babelPluginSportFunctions,
-						],
-					})
-				).code;
+			const contents = (
+				await babel.transformAsync(text, {
+					babelrc: false,
+					configFile: false,
+					sourceMaps: "inline",
+					plugins: [
+						[babelPluginSyntaxTypescript, { isTSX: true }],
+						babelPluginSportFunctions,
+					],
+				})
+			).code;
 
-				result = { contents, loader };
-			}
+			const result = { contents, loader };
 
 			babelCache[args.path] = {
 				mtimeMs,
 				result,
 			};
 
-			if (result === undefined) {
-				// Might as well return the text, since we have it in memory already
-				result = { contents: text, loader };
-			}
-
 			return result;
 		});
 	},
@@ -69,16 +64,15 @@ const esbuildConfig = ({ nodeEnv, name }) => {
 		outfile,
 		bundle: true,
 		sourcemap: true,
-		jsx: "automatic",
-		jsxDev: nodeEnv === "development",
+		inject: ["tools/lib/react-shim.mjs"],
 		define: {
 			"process.env.NODE_ENV": JSON.stringify(nodeEnv),
 			"process.env.SPORT": JSON.stringify(sport),
 		},
 		plugins: [pluginSportFunctions(nodeEnv)],
 
-		// This is needed because dropbox conditionally requries various node builtins, and esbuild chokes on that even though it never actually makes it to the browser
-		external: name === "ui" ? ["crypto", "util"] : undefined,
+		// This is needed because dropbox conditionally requries various node builtins, and esbuild chokes on that even though it never actually makes it to the browser. Skip it for the worker though, otherwise that introduces a spurious error because the type export in worker/index.ts results in a module.exports being added.
+		platform: name === "ui" ? "node" : undefined,
 	};
 };