Skip to content

Commit

Permalink
feat: make sure Viper compiles on WASM
Browse files Browse the repository at this point in the history
fsnotify is not available on WASM,
so config watching is not going to work.

Signed-off-by: Mark Sagi-Kazar <mark.sagikazar@gmail.com>
  • Loading branch information
sagikazarmark committed Apr 24, 2021
1 parent 727a41c commit 36be6bf
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 1 deletion.
26 changes: 26 additions & 0 deletions .github/workflows/wasm.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: WASM

on:
push:
branches:
- master
pull_request:

jobs:
build:
name: Build
runs-on: ubuntu-latest
env:
GOFLAGS: -mod=readonly

steps:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: '1.16'

- name: Checkout code
uses: actions/checkout@v2

- name: Ensure Viper compiles for WASM
run: GOOS=js GOARCH=wasm go build .
2 changes: 1 addition & 1 deletion viper.go
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ func (v *Viper) WatchConfig() {
initWG := sync.WaitGroup{}
initWG.Add(1)
go func() {
watcher, err := fsnotify.NewWatcher()
watcher, err := newWatcher()
if err != nil {
log.Fatal(err)
}
Expand Down
11 changes: 11 additions & 0 deletions watch.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// +build !js

package viper

import "github.com/fsnotify/fsnotify"

type watcher = fsnotify.Watcher

func newWatcher() (*watcher, error) {
return fsnotify.NewWatcher()
}
30 changes: 30 additions & 0 deletions watch_wasm.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// +build js,wasm

package viper

import (
"errors"

"github.com/fsnotify/fsnotify"
)

type watcher struct {
Events chan fsnotify.Event
Errors chan error
}

func (*watcher) Close() error {
return nil
}

func (*watcher) Add(name string) error {
return nil
}

func (*watcher) Remove(name string) error {
return nil
}

func newWatcher() (*watcher, error) {
return &watcher{}, errors.New("fsnotify is not supported on WASM")
}

0 comments on commit 36be6bf

Please sign in to comment.