fix: conflicts

Author: thelullabyy

.github/actions/javascript/markPullRequestsAsDeployed/index.js

@@ -12707,7 +12707,7 @@ function wrappy (fn, cb) {
 /***/ }),
 
 /***/ 2483:
-/***/ (function(module, exports, __nccwpck_require__) {
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
 "use strict";
 
@@ -12748,7 +12748,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-/* eslint-disable @typescript-eslint/naming-convention, import/no-import-module-exports */
+/* eslint-disable @typescript-eslint/naming-convention */
 const ActionUtils = __importStar(__nccwpck_require__(6981));
 const CONST_1 = __importDefault(__nccwpck_require__(9873));
 const GithubUtils_1 = __importDefault(__nccwpck_require__(9296));
@@ -12937,7 +12937,7 @@ async function run() {
 if (require.main === require.cache[eval('__filename')]) {
     run();
 }
-module.exports = run;
+exports["default"] = run;
 
 
 /***/ }),

.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed.ts

@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/naming-convention, import/no-import-module-exports */
+/* eslint-disable @typescript-eslint/naming-convention */
 import * as ActionUtils from '@github/libs/ActionUtils';
 import CONST from '@github/libs/CONST';
 import GithubUtils from '@github/libs/GithubUtils';
@@ -219,4 +219,4 @@ if (require.main === module) {
     run();
 }
 
-module.exports = run;
+export default run;

.github/workflows/authorChecklist.yml

@@ -16,7 +16,7 @@ jobs:
     if: |
       github.actor != 'OSBotify'
       && github.actor != 'imgbot[bot]'
-      && github.actor != 'melvin-bot[bot]'
+      && github.actor != 'MelvinBot'
     steps:
       - name: Checkout
         uses: useblacksmith/checkout@1c9394c220d293645707b625ba9d79685f093a8f # v1

.github/workflows/bunTests.yml

@@ -1,20 +1,27 @@
 name: Bun tests
 
 on:
+  workflow_call:
   pull_request:
     types: [opened, synchronize]
     branches-ignore: [staging, production]
     paths:
       - 'server/**'
       - 'src/**'
+      - 'tests/tooling/**'
+      - 'tests/utils/**'
+      - '.github/actions/javascript/**'
+      - '.github/libs/**'
+      - '.github/scripts/**'
+      - 'scripts/**'
       - 'bunfig.toml'
       - '.bun-version'
       - 'package.json'
       - 'package-lock.json'
       - '.github/workflows/bunTests.yml'
 
 concurrency:
-  group: ${{ github.ref }}-bun-tests
+  group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-bun-tests
   cancel-in-progress: true
 
 jobs:

.github/workflows/lint.yml

@@ -6,7 +6,21 @@ on:
     types: [opened, synchronize]
     branches-ignore: [staging, production]
     paths:
-      ['**.js', '**.ts', '**.tsx', '**.json', '**.mjs', '**.cjs', 'config/.editorconfig', 'config/eslint/**', 'scripts/lint.sh', 'scripts/lintChanged.sh', '.watchmanconfig', '.imgbotconfig']
+      [
+        '**.js',
+        '**.ts',
+        '**.tsx',
+        '**.json',
+        '**.mjs',
+        '**.cjs',
+        'config/.editorconfig',
+        'config/eslint/**',
+        'scripts/lint.ts',
+        'scripts/lintChanged.sh',
+        '.watchmanconfig',
+        '.imgbotconfig',
+        '.github/workflows/lint.yml',
+      ]
 
 concurrency:
   group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-lint
@@ -16,10 +30,9 @@ jobs:
   lint:
     name: ESLint check
     if: ${{ github.event.head_commit.author.name != 'OSBotify' || github.event_name == 'push' }}
-    # A cold-cache run lints the whole repo with type-aware rules, which loads the full TypeScript
-    # program in every worker (~12GB of heap each, regardless of how files are split between workers).
-    # 2 workers with a 14GB heap cap need ~30GB of memory, so this requires the 32GB (8vcpu) runner.
-    runs-on: blacksmith-8vcpu-ubuntu-2404
+    # A cold-cache run loads the full TypeScript program into every worker (~12GB each), plus any extra
+    # tsconfig project a file is mapped to. 2 workers need more than the 32GB an 8vcpu runner has.
+    runs-on: blacksmith-16vcpu-ubuntu-2404
     steps:
       - name: Checkout
         uses: useblacksmith/checkout@1c9394c220d293645707b625ba9d79685f093a8f # v1

.github/workflows/preDeploy.yml

@@ -21,18 +21,21 @@ jobs:
     uses: ./.github/workflows/test.yml
     secrets: inherit
 
+  bunTests:
+    uses: ./.github/workflows/bunTests.yml
+
   confirmPassingBuild:
     runs-on: blacksmith-4vcpu-ubuntu-2404
-    needs: [typecheck, lint, test]
+    needs: [typecheck, lint, test, bunTests]
     if: ${{ always() }}
 
     steps:
       - uses: useblacksmith/checkout@1c9394c220d293645707b625ba9d79685f093a8f # v1
 
       - name: Exit failed workflow
-        if: ${{ needs.typecheck.result == 'failure' || needs.lint.result == 'failure' || needs.test.result == 'failure' }}
+        if: ${{ needs.typecheck.result == 'failure' || needs.lint.result == 'failure' || needs.test.result == 'failure' || needs.bunTests.result == 'failure' }}
         run: |
-          echo "Checks failed, exiting ~ typecheck: ${{ needs.typecheck.result }}, lint: ${{ needs.lint.result }}, test: ${{ needs.test.result }}"
+          echo "Checks failed, exiting ~ typecheck: ${{ needs.typecheck.result }}, lint: ${{ needs.lint.result }}, test: ${{ needs.test.result }}, bunTests: ${{ needs.bunTests.result }}"
           exit 1
 
   chooseDeployActions:

.github/workflows/typecheck.yml

@@ -5,7 +5,7 @@ on:
   pull_request:
     types: [opened, synchronize]
     branches-ignore: [staging, production]
-    paths: ['**.js', '**.ts', '**.tsx', 'package.json', 'package-lock.json', 'tsconfig.json']
+    paths: ['**.js', '**.ts', '**.tsx', 'package.json', 'package-lock.json', '**/tsconfig.json']
 
 concurrency:
   group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-typecheck

.oxfmtrc.json

@@ -11,8 +11,8 @@
         "ignoreCase": true,
         "customGroups": [
             {
-                "groupName": "jest",
-                "elementNamePattern": ["@jest/globals", "@testing-library/**"]
+                "groupName": "test-runner",
+                "elementNamePattern": ["@jest/globals", "@testing-library/**", "bun:test"]
             },
             {"groupName": "assets", "elementNamePattern": ["@assets/**"]},
             {"groupName": "components", "elementNamePattern": ["@components/**"]},
@@ -28,7 +28,7 @@
             {"groupName": "src", "elementNamePattern": ["@src/**"]}
         ],
         "groups": [
-            "jest",
+            "test-runner",
             "assets",
             "components",
             "github",

CLAUDE.md

@@ -231,7 +231,8 @@ React Compiler auto-memoizes object literals, callbacks, JSX, and derived values
 
 ### Testing
 
-- **Unit Tests**: Jest with React Native Testing Library
+- **Unit Tests**: Jest with React Native Testing Library. Tests for `.github/` and `scripts/` live in
+  `tests/tooling/` and run under `bun:test` (`npm run test:bun`) — see `tests/tooling/README.md`.
 - **Performance Tests**: Reassure framework
 
 ## Special Considerations
@@ -292,6 +293,9 @@ npm run fmt
 
 # Testing
 npm run test
+
+# Bun tests: server/ plus the repo's own tooling (.github/ and scripts/)
+npm run test:bun
 ```
 
 ### Platform Builds