From c4f613e4c556d64bb4d1c47b4fa2f66015f28448 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Tue, 18 Apr 2023 20:26:56 +1000 Subject: [PATCH] [windows] Fix paths for `wails init` --- v3/internal/templates/_base/default/go.mod.tmpl | 4 ++-- v3/internal/templates/lit-ts/go.mod.tmpl | 4 ++-- v3/internal/templates/lit/go.mod.tmpl | 4 ++-- v3/internal/templates/preact-ts/go.mod.tmpl | 4 ++-- v3/internal/templates/preact/go.mod.tmpl | 4 ++-- v3/internal/templates/react-swc-ts/go.mod.tmpl | 4 ++-- v3/internal/templates/react-swc/go.mod.tmpl | 4 ++-- v3/internal/templates/react-ts/go.mod.tmpl | 4 ++-- v3/internal/templates/react/go.mod.tmpl | 4 ++-- v3/internal/templates/svelte-ts/go.mod.tmpl | 4 ++-- v3/internal/templates/svelte/go.mod.tmpl | 4 ++-- v3/internal/templates/templates.go | 6 ++++-- v3/internal/templates/vanilla-ts/go.mod.tmpl | 4 ++-- v3/internal/templates/vanilla/go.mod.tmpl | 4 ++-- v3/internal/templates/vue-ts/go.mod.tmpl | 4 ++-- v3/internal/templates/vue/go.mod.tmpl | 4 ++-- 16 files changed, 34 insertions(+), 32 deletions(-) diff --git a/v3/internal/templates/_base/default/go.mod.tmpl b/v3/internal/templates/_base/default/go.mod.tmpl index 3c878c9ab..a05b62ce6 100644 --- a/v3/internal/templates/_base/default/go.mod.tmpl +++ b/v3/internal/templates/_base/default/go.mod.tmpl @@ -16,6 +16,6 @@ require ( golang.org/x/net v0.7.0 // indirect ) {{if gt (len .LocalModulePath) 0}} -replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}/v3 -replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}/v2 +replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}v3 +replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}v2 {{end}} diff --git a/v3/internal/templates/lit-ts/go.mod.tmpl b/v3/internal/templates/lit-ts/go.mod.tmpl index 3c878c9ab..a05b62ce6 100644 --- a/v3/internal/templates/lit-ts/go.mod.tmpl +++ b/v3/internal/templates/lit-ts/go.mod.tmpl @@ -16,6 +16,6 @@ require ( golang.org/x/net v0.7.0 // indirect ) {{if gt (len .LocalModulePath) 0}} -replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}/v3 -replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}/v2 +replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}v3 +replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}v2 {{end}} diff --git a/v3/internal/templates/lit/go.mod.tmpl b/v3/internal/templates/lit/go.mod.tmpl index 3c878c9ab..a05b62ce6 100644 --- a/v3/internal/templates/lit/go.mod.tmpl +++ b/v3/internal/templates/lit/go.mod.tmpl @@ -16,6 +16,6 @@ require ( golang.org/x/net v0.7.0 // indirect ) {{if gt (len .LocalModulePath) 0}} -replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}/v3 -replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}/v2 +replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}v3 +replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}v2 {{end}} diff --git a/v3/internal/templates/preact-ts/go.mod.tmpl b/v3/internal/templates/preact-ts/go.mod.tmpl index 3c878c9ab..a05b62ce6 100644 --- a/v3/internal/templates/preact-ts/go.mod.tmpl +++ b/v3/internal/templates/preact-ts/go.mod.tmpl @@ -16,6 +16,6 @@ require ( golang.org/x/net v0.7.0 // indirect ) {{if gt (len .LocalModulePath) 0}} -replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}/v3 -replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}/v2 +replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}v3 +replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}v2 {{end}} diff --git a/v3/internal/templates/preact/go.mod.tmpl b/v3/internal/templates/preact/go.mod.tmpl index 5fbc49867..bc1cc31ea 100644 --- a/v3/internal/templates/preact/go.mod.tmpl +++ b/v3/internal/templates/preact/go.mod.tmpl @@ -12,6 +12,6 @@ require ( golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect ) {{if gt (len .LocalModulePath) 0}} -replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}/v3 -replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}/v2 +replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}v3 +replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}v2 {{end}} diff --git a/v3/internal/templates/react-swc-ts/go.mod.tmpl b/v3/internal/templates/react-swc-ts/go.mod.tmpl index 3c878c9ab..a05b62ce6 100644 --- a/v3/internal/templates/react-swc-ts/go.mod.tmpl +++ b/v3/internal/templates/react-swc-ts/go.mod.tmpl @@ -16,6 +16,6 @@ require ( golang.org/x/net v0.7.0 // indirect ) {{if gt (len .LocalModulePath) 0}} -replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}/v3 -replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}/v2 +replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}v3 +replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}v2 {{end}} diff --git a/v3/internal/templates/react-swc/go.mod.tmpl b/v3/internal/templates/react-swc/go.mod.tmpl index 3c878c9ab..a05b62ce6 100644 --- a/v3/internal/templates/react-swc/go.mod.tmpl +++ b/v3/internal/templates/react-swc/go.mod.tmpl @@ -16,6 +16,6 @@ require ( golang.org/x/net v0.7.0 // indirect ) {{if gt (len .LocalModulePath) 0}} -replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}/v3 -replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}/v2 +replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}v3 +replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}v2 {{end}} diff --git a/v3/internal/templates/react-ts/go.mod.tmpl b/v3/internal/templates/react-ts/go.mod.tmpl index 3c878c9ab..a05b62ce6 100644 --- a/v3/internal/templates/react-ts/go.mod.tmpl +++ b/v3/internal/templates/react-ts/go.mod.tmpl @@ -16,6 +16,6 @@ require ( golang.org/x/net v0.7.0 // indirect ) {{if gt (len .LocalModulePath) 0}} -replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}/v3 -replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}/v2 +replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}v3 +replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}v2 {{end}} diff --git a/v3/internal/templates/react/go.mod.tmpl b/v3/internal/templates/react/go.mod.tmpl index 3c878c9ab..a05b62ce6 100644 --- a/v3/internal/templates/react/go.mod.tmpl +++ b/v3/internal/templates/react/go.mod.tmpl @@ -16,6 +16,6 @@ require ( golang.org/x/net v0.7.0 // indirect ) {{if gt (len .LocalModulePath) 0}} -replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}/v3 -replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}/v2 +replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}v3 +replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}v2 {{end}} diff --git a/v3/internal/templates/svelte-ts/go.mod.tmpl b/v3/internal/templates/svelte-ts/go.mod.tmpl index 3c878c9ab..a05b62ce6 100644 --- a/v3/internal/templates/svelte-ts/go.mod.tmpl +++ b/v3/internal/templates/svelte-ts/go.mod.tmpl @@ -16,6 +16,6 @@ require ( golang.org/x/net v0.7.0 // indirect ) {{if gt (len .LocalModulePath) 0}} -replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}/v3 -replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}/v2 +replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}v3 +replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}v2 {{end}} diff --git a/v3/internal/templates/svelte/go.mod.tmpl b/v3/internal/templates/svelte/go.mod.tmpl index 3c878c9ab..a05b62ce6 100644 --- a/v3/internal/templates/svelte/go.mod.tmpl +++ b/v3/internal/templates/svelte/go.mod.tmpl @@ -16,6 +16,6 @@ require ( golang.org/x/net v0.7.0 // indirect ) {{if gt (len .LocalModulePath) 0}} -replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}/v3 -replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}/v2 +replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}v3 +replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}v2 {{end}} diff --git a/v3/internal/templates/templates.go b/v3/internal/templates/templates.go index e0da5a48b..c3fae1bb6 100644 --- a/v3/internal/templates/templates.go +++ b/v3/internal/templates/templates.go @@ -3,9 +3,11 @@ package templates import ( "embed" "fmt" + "github.com/pterm/pterm" "github.com/wailsapp/wails/v3/internal/debug" "io/fs" "os" + "path/filepath" "github.com/wailsapp/wails/v3/internal/flags" @@ -154,7 +156,7 @@ func Install(options *flags.Init) error { templateData := TemplateOptions{ options, - debug.LocalModulePath, + filepath.FromSlash(debug.LocalModulePath + "/"), } template, found := lo.Find(defaultTemplates, func(template TemplateData) bool { return template.Name == options.TemplateName @@ -167,7 +169,7 @@ func Install(options *flags.Init) error { templateData.ProjectDir = lo.Must(os.Getwd()) } templateData.ProjectDir = fmt.Sprintf("%s/%s", options.ProjectDir, options.ProjectName) - fmt.Printf("Installing template '%s' into '%s'\n", options.TemplateName, options.ProjectDir) + pterm.Printf("Installing template '%s' into '%s'\n", options.TemplateName, filepath.FromSlash(options.ProjectDir)) tfs, err := fs.Sub(template.FS, options.TemplateName) if err != nil { return err diff --git a/v3/internal/templates/vanilla-ts/go.mod.tmpl b/v3/internal/templates/vanilla-ts/go.mod.tmpl index 3c878c9ab..a05b62ce6 100644 --- a/v3/internal/templates/vanilla-ts/go.mod.tmpl +++ b/v3/internal/templates/vanilla-ts/go.mod.tmpl @@ -16,6 +16,6 @@ require ( golang.org/x/net v0.7.0 // indirect ) {{if gt (len .LocalModulePath) 0}} -replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}/v3 -replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}/v2 +replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}v3 +replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}v2 {{end}} diff --git a/v3/internal/templates/vanilla/go.mod.tmpl b/v3/internal/templates/vanilla/go.mod.tmpl index 3c878c9ab..a05b62ce6 100644 --- a/v3/internal/templates/vanilla/go.mod.tmpl +++ b/v3/internal/templates/vanilla/go.mod.tmpl @@ -16,6 +16,6 @@ require ( golang.org/x/net v0.7.0 // indirect ) {{if gt (len .LocalModulePath) 0}} -replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}/v3 -replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}/v2 +replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}v3 +replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}v2 {{end}} diff --git a/v3/internal/templates/vue-ts/go.mod.tmpl b/v3/internal/templates/vue-ts/go.mod.tmpl index 3c878c9ab..a05b62ce6 100644 --- a/v3/internal/templates/vue-ts/go.mod.tmpl +++ b/v3/internal/templates/vue-ts/go.mod.tmpl @@ -16,6 +16,6 @@ require ( golang.org/x/net v0.7.0 // indirect ) {{if gt (len .LocalModulePath) 0}} -replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}/v3 -replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}/v2 +replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}v3 +replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}v2 {{end}} diff --git a/v3/internal/templates/vue/go.mod.tmpl b/v3/internal/templates/vue/go.mod.tmpl index 3c878c9ab..a05b62ce6 100644 --- a/v3/internal/templates/vue/go.mod.tmpl +++ b/v3/internal/templates/vue/go.mod.tmpl @@ -16,6 +16,6 @@ require ( golang.org/x/net v0.7.0 // indirect ) {{if gt (len .LocalModulePath) 0}} -replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}/v3 -replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}/v2 +replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}v3 +replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}v2 {{end}}