From 811dcc8c8c3de514ad21f8a3a94c1a83276ac4ea Mon Sep 17 00:00:00 2001
From: nick-delirium <nikita@openreplay.com>
Date: Fri, 27 Oct 2023 17:00:33 +0200
Subject: [PATCH] chore(tracker): fix assist build and version ingestion

---
 tracker/tracker-assist/bun.lockb      | Bin 245345 -> 245037 bytes
 tracker/tracker-assist/package.json   |  15 +++++++--------
 tracker/tracker-assist/pkgver.sh      |   1 +
 tracker/tracker-assist/src/Assist.ts  |   3 ++-
 tracker/tracker-assist/src/version.ts |   1 +
 5 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 tracker/tracker-assist/pkgver.sh
 create mode 100644 tracker/tracker-assist/src/version.ts

diff --git a/tracker/tracker-assist/bun.lockb b/tracker/tracker-assist/bun.lockb
index 25b189fe6a0ec832f1c3ba55001f38b5b7d4bb97..06287d996e625d42ffa1a911792f07ebdead5c0b 100755
GIT binary patch
delta 307
zcmaF(hi~mKz6pAoqA#v+cg0&)|0!O7_tX2tN#QkFC6iJa8J;95`b9Q*ZkxM@nE?b+
zCWgy1g~V>G&=B6dLRdj~^98jFGZ?uhUsN;REOJ0bc(cF(pkTr?*-H*yhc+s!#YS8d
z=;FKaB-G=<rBo%;6Uu7aVm}2&yu36=J|KAW!<9lSe;cYDGPAdyq3_UZ)qW~qdG5j%
z->rw61;n=(?q+mmoGhTuvOQ)O;~Kr~GA|ifO1WmlGJ##PC1rYa9FyJlIdM#q?3^hO
zL6yAi`%;<GIXUwn{D8*odihLp!h8ZienTTfkm2w4s3xY|>gkqmnJl>i{z60x{%z;_
h$CS><`47UMx@UXUe<s0wT!sdEAXt)KH67@p831bUZ0-O6

delta 461
zcmZ4ci|^qdz6pAoOp;BrJ~GukG_BUXw03JtN67rgzux=g9*XU9OZq0y*?w^^GXn^u
zP7If43XI!Wp&`tXmX?!PlFGoad4aHkFvspYGLp(cC+apIP`faLk#lljm^ts)y$lQ{
z3=9n*o$QkXUG+B~*)Jo^bbw{^uKjAltOr<t;+y|IRk&2YIU;U)Px`F`|8l?oxg*26
zd#&z#{fY4jllf;ZE6ZT{uJy}%`s5k@k2Kc2zrwSW*}hv{PN}Nm?d;4?KUls5bCgd6
z8pO!(kN+Pd149ZE$T|pMdG>bdABAhzr|?`YyWOb2h4=Hv5c$OcE5Za;uM>Otyl|)a
z7DugfS>lrVZ@W%B%+tu~o0sl!+W&6W*VZeVdWUYz=H7mA7o#)dBz2bUOLj7@(VKih
zO=Nq(3r3dG=@)h}8gk8ugV?qub$VPZlil{2u}m`ToT(5&mHh4dQkc>?IrAa>fTrzw
zc}#M`d>|(_G(iLz{%wzHWXi2(G?;GnhRK-UTn`vx0skP91^>5m{bfpL<oplepWM5>
e>K~KfK1R#wagNL?(>E_-7GehKm_Bh2^Be%ADXJs@

diff --git a/tracker/tracker-assist/package.json b/tracker/tracker-assist/package.json
index 9e93ab8f3..1ca11de79 100644
--- a/tracker/tracker-assist/package.json
+++ b/tracker/tracker-assist/package.json
@@ -15,19 +15,18 @@
   "scripts": {
     "tsrun": "tsc",
     "lint": "eslint src --ext .ts,.js --fix --quiet",
-    "build": "npm run build-es && npm run build-cjs",
-    "build-es": "rm -Rf lib && tsc && npm run replace-versions",
-    "build-cjs": "rm -Rf cjs && tsc --project tsconfig-cjs.json && echo '{ \"type\": \"commonjs\" }' > cjs/package.json && npm run replace-paths && npm run replace-versions",
+    "build": "bun run replace-pkg-version && bun run build-es && bun run build-cjs",
+    "build-es": "rm -Rf lib && tsc && bun run replace-req-version",
+    "build-cjs": "rm -Rf cjs && tsc --project tsconfig-cjs.json && echo '{ \"type\": \"commonjs\" }' > cjs/package.json && bun run replace-paths && bun run replace-req-version",
     "replace-paths": "replace-in-files cjs/* --string='@openreplay/tracker' --replacement='@openreplay/tracker/cjs' && replace-in-files cjs/* --string='/lib/' --replacement='/'",
-    "replace-versions": "npm run replace-pkg-version && npm run replace-req-version",
-    "replace-pkg-version": "replace-in-files lib/* cjs/* --string='PACKAGE_VERSION' --replacement=$npm_package_version",
-    "replace-req-version": "replace-in-files lib/* cjs/* --string='REQUIRED_TRACKER_VERSION' --replacement='8.0.0'",
-    "prepublishOnly": "npm run build",
+    "replace-pkg-version": "sh pkgver.sh",
+    "replace-req-version": "replace-in-files lib/* cjs/* --string='REQUIRED_TRACKER_VERSION' --replacement='9.0.0'",
+    "prepublishOnly": "bun run build",
     "prepare": "cd ../../ && husky install tracker/.husky/",
     "lint-front": "lint-staged",
     "test": "jest --coverage=false",
     "test:ci": "jest --coverage=true",
-    "postversion": "npm run build"
+    "postversion": "bun run build"
   },
   "dependencies": {
     "csstype": "^3.0.10",
diff --git a/tracker/tracker-assist/pkgver.sh b/tracker/tracker-assist/pkgver.sh
new file mode 100644
index 000000000..14be7d7f6
--- /dev/null
+++ b/tracker/tracker-assist/pkgver.sh
@@ -0,0 +1 @@
+sed -n 's/.*"version": *"\([^"]*\)".*/export const pkgVersion = "\1";/p' package.json > src/version.ts
diff --git a/tracker/tracker-assist/src/Assist.ts b/tracker/tracker-assist/src/Assist.ts
index 4253a5231..a52bad921 100644
--- a/tracker/tracker-assist/src/Assist.ts
+++ b/tracker/tracker-assist/src/Assist.ts
@@ -13,6 +13,7 @@ import ConfirmWindow from './ConfirmWindow/ConfirmWindow.js'
 import { callConfirmDefault, } from './ConfirmWindow/defaults.js'
 import type { Options as ConfirmOptions, } from './ConfirmWindow/defaults.js'
 import ScreenRecordingState from './ScreenRecordingState.js'
+import { pkgVersion, } from './version.js'
 
 // TODO: fully specified strict check with no-any (everywhere)
 // @ts-ignore
@@ -63,7 +64,7 @@ type Agent = {
 
 
 export default class Assist {
-  readonly version = 'PACKAGE_VERSION'
+  readonly version = pkgVersion
 
   private socket: Socket | null = null
   private peer: Peer | null = null
diff --git a/tracker/tracker-assist/src/version.ts b/tracker/tracker-assist/src/version.ts
new file mode 100644
index 000000000..819bfe0a6
--- /dev/null
+++ b/tracker/tracker-assist/src/version.ts
@@ -0,0 +1 @@
+export const pkgVersion = '6.0.3'