Merge branch 'develop' into windows-scaling-fix

v1.7.2-pre10
Simplify Subscribe()
2026-04-02 13:19:00 -07:00 · 2020-09-10 06:13:28 +10:00 · 2020-09-09 06:58:30 +10:00 · 2020-09-09 06:27:57 +10:00 · 2020-09-08 09:11:52 +10:00 · 2020-09-08 07:06:27 +10:00
20 changed files with 464 additions and 10 deletions
--- a/cmd/templates/svelte/frontend/.gitignore
+++ b/cmd/templates/svelte/frontend/.gitignore
@@ -0,0 +1,4 @@
+/node_modules/
+/public/build/
+
+.DS_Store
--- a/cmd/templates/svelte/frontend/README.md
+++ b/cmd/templates/svelte/frontend/README.md
@@ -0,0 +1,90 @@
+*Looking for a shareable component template? Go here --> [sveltejs/component-template](https://github.com/sveltejs/component-template)*
+
+---
+
+# svelte app
+
+This is a project template for [Svelte](https://svelte.dev) apps. It lives at https://github.com/sveltejs/template.
+
+To create a new project based on this template using [degit](https://github.com/Rich-Harris/degit):
+
+```bash
+npx degit sveltejs/template svelte-app
+cd svelte-app
+```
+
+*Note that you will need to have [Node.js](https://nodejs.org) installed.*
+
+
+## Get started
+
+Install the dependencies...
+
+```bash
+cd svelte-app
+npm install
+```
+
+...then start [Rollup](https://rollupjs.org):
+
+```bash
+npm run dev
+```
+
+Navigate to [localhost:5000](http://localhost:5000). You should see your app running. Edit a component file in `src`, save it, and reload the page to see your changes.
+
+By default, the server will only respond to requests from localhost. To allow connections from other computers, edit the `sirv` commands in package.json to include the option `--host 0.0.0.0`.
+
+
+## Building and running in production mode
+
+To create an optimised version of the app:
+
+```bash
+npm run build
+```
+
+You can run the newly built app with `npm run start`. This uses [sirv](https://github.com/lukeed/sirv), which is included in your package.json's `dependencies` so that the app will work when you deploy to platforms like [Heroku](https://heroku.com).
+
+
+## Single-page app mode
+
+By default, sirv will only respond to requests that match files in `public`. This is to maximise compatibility with static fileservers, allowing you to deploy your app anywhere.
+
+If you're building a single-page app (SPA) with multiple routes, sirv needs to be able to respond to requests for *any* path. You can make it so by editing the `"start"` command in package.json:
+
+```js
+"start": "sirv public --single"
+```
+
+## Deploying to the web
+
+### With [Vercel](https://vercel.com)
+
+Install `vercel` if you haven't already:
+
+```bash
+npm install -g vercel
+```
+
+Then, from within your project folder:
+
+```bash
+cd public
+vercel deploy --name my-project
+```
+
+### With [surge](https://surge.sh/)
+
+Install `surge` if you haven't already:
+
+```bash
+npm install -g surge
+```
+
+Then, from within your project folder:
+
+```bash
+npm run build
+surge public my-project.surge.sh
+```
--- a/cmd/templates/svelte/frontend/package.json.template
+++ b/cmd/templates/svelte/frontend/package.json.template
@@ -0,0 +1,31 @@
+{
+  "name": "{{.NPMProjectName}}",
+  "author": "{{.Author.Name}}<{{.Author.Email}}>",
+  "scripts": {
+    "build": "rollup -c",
+    "dev": "rollup -c -w",
+    "start": "sirv public"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.11.6",
+    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+    "@babel/plugin-transform-runtime": "^7.11.5",
+    "@babel/preset-env": "^7.11.5",
+    "@rollup/plugin-commonjs": "^14.0.0",
+    "@rollup/plugin-image": "^2.0.5",
+    "@rollup/plugin-node-resolve": "^8.0.0",
+    "core-js": "^3.6.5",
+    "rollup": "^2.3.4",
+    "rollup-plugin-babel": "^4.4.0",
+    "rollup-plugin-livereload": "^2.0.0",
+    "rollup-plugin-polyfill": "^3.0.0",
+    "rollup-plugin-svelte": "^6.0.0",
+    "rollup-plugin-terser": "^7.0.0",
+    "svelte": "^3.0.0"
+  },
+  "dependencies": {
+    "sirv-cli": "^1.0.0",
+	  "@wailsapp/runtime": "^1.0.10",
+	  "svelte-simple-modal": "^0.6.0"
+  }
+}
--- a/cmd/templates/svelte/frontend/public/favicon.png
+++ b/cmd/templates/svelte/frontend/public/favicon.png
--- a/cmd/templates/svelte/frontend/public/index.html
+++ b/cmd/templates/svelte/frontend/public/index.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset='utf-8'>
+	<meta name='viewport' content='width=device-width,initial-scale=1'>
+
+	<title>Svelte app</title>
+
+	<link rel='icon' type='image/png' href='/favicon.png'>
+	<link rel='stylesheet' href='/build/bundle.css'>
+
+	<script defer src='/build/bundle.js'></script>
+</head>
+
+<body>
+</body>
+</html>
--- a/cmd/templates/svelte/frontend/rollup.config.js
+++ b/cmd/templates/svelte/frontend/rollup.config.js
@@ -0,0 +1,110 @@
+import svelte from 'rollup-plugin-svelte';
+import resolve from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
+import livereload from 'rollup-plugin-livereload';
+import { terser } from 'rollup-plugin-terser';
+import image from '@rollup/plugin-image';
+import babel from 'rollup-plugin-babel';
+import polyfill from 'rollup-plugin-polyfill';
+
+const production = !process.env.ROLLUP_WATCH;
+
+function serve() {
+	let server;
+	
+	function toExit() {
+		if (server) server.kill(0);
+	}
+
+	return {
+		writeBundle() {
+			if (server) return;
+			server = require('child_process').spawn('npm', ['run', 'start', '--', '--dev'], {
+				stdio: ['ignore', 'inherit', 'inherit'],
+				shell: true
+			});
+
+			process.on('SIGTERM', toExit);
+			process.on('exit', toExit);
+		}
+	};
+}
+
+export default {
+	input: 'src/main.js',
+	output: {
+		sourcemap: true,
+		format: 'iife',
+		name: 'app',
+		file: 'public/build/bundle.js'
+	},
+	plugins: [
+		image(),
+		svelte({
+			// enable run-time checks when not in production
+			dev: !production,
+			// we'll extract any component CSS out into
+			// a separate file - better for performance
+			css: css => {
+				css.write('bundle.css');
+			}
+		}),
+
+		// If you have external dependencies installed from
+		// npm, you'll most likely need these plugins. In
+		// some cases you'll need additional configuration -
+		// consult the documentation for details:
+		// https://github.com/rollup/plugins/tree/master/packages/commonjs
+		resolve({
+			browser: true,
+			dedupe: ['svelte', 'svelte/transition', 'svelte/internal']
+		}),
+		commonjs(),
+
+		// In dev mode, call `npm run start` once
+		// the bundle has been generated
+		!production && serve(),
+
+		// Watch the `public` directory and refresh the
+		// browser on changes when not in production
+		!production && livereload('public'),
+
+		// Credit: https://blog.az.sg/posts/svelte-and-ie11/
+		babel({
+			extensions: [ '.js', '.jsx', '.es6', '.es', '.mjs', '.svelte', '.html' ],
+			runtimeHelpers: true,
+			exclude: [ 'node_modules/@babel/**', 'node_modules/core-js/**' ],
+			presets: [
+			  [
+				'@babel/preset-env',
+				{
+				  targets: '> 0.25%, not dead, IE 11',
+				  modules: false,
+				  spec: true, 
+				  useBuiltIns: 'usage',
+				  forceAllTransforms: true,
+				  corejs: 3,
+				},
+
+			  ]
+			],
+			plugins: [
+			  '@babel/plugin-syntax-dynamic-import',
+			  [
+				'@babel/plugin-transform-runtime',
+				{
+				  useESModules: true
+				}
+			  ]
+			]
+		  }),
+		  polyfill(['@webcomponents/webcomponentsjs']),
+
+		// If we're building for production (npm run build
+		// instead of npm run dev), minify
+		production && terser()
+	],
+	watch: {
+		clearScreen: false
+	}
+};
--- a/cmd/templates/svelte/frontend/src/App.svelte
+++ b/cmd/templates/svelte/frontend/src/App.svelte
@@ -0,0 +1,69 @@
+
+
+<script>
+	import Modal from 'svelte-simple-modal';
+	import HelloWorld from './components/HelloWorld.svelte'
+	import logo from './logo.png';
+</script>
+
+<main>
+	<div class="App">
+		<header class="App-header">
+			<Modal>
+				<img src={logo} class="App-logo" alt="logo" />
+				<p>Welcome to your new <code>wails/svelte</code> project.</p>
+				<HelloWorld/>
+			</Modal>
+		</header>
+	</div>
+</main>
+
+<style>
+	:global(body) {
+		margin: 0;
+		font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen",
+			"Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
+			sans-serif;
+		-webkit-font-smoothing: antialiased;
+		-moz-osx-font-smoothing: grayscale;
+	}
+
+	code {
+		font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New", monospace;
+	}
+
+	.App {
+		text-align: center;
+	}
+
+	.App-logo {
+		height: 40vmin;
+		pointer-events: none;
+	}
+
+	@media (prefers-reduced-motion: no-preference) {
+		.App-logo {
+			animation: App-logo-spin infinite 20s linear;
+		}
+	}
+
+	.App-header {
+		background-color: #282c34;
+		min-height: 100vh;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		font-size: calc(10px + 2vmin);
+		color: white;
+	}
+
+	@keyframes App-logo-spin {
+		from {
+			transform: rotate(0deg);
+		}
+		to {
+			transform: rotate(360deg);
+		}
+	}
+</style>
--- a/cmd/templates/svelte/frontend/src/components/HelloWorld.svelte
+++ b/cmd/templates/svelte/frontend/src/components/HelloWorld.svelte
@@ -0,0 +1,18 @@
+<script>
+	import { getContext } from 'svelte';
+	import ModalContent from './ModalContent.svelte'
+	
+	const { open } = getContext('simple-modal');
+
+	const handleOpenModal = () => {
+		window.backend.basic().then((result) => {
+			open(ModalContent, { message: result });
+		});
+	};
+</script>
+
+<main>
+	<p><button on:click={handleOpenModal}>Hello</button></p>
+</main>
+
+<style></style>
--- a/cmd/templates/svelte/frontend/src/components/ModalContent.svelte
+++ b/cmd/templates/svelte/frontend/src/components/ModalContent.svelte
@@ -0,0 +1,7 @@
+<script>
+	export let message;
+</script> 
+   
+<p>
+	{message}
+</p>
--- a/cmd/templates/svelte/frontend/src/logo.png
+++ b/cmd/templates/svelte/frontend/src/logo.png
--- a/cmd/templates/svelte/frontend/src/main.js
+++ b/cmd/templates/svelte/frontend/src/main.js
@@ -0,0 +1,13 @@
+import App from './App.svelte';
+
+import * as Wails from '@wailsapp/runtime';
+
+let app;
+
+Wails.Init(() => {
+	app = new App({
+		target: document.body,
+	});
+}); 
+
+export default app;
--- a/cmd/templates/svelte/go.mod.template
+++ b/cmd/templates/svelte/go.mod.template
@@ -0,0 +1,5 @@
+module {{.BinaryName}}
+
+require (
+	github.com/wailsapp/wails {{.WailsVersion}}
+)
--- a/cmd/templates/svelte/main.go.template
+++ b/cmd/templates/svelte/main.go.template
@@ -0,0 +1,27 @@
+package main
+
+import (
+	"github.com/leaanthony/mewn"
+	"github.com/wailsapp/wails"
+)
+
+func basic() string {
+	return "World!"
+}
+
+func main() {
+	js := mewn.String("./frontend/public/build/bundle.js")
+	css := mewn.String("./frontend/public/build/bundle.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/svelte/template.json
+++ b/cmd/templates/svelte/template.json
@@ -0,0 +1,14 @@
+{
+  "name": "Svelte",
+  "version": "1.0.0",
+  "shortdescription": "A basic Svelte template",
+  "description": "A basic Svelte template",
+  "install": "npm install",
+  "build": "npm run build",
+  "author": "Tim Kipp <timkipp.22.developer@gmail.com>",
+  "created": "2020-09-06 13:06:10.469848 -0700 PDT m=+213.578828559",
+  "frontenddir": "frontend",
+  "serve": "npm run dev",
+  "bridge": "src",
+  "wailsdir": ""
+}
--- a/cmd/templates/vanilla/frontend/src/main.css
+++ b/cmd/templates/vanilla/frontend/src/main.css
@@ -11,7 +11,7 @@ body {
  display: block;
  width:100%;
  text-align: center;
-  margin-top: 3rem;
+  margin-top: 1rem;
  font-size: 2rem;
 }

@@ -24,7 +24,7 @@ button {
 }

 .result {
-  margin-top: 3rem;
+  margin-top: 1rem;
  text-align: center;
  font-size: 2rem;
 }
--- a/cmd/templates/vanilla/frontend/src/main.js
+++ b/cmd/templates/vanilla/frontend/src/main.js
@@ -36,7 +36,7 @@ function start() {
 		mystore.set(newValue);
 	};

-	mystore.subscribe( (state) => {
+	mystore.subscribe( function(state) {
 		document.getElementById('counter').innerText = state;
 	});
 	
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -1,4 +1,4 @@
 package cmd

 // Version - Wails version
-const Version = "v1.7.2-pre5"
+const Version = "v1.7.2-pre10"
--- a/lib/renderer/webview/webview.h
+++ b/lib/renderer/webview/webview.h
@@ -1431,6 +1431,13 @@ struct webview_priv
      style = WS_OVERLAPPED | WS_CAPTION | WS_MINIMIZEBOX | WS_SYSMENU;
    }

+    // Scale
+    // Credit: https://github.com/webview/webview/issues/54#issuecomment-379528243
+    HDC hDC = GetDC(NULL);
+    w->width = GetDeviceCaps(hDC, 88)*w->width/96.0;
+    w->height = GetDeviceCaps(hDC, 90)*w->height/96.0;
+    ReleaseDC(NULL, hDC);
+
    rect.left = 0;
    rect.top = 0;
    rect.right = w->width;
--- a/runtime/js/runtime/package.json
+++ b/runtime/js/runtime/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@wailsapp/runtime",
-  "version": "1.1.0",
+  "version": "1.1.1",
  "description": "Wails Javascript runtime library",
  "main": "main.js",
  "types": "runtime.d.ts",
--- a/runtime/store.go
+++ b/runtime/store.go
@@ -45,7 +45,7 @@ type Store struct {
 	data                reflect.Value
 	dataType            reflect.Type
 	eventPrefix         string
-	callbacks           []func(interface{})
+	callbacks           []reflect.Value
 	runtime             *Runtime
 	notifySynchronously bool

@@ -143,10 +143,13 @@ func (s *Store) notify() {
 	// Execute callbacks
 	for _, callback := range s.callbacks {

+		// Build args
+		args := []reflect.Value{s.data}
+
 		if s.notifySynchronously {
-			callback(s.data)
+			callback.Call(args)
 		} else {
-			go callback(s.data)
+			go callback.Call(args)
 		}

 	}
@@ -184,11 +187,50 @@ func (s *Store) Set(data interface{}) error {
 	return nil
 }

+// callbackCheck ensures the given function to Subscribe() is
+// of the correct signature. Absolutely cannot wait for
+// generics to land rather than writing this nonsense.
+func (s *Store) callbackCheck(callback interface{}) error {
+
+	// Get type
+	callbackType := reflect.TypeOf(callback)
+
+	// Check callback is a function
+	if callbackType.Kind() != reflect.Func {
+		return fmt.Errorf("invalid value given to store.Subscribe(). Expected 'func(%s)'", s.dataType.String())
+	}
+
+	// Check input param
+	if callbackType.NumIn() != 1 {
+		return fmt.Errorf("invalid number of parameters given in callback function. Expected 1")
+	}
+
+	// Check input data type
+	if callbackType.In(0) != s.dataType {
+		return fmt.Errorf("invalid type for input parameter given in callback function. Expected %s, got %s", s.dataType.String(), callbackType.In(0))
+	}
+
+	// Check output param
+	if callbackType.NumOut() != 0 {
+		return fmt.Errorf("invalid number of return parameters given in callback function. Expected 0")
+	}
+
+	return nil
+}
+
 // Subscribe will subscribe to updates to the store by
 // providing a callback. Any updates to the store are sent
 // to the callback
-func (s *Store) Subscribe(callback func(interface{})) {
-	s.callbacks = append(s.callbacks, callback)
+func (s *Store) Subscribe(callback interface{}) {
+
+	err := s.callbackCheck(callback)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	callbackFunc := reflect.ValueOf(callback)
+
+	s.callbacks = append(s.callbacks, callbackFunc)
 }

 // updaterCheck ensures the given function to Update() is
Author	SHA1	Message	Date
Lea Anthony	d9341f76d5	Merge branch 'develop' into windows-scaling-fix	2020-09-10 06:13:28 +10:00
Lea Anthony	8154887824	v1.7.2-pre10	2020-09-09 06:58:30 +10:00
Lea Anthony	39ae91a250	Simplify Subscribe()	2020-09-09 06:27:57 +10:00
Lea Anthony	d7f3cec079	test fix	2020-09-08 09:11:52 +10:00
Lea Anthony	861f5f2a1c	v1.7.2-pre9	2020-09-08 07:06:27 +10:00
Lea Anthony	89ed00d6ed	Fix svelte for Windows	2020-09-08 07:04:01 +10:00
Lea Anthony	1e1834158b	fix vanilla template for windows	2020-09-07 20:45:20 +10:00
Lea Anthony	214fcf03b9	v1.7.2-pre8	2020-09-07 20:28:29 +10:00
Tim Kipp	82ac4f1358	chore: removed Svelte TypeScript support for now	2020-09-07 17:35:12 +10:00
Tim Kipp	8b7cd03428	chore: removed Svelte template link	2020-09-07 17:35:12 +10:00
Tim Kipp	4d2b4fec45	feat: added Svelte template	2020-09-07 17:35:12 +10:00
Lea Anthony	d59849b952	v1.7.2-pre7	2020-09-05 07:11:28 +10:00
Lea Anthony	806821ad49	v1.7.2-pre6	2020-09-05 07:01:15 +10:00
Lea Anthony	a4cc95351f	Updated runtime package version	2020-09-05 06:52:39 +10:00