fix(sponsor): fixing sponsor syncing

johnlindquist · Dec 20, 2024 · 296fdee · 296fdee
1 parent d03fc38
commit 296fdee
Show file tree

Hide file tree

Showing 9 changed files with 231 additions and 304 deletions.
diff --git a/package.json b/package.json
@@ -110,14 +110,14 @@
     "isomorphic-git": "1.27.2",
     "jsonfile": "6.1.0",
     "keyv": "^5.2.2",
-    "keyv-file": "^5.0.4",
+    "keyv-file": "^5.1.1",
     "lowdb": "7.0.1",
     "marked": "4.3.0",
     "minimist": "1.2.8",
     "p-retry": "6.2.1",
     "project-name-generator": "2.1.9",
     "quick-score": "^0.2.0",
-    "replace-in-file": "8.2.0",
+    "replace-in-file": "8.3.0",
     "rimraf": "6.0.1",
     "rxjs": "7.8.1",
     "safe-stable-stringify": "^2.5.0",
@@ -144,7 +144,7 @@
     "tsx": "4.19.2",
     "typescript": "5.7.2",
     "unzipper": "0.12.3",
-    "vite": "6.0.3"
+    "vite": "6.0.4"
   },
   "ava": {
     "environmentVariables": {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/api/kit.ts b/src/api/kit.ts
@@ -1503,7 +1503,7 @@ let groupScripts = (scripts) => {
   return groupChoices(scripts, {
     groupKey: 'kenv',
     missingGroupName: 'Main',
-    order: splitEnvVarIntoArray(process?.env?.KIT_MAIN_ORDER, ['Favorite', 'Main', 'Scriptlets']),
+    order: splitEnvVarIntoArray(process?.env?.KIT_MAIN_ORDER, ['Favorite', 'Main', 'Scriptlets', 'Kit']),
 
     endOrder: splitEnvVarIntoArray(process?.env?.KIT_MAIN_END_ORDER, ['Apps', 'Pass']),
     recentKey: 'timestamp',

diff --git a/src/core/db.ts b/src/core/db.ts
@@ -31,6 +31,7 @@ import { JSONFile } from 'lowdb/node'
 import type { RestEndpointMethodTypes } from '@octokit/plugin-rest-endpoint-methods'
 import type { Keyv } from 'keyv'
 import type { DBData, DBKeyOrPath, DBReturnType } from '../types/kit.js'
+import { Env } from './enum.js'
 
 export const resolveKenv = (...parts: string[]) => {
   if (global.kitScript) {
@@ -402,6 +403,7 @@ export type AppDb = {
 export type UserDb = Partial<RestEndpointMethodTypes['users']['getAuthenticated']['response']['data']>
 
 export let setUserJson = async (user: UserDb) => {
+  await global.cli('set-env-var', 'KIT_LOGIN', user?.login || Env.REMOVE)
   await writeJson(userDbPath, user)
 }