diff --git a/.gitignore b/.gitignore index 20996fc..2076a23 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,5 @@ _testmain.go *.test *.prof *.bak + +go.sum diff --git a/README.md b/README.md index cbc5dc6..db523bb 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,7 @@ ### News + * `v0.13.1` [released](https://github.com/go-aah/tools/releases/tag/v0.13.1) and tagged on Dec 04, 2018. * `v0.13.0` [released](https://github.com/go-aah/tools/releases/tag/v0.13.0) and tagged on Dec 02, 2018. * `v0.12.2` [released](https://github.com/go-aah/tools/releases/tag/v0.12.2) and tagged on Jul 20, 2018. diff --git a/aah/embed.go b/aah/embed.go index 5cce2dd..fe7cc7d 100644 --- a/aah/embed.go +++ b/aah/embed.go @@ -38,7 +38,7 @@ func processMount(mode bool, appBaseDir, vroot, proot string, skipList ess.Exclu if mode { cliLog.Infof("|-- Processing mount: '%s' <== '%s'", vroot, proot) } - b, err := generateVFSSource(mode, vroot, proot, skipList, noGzipList) + b, err := generateVFSSource(mode, appBaseDir, vroot, proot, skipList, noGzipList) if err != nil { return err } @@ -53,7 +53,7 @@ func processMount(mode bool, appBaseDir, vroot, proot string, skipList ess.Exclu // generateVFSSource method creates Virtual FileSystem (VFS) code // to add files and directories within binary for configured Mount points // on file aah.project. -func generateVFSSource(mode bool, vroot, proot string, skipList ess.Excludes, noGzipList []string) ([]byte, error) { +func generateVFSSource(mode bool, appBaseDir, vroot, proot string, skipList ess.Excludes, noGzipList []string) ([]byte, error) { err := skipList.Validate() if err != nil { return nil, err @@ -87,7 +87,8 @@ func generateVFSSource(mode bool, vroot, proot string, skipList ess.Excludes, no fpath = filepath.ToSlash(fpath) fname := path.Base(fpath) if skipList.Match(fname) { - if fname == "app" && strings.Contains(fpath, "/pages/") { + if fname == "app" && (strings.Contains(fpath, "/pages/") || + fpath == filepath.ToSlash(appBaseDir)) { goto sc } diff --git a/aah/go.sum b/aah/go.sum deleted file mode 100644 index d024337..0000000 --- a/aah/go.sum +++ /dev/null @@ -1,31 +0,0 @@ -aahframe.work v0.12.0 h1:BTDHD2qpqrtTre9G/uzARIEnKaopcjf879fIgB/YlH0= -aahframe.work v0.12.0/go.mod h1:pJFDfvHExiQFl3P3o5cvuhvJVZUBMtlbQmxafVhnbL0= -cloud.google.com/go v0.30.0 h1:xKvyLgk56d0nksWq49J0UyGEeUIicTl4+UBiX1NPX9g= -cloud.google.com/go v0.30.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-aah/forge v0.6.0 h1:cEcHIz31icYqPxYCNvtAU8xvkOPA1TQl9u9pa/P6wJk= -github.com/go-aah/forge v0.6.0/go.mod h1:noFuP/1ZMLfYHd/CpUGNdlXgqeRaYiEkj7WsCdqnlvc= -github.com/go-playground/locales v0.12.1 h1:2FITxuFt/xuCNP1Acdhv62OzaCiviiE4kotfhkmOqEc= -github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM= -github.com/go-playground/universal-translator v0.16.0 h1:X++omBR/4cE2MNg91AoC3rmGrCjJ8eAeUP/K/EKx4DM= -github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY= -github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0= -github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= -github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8= -github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= -github.com/gobwas/ws v1.0.0 h1:1WdyfgUcImUfVBvYbsW2krIsnko+1QU2t45soaF8v1M= -github.com/gobwas/ws v1.0.0/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/radovskyb/watcher v0.0.0-20181027232338-25a66c5e3b26 h1:F2h0xraCykw2I3O/P2TWDyCdLf3MmX6GHd82SxFWEnA= -github.com/radovskyb/watcher v0.0.0-20181027232338-25a66c5e3b26/go.mod h1:78okwvY5wPdzcb1UYnip1pvrZNIVEIh/Cm+ZuvsUYIg= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/urfave/cli v1.20.0 h1:fDqGv3UG/4jbVl/QkFwEdddtEDjh/5Ov6X+0B/3bPaw= -github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= -golang.org/x/crypto v0.0.0-20181012144002-a92615f3c490 h1:va0qYsIOza3Nlf2IncFyOql4/3XUq3vfge/Ad64bhlM= -golang.org/x/crypto v0.0.0-20181012144002-a92615f3c490/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/net v0.0.0-20181201002055-351d144fa1fc h1:a3CU5tJYVj92DY2LaA1kUkrsqD5/3mLDhx2NcNqyW+0= -golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/oauth2 v0.0.0-20181003184128-c57b0facaced h1:4oqSq7eft7MdPKBGQK11X9WYUxmj6ZLgGTqYIbY1kyw= -golang.org/x/oauth2 v0.0.0-20181003184128-c57b0facaced/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -gopkg.in/go-playground/validator.v9 v9.21.0 h1:wSDJGBpQBYC1wLpVnGHLmshm2JicoSNdrb38Zj+8yHI= -gopkg.in/go-playground/validator.v9 v9.21.0/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ= diff --git a/aah/version.go b/aah/version.go index 206ac8f..169214f 100644 --- a/aah/version.go +++ b/aah/version.go @@ -18,7 +18,7 @@ import ( ) // Version no. of aah framework CLI tool -var Version = "0.13.0" +var Version = "0.13.1" var ( errVersionNotExists = errors.New("version not exists")