From 828f07ea132bc4a7cc2fa154bfc03188eec87094 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Mon, 27 Sep 2021 19:09:49 +1000 Subject: [PATCH] [v2] Misc template updates --- .../templates/svelte/{app.tmpl.go => app.go} | 0 .../templates/svelte/frontend/dist/index.html | 1 + .../svelte/frontend/rollup.config.js | 16 ++++----------- .../src/{index.html => index.tmpl.html} | 6 +++--- .../templates/svelte/frontend/src/main.js | 2 -- .../templates/templates/svelte/go.mod.tmpl | 4 ++-- .../templates/templates/svelte/main.tmpl.go | 20 +++++++++---------- .../templates/vanilla/{app.tmpl.go => app.go} | 0 .../src/{index.html => index.tmpl.html} | 1 + .../templates/templates/vanilla/go.mod.tmpl | 4 ++-- .../templates/templates/vanilla/main.tmpl.go | 10 +++++----- 11 files changed, 28 insertions(+), 36 deletions(-) rename v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/{app.tmpl.go => app.go} (100%) create mode 100644 v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/dist/index.html rename v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/src/{index.html => index.tmpl.html} (51%) rename v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/{app.tmpl.go => app.go} (100%) rename v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/frontend/src/{index.html => index.tmpl.html} (92%) diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/app.tmpl.go b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/app.go similarity index 100% rename from v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/app.tmpl.go rename to v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/app.go diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/dist/index.html b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/dist/index.html new file mode 100644 index 000000000..58f98f0d1 --- /dev/null +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/dist/index.html @@ -0,0 +1 @@ + diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/rollup.config.js b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/rollup.config.js index d93aceb6a..42685908c 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/rollup.config.js +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/rollup.config.js @@ -2,11 +2,9 @@ import svelte from 'rollup-plugin-svelte'; import commonjs from '@rollup/plugin-commonjs'; import resolve from '@rollup/plugin-node-resolve'; import livereload from 'rollup-plugin-livereload'; -import { terser } from 'rollup-plugin-terser'; +import {terser} from 'rollup-plugin-terser'; import copy from 'rollup-plugin-copy'; -import image from '@rollup/plugin-image'; import postcss from 'rollup-plugin-postcss' -import url from 'postcss-url'; const production = !process.env.ROLLUP_WATCH; @@ -40,9 +38,6 @@ export default { file: 'dist/bundle.js' }, plugins: [ - image({ - include: './src/assets/images/**' - }), svelte({ compilerOptions: { // enable run-time checks when not in production @@ -51,11 +46,6 @@ export default { }), postcss({ minimize: true, - plugins: [ - url({ - url: "inline" - }) - ] }), // If you have external dependencies installed from // npm, you'll most likely need these plugins. In @@ -69,7 +59,9 @@ export default { commonjs(), copy({ targets: [ - { src: 'src/index.html', dest: 'dist/' }, + {src: 'src/index.html', dest: 'dist/'}, + {src: 'src/global.css', dest: 'dist/'}, + {src: 'src/assets', dest: 'dist/'}, ] }), diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/src/index.html b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/src/index.tmpl.html similarity index 51% rename from v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/src/index.html rename to v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/src/index.tmpl.html index 589af3a3f..d6dfa7948 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/src/index.html +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/src/index.tmpl.html @@ -2,10 +2,10 @@ - - - Svelte app + + {{.ProjectName}} + diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/src/main.js b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/src/main.js index e694ef9f5..d80e9a350 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/src/main.js +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/frontend/src/main.js @@ -1,6 +1,4 @@ - import App from './App.svelte'; -import './global.css'; const app = new App({ target: document.body, diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/go.mod.tmpl b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/go.mod.tmpl index 9c7b6f581..d8ce340c3 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/go.mod.tmpl +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/go.mod.tmpl @@ -1,9 +1,9 @@ -module test +module changeme go 1.16 require ( - github.com/wailsapp/wails/v2 v2.0.0-alpha +github.com/wailsapp/wails/v2 v2.0.0-alpha ) replace github.com/wailsapp/wails/v2 v2.0.0-alpha => {{.WailsDirectory}} diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/main.tmpl.go b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/main.tmpl.go index 20072c4c1..d30cabb4d 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/main.tmpl.go +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/svelte/main.tmpl.go @@ -19,7 +19,7 @@ func main() { // Create application with options err := wails.Run(&options.App{ - Title: "{{.ProjectName}}", + Title: "", Width: 720, Height: 570, MinWidth: 720, @@ -31,23 +31,23 @@ func main() { Frameless: false, StartHidden: false, HideWindowOnClose: false, - RGBA: &options.RGBA{255, 255, 255, 255}, + RGBA: &options.RGBA{R: 255, G: 255, B: 255, A: 255}, Assets: assets, - LogLevel: logger.DEBUG, - OnStartup: app.startup, - OnDomReady: app.domReady, - OnShutdown: app.shutdown, + LogLevel: logger.DEBUG, + OnStartup: app.startup, + OnDomReady: app.domReady, + OnShutdown: app.shutdown, Bind: []interface{}{ app, }, // Windows platform specific options Windows: &windows.Options{ - WebviewIsTransparent: false, - WindowIsTranslucent: false, - DisableWindowIcon: false, + WebviewIsTransparent: true, + WindowIsTranslucent: true, + DisableWindowIcon: true, }, }) - + if err != nil { log.Fatal(err) } diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/app.tmpl.go b/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/app.go similarity index 100% rename from v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/app.tmpl.go rename to v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/app.go diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/frontend/src/index.html b/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/frontend/src/index.tmpl.html similarity index 92% rename from v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/frontend/src/index.html rename to v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/frontend/src/index.tmpl.html index 7f516f7fa..73eebf442 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/frontend/src/index.html +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/frontend/src/index.tmpl.html @@ -1,6 +1,7 @@ + {{.ProjectName}} diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/go.mod.tmpl b/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/go.mod.tmpl index 9c7b6f581..d8ce340c3 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/go.mod.tmpl +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/go.mod.tmpl @@ -1,9 +1,9 @@ -module test +module changeme go 1.16 require ( - github.com/wailsapp/wails/v2 v2.0.0-alpha +github.com/wailsapp/wails/v2 v2.0.0-alpha ) replace github.com/wailsapp/wails/v2 v2.0.0-alpha => {{.WailsDirectory}} diff --git a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/main.tmpl.go b/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/main.tmpl.go index 56ccd7e6d..28d7826d9 100644 --- a/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/main.tmpl.go +++ b/v2/cmd/wails/internal/commands/initialise/templates/templates/vanilla/main.tmpl.go @@ -31,12 +31,12 @@ func main() { Frameless: false, StartHidden: false, HideWindowOnClose: false, - RGBA: &options.RGBA{255, 255, 255, 255}, + RGBA: &options.RGBA{R: 255, G: 255, B: 255, A: 255}, Assets: assets, - LogLevel: logger.DEBUG, - OnStartup: app.startup, - OnDomReady: app.domReady, - OnShutdown: app.shutdown, + LogLevel: logger.DEBUG, + OnStartup: app.startup, + OnDomReady: app.domReady, + OnShutdown: app.shutdown, Bind: []interface{}{ app, },