diff --git a/.github/workflows/deploy-hway.yml b/.github/workflows/deploy-hway.yml index 7ea78c5f1..df4078ac0 100644 --- a/.github/workflows/deploy-hway.yml +++ b/.github/workflows/deploy-hway.yml @@ -11,6 +11,8 @@ jobs: name: Deploy Sonr.ID on Cloudflare steps: - uses: actions/checkout@v4 + - name: Install devbox + uses: jetify-com/devbox-install-action@v0.12.0 - name: Deploy uses: cloudflare/wrangler-action@v3 with: diff --git a/Makefile b/Makefile index 25215da59..995198b5b 100644 --- a/Makefile +++ b/Makefile @@ -329,7 +329,7 @@ build-motr: gen-templ gen-pkl build-nebula: @echo "(nebula) Building nebula" - cd pkg/nebula && bun run build + cd pkg/nebula && bun install && bun run build ############################################################################### diff --git a/devbox.json b/devbox.json index 8795ff2e0..7c23bc064 100644 --- a/devbox.json +++ b/devbox.json @@ -30,6 +30,9 @@ "TEMPL_EXPERIMENT": "rawgo" }, "shell": { + "init_hook": [ + "cd web && bun install" + ], "scripts": { "build:docker": [ "make local-image" diff --git a/pkg/nebula/bun.lockb b/pkg/nebula/bun.lockb index 2b4712108..9282d2731 100755 Binary files a/pkg/nebula/bun.lockb and b/pkg/nebula/bun.lockb differ diff --git a/pkg/nebula/global/state/credentials.templ b/pkg/nebula/global/state/authenticator.templ similarity index 92% rename from pkg/nebula/global/state/credentials.templ rename to pkg/nebula/global/state/authenticator.templ index efe40b8fa..3166f8162 100644 --- a/pkg/nebula/global/state/credentials.templ +++ b/pkg/nebula/global/state/authenticator.templ @@ -1,12 +1,16 @@ package state +func UseNavigatorCredentials() { + templ.NewOnceHandle().Once() +} + templ NavigatorCredentialsCreate() { } templ NavigatorCredentialsGet() { } diff --git a/pkg/nebula/global/state/credentials_templ.go b/pkg/nebula/global/state/authenticator_templ.go similarity index 79% rename from pkg/nebula/global/state/credentials_templ.go rename to pkg/nebula/global/state/authenticator_templ.go index 1bcc75958..1c094100c 100644 --- a/pkg/nebula/global/state/credentials_templ.go +++ b/pkg/nebula/global/state/authenticator_templ.go @@ -8,6 +8,10 @@ package state import "github.com/a-h/templ" import templruntime "github.com/a-h/templ/runtime" +func UseNavigatorCredentials() { + templ.NewOnceHandle().Once() +} + func NavigatorCredentialsCreate() templ.Component { return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context @@ -29,7 +33,7 @@ func NavigatorCredentialsCreate() templ.Component { templ_7745c5c3_Var1 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -58,7 +62,7 @@ func NavigatorCredentialsGet() templ.Component { templ_7745c5c3_Var2 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/pkg/nebula/global/state/database.templ b/pkg/nebula/global/state/store.templ similarity index 100% rename from pkg/nebula/global/state/database.templ rename to pkg/nebula/global/state/store.templ diff --git a/pkg/nebula/global/state/database_templ.go b/pkg/nebula/global/state/store_templ.go similarity index 100% rename from pkg/nebula/global/state/database_templ.go rename to pkg/nebula/global/state/store_templ.go diff --git a/pkg/nebula/package.json b/pkg/nebula/package.json index 4ae6b4f02..3ce73e18d 100644 --- a/pkg/nebula/package.json +++ b/pkg/nebula/package.json @@ -7,17 +7,12 @@ "build": "bun run fetch:deps && bun run build:css", "watch": "bunx tailwindcss -i ./global/styles/globals.css -o ./assets/css/styles.css --watch" }, - "devDependencies": { + "dependencies": { + "node-fetch": "^3.3.2", "@tailwindcss/forms": "^0.5.7", "@tailwindcss/typography": "^0.5.15", - "alpinejs": "^3.14.1", - "htmx.org": "^1.9.12", + "sonr-es": "^0.5.3", "tailwindcss": "^3.3.0", - "tailwindcss-motion": "^0.3.0-beta", - "typescript": "^4.9.0" - }, - "dependencies": { - "node-fetch": "^3.3.2", - "sonr-es": "^0.5.3" + "tailwindcss-motion": "^0.3.0-beta" } } diff --git a/web/bun.lockb b/web/bun.lockb new file mode 100755 index 000000000..38ad7783c Binary files /dev/null and b/web/bun.lockb differ