free filter memory

v1.7.0-pre1
Add ldflags option to build
2026-04-03 21:52:45 -07:00 · 2020-06-28 14:23:23 +10:00 · 2020-06-22 20:14:10 +10:00 · 2020-06-22 20:13:15 +10:00 · 2020-06-19 09:38:01 +10:00 · 2020-06-19 09:26:19 +10:00
15 changed files with 230 additions and 3 deletions
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -28,3 +28,4 @@ Wails is what it is because of the time and effort given by these great people.
  * [Konez2k](https://github.com/konez2k)
  * [msms](https://github.com/sayuthisobri)
  * [dedo1911](https://github.com/dedo1911)
+  * [Florian Didron](https://github.com/fdidron)
--- a/cmd/helpers.go
+++ b/cmd/helpers.go
@@ -561,6 +561,11 @@ func ldFlags(po *ProjectOptions, buildMode string) string {

 	ldflags += "-X github.com/wailsapp/wails.BuildMode=" + buildMode

+	// Add additional ldflags passed in via the `ldflags` cli flag
+	if len(po.LdFlags) > 0 {
+		ldflags += " " + po.LdFlags
+	}
+
 	// If we wish to generate typescript
 	if po.typescriptDefsFilename != "" {
 		cwd, err := os.Getwd()
--- a/cmd/project.go
+++ b/cmd/project.go
@@ -161,6 +161,7 @@ type ProjectOptions struct {
 	CrossCompile           bool
 	Platform               string
 	Architecture           string
+	LdFlags                string
 }

 // Defaults sets the default project template
--- a/cmd/templates/vanilla/README.md
+++ b/cmd/templates/vanilla/README.md
@@ -0,0 +1,5 @@
+# README
+
+This is an experimental template for vanilla HTML/JS/CSS.
+
+The webpack rules may need to be adjusted to correctly embed all assets. Babel may also need to be setup correctly.
--- a/cmd/templates/vanilla/frontend/package.json.template
+++ b/cmd/templates/vanilla/frontend/package.json.template
@@ -0,0 +1,42 @@
+{
+  "name": "vanilla",
+  "author": "Lea<l>",
+  "private": true,
+  "scripts": {
+    "serve": "webpack-dev-server",
+    "build": "npx webpack"
+  },
+  "dependencies": {
+    "core-js": "^3.6.4",
+    "regenerator-runtime": "^0.13.3",
+    "@wailsapp/runtime": "^1.0.10"
+  },
+  "devDependencies": {
+    "babel-eslint": "^10.1.0",
+    "copy-webpack-plugin": "^6.0.2",
+    "eslint": "^6.8.0",
+    "eventsource-polyfill": "^0.9.6",
+    "webpack": "^4.43.0",
+    "webpack-cli": "^3.3.11",
+    "webpack-dev-server": "^3.11.0",
+    "webpack-hot-middleware": "^2.25.0"
+  },
+  "eslintConfig": {
+    "root": true,
+    "env": {
+      "node": true
+    },
+    "extends": [
+      "eslint:recommended"
+    ],
+    "rules": {},
+    "parserOptions": {
+      "parser": "babel-eslint"
+    }
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not ie <= 8"
+  ]
+}
--- a/cmd/templates/vanilla/frontend/src/index.html
+++ b/cmd/templates/vanilla/frontend/src/index.html
@@ -0,0 +1,9 @@
+<html>
+    <head>
+        <link rel="stylesheet" type="text/css" href="main.css">
+    </head>
+    <body>
+        <div id="app"></div>
+        <script src="main.js"></script>
+    </body>
+</html>
--- a/cmd/templates/vanilla/frontend/src/main.css
+++ b/cmd/templates/vanilla/frontend/src/main.css
--- a/cmd/templates/vanilla/frontend/src/main.js
+++ b/cmd/templates/vanilla/frontend/src/main.js
@@ -0,0 +1,28 @@
+
+const runtime = require('@wailsapp/runtime');
+
+// We need to wait for runtime.Init to complete before 
+// running our JS
+runtime.Init(() => {
+
+	// Ensure the default app div is 100% wide/high
+	var app = document.getElementById('app');
+	app.style.width = '100%';
+	app.style.height = '100%';
+
+	// Inject html
+	app.innerHTML = `
+	<div class='logo'></div>
+	<div class='container'>
+			<button id='button'>Click Me!</button>
+			<div id='result'/>
+	</div>
+	`;
+
+	// Connect button to Go method
+	document.getElementById('button').onclick = () => {
+		window.backend.basic().then((result) => {
+			document.getElementById('result').innerText = result;
+		})
+	} 
+});
--- a/cmd/templates/vanilla/frontend/webpack.config.js
+++ b/cmd/templates/vanilla/frontend/webpack.config.js
@@ -0,0 +1,56 @@
+const path = require('path');
+const CopyWebpackPlugin = require('copy-webpack-plugin');
+
+let imageSizeLimit = 9007199254740991; // Number.MAX_SAFE_INTEGER
+let sourceDir = path.resolve(__dirname, 'src');
+let buildDir = path.resolve(__dirname, 'build');
+
+module.exports = {
+	entry: {
+		index: path.resolve(sourceDir, 'main.js')
+	},
+	output: {
+		path: buildDir,
+		filename: 'main.js'
+	},
+	optimization: {
+		splitChunks: false
+	},
+	devServer: {
+		disableHostCheck: true,
+		contentBase: path.join(__dirname, 'src'),
+		compress: true,
+		open: true,
+		port: 8090
+	},
+	mode: 'production',
+	module: {
+		rules: [
+			{
+				test: /\.(png|gif|jpg|woff2?|eot|ttf|otf|svg)(\?.*)?$/i,
+				use: [
+					{
+						loader: 'url-loader',
+						options: {
+							limit: imageSizeLimit
+						}
+					}
+				],
+			}
+		]
+	},
+	plugins: [
+		new CopyWebpackPlugin({
+			patterns: [
+				{
+					from: path.resolve(sourceDir, 'main.css'),
+					to: path.resolve(buildDir, 'main.css')
+				},
+				{
+					from: path.resolve(sourceDir, 'index.html'),
+					to: path.resolve(buildDir, 'index.html')
+				},
+			]
+		})
+	]
+};
--- a/cmd/templates/vanilla/go.mod.template
+++ b/cmd/templates/vanilla/go.mod.template
@@ -0,0 +1,5 @@
+module {{.BinaryName}}
+
+require (
+	github.com/wailsapp/wails {{.WailsVersion}}
+)
--- a/cmd/templates/vanilla/main.go.template
+++ b/cmd/templates/vanilla/main.go.template
@@ -0,0 +1,27 @@
+package main
+
+import (
+  "github.com/leaanthony/mewn"
+  "github.com/wailsapp/wails"
+)
+
+func basic() string {
+  return "Hello World!"
+}
+
+func main() {
+
+	js := mewn.String("./frontend/build/main.js")
+	css := mewn.String("./frontend/build/main.css")
+
+  app := wails.CreateApp(&wails.AppConfig{
+    Width:  1024,
+    Height: 768,
+    Title:  "{{.Name}}",
+    JS:     js,
+    CSS:    css,
+    Colour: "#131313",
+  })
+  app.Bind(basic)
+  app.Run()
+}
--- a/cmd/templates/vanilla/template.json
+++ b/cmd/templates/vanilla/template.json
@@ -0,0 +1,12 @@
+{
+  "name": "Vanilla",
+  "shortdescription": "A Vanilla HTML/JS template",
+  "description": "A basic template using plain html/js and bundled using Webpack 4",
+  "author": "Lea Anthony<lea.anthony@gmail.com>",
+  "created": "2020-06-14",
+  "frontenddir": "frontend",
+  "install": "npm install",
+  "build": "npm run build",
+  "serve": "npm run serve",
+  "bridge": "src"
+}
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -1,4 +1,4 @@
 package cmd

 // Version - Wails version
-const Version = "v1.6.0-pre6"
+const Version = "v1.7.0-pre1"
--- a/cmd/wails/4_build.go
+++ b/cmd/wails/4_build.go
@@ -29,6 +29,7 @@ func init() {
 	var typescriptFilename = ""
 	var verbose = false
 	var platform = ""
+	var ldflags = ""

 	buildSpinner := spinner.NewSpinner()
 	buildSpinner.SetSpinSpeed(50)
@@ -40,7 +41,8 @@ func init() {
 		BoolFlag("f", "Force rebuild of application components", &forceRebuild).
 		BoolFlag("d", "Build in Debug mode", &debugMode).
 		BoolFlag("verbose", "Verbose output", &verbose).
-		StringFlag("t", "Generate Typescript definitions to given file (at runtime)", &typescriptFilename)
+		StringFlag("t", "Generate Typescript definitions to given file (at runtime)", &typescriptFilename).
+		StringFlag("ldflags", "Extra options for -ldflags", &ldflags)

 	var b strings.Builder
 	for _, plat := range getSupportedPlatforms() {
@@ -84,7 +86,7 @@ func init() {
 				}
 			}
 			if !supported {
-				return fmt.Errorf("Unsupported platform '%s' specified.\nPlease run `wails build -h` to see the supported platform/architecture options.", platform)
+				return fmt.Errorf("unsupported platform '%s' specified.\nPlease run `wails build -h` to see the supported platform/architecture options", platform)
 			}

 			projectOptions.CrossCompile = true
@@ -93,6 +95,9 @@ func init() {
 			projectOptions.Architecture = plat[1]
 		}

+		// Add ldflags
+		projectOptions.LdFlags = ldflags
+
 		// Validate config
 		// Check if we have a frontend
 		err = cmd.ValidateFrontendConfig(projectOptions)
--- a/lib/renderer/webview/webview.h
+++ b/lib/renderer/webview/webview.h
@@ -447,6 +447,7 @@ struct webview_priv
          }
          gtk_file_filter_set_name(file_filter, filter);
          gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dlg), file_filter);
+          g_strfreev(filters);
      }
      gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(dlg), FALSE);
      gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dlg), FALSE);
Author	SHA1	Message	Date
Lea Anthony	bb395dfa5e	free filter memory	2020-06-28 14:23:23 +10:00
Lea Anthony	ee93f3c1e6	v1.7.0-pre1	2020-06-22 20:14:10 +10:00
Lea Anthony	b9ffe53732	Add `ldflags` option to build	2020-06-22 20:13:15 +10:00
Lea Anthony	bbc16fe03a	Lint fixes	2020-06-19 09:38:01 +10:00
Lea Anthony	bdfc3ca631	Release v1.6.0	2020-06-19 09:26:19 +10:00
Lea Anthony	490d66cf77	Update Contributors	2020-06-19 09:11:34 +10:00
Lea Anthony	bce686d779	lint fixes	2020-06-19 08:52:44 +10:00
Lea Anthony	c0b0ef0200	Initial implementation of vanilla template	2020-06-19 08:52:44 +10:00