Feature/default templates (#1334)

.gitignore

@@ -31,3 +31,4 @@ v2/test/kitchensink/frontend/package.json.md5
 !v2/internal/ffenestri/windows/x64/webview2.dll
 !v2/internal/ffenestri/windows/x64/WebView2Loader.dll
 .idea/
+v2/cmd/wails/internal/commands/initialise/templates/testtemplates/

v2/cmd/wails/internal/commands/dev/dev.go

@@ -132,7 +132,7 @@ func AddSubcommand(app *clir.Cli, w io.Writer) error {
 		}
 
 		// Run go mod tidy to ensure we're up to date
-		err = runCommand(cwd, false, "go", "mod", "tidy")
+		err = runCommand(cwd, false, "go", "mod", "tidy", "-compat=1.17")
 		if err != nil {
 			return err
 		}

v2/cmd/wails/internal/commands/initialise/initialise.go

@@ -156,7 +156,7 @@ func initProject(options *templates.Options, quiet bool) error {
 	}
 
 	// Run `go mod tidy` to ensure `go.sum` is up to date
-	cmd := exec.Command("go", "mod", "tidy")
+	cmd := exec.Command("go", "mod", "tidy", "-compat=1.17")
 	cmd.Dir = options.TargetDir
 	cmd.Stderr = os.Stderr
 	if !quiet {

v2/cmd/wails/internal/commands/initialise/templates/base/README.md

@@ -0,0 +1,15 @@
+# README
+
+## About
+
+This is the official Wails $NAME template.
+
+## Live Development
+
+To run in live development mode, run `wails dev` in the project directory. In another terminal, go into the `frontend`
+directory and run `npm run dev`. The frontend dev server will run on http://localhost:34115. Connect to this in your
+browser and connect to your application.
+
+## Building
+
+To build a redistributable, production mode package, use `wails build`.

v2/cmd/wails/internal/commands/initialise/templates/base/app.tmpl.go

@@ -0,0 +1,21 @@
+package main
+
+import (
+	"context"
+	"fmt"
+)
+
+// App struct
+type App struct {
+	ctx context.Context
+}
+
+// NewApp creates a new App application struct
+func NewApp() *App {
+	return &App{}
+}
+
+// Greet returns a greeting for the given name
+func (a *App) Greet(name string) string {
+	return fmt.Sprintf("Hello %s, It's show time!", name)
+}

v2/cmd/wails/internal/commands/initialise/templates/base/go.mod.tmpl

@@ -0,0 +1,7 @@
+module changeme
+
+go 1.17
+
+require github.com/wailsapp/wails/v2 {{.WailsVersion}}
+
+// replace github.com/wailsapp/wails/v2 {{.WailsVersion}} => {{.WailsDirectory}}

v2/cmd/wails/internal/commands/initialise/templates/base/main.tmpl.go

@@ -0,0 +1,30 @@
+package main
+
+import (
+	"embed"
+	"github.com/wailsapp/wails/v2"
+	"github.com/wailsapp/wails/v2/pkg/options"
+)
+
+//go:embed frontend/dist
+var assets embed.FS
+
+func main() {
+	// Create an instance of the app structure
+	app := NewApp()
+
+	// Create application with options
+	err := wails.Run(&options.App{
+		Title:  "{{.ProjectName}}",
+		Width:  1024,
+		Height: 768,
+		Assets: assets,
+		Bind: []interface{}{
+			app,
+		},
+	})
+
+	if err != nil {
+		println("Error:", err)
+	}
+}

v2/cmd/wails/internal/commands/initialise/templates/base/template.json

@@ -0,0 +1,7 @@
+{
+  "name": "$NAME",
+  "shortname": "$SHORTNAME",
+  "author": "Lea Anthony",
+  "description": "$DESCRIPTION",
+  "helpurl": "https://wails.io"
+}

v2/cmd/wails/internal/commands/initialise/templates/base/wails.tmpl.json

@@ -0,0 +1,12 @@
+{
+  "name": "{{.ProjectName}}",
+  "outputfilename": "{{.BinaryName}}",
+  "frontend:install": "npm install",
+  "frontend:build": "npm run build",
+  "frontend:dev:watcher": "npm run dev",
+  "frontend:dev:serverUrl": "http://localhost:3000",
+  "author": {
+    "name": "{{.AuthorName}}",
+    "email": "{{.AuthorEmail}}"
+  }
+}

v2/cmd/wails/internal/commands/initialise/templates/generate/assets/common/frontend/src/assets/fonts/OFL.txt

@@ -0,0 +1,93 @@
+Copyright 2016 The Nunito Project Authors (contact@sansoxygen.com),
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

v2/cmd/wails/internal/commands/initialise/templates/generate/assets/common/frontend/src/style.css

@@ -0,0 +1,26 @@
+html {
+    background-color: rgba(27, 38, 54, 1);
+    text-align: center;
+    color: white;
+}
+
+body {
+    margin: 0;
+    color: white;
+    font-family: "Nunito", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto",
+    "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
+    sans-serif;
+}
+
+@font-face {
+    font-family: "Nunito";
+    font-style: normal;
+    font-weight: 400;
+    src: local(""),
+    url("assets/fonts/nunito-v16-latin-regular.woff2") format("woff2");
+}
+
+#app {
+    height: 100vh;
+    text-align: center;
+}

v2/cmd/wails/internal/commands/initialise/templates/generate/assets/common/frontend/wailsjs/go/main/App.d.ts

@@ -0,0 +1,4 @@
+// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
+// This file is automatically generated. DO NOT EDIT
+
+export function Greet(arg1: string): Promise<string>;

v2/cmd/wails/internal/commands/initialise/templates/generate/assets/common/frontend/wailsjs/go/main/App.js

@@ -0,0 +1,7 @@
+// @ts-check
+// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
+// This file is automatically generated. DO NOT EDIT
+
+export function Greet(arg1) {
+    return window['go']['main']['App']['Greet'](arg1);
+}

v2/cmd/wails/internal/commands/initialise/templates/generate/assets/common/frontend/wailsjs/runtime/ipcdev.js

@@ -0,0 +1 @@
+(()=>{(function(){let n=function(e){for(var s=window[e.shift()];s&&e.length;)s=s[e.shift()];return s},o=n(["chrome","webview","postMessage"]),t=n(["webkit","messageHandlers","external","postMessage"]);if(!o&&!t){console.error("Unsupported Platform");return}o&&(window.WailsInvoke=e=>window.chrome.webview.postMessage(e)),t&&(window.WailsInvoke=e=>window.webkit.messageHandlers.external.postMessage(e))})();})();

v2/cmd/wails/internal/commands/initialise/templates/generate/assets/common/frontend/wailsjs/runtime/package.json

@@ -0,0 +1,24 @@
+{
+  "name": "@wailsapp/runtime",
+  "version": "2.0.0",
+  "description": "Wails Javascript runtime library",
+  "main": "runtime.js",
+  "types": "runtime.d.ts",
+  "scripts": {
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/wailsapp/wails.git"
+  },
+  "keywords": [
+    "Wails",
+    "Javascript",
+    "Go"
+  ],
+  "author": "Lea Anthony <lea.anthony@gmail.com>",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/wailsapp/wails/issues"
+  },
+  "homepage": "https://github.com/wailsapp/wails#readme"
+}

v2/cmd/wails/internal/commands/initialise/templates/generate/assets/common/frontend/wailsjs/runtime/runtime.d.ts

@@ -0,0 +1,87 @@
+export interface Position {
+    x: number;
+    y: number;
+}
+
+export interface Size {
+    w: number;
+    h: number;
+}
+
+export interface runtime {
+    EventsEmit(eventName: string, data?: any): void;
+
+    EventsOn(eventName: string, callback: (data?: any) => void): void;
+
+    EventsOnMultiple(eventName: string, callback: (data?: any) => void, maxCallbacks: number): void;
+
+    EventsOnce(eventName: string, callback: (data?: any) => void): void;
+
+    EventsOff(eventName: string): void;
+
+    LogTrace(message: string): void;
+
+    LogDebug(message: string): void;
+
+    LogError(message: string): void;
+
+    LogFatal(message: string): void;
+
+    LogInfo(message: string): void;
+
+    LogWarning(message: string): void;
+
+    WindowReload(): void;
+
+    WindowSetSystemDefaultTheme(): void;
+
+    WindowSetLightTheme(): void;
+
+    WindowSetDarkTheme(): void;
+
+    WindowCenter(): void;
+
+    WindowSetTitle(title: string): void;
+
+    WindowFullscreen(): void;
+
+    WindowUnfullscreen(): void;
+
+    WindowSetSize(width: number, height: number): Promise<Size>;
+
+    WindowGetSize(): Promise<Size>;
+
+    WindowSetMaxSize(width: number, height: number): void;
+
+    WindowSetMinSize(width: number, height: number): void;
+
+    WindowSetPosition(x: number, y: number): void;
+
+    WindowGetPosition(): Promise<Position>;
+
+    WindowHide(): void;
+
+    WindowShow(): void;
+
+    WindowMaximise(): void;
+
+    WindowToggleMaximise(): void;
+
+    WindowUnmaximise(): void;
+
+    WindowMinimise(): void;
+
+    WindowUnminimise(): void;
+
+    WindowSetRGBA(R: number, G: number, B: number, A: number): void;
+
+    BrowserOpenURL(url: string): void;
+
+    Quit(): void;
+}
+
+declare global {
+    interface Window {
+        runtime: runtime;
+    }
+}