Merge branch 'main' into 1185-git-request-classification

Author: JamieSlome

.github/workflows/ci.yml

@@ -50,6 +50,9 @@ jobs:
       - name: Check Types (Server)
         run: npm run check-types:server
 
+      - name: Build TypeScript
+        run: npm run build-ts
+
       - name: Test
         id: test
         run: |

.github/workflows/sample-publish.yml

@@ -9,22 +9,32 @@ permissions:
   contents: read
 
 jobs:
-  build:
+  build-and-publish:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
         with:
           egress-policy: audit
-
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
       # Setup .npmrc file to publish to npm
       - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
         with:
           node-version: '22.x'
           registry-url: 'https://registry.npmjs.org'
-      - name: publish sample package
-        run: npm install --include peer && npm publish --access=public
+
+      - name: Install dependencies
+        working-directory: plugins/git-proxy-plugin-samples
+        run: npm ci
+
+      - name: Build TypeScript
+        working-directory: plugins/git-proxy-plugin-samples
+        run: npm run build
+
+      - name: Install peers and publish
         working-directory: plugins/git-proxy-plugin-samples
+        run: |
+          npm install --include=peer
+          npm publish --provenance --access=public
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.npmignore

@@ -1,5 +1,12 @@
 # This file required to override .gitignore when publishing to npm
+src/
+tests/
+*.test.ts
+
+tsconfig.json
+jest.config.js
+.eslintrc.js
+.prettierrc
+
 website/
 plugins/
-experimental/
-cypress/

package.json

@@ -2,18 +2,45 @@
   "name": "@finos/git-proxy",
   "version": "2.0.0-rc.3",
   "description": "Deploy custom push protections and policies on top of Git.",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./dist/index.js",
+      "require": "./dist/index.js",
+      "types": "./dist/index.d.ts"
+    },
+    "./config": {
+      "import": "./dist/src/config/index.js",
+      "require": "./dist/src/config/index.js",
+      "types": "./dist/src/config/index.d.ts"
+    },
+    "./db": {
+      "import": "./dist/src/db/index.js",
+      "require": "./dist/src/db/index.js",
+      "types": "./dist/src/db/index.d.ts"
+    },
+    "./proxy": {
+      "import": "./dist/src/proxy/index.js",
+      "require": "./dist/src/proxy/index.js",
+      "types": "./dist/src/proxy/index.d.ts"
+    },
+    "./types": {
+      "import": "./dist/src/types/models.js",
+      "require": "./dist/src/types/models.js",
+      "types": "./dist/src/types/models.d.ts"
+    }
+  },
   "scripts": {
     "cli": "tsx ./packages/git-proxy-cli/index.ts",
     "cli:js": "node ./packages/git-proxy-cli/dist/index.js",
     "client": "vite --config vite.config.ts",
     "clientinstall": "npm install --prefix client",
     "server": "tsx index.ts",
     "start": "concurrently \"npm run server\" \"npm run client\"",
-    "build": "npm run generate-config-types && npm run build-ui && npm run build-lib",
-    "build-ts": "tsc",
+    "build": "npm run generate-config-types && npm run build-ui && npm run build-ts",
+    "build-ts": "tsc --project tsconfig.publish.json && ./scripts/fix-shebang.sh",
     "build-ui": "vite build",
-    "build-lib": "./scripts/build-for-publish.sh",
-    "restore-lib": "./scripts/undo-build.sh",
     "check-types": "tsc",
     "check-types:server": "tsc --project tsconfig.publish.json --noEmit",
     "test": "NODE_ENV=test ts-mocha './test/**/*.test.js' --exit",
@@ -30,7 +57,7 @@
     "generate-config-types": "quicktype --src-lang schema --lang typescript --out src/config/generated/config.ts --top-level GitProxyConfig config.schema.json && ts-node scripts/add-banner.ts src/config/generated/config.ts && prettier --write src/config/generated/config.ts"
   },
   "bin": {
-    "git-proxy": "./index.js",
+    "git-proxy": "./dist/index.js",
     "git-proxy-all": "concurrently 'npm run server' 'npm run client'"
   },
   "workspaces": [

packages/git-proxy-cli/index.ts

@@ -5,8 +5,8 @@ import { hideBin } from 'yargs/helpers';
 import fs from 'fs';
 import util from 'util';
 
-import { CommitData, PushData } from '@finos/git-proxy/src/types/models';
-import { PushQuery } from '@finos/git-proxy/src/db/types';
+import { CommitData, PushData } from '@finos/git-proxy/types';
+import { PushQuery } from '@finos/git-proxy/db';
 
 const GIT_PROXY_COOKIE_FILE = 'git-proxy-cookie';
 // GitProxy UI HOST and PORT (configurable via environment variable)

scripts/build-for-publish.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+REPO_ROOT="$(git rev-parse --show-toplevel)"
+cd "$REPO_ROOT"
+
+# Replace tsx with node in the shebang
+sed -ie '1s/tsx/node/' dist/index.js

scripts/fix-shebang.sh

@@ -1,11 +1,9 @@
 #!/usr/bin/env bash
 set -euxo pipefail
 
-# Undo what was done by build-for-publish.sh in the event this was ran locally
+# Clean build artifacts
 
 REPO_ROOT="$(git rev-parse --show-toplevel)"
 cd "$REPO_ROOT"
 
-rm -rf dist index.js index.d.ts || true
-git checkout src index.ts
-git clean -f src
+rm -rf dist

scripts/undo-build.sh

@@ -169,4 +169,6 @@ export const findUserByEmail = (email: string): Promise<User | null> => sink.fin
 export const findUserByOIDC = (oidcId: string): Promise<User | null> => sink.findUserByOIDC(oidcId);
 export const getUsers = (query?: Partial<UserQuery>): Promise<User[]> => sink.getUsers(query);
 export const deleteUser = (username: string): Promise<void> => sink.deleteUser(username);
+
 export const updateUser = (user: Partial<User>): Promise<void> => sink.updateUser(user);
+export type { PushQuery, Repo, Sink, User } from './types';

src/db/index.ts

@@ -21,7 +21,7 @@ import RouteGuard from './ui/components/RouteGuard/RouteGuard';
 import Person from '@material-ui/icons/Person';
 import OpenPushRequests from './ui/views/OpenPushRequests/OpenPushRequests';
 import PushDetails from './ui/views/PushDetails/PushDetails';
-import User from './ui/views/User/User';
+import User from './ui/views/User/UserProfile';
 import UserList from './ui/views/UserList/UserList';
 import RepoDetails from './ui/views/RepoDetails/RepoDetails';
 import RepoList from './ui/views/RepoList/RepoList';