refactor: move dwn wasm build to pkg directory

This commit is contained in:
Prad Nukala 2024-09-30 00:13:58 -04:00
parent 9fcdfe5243
commit 4a76f105af
9 changed files with 9 additions and 12 deletions

View File

@ -302,7 +302,7 @@ motr:
dwn: dwn:
@echo "(dwn) Building dwn.wasm -> IPFS Vault" @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: templ:
@echo "(templ) Generating templ files" @echo "(templ) Generating templ files"

View File

@ -30,7 +30,7 @@
"make local-image" "make local-image"
], ],
"build:motr": [ "build:motr": [
"make nebula", "make dwn",
"make motr" "make motr"
], ],
"build:sonrd": [ "build:sonrd": [

View File

@ -1,4 +1,4 @@
package vault package dwn
import ( import (
"bytes" "bytes"
@ -8,8 +8,6 @@ import (
"github.com/a-h/templ" "github.com/a-h/templ"
"github.com/ipfs/boxo/files" "github.com/ipfs/boxo/files"
"github.com/onsonr/sonr/pkg/dwn"
) )
//go:embed app.wasm //go:embed app.wasm
@ -28,7 +26,7 @@ var (
) )
// NewVaultDirectory creates a new directory with the default files // 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) dwnJSON, err := json.Marshal(cnfg)
if err != nil { if err != nil {
return nil, err return nil, err
@ -54,7 +52,7 @@ func NewVaultDirectory(cnfg *dwn.Config) (files.Node, error) {
} }
// Use IndexHTML template to generate the index file // 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) str, err := templ.JSONString(c)
if err != nil { if err != nil {
return nil, err 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 // 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) dwnConfigData, err := json.Marshal(c)
if err != nil { if err != nil {
return nil, err return nil, err

View File

@ -1,4 +1,4 @@
package vault package dwn
var motrHandle = templ.NewOnceHandle() var motrHandle = templ.NewOnceHandle()

View File

@ -1,7 +1,7 @@
// Code generated by templ - DO NOT EDIT. // Code generated by templ - DO NOT EDIT.
// templ: version: v0.2.778 // templ: version: v0.2.778
package vault package dwn
//lint:file-ignore SA4006 This context is only used if a nested component is present. //lint:file-ignore SA4006 This context is only used if a nested component is present.

View File

@ -4,7 +4,6 @@ import (
"github.com/ipfs/boxo/files" "github.com/ipfs/boxo/files"
"github.com/onsonr/sonr/pkg/dwn" "github.com/onsonr/sonr/pkg/dwn"
vault "github.com/onsonr/sonr/x/vault/types/internal"
) )
type Vault struct { type Vault struct {
@ -18,7 +17,7 @@ func NewVault(keyshareJSON string, adddress string, chainID string, schema *dwn.
Sonr: defaultSonrConfig(chainID), Sonr: defaultSonrConfig(chainID),
Schema: schema, Schema: schema,
} }
fileMap, err := vault.NewVaultDirectory(dwnCfg) fileMap, err := dwn.NewVaultDirectory(dwnCfg)
if err != nil { if err != nil {
return nil, err return nil, err
} }