@typed-assistant/builder 0.0.73 → 0.0.75

package/CHANGELOG.md

@@ -1,13 +1,7 @@
 # @typed-assistant/builder
 
-## 0.0.2
+## 0.0.75
 
 ### Patch Changes
 
-- Update READMEs.
-
-## 0.0.1
-
-### Patch Changes
-
-- First version.
+- Prevent git pull from throwing.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typed-assistant/builder",
-  "version": "0.0.73",
+  "version": "0.0.75",
   "exports": {
     "./appProcess": "./src/appProcess.tsx",
     "./bunInstall": "./src/bunInstall.tsx",
@@ -23,11 +23,11 @@
     "eslint-plugin-html": "^7.1.0",
     "eslint": "^8.56.0",
     "ts-toolbelt": "^9.6.0",
-    "typescript": "^5.3.3",
-    "@typed-assistant/eslint-config": "0.0.10",
+    "typescript": "^5.4.0",
     "@typed-assistant/logger": "0.0.21",
     "@typed-assistant/typescript-config": "0.0.10",
-    "@typed-assistant/utils": "0.0.18"
+    "@typed-assistant/utils": "0.0.18",
+    "@typed-assistant/eslint-config": "0.0.10"
   },
   "peerDependencies": {},
   "publishConfig": {

package/src/appProcess.tsx

@@ -74,7 +74,15 @@ export async function setup({
       )
     },
   })
-  await setupGitSync()
+  await setupGitSync({
+    onChangesPulled: async () => {
+      subprocesses = await killAndRestartApp(
+        entryFile,
+        { mdiPaths },
+        subprocesses,
+      )
+    },
+  })
 
   return subprocesses
 }
@@ -164,7 +172,11 @@ const getAddonInfo = async () => {
   return data
 }
 
-const setupGitSync = async () => {
+const setupGitSync = async ({
+  onChangesPulled,
+}: {
+  onChangesPulled: () => void
+}) => {
   if (
     !process.env.GITHUB_TOKEN ||
     !process.env.GITHUB_USERNAME ||
@@ -178,7 +190,7 @@ const setupGitSync = async () => {
   }
 
   logger.warn({ emoji: "⬇️" }, "Setting up git poller...")
-  await setupGitPoller()
+  await setupGitPoller({ onChangesPulled })
 }
 
 const ig = ignore().add(

package/src/pullChanges.tsx

@@ -2,9 +2,13 @@ import { logger } from "@typed-assistant/logger"
 import { $ } from "bun"
 import { bunInstall } from "./bunInstall"
 
-export const pullChanges = async () => {
+export const pullChanges = async ({
+  onChangesPulled,
+}: {
+  onChangesPulled: () => void
+}) => {
   logger.debug({ emoji: "⬇️" }, "Pulling changes...")
-  const { exitCode, stderr, stdout } = await $`git pull`.quiet()
+  const { exitCode, stderr, stdout } = await $`git pull`.nothrow().quiet()
   if (exitCode) {
     logger.error(
       { additionalDetails: stderr.toString().trim(), emoji: "⬇️🚨" },
@@ -19,11 +23,12 @@ export const pullChanges = async () => {
     logger.debug({ emoji: "⬇️👌" }, "No new changes.")
     return {}
   } else {
+    if (packageJSONUpdated) {
+      logger.info({ emoji: "⬇️📦" }, "package.json updated.")
+      await bunInstall()
+    }
     logger.info({ emoji: "⬇️🆕" }, "Changes pulled.")
-  }
-  if (packageJSONUpdated) {
-    logger.info({ emoji: "⬇️📦" }, "package.json updated.")
-    await bunInstall()
+    onChangesPulled()
   }
   return {}
 }

package/src/setupGitPoller.tsx

@@ -4,18 +4,20 @@ import { pullChanges } from "./pullChanges"
 
 export const setupGitPoller = async ({
   gitPullPollDuration,
+  onChangesPulled,
 }: {
   /** Duration in seconds */
   gitPullPollDuration?: number
-} = {}) => {
+  onChangesPulled: () => void
+}) => {
   const duration = gitPullPollDuration ?? 30
-  await pullChanges()
+  await pullChanges({ onChangesPulled })
   logger.debug(
     { emoji: "⬇️⏳" },
     `Pulling changes again in ${duration} seconds...`,
   )
 
   setTimeout(() => {
-    setupGitPoller({ gitPullPollDuration })
+    setupGitPoller({ gitPullPollDuration, onChangesPulled })
   }, duration * ONE_SECOND)
 }