Merge branch 'main' into chris.whited/fix-published-pkg

Author: marcusrein

Dockerfile

@@ -37,7 +37,10 @@ RUN \
   # Create an isolated deployment for the server.
   pnpm --filter server deploy --prod deployment --legacy && \
   # Move the runtime build artifacts into a separate directory.
-  mkdir -p deployment/out && mv deployment/dist deployment/prisma deployment/node_modules deployment/package.json deployment/out
+  mkdir -p deployment/out && mv deployment/dist deployment/node_modules deployment/package.json deployment/out && \
+  # Add prisma client in dist
+  mv deployment/prisma/generated/client/libquery_engine-linux-musl-arm64-openssl-3.0.x.so.node deployment/out/dist/libquery_engine-linux-musl-arm64-openssl-3.0.x.so.node && \
+  mv deployment/prisma/generated/client/libquery_engine-linux-musl-openssl-3.0.x.so.node deployment/out/dist/libquery_engine-linux-musl-openssl-3.0.x.so.node
 
 # Slim runtime image.
 FROM node:22-alpine AS server

README.md

@@ -44,4 +44,17 @@ pnpm dev
 
 ```sh
 pnpm up --interactive --latest -r
+```
+
+## Publishing
+
+```sh
+# publish hypergraph
+pnpm build
+cd packages/hypergraph/publish
+pnpm publish
+# publish hypergraph-react
+pnpm build
+cd packages/hypergraph-react/publish
+pnpm publish
 ```

apps/connect/.env.development

@@ -1 +1,4 @@
-VITE_HYPERGRAPH_SYNC_SERVER_ORIGIN="http://localhost:3030"
+VITE_HYPERGRAPH_SYNC_SERVER_ORIGIN="http://localhost:3030"
+VITE_HYPERGRAPH_CHAIN="geogenesis"
+VITE_HYPERGRAPH_API_URL="https://hypergraph-v2.up.railway.app/graphql"
+VITE_HYPERGRAPH_RPC_URL="https://rpc-geo-genesis-h0q2s21xx8.t.conduit.xyz"

apps/connect/.env.production

@@ -1 +1,4 @@
-VITE_HYPERGRAPH_SYNC_SERVER_ORIGIN="https://syncserver.hypergraph.thegraph.com"
+VITE_HYPERGRAPH_SYNC_SERVER_ORIGIN="https://syncserver.hypergraph.thegraph.com"
+VITE_HYPERGRAPH_CHAIN="geogenesis"
+VITE_HYPERGRAPH_API_URL="https://hypergraph-v2.up.railway.app/graphql"
+VITE_HYPERGRAPH_RPC_URL="https://rpc-geo-genesis-h0q2s21xx8.t.conduit.xyz"

apps/connect/package.json

@@ -8,7 +8,6 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@graphprotocol/grc-20": "^0.11.5",
     "@graphprotocol/hypergraph": "workspace:*",
     "@graphprotocol/hypergraph-react": "workspace:*",
     "@privy-io/react-auth": "^2.13.0",
@@ -22,6 +21,7 @@
     "clsx": "^2.1.1",
     "effect": "^3.16.3",
     "framer-motion": "^12.10.1",
+    "graphql-request": "^7.2.0",
     "lucide-react": "^0.508.0",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",

apps/connect/src/components/create-space.tsx

@@ -54,6 +54,7 @@ export function CreateSpace() {
 
       const message: Messages.RequestConnectCreateSpaceEvent = {
         type: 'connect-create-space-event',
+        accountAddress,
         event: spaceEvent,
         spaceId: spaceEvent.transaction.id,
         keyBox: {

apps/connect/src/components/spaces.tsx

@@ -1,17 +1,16 @@
-import { useSpaces } from '@/hooks/use-spaces';
+import { usePrivateSpaces } from '@/hooks/use-private-spaces';
 
 export function Spaces() {
-  const { isPending, error, data } = useSpaces();
-
-  if (isPending) return 'Loading spaces …';
-
-  if (error) return `An error has occurred: ${error.message}`;
+  const { isPending, error, data } = usePrivateSpaces();
 
   return (
     <div>
       <h2 className="font-bold mb-2 mt-2">Spaces</h2>
       <ul className="space-y-4">
-        {data.map((space) => (
+        {!isPending && !error && data && data.length === 0 && <p>No spaces found</p>}
+        {isPending && <p>Loading spaces …</p>}
+        {error && <p>An error has occurred loading spaces: {error.message}</p>}
+        {data?.map((space) => (
           <li key={space.id}>
             <p>{space.name}</p>
             <p className="text-xs text-gray-500 mt-2 mb-1">Apps with access to this space</p>

apps/connect/src/hooks/use-spaces.ts …/connect/src/hooks/use-private-spaces.tsapps/connect/src/hooks/use-spaces.ts renamed to apps/connect/src/hooks/use-private-spaces.ts apps/connect/src/hooks/use-spaces.ts renamed to apps/connect/src/hooks/use-private-spaces.ts

@@ -1,6 +1,7 @@
 import { getAppInfoByIds } from '@/lib/get-app-info-by-ids';
+import { Connect } from '@graphprotocol/hypergraph';
 import { useIdentityToken } from '@privy-io/react-auth';
-import { useQuery } from '@tanstack/react-query';
+import { type UseQueryResult, useQuery } from '@tanstack/react-query';
 
 type SpaceData = {
   id: string;
@@ -15,15 +16,17 @@ type SpaceData = {
   }[];
 };
 
-export const useSpaces = () => {
+export const usePrivateSpaces = (): UseQueryResult<SpaceData[], Error> => {
   const { identityToken } = useIdentityToken();
 
   return useQuery<SpaceData[]>({
-    queryKey: ['spaces'],
+    queryKey: ['private-spaces'],
     queryFn: async () => {
       if (!identityToken) return [];
+      const accountAddress = Connect.loadAccountAddress(localStorage);
+      if (!accountAddress) return [];
       const response = await fetch(`${import.meta.env.VITE_HYPERGRAPH_SYNC_SERVER_ORIGIN}/connect/spaces`, {
-        headers: { 'privy-id-token': identityToken },
+        headers: { 'privy-id-token': identityToken, 'account-address': accountAddress },
       });
       const data = await response.json();
       const appIds = new Set<string>();

apps/connect/src/hooks/use-public-spaces.ts

@@ -0,0 +1,63 @@
+import { Connect } from '@graphprotocol/hypergraph';
+import { type UseQueryResult, useQuery } from '@tanstack/react-query';
+import { gql, request } from 'graphql-request';
+
+const publicSpacesQueryDocument = gql`
+query Spaces($accountAddress: String!) {
+  spaces(filter: {
+      member: { is: $accountAddress }
+  }) {
+    id
+    type
+    mainVotingAddress
+    personalAddress
+    entity {
+      name
+    }
+  }
+}
+`;
+
+type SpaceQueryResult = {
+  id: string;
+  type: string;
+  mainVotingAddress: string;
+  personalAddress: string;
+  entity: {
+    name: string;
+  };
+};
+
+type PublicSpacesQueryResult = {
+  spaces: SpaceQueryResult[];
+};
+
+export type PublicSpaceData = {
+  id: string;
+  type: string;
+  mainVotingAddress: string;
+  personalAddress: string;
+  name: string;
+};
+
+export const usePublicSpaces = (url: string): UseQueryResult<PublicSpaceData[], Error> => {
+  return useQuery<PublicSpaceData[]>({
+    queryKey: ['public-spaces'],
+    queryFn: async () => {
+      const accountAddress = Connect.loadAccountAddress(localStorage);
+      if (!accountAddress) return [];
+      const result = await request<PublicSpacesQueryResult>(url, publicSpacesQueryDocument, {
+        accountAddress,
+      });
+      return result?.spaces
+        ? result.spaces.map((space: SpaceQueryResult) => ({
+            id: space.id,
+            name: space.entity.name,
+            type: space.type,
+            mainVotingAddress: space.mainVotingAddress,
+            personalAddress: space.personalAddress,
+          }))
+        : [];
+    },
+  });
+};

apps/connect/src/routes/__root.tsx

@@ -14,6 +14,9 @@ export const Route = createRootRoute({
       }
 
       if (ready && !authenticated) {
+        if (router.state.location.href.startsWith('/authenticate')) {
+          localStorage.setItem('geo-connect-authenticate-redirect', router.state.location.href);
+        }
         router.navigate({
           to: '/login',
         });