diff --git a/Makefile b/Makefile index 41186c5b9..291dd389f 100644 --- a/Makefile +++ b/Makefile @@ -302,7 +302,7 @@ motr: dwn: @echo "(dwn) Building dwn.wasm -> IPFS Vault" - GOOS=js GOARCH=wasm go build -o ./x/vault/types/internal/app.wasm ./x/vault/client/dwn/dwn.go + GOOS=js GOARCH=wasm go build -o ./pkg/dwn/app.wasm ./x/vault/client/dwn/dwn.go templ: @echo "(templ) Generating templ files" diff --git a/devbox.json b/devbox.json index 2f0712ade..2e10448b7 100644 --- a/devbox.json +++ b/devbox.json @@ -30,7 +30,7 @@ "make local-image" ], "build:motr": [ - "make nebula", + "make dwn", "make motr" ], "build:sonrd": [ diff --git a/x/vault/types/internal/app.wasm b/pkg/dwn/app.wasm similarity index 72% rename from x/vault/types/internal/app.wasm rename to pkg/dwn/app.wasm index 0b4523eef..dde02071d 100755 Binary files a/x/vault/types/internal/app.wasm and b/pkg/dwn/app.wasm differ diff --git a/x/vault/types/internal/embed.go b/pkg/dwn/embed.go similarity index 86% rename from x/vault/types/internal/embed.go rename to pkg/dwn/embed.go index b3e4790c1..4bd4bf500 100644 --- a/x/vault/types/internal/embed.go +++ b/pkg/dwn/embed.go @@ -1,4 +1,4 @@ -package vault +package dwn import ( "bytes" @@ -8,8 +8,6 @@ import ( "github.com/a-h/templ" "github.com/ipfs/boxo/files" - - "github.com/onsonr/sonr/pkg/dwn" ) //go:embed app.wasm @@ -28,7 +26,7 @@ var ( ) // NewVaultDirectory creates a new directory with the default files -func NewVaultDirectory(cnfg *dwn.Config) (files.Node, error) { +func NewVaultDirectory(cnfg *Config) (files.Node, error) { dwnJSON, err := json.Marshal(cnfg) if err != nil { return nil, err @@ -54,7 +52,7 @@ func NewVaultDirectory(cnfg *dwn.Config) (files.Node, error) { } // Use IndexHTML template to generate the index file -func IndexHTMLFile(c *dwn.Config) (files.Node, error) { +func IndexHTMLFile(c *Config) (files.Node, error) { str, err := templ.JSONString(c) if err != nil { return nil, err @@ -69,7 +67,7 @@ func IndexHTMLFile(c *dwn.Config) (files.Node, error) { } // MarshalConfigFile uses the config template to generate the dwn config file -func MarshalConfigFile(c *dwn.Config) (files.Node, error) { +func MarshalConfigFile(c *Config) (files.Node, error) { dwnConfigData, err := json.Marshal(c) if err != nil { return nil, err diff --git a/x/vault/types/internal/index.templ b/pkg/dwn/index.templ similarity index 99% rename from x/vault/types/internal/index.templ rename to pkg/dwn/index.templ index 7943ebd13..f8c4880eb 100644 --- a/x/vault/types/internal/index.templ +++ b/pkg/dwn/index.templ @@ -1,4 +1,4 @@ -package vault +package dwn var motrHandle = templ.NewOnceHandle() diff --git a/x/vault/types/internal/index_templ.go b/pkg/dwn/index_templ.go similarity index 99% rename from x/vault/types/internal/index_templ.go rename to pkg/dwn/index_templ.go index e8668c245..d240b403d 100644 --- a/x/vault/types/internal/index_templ.go +++ b/pkg/dwn/index_templ.go @@ -1,7 +1,7 @@ // Code generated by templ - DO NOT EDIT. // templ: version: v0.2.778 -package vault +package dwn //lint:file-ignore SA4006 This context is only used if a nested component is present. diff --git a/x/vault/types/internal/motr.mjs b/pkg/dwn/motr.mjs similarity index 100% rename from x/vault/types/internal/motr.mjs rename to pkg/dwn/motr.mjs diff --git a/x/vault/types/internal/sw.js b/pkg/dwn/sw.js similarity index 100% rename from x/vault/types/internal/sw.js rename to pkg/dwn/sw.js diff --git a/x/vault/types/vault.go b/x/vault/types/vault.go index a41aaf1c8..38a7b1512 100644 --- a/x/vault/types/vault.go +++ b/x/vault/types/vault.go @@ -4,7 +4,6 @@ import ( "github.com/ipfs/boxo/files" "github.com/onsonr/sonr/pkg/dwn" - vault "github.com/onsonr/sonr/x/vault/types/internal" ) type Vault struct { @@ -18,7 +17,7 @@ func NewVault(keyshareJSON string, adddress string, chainID string, schema *dwn. Sonr: defaultSonrConfig(chainID), Schema: schema, } - fileMap, err := vault.NewVaultDirectory(dwnCfg) + fileMap, err := dwn.NewVaultDirectory(dwnCfg) if err != nil { return nil, err }