change paths from .tea -> .pkgx (#814)

Author: getneil

.github/workflows/ci.yml

@@ -84,8 +84,8 @@ jobs:
           MAC_BUILD_TARGET: "dir"
       - name: setup dev
         run: |
-          mkdir -p /Users/runner/.tea/tea.xyz/gui
-          touch /Users/runner/.tea/tea.xyz/gui/dev
+          mkdir -p /Users/runner/.pkgx/pkgx.app
+          touch /Users/runner/.pkgx/pkgx.app/dev
       - name: e2e test
         run: xc e2e
 

electron-builder.config.cjs

@@ -79,6 +79,6 @@ module.exports = {
   // this determines the configuration of the auto-update feature
   publish: {
     provider: "generic",
-    url: process.env.PUBLISH_URL || "https://gui.tea.xyz/release"
+    url: process.env.PUBLISH_URL || "https://gui.pkgx.dev/release"
   }
 };

electron/libs/auth.ts

@@ -1,7 +1,7 @@
 import { mkdirp } from "mkdirp";
 import path from "path";
 import fs from "fs";
-import { getTeaPath } from "./tea-dir";
+import { getPkgxPath } from "./pkgx-dir";
 import { app } from "electron";
 import log from "./logger";
 import axios from "axios";
@@ -12,8 +12,8 @@ import { InitWatcher } from "./initialize";
 import { baseURL } from "./v1-client";
 import { isDev } from "./auto-updater";
 
-const sessionFilePath = path.join(getTeaPath(), `tea.xyz/gui/${isDev() ? "dev.dat" : "tmp.dat"}`);
-const sessionFolder = path.join(getTeaPath(), "tea.xyz/gui");
+const sessionFilePath = path.join(getPkgxPath(), isDev() ? "dev.dat" : "tmp.dat");
+const sessionFolder = getPkgxPath();
 
 export interface Session {
   device_id?: string;

electron/libs/auto-updater.ts

@@ -1,7 +1,7 @@
 import { type AppUpdater, autoUpdater } from "electron-updater";
 import log from "./logger";
 import { MainWindowNotifier } from "./types";
-import { getTeaPath } from "./tea-dir";
+import { getGuiPath, getPkgxPath } from "./pkgx-dir";
 import path from "path";
 import fs from "fs";
 
@@ -109,14 +109,13 @@ autoUpdater.on("update-downloaded", (info) => {
   sendStatusToWindow({ status: "ready", version: info.version });
 });
 
-export const isDev = () => fs.existsSync(path.join(getTeaPath(), "tea.xyz/gui/dev"));
-export const isForceUpdate = () =>
-  fs.existsSync(path.join(getTeaPath(), "tea.xyz/gui/force-auto-update"));
+export const isDev = () => fs.existsSync(path.join(getPkgxPath(), "tea.xyz/gui/dev"));
+export const isForceUpdate = () => fs.existsSync(path.join(getGuiPath(), "force-auto-update"));
 
 async function setPublishURL() {
   try {
     const folder = isForceUpdate() ? "auto-update-test" : isDev() ? "dev" : "release";
-    const feedUrl = `https://gui.tea.xyz/${folder}`;
+    const feedUrl = `https://gui.pkgx.dev/${folder}`;
     log.info(`feedUrl$: ${feedUrl}`);
     autoUpdater.setFeedURL(feedUrl);
   } catch (error) {

electron/libs/cli.ts

@@ -1,10 +1,10 @@
-import { hooks } from "@teaxyz/lib";
+import { hooks } from "libpkgx";
 
 import log from "./logger";
 import { MainWindowNotifier } from "./types";
-import * as tea from "@teaxyz/lib";
-import { Installation } from "@teaxyz/lib";
-import type { Resolution } from "@teaxyz/lib/script/src/plumbing/resolve";
+import * as pkgx from "libpkgx";
+import { Installation } from "libpkgx";
+import type { Resolution } from "libpkgx/script/src/plumbing/resolve";
 
 export async function installPackage(
   full_name: string,
@@ -15,7 +15,7 @@ export async function installPackage(
 
   const qualifedPackage = `${full_name}@${version}`;
   log.info(`installing package ${qualifedPackage}`);
-  const result = await tea.porcelain.install(qualifedPackage, notifier);
+  const result = await pkgx.porcelain.install(qualifedPackage, notifier);
   log.info(`successfully installed ${qualifedPackage}`, result);
 }
 

electron/libs/entrypoints.ts

@@ -2,14 +2,14 @@ import pty from "node-pty";
 
 import log from "./logger";
 import { MainWindowNotifier } from "./types";
-import * as tea from "@teaxyz/lib";
+import * as pkgx from "libpkgx";
 import { GUIPackage } from "../../svelte/src/libs/types";
 import { getPantryDetails } from "./pantry";
 import { ipcMain } from "electron";
 
 // the tea cli package is needed to open any other package in the terminal, so make sure it's installed and return the path
 async function installTeaCli() {
-  const installations = await tea.porcelain.install("tea.xyz");
+  const installations = await pkgx.porcelain.install("tea.xyz");
   const install = installations.find((i) => i.pkg.project === "tea.xyz");
   if (!install) {
     throw new Error("installing tea/cli failed");
@@ -59,13 +59,13 @@ export async function openPackageEntrypointInTerminal(
 
   notifyMainWindow("pty.out", { project, type: "reset" });
 
-  const installation = await tea.hooks
+  const installation = await pkgx.hooks
     .useCellar()
-    .resolve({ project, constraint: new tea.semver.Range("*") });
+    .resolve({ project, constraint: new pkgx.semver.Range("*") });
   const shell =
     process.platform === "win32" ? "powershell.exe" : process.platform == "darwin" ? "zsh" : "bash";
-  const wet = await tea.plumbing.hydrate(installation.pkg);
-  const gas = await tea.plumbing.resolve(wet.pkgs);
+  const wet = await pkgx.plumbing.hydrate(installation.pkg);
+  const gas = await pkgx.plumbing.resolve(wet.pkgs);
   if (gas.pending.length) throw new Error("pkg dependencies not installed");
   const cwd = installation.path.string;
 
@@ -76,8 +76,8 @@ export async function openPackageEntrypointInTerminal(
     installations.push(cli);
   }
 
-  const rawenv = await tea.hooks.useShellEnv().map({ installations });
-  const env = tea.hooks.useShellEnv().flatten(rawenv);
+  const rawenv = await pkgx.hooks.useShellEnv().map({ installations });
+  const env = pkgx.hooks.useShellEnv().flatten(rawenv);
   env.PATH += ":/usr/bin:/bin";
   env.TMPDIR ??= process.env.TMPDIR ?? "error";
   env.HOME ??= process.env.HOME ?? "error";

electron/libs/ipc.ts

@@ -6,7 +6,7 @@ import {
   cacheImage,
   startMonitoringTeaDir,
   stopMonitoringTeaDir
-} from "./tea-dir";
+} from "./pkgx-dir";
 import { readSessionData, writeSessionData, pollAuth } from "./auth";
 import type { Packages, Session, GUIPackage } from "../../svelte/src/libs/types";
 import log from "./logger";
@@ -246,7 +246,7 @@ export default function initializeHandlers({ notifyMainWindow }: HandlerOptions)
     }
   });
 
-  ipcMain.handle("monitor-tea-dir", async () => {
+  ipcMain.handle("monitor-pkgx-dir", async () => {
     try {
       await startMonitoringTeaDir(notifyMainWindow);
     } catch (err) {
@@ -255,7 +255,7 @@ export default function initializeHandlers({ notifyMainWindow }: HandlerOptions)
     }
   });
 
-  ipcMain.handle("stop-monitor-tea-dir", async () => {
+  ipcMain.handle("stop-monitor-pkgx-dir", async () => {
     try {
       await stopMonitoringTeaDir();
     } catch (err) {

electron/libs/package.ts

@@ -2,13 +2,13 @@ import path from "path";
 import { mkdirp } from "mkdirp";
 import fs from "fs";
 import log from "./logger";
-import { getTeaPath } from "./tea-dir";
+import { getPkgxPath } from "./pkgx-dir";
 import { GUIPackage, Packages } from "../../svelte/src/libs/types";
 import { GUIBaseURL } from "../../svelte/src/libs/constants";
 import { isDev } from "./auto-updater";
 
-const pkgsFilePath = path.join(getTeaPath(), "tea.xyz/gui/pkgs.json");
-const pkgsFolder = path.join(getTeaPath(), "tea.xyz/gui");
+const pkgsFilePath = path.join(getPkgxPath(), "tea.xyz/gui/pkgs.json");
+const pkgsFolder = path.join(getPkgxPath(), "tea.xyz/gui");
 const dev = isDev();
 
 export async function writePackageCache(pkgs: Packages) {
@@ -70,7 +70,7 @@ export const nameToSlug = (name: string) => {
 
 export async function isInstalled(project: string, version?: string) {
   if (!version) {
-    const folderPath = path.join(getTeaPath(), project);
+    const folderPath = path.join(getPkgxPath(), project);
     return fs.existsSync(folderPath);
   } else {
     const cache = await loadPackageCache();

electron/libs/pantry.ts

@@ -1,4 +1,4 @@
-import { hooks } from "@teaxyz/lib";
+import { hooks } from "libpkgx";
 
 // Fetches the details for a package from the local pantry
 export async function getPantryDetails(full_name: string) {

electron/libs/tea-dir.ts electron/libs/pkgx-dir.tselectron/libs/tea-dir.ts renamed to electron/libs/pkgx-dir.ts

@@ -6,38 +6,36 @@ import { defaultImgUrl, type InstalledPackage } from "../../svelte/src/libs/type
 import { GUIBaseURL } from "../../svelte/src/libs/constants";
 import { mkdirp } from "mkdirp";
 import fetch from "node-fetch";
-import { SemVer, semver } from "@teaxyz/lib";
+import { SemVer, semver } from "libpkgx";
 import chokidar from "chokidar";
 import { MainWindowNotifier } from "./types";
-import { hooks } from "@teaxyz/lib";
+import { hooks } from "libpkgx";
 
 type ParsedVersion = { full_name: string; semVer: SemVer };
 
-export const getTeaPath = (): string => {
+export const getPkgxPath = (): string => {
   try {
     return hooks.useConfig().prefix.toString();
   } catch (error) {
     const homePath = app.getPath("home");
     log.info("Could not run tea --prefix. Using default path.");
-    return path.join(homePath, "./.tea");
+    return path.join(homePath, "./.pkgx");
   }
 };
 
-const guiFolder = path.join(getTeaPath(), "tea.xyz/gui");
-
 export const getGuiPath = () => {
-  return path.join(getTeaPath(), "tea.xyz/gui");
+  return path.join(getPkgxPath(), "pkgx.app");
 };
 
 export async function getInstalledVersionsForPackage(fullName: string): Promise<InstalledPackage> {
-  const pkgsPath = path.join(getTeaPath(), fullName);
+  const pkgsPath = path.join(getPkgxPath(), fullName);
   const result = await findInstalledVersions(pkgsPath);
   const pkg = result.find((v) => v.full_name === fullName);
   return pkg ?? { full_name: fullName, installed_versions: [] };
 }
 
 export async function getInstalledPackages(): Promise<InstalledPackage[]> {
-  return findInstalledVersions(getTeaPath());
+  return findInstalledVersions(getPkgxPath());
 }
 
 async function findInstalledVersions(pkgsPath: string): Promise<InstalledPackage[]> {
@@ -50,14 +48,14 @@ async function findInstalledVersions(pkgsPath: string): Promise<InstalledPackage
   const folders = await deepReadDir({
     dir: pkgsPath,
     continueDeeper: (name: string, path: string) => {
-      return !semver.isValid(name) && !name.startsWith(".") && !path.includes("tea.xyz/var");
+      return !semver.isValid(name) && !name.startsWith(".");
     },
-    filter: (name: string) => semver.isValid(name) && name !== ".tea",
+    filter: (name: string) => semver.isValid(name) && name !== ".pkgx",
     maxDepth: 5
   });
 
   const bottles = folders
-    .map((p: string) => p.split(".tea/")[1])
+    .map((p: string) => p.split(".pkgx/")[1])
     .map(parseVersionFromPath)
     .filter((v): v is ParsedVersion => !!v)
     .sort((a, b) => b.semVer.compare(a.semVer));
@@ -144,7 +142,7 @@ export const getPackagesInstalledList = async (): Promise<InstalledPackage[]> =>
       list = JSON.parse(listBuffer.toString()) as InstalledPackage[];
     } else {
       log.info("gui/installed.json does not exists!");
-      await mkdirp(guiFolder);
+      await mkdirp(getGuiPath());
       await updatePackageInstalledList([]);
     }
   } catch (error) {
@@ -156,7 +154,7 @@ export const getPackagesInstalledList = async (): Promise<InstalledPackage[]> =>
 export async function updatePackageInstalledList(list: InstalledPackage[]) {
   try {
     log.info("creating:", listFilePath);
-    await mkdirp(guiFolder);
+    await mkdirp(getGuiPath());
     await fs.writeFileSync(listFilePath, JSON.stringify(list), {
       encoding: "utf-8"
     });
@@ -167,7 +165,7 @@ export async function updatePackageInstalledList(list: InstalledPackage[]) {
 
 export async function deletePackageFolder(fullName, version) {
   try {
-    const foldPath = path.join(getTeaPath(), fullName, `v${version}`);
+    const foldPath = path.join(getPkgxPath(), fullName, `v${version}`);
     log.info("rm:", foldPath);
     fs.rmSync(foldPath, { recursive: true });
   } catch (error) {
@@ -240,7 +238,7 @@ export async function startMonitoringTeaDir(mainWindowNotifier: MainWindowNotifi
     return;
   }
 
-  const dir = path.join(getTeaPath(), "**/v*");
+  const dir = path.join(getPkgxPath(), "**/v*");
   log.info(`Start monitoring tea dir: ${dir}}`);
 
   watcher = chokidar.watch(dir, {
@@ -256,7 +254,7 @@ export async function startMonitoringTeaDir(mainWindowNotifier: MainWindowNotifi
       const dir = path.dirname(pth);
       const version = path.basename(pth);
       if (semver.isValid(version) && !fs.lstatSync(pth).isSymbolicLink()) {
-        const full_name = dir.split(".tea/")[1];
+        const full_name = dir.split(".pkgx/")[1];
         log.info(`Monitor - Added Package: ${full_name} v${version}`);
         mainWindowNotifier("pkg-modified", { full_name, version, type: "add" });
       }
@@ -266,7 +264,7 @@ export async function startMonitoringTeaDir(mainWindowNotifier: MainWindowNotifi
       const dir = path.dirname(pth);
       const version = path.basename(pth);
       if (semver.isValid(version)) {
-        const full_name = dir.split(".tea/")[1];
+        const full_name = dir.split(".pkgx/")[1];
         log.info(`Monitor - Removed Package: ${full_name} v${version}`);
         mainWindowNotifier("pkg-modified", {
           full_name,