github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-11 22:49:29 +08:00
Code Projects Activity

[windows] Fix paths for wails init

Browse Source
This commit is contained in:
Lea Anthony 2023-04-18 20:26:56 +10:00
parent a66d9ab0b1
commit c4f613e4c5
No known key found for this signature in database
GPG Key ID: 33DAF7BB90A58405
16 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
v3/internal/templates/_base/default/go.mod.tmpl
View File

@ -16,6 +16,6 @@ require (
golang.org/x/net v0.7.0 // indirect golang.org/x/net v0.7.0 // indirect
) )
{{if gt (len .LocalModulePath) 0}} {{if gt (len .LocalModulePath) 0}}
replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}/v3 replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}v3
replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}/v2 replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}v2
{{end}} {{end}}

4
v3/internal/templates/lit-ts/go.mod.tmpl
View File

@ -16,6 +16,6 @@ require (
golang.org/x/net v0.7.0 // indirect golang.org/x/net v0.7.0 // indirect
) )
{{if gt (len .LocalModulePath) 0}} {{if gt (len .LocalModulePath) 0}}
replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}/v3 replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}v3
replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}/v2 replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}v2
{{end}} {{end}}

4
v3/internal/templates/lit/go.mod.tmpl
View File

@ -16,6 +16,6 @@ require (
golang.org/x/net v0.7.0 // indirect golang.org/x/net v0.7.0 // indirect
) )
{{if gt (len .LocalModulePath) 0}} {{if gt (len .LocalModulePath) 0}}
replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}/v3 replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}v3
replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}/v2 replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}v2
{{end}} {{end}}

4
v3/internal/templates/preact-ts/go.mod.tmpl
View File

@ -16,6 +16,6 @@ require (
golang.org/x/net v0.7.0 // indirect golang.org/x/net v0.7.0 // indirect
) )
{{if gt (len .LocalModulePath) 0}} {{if gt (len .LocalModulePath) 0}}
replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}/v3 replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}v3
replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}/v2 replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}v2
{{end}} {{end}}

4
v3/internal/templates/preact/go.mod.tmpl
View File

@ -12,6 +12,6 @@ require (
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
) )
{{if gt (len .LocalModulePath) 0}} {{if gt (len .LocalModulePath) 0}}
replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}/v3 replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}v3
replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}/v2 replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}v2
{{end}} {{end}}

4
v3/internal/templates/react-swc-ts/go.mod.tmpl
View File

@ -16,6 +16,6 @@ require (
golang.org/x/net v0.7.0 // indirect golang.org/x/net v0.7.0 // indirect
) )
{{if gt (len .LocalModulePath) 0}} {{if gt (len .LocalModulePath) 0}}
replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}/v3 replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}v3
replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}/v2 replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}v2
{{end}} {{end}}

4
v3/internal/templates/react-swc/go.mod.tmpl
View File

@ -16,6 +16,6 @@ require (
golang.org/x/net v0.7.0 // indirect golang.org/x/net v0.7.0 // indirect
) )
{{if gt (len .LocalModulePath) 0}} {{if gt (len .LocalModulePath) 0}}
replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}/v3 replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}v3
replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}/v2 replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}v2
{{end}} {{end}}

4
v3/internal/templates/react-ts/go.mod.tmpl
View File

@ -16,6 +16,6 @@ require (
golang.org/x/net v0.7.0 // indirect golang.org/x/net v0.7.0 // indirect
) )
{{if gt (len .LocalModulePath) 0}} {{if gt (len .LocalModulePath) 0}}
replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}/v3 replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}v3
replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}/v2 replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}v2
{{end}} {{end}}

4
v3/internal/templates/react/go.mod.tmpl
View File

@ -16,6 +16,6 @@ require (
golang.org/x/net v0.7.0 // indirect golang.org/x/net v0.7.0 // indirect
) )
{{if gt (len .LocalModulePath) 0}} {{if gt (len .LocalModulePath) 0}}
replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}/v3 replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}v3
replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}/v2 replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}v2
{{end}} {{end}}

4
v3/internal/templates/svelte-ts/go.mod.tmpl
View File

@ -16,6 +16,6 @@ require (
golang.org/x/net v0.7.0 // indirect golang.org/x/net v0.7.0 // indirect
) )
{{if gt (len .LocalModulePath) 0}} {{if gt (len .LocalModulePath) 0}}
replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}/v3 replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}v3
replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}/v2 replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}v2
{{end}} {{end}}

4
v3/internal/templates/svelte/go.mod.tmpl
View File

@ -16,6 +16,6 @@ require (
golang.org/x/net v0.7.0 // indirect golang.org/x/net v0.7.0 // indirect
) )
{{if gt (len .LocalModulePath) 0}} {{if gt (len .LocalModulePath) 0}}
replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}/v3 replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}v3
replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}/v2 replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}v2
{{end}} {{end}}

6
v3/internal/templates/templates.go
View File

@ -3,9 +3,11 @@ package templates
import ( import (
"embed" "embed"
"fmt" "fmt"
"github.com/pterm/pterm"
"github.com/wailsapp/wails/v3/internal/debug" "github.com/wailsapp/wails/v3/internal/debug"
"io/fs" "io/fs"
"os" "os"
"path/filepath"
"github.com/wailsapp/wails/v3/internal/flags" "github.com/wailsapp/wails/v3/internal/flags"
@ -154,7 +156,7 @@ func Install(options *flags.Init) error {
templateData := TemplateOptions{ templateData := TemplateOptions{
options, options,
debug.LocalModulePath, filepath.FromSlash(debug.LocalModulePath + "/"),
} }
template, found := lo.Find(defaultTemplates, func(template TemplateData) bool { template, found := lo.Find(defaultTemplates, func(template TemplateData) bool {
return template.Name == options.TemplateName return template.Name == options.TemplateName
@ -167,7 +169,7 @@ func Install(options *flags.Init) error {
templateData.ProjectDir = lo.Must(os.Getwd()) templateData.ProjectDir = lo.Must(os.Getwd())
} }
templateData.ProjectDir = fmt.Sprintf("%s/%s", options.ProjectDir, options.ProjectName) 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) tfs, err := fs.Sub(template.FS, options.TemplateName)
if err != nil { if err != nil {
return err return err

4
v3/internal/templates/vanilla-ts/go.mod.tmpl
View File

@ -16,6 +16,6 @@ require (
golang.org/x/net v0.7.0 // indirect golang.org/x/net v0.7.0 // indirect
) )
{{if gt (len .LocalModulePath) 0}} {{if gt (len .LocalModulePath) 0}}
replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}/v3 replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}v3
replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}/v2 replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}v2
{{end}} {{end}}

4
v3/internal/templates/vanilla/go.mod.tmpl
View File

@ -16,6 +16,6 @@ require (
golang.org/x/net v0.7.0 // indirect golang.org/x/net v0.7.0 // indirect
) )
{{if gt (len .LocalModulePath) 0}} {{if gt (len .LocalModulePath) 0}}
replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}/v3 replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}v3
replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}/v2 replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}v2
{{end}} {{end}}

4
v3/internal/templates/vue-ts/go.mod.tmpl
View File

@ -16,6 +16,6 @@ require (
golang.org/x/net v0.7.0 // indirect golang.org/x/net v0.7.0 // indirect
) )
{{if gt (len .LocalModulePath) 0}} {{if gt (len .LocalModulePath) 0}}
replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}/v3 replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}v3
replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}/v2 replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}v2
{{end}} {{end}}

4
v3/internal/templates/vue/go.mod.tmpl
View File

@ -16,6 +16,6 @@ require (
golang.org/x/net v0.7.0 // indirect golang.org/x/net v0.7.0 // indirect
) )
{{if gt (len .LocalModulePath) 0}} {{if gt (len .LocalModulePath) 0}}
replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}/v3 replace github.com/wailsapp/wails/v3 => {{.LocalModulePath}}v3
replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}/v2 replace github.com/wailsapp/wails/v2 => {{.LocalModulePath}}v2
{{end}} {{end}}