From 1d8e99d8466e2b93e07d7af1184418914abd3d0b Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Mon, 18 Feb 2019 21:06:53 +1100 Subject: [PATCH] Move to mewn --- app_config.go | 2 +- cmd/helpers.go | 2 +- cmd/templates/vuebasic/frontend/src/App.vue | 4 ++-- cmd/version.go | 2 +- renderer_headless.go | 2 +- renderer_webview.go | 4 ++-- wails-mewn.go | 9 +++++++++ {assets => wailsruntimeassets}/bridge/wailsbridge.js | 0 .../bridge/wailsbridge.prod.js | 0 {assets => wailsruntimeassets}/default/default.html | 0 {assets => wailsruntimeassets}/default/wails.css | 0 {assets => wailsruntimeassets}/default/wails.js | 0 12 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 wails-mewn.go rename {assets => wailsruntimeassets}/bridge/wailsbridge.js (100%) rename {assets => wailsruntimeassets}/bridge/wailsbridge.prod.js (100%) rename {assets => wailsruntimeassets}/default/default.html (100%) rename {assets => wailsruntimeassets}/default/wails.css (100%) rename {assets => wailsruntimeassets}/default/wails.js (100%) diff --git a/app_config.go b/app_config.go index c3a3d63b6..ed5579e7a 100644 --- a/app_config.go +++ b/app_config.go @@ -83,7 +83,7 @@ func newAppConfig(userConfig *AppConfig) (*AppConfig, error) { Resizable: true, Title: "My Wails App", Colour: "#FFF", // White by default - HTML: mewn.String("./assets/default/default.html"), + HTML: mewn.String("./wailsruntimeassets/default/default.html"), } if userConfig != nil { diff --git a/cmd/helpers.go b/cmd/helpers.go index b17288e9d..bf78d8903 100644 --- a/cmd/helpers.go +++ b/cmd/helpers.go @@ -196,7 +196,7 @@ func InstallFrontendDeps(projectDir string, projectOptions *ProjectOptions, forc // Copy bridge to project _, filename, _, _ := runtime.Caller(1) - bridgeFileSource := filepath.Join(path.Dir(filename), "..", "..", "assets", "bridge", bridgeFile) + bridgeFileSource := filepath.Join(path.Dir(filename), "..", "..", "wailsruntimeassets", "bridge", bridgeFile) bridgeFileTarget := filepath.Join(projectDir, projectOptions.FrontEnd.Dir, projectOptions.FrontEnd.Bridge, "wailsbridge.js") err = fs.CopyFile(bridgeFileSource, bridgeFileTarget) if err != nil { diff --git a/cmd/templates/vuebasic/frontend/src/App.vue b/cmd/templates/vuebasic/frontend/src/App.vue index 4700f3a71..eeeff76e8 100644 --- a/cmd/templates/vuebasic/frontend/src/App.vue +++ b/cmd/templates/vuebasic/frontend/src/App.vue @@ -1,13 +1,13 @@