Skip to content

Commit f26cb36

Browse files
authored
Merge pull request #24 for v0.13.1 release
2 parents 58019f8 + a9025b3 commit f26cb36

File tree

5 files changed

+8
-35
lines changed

5 files changed

+8
-35
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,5 @@ _testmain.go
2727
*.test
2828
*.prof
2929
*.bak
30+
31+
go.sum

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
### News
1212

13+
* `v0.13.1` [released](https://github.com/go-aah/tools/releases/tag/v0.13.1) and tagged on Dec 04, 2018.
1314
* `v0.13.0` [released](https://github.com/go-aah/tools/releases/tag/v0.13.0) and tagged on Dec 02, 2018.
1415
* `v0.12.2` [released](https://github.com/go-aah/tools/releases/tag/v0.12.2) and tagged on Jul 20, 2018.
1516

aah/embed.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func processMount(mode bool, appBaseDir, vroot, proot string, skipList ess.Exclu
3838
if mode {
3939
cliLog.Infof("|-- Processing mount: '%s' <== '%s'", vroot, proot)
4040
}
41-
b, err := generateVFSSource(mode, vroot, proot, skipList, noGzipList)
41+
b, err := generateVFSSource(mode, appBaseDir, vroot, proot, skipList, noGzipList)
4242
if err != nil {
4343
return err
4444
}
@@ -53,7 +53,7 @@ func processMount(mode bool, appBaseDir, vroot, proot string, skipList ess.Exclu
5353
// generateVFSSource method creates Virtual FileSystem (VFS) code
5454
// to add files and directories within binary for configured Mount points
5555
// on file aah.project.
56-
func generateVFSSource(mode bool, vroot, proot string, skipList ess.Excludes, noGzipList []string) ([]byte, error) {
56+
func generateVFSSource(mode bool, appBaseDir, vroot, proot string, skipList ess.Excludes, noGzipList []string) ([]byte, error) {
5757
err := skipList.Validate()
5858
if err != nil {
5959
return nil, err
@@ -87,7 +87,8 @@ func generateVFSSource(mode bool, vroot, proot string, skipList ess.Excludes, no
8787
fpath = filepath.ToSlash(fpath)
8888
fname := path.Base(fpath)
8989
if skipList.Match(fname) {
90-
if fname == "app" && strings.Contains(fpath, "/pages/") {
90+
if fname == "app" && (strings.Contains(fpath, "/pages/") ||
91+
fpath == filepath.ToSlash(appBaseDir)) {
9192
goto sc
9293
}
9394

aah/go.sum

Lines changed: 0 additions & 31 deletions
This file was deleted.

aah/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
)
1919

2020
// Version no. of aah framework CLI tool
21-
var Version = "0.13.0"
21+
var Version = "0.13.1"
2222

2323
var (
2424
errVersionNotExists = errors.New("version not exists")

0 commit comments

Comments
 (0)