Skip to content

Commit 4b14c79

Browse files
committed
Merge branch 'main' of github.com:graphprotocol/hypergraph into chris.whited/fix-published-pkg
2 parents 6b01afd + 42d9a3b commit 4b14c79

File tree

119 files changed

+3245
-1711
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+3245
-1711
lines changed

.github/workflows/fly-deploy.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# See https://fly.io/docs/app-guides/continuous-deployment-with-github-actions/
2+
3+
name: Fly Deploy (Paused)
4+
on:
5+
push:
6+
branches:
7+
- main
8+
jobs:
9+
deploy:
10+
name: Deploy app
11+
runs-on: ubuntu-latest
12+
concurrency: deploy-group # optional: ensure only one action runs at a time
13+
steps:
14+
- uses: actions/checkout@v4
15+
# - uses: superfly/flyctl-actions/setup-flyctl@master
16+
# - run: flyctl deploy --remote-only
17+
# env:
18+
# FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
22

Dockerfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ RUN --mount=type=cache,id=workspace,target=/root/.local/share/pnpm/store pnpm in
2424
# Build stage for the server.
2525
FROM base AS build
2626
# TODO: Remove this when we switch to an actual database.
27-
ENV DATABASE_URL="file:./dev.db"
27+
# ENV DATABASE_URL="file:./dev.db"
2828
RUN \
2929
# TODO: This initalizes the database. But we should probably remove this later.
3030
pnpm --filter server prisma migrate reset --force && \
@@ -40,13 +40,15 @@ RUN \
4040
mkdir -p deployment/out && mv deployment/dist deployment/node_modules deployment/package.json deployment/out && \
4141
# Add prisma client in dist
4242
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 && \
43-
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
43+
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 && \
44+
mv deployment/prisma deployment/out
4445

4546
# Slim runtime image.
4647
FROM node:22-alpine AS server
4748
WORKDIR /app
4849
COPY --from=build /workspace/deployment/out .
4950
# TODO: Remove this when we switch to an actual database.
50-
ENV DATABASE_URL="file:./dev.db"
51+
ENV DATABASE_URL="file:/mnt/hypergraph_data/production.sqlite"
52+
RUN npm run prisma migrate deploy --skip-generate
5153
EXPOSE 3030
52-
CMD ["node", "dist/index.js"]
54+
CMD ["sh", "-c", "npm run prisma migrate deploy && node dist/index.js"]

README.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Graph Framework
1+
# Hypergraph Framework
22

33
## Development
44

@@ -22,16 +22,22 @@ pnpm dev
2222
# in another tab
2323
cd apps/server
2424
pnpm dev
25+
# in another tab
26+
cd apps/typesync
27+
pnpm build
28+
# then, from anywhere in the repo, start Typesync
29+
hypergraph typesync
2530
```
2631

32+
2733
Any time you make changes to the schema, you will need to run the following commands:
2834

2935
```sh
3036
cd apps/server
3137
pnpm prisma migrate dev # this will also generate the Prisma client
3238
```
3339

34-
You can run the next example app with:
40+
You can run the Typesync Next example app with:
3541

3642
```sh
3743
# Notes:
@@ -40,6 +46,7 @@ cd apps/next-example
4046
pnpm dev
4147
```
4248

49+
4350
## Upgrading Dependencies
4451

4552
```sh

apps/connect/.env.development

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
VITE_HYPERGRAPH_SYNC_SERVER_ORIGIN="http://localhost:3030"
2-
VITE_HYPERGRAPH_CHAIN="geogenesis"
3-
VITE_HYPERGRAPH_API_URL="https://hypergraph-v2.up.railway.app/graphql"
4-
VITE_HYPERGRAPH_RPC_URL="https://rpc-geo-genesis-h0q2s21xx8.t.conduit.xyz"
2+
VITE_HYPERGRAPH_CHAIN="geo-testnet"
3+
VITE_HYPERGRAPH_API_URL="https://hypergraph-v2-testnet.up.railway.app/graphql"
4+
VITE_HYPERGRAPH_RPC_URL="https://rpc-geo-test-zc16z3tcvf.t.conduit.xyz"
5+
VITE_PRIVY_APP_ID="cmbhnmo1x000bla0mxudtd8z9"
6+
VITE_PRIVY_PROVIDERS="development"
7+
# VITE_HYPERGRAPH_CHAIN="geogenesis"
8+
# VITE_HYPERGRAPH_API_URL="https://hypergraph-v2.up.railway.app/graphql"
9+
# VITE_HYPERGRAPH_RPC_URL="https://rpc-geo-genesis-h0q2s21xx8.t.conduit.xyz"

apps/connect/.env.production

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
VITE_HYPERGRAPH_SYNC_SERVER_ORIGIN="https://syncserver.hypergraph.thegraph.com"
2-
VITE_HYPERGRAPH_CHAIN="geogenesis"
3-
VITE_HYPERGRAPH_API_URL="https://hypergraph-v2.up.railway.app/graphql"
4-
VITE_HYPERGRAPH_RPC_URL="https://rpc-geo-genesis-h0q2s21xx8.t.conduit.xyz"
1+
# VITE_HYPERGRAPH_SYNC_SERVER_ORIGIN="https://syncserver.hypergraph.thegraph.com"
2+
VITE_HYPERGRAPH_SYNC_SERVER_ORIGIN="https://hypergraph.fly.dev"
3+
VITE_HYPERGRAPH_CHAIN="geo-testnet"
4+
VITE_HYPERGRAPH_API_URL="https://hypergraph-v2-testnet.up.railway.app/graphql"
5+
VITE_HYPERGRAPH_RPC_URL="https://rpc-geo-test-zc16z3tcvf.t.conduit.xyz"
6+
VITE_PRIVY_APP_ID="cmcccikza007bjy0niawgutl0"
7+
VITE_PRIVY_PROVIDERS="production"

apps/connect/.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
routeTree.gen.ts

apps/connect/components.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

apps/connect/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8" />
55
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7-
<title>Connect</title>
7+
<title>Geo Connect</title>
88
<meta name="description" content="Authenticate with your Geo Account" />
99
</head>
1010
<body>

apps/connect/package.json

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,39 +5,46 @@
55
"type": "module",
66
"scripts": {
77
"dev": "vite --force",
8-
"preview": "vite preview"
8+
"preview": "vite preview",
9+
"lint": "biome check --formatter-enabled=false",
10+
"lint:fix": "biome check --formatter-enabled=false --write --unsafe",
11+
"format": "prettier --write --list-different . && biome format --write",
12+
"format:check": "biome check --linter-enabled=false",
13+
"check": "pnpm run lint && pnpm run format:check",
14+
"check:fix": "pnpm run lint:fix && pnpm run format"
915
},
1016
"dependencies": {
17+
"@base-ui-components/react": "1.0.0-beta.0",
18+
"@graphprotocol/grc-20": "^0.21.2",
1119
"@graphprotocol/hypergraph": "workspace:*",
1220
"@graphprotocol/hypergraph-react": "workspace:*",
1321
"@privy-io/react-auth": "^2.13.0",
14-
"@radix-ui/react-avatar": "^1.1.9",
15-
"@radix-ui/react-icons": "^1.3.2",
16-
"@radix-ui/react-slot": "^1.2.2",
1722
"@tanstack/react-query": "^5.75.5",
1823
"@tanstack/react-router": "^1.120.2",
1924
"@xstate/store": "^3.5.1",
20-
"class-variance-authority": "^0.7.1",
2125
"clsx": "^2.1.1",
22-
"effect": "^3.16.3",
23-
"framer-motion": "^12.10.1",
26+
"effect": "^3.16.10",
2427
"graphql-request": "^7.2.0",
2528
"lucide-react": "^0.508.0",
2629
"react": "^19.1.0",
2730
"react-dom": "^19.1.0",
2831
"tailwind-merge": "^3.2.0",
29-
"tailwindcss-animate": "^1.0.7",
3032
"viem": "^2.30.6",
3133
"vite": "^6.3.5"
3234
},
3335
"devDependencies": {
34-
"@tailwindcss/vite": "^4.1.5",
36+
"@tailwindcss/vite": "^4.1.10",
3537
"@tanstack/router-devtools": "^1.120.2",
3638
"@tanstack/router-plugin": "^1.120.2",
3739
"@types/node": "^22.15.15",
3840
"@types/react": "^19.1.3",
3941
"@types/react-dom": "^19.1.3",
4042
"@vitejs/plugin-react": "^4.4.1",
41-
"tailwindcss": "^4.1.5"
43+
"prettier": "^3.6.0",
44+
"prettier-plugin-tailwindcss": "^0.6.13",
45+
"tailwindcss": "^4.1.10",
46+
"unplugin-fonts": "^1.3.1",
47+
"vite-plugin-node-polyfills": "^0.23.0",
48+
"vite-plugin-svgr": "^4.3.0"
4249
}
4350
}

0 commit comments

Comments
 (0)