fix: Templating failing (#209)

Signed-off-by: AlexNg <[email protected]>

Author: caffeine-addictt

Diff for: cmd/commands/new.go

@@ -219,7 +219,7 @@ var NewCmd = &cobra.Command{
 			}
 			log.Debugf("final template data: %v\n", finalTemplateData)
 
-			return WriteFiles(tmpDir, projectRootDir, filePathsToWrite, licenseText, finalTemplateData, licenseTmpl)
+			return WriteFiles(rootDir, projectRootDir, filePathsToWrite, licenseText, finalTemplateData, licenseTmpl)
 		})
 		if err != nil {
 			return errors.NewWakuErrorf("failed to write files: %s\n", err)

Diff for: internal/template/resource.go

@@ -49,7 +49,7 @@ func GetStyleResources(c *config.TemplateJson, s *config.TemplateStyle, configPa
 	ignoreRules = ResolveGlobs(ignoreRules, types.NewSet(".git/"))
 	log.Debugf("ignore rules: %v\n", ignoreRules)
 
-	includePaths := make(map[string]string, len(s.Includes)) // includePath: dir
+	includePaths := make(map[string]*config.TemplateInclude, len(s.Includes)) // includePath: dir
 	if s.Includes != nil {
 		for _, includePath := range s.Includes {
 			log.Infof("include path: %s\n", includePath.Source.String())
@@ -60,11 +60,7 @@ func GetStyleResources(c *config.TemplateJson, s *config.TemplateStyle, configPa
 
 			log.Debugf("resolved include paths: %v\n", inPths)
 			for p := range inPths {
-				if includePath.Directory == nil {
-					includePaths[filepath.Join(includePath.Source.String(), p)] = ""
-				} else {
-					includePaths[filepath.Join(includePath.Source.String(), p)] = includePath.Directory.String()
-				}
+				includePaths[filepath.Join(includePath.Source.String(), p)] = &includePath
 			}
 		}
 	}
@@ -87,19 +83,25 @@ func GetStyleResources(c *config.TemplateJson, s *config.TemplateStyle, configPa
 
 	resources := make([]types.StyleResource, 0, len(filteredPaths))
 	for v := range filteredPaths {
-		parts := strings.Split(v, "/")
-		projPath := strings.Join(parts[min(len(parts), 1):], "/")
+		var projPath string
 
-		if dirPrepend, ok := includePaths[v]; ok {
-			projPath = filepath.Join(dirPrepend, projPath)
+		if include, ok := includePaths[v]; ok {
+			projPath = strings.TrimPrefix(v, include.Source.String()+"/")
+			if include.Directory != nil {
+                projPath = filepath.Join(include.Directory.String(), projPath)
+            }
 
 			// skip if found in style list
-			searchPath := filepath.Join(s.Source.String(), projPath)
-			if stylePaths.Contains(searchPath) {
+			expectedStyleRelPath := filepath.Join(s.Source.String(), projPath)
+			if stylePaths.Contains(expectedStyleRelPath) {
 				continue
 			}
 		}
 
+		if projPath == "" {
+			projPath = strings.TrimPrefix(v, s.Source.String()+"/")
+		}
+
 		resources = append(resources, types.StyleResource{
 			TemplateResourceRelPath: v,
 			TemplatedProjectRelPath: projPath,

Diff for: pkg/version/version.go

@@ -1,4 +1,4 @@
 package version
 
 // The current app version
-const Version = "0.9.0-alpha1"
+const Version = "0.9.0-alpha2"

Diff for: scripts/version_bump.sh

@@ -3,7 +3,7 @@
 VERSION=$1
 VERSION_FILES="README.md pkg/version/version.go"
 VERSION_DIRS="www/docs scripts"
-CURRENT_VERSION=$(grep -oP 'const Version = "\K[\d\.]+' 'pkg/version/version.go' | head -n 1)
+CURRENT_VERSION=$(grep -oP 'const Version = "\K[\d\w\-\.]+' 'pkg/version/version.go' | head -n 1)
 SEMVER_REGEX=$(grep -oP "MustCompile\(\`\K.+(?=\`\))" "pkg/version/version_test.go" | head -n 1)
 
 if [[ -z "$VERSION" ]]; then