Merge branch 'develop'

Merge commit '73ee9ef5307c6fa12007395efc68c900ba90070a'
v1.8.1 (#546 )
2026-04-07 23:51:34 -07:00 · 2020-12-08 20:43:40 +11:00 · 2020-12-08 20:39:29 +11:00 · 2020-10-29 20:18:52 +11:00 · 2020-10-27 21:11:53 +11:00 · 2020-10-27 21:11:46 +11:00
6 changed files with 21 additions and 17 deletions
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -39,5 +39,4 @@ Wails is what it is because of the time and effort given by these great people.
  * [Kyle](https://github.com/kmuchmore)
  * [Balakrishna Prasad Ganne](https://github.com/aayush420)
  * [Charaf Rezrazi](https://github.com/Rezrazi)
-  * [misitebao](https://github.com/misitebao)
-  * [Elie Grenon](https://github.com/DrunkenPoney)
+  * [misitebao](https://github.com/misitebao)
--- a/cmd/templates/vue3-full/frontend/package.json.template
+++ b/cmd/templates/vue3-full/frontend/package.json.template
@@ -19,16 +19,16 @@
    "@types/mocha": "^8.0.3",
    "@typescript-eslint/eslint-plugin": "^4.3.0",
    "@typescript-eslint/parser": "^4.3.0",
-    "@vue/cli-plugin-eslint": "~4.5.9",
-    "@vue/cli-plugin-router": "~4.5.9",
-    "@vue/cli-plugin-typescript": "~4.5.9",
-    "@vue/cli-plugin-unit-mocha": "~4.5.9",
-    "@vue/cli-service": "~4.5.9",
+    "@vue/cli-plugin-eslint": "~4.5.6",
+    "@vue/cli-plugin-router": "~4.5.6",
+    "@vue/cli-plugin-typescript": "~4.5.6",
+    "@vue/cli-plugin-unit-mocha": "~4.5.6",
+    "@vue/cli-service": "~4.5.6",
    "@vue/compiler-sfc": "^3.0.0",
-    "@vue/eslint-config-typescript": "^7.0.0",
+    "@vue/eslint-config-typescript": "^5.1.0",
    "@vue/test-utils": "^2.0.0-0",
    "chai": "^4.2.0",
-    "eslint": "<7.0.0",
+    "eslint": "^7.10.0",
    "eslint-plugin-vue": "^7.0.0",
    "node-sass": "^4.14.1",
    "sass-loader": "^10.0.2",
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -1,4 +1,4 @@
 package cmd

 // Version - Wails version
-const Version = "v1.11.0-pre2"
+const Version = "v1.10.0"
--- a/config.go
+++ b/config.go
@@ -1,6 +1,7 @@
 package wails

 import (
+	"fmt"
 	"net/url"
 	"strings"

@@ -139,6 +140,10 @@ func newConfig(userConfig *AppConfig) (*AppConfig, error) {
 		}
 	}

+	println("****************************************************")
+	fmt.Printf("%+v\n", result)
+	println("****************************************************")
+
 	return result, nil
 }

--- a/runtime/js/package-lock.json
+++ b/runtime/js/package-lock.json
@@ -3959,9 +3959,9 @@
      "dev": true
    },
    "ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
      "dev": true
    },
    "interpret": {
--- a/runtime/js/runtime/package-lock.json
+++ b/runtime/js/runtime/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "@wailsapp/runtime",
-  "version": "1.1.1",
+  "version": "1.1.0",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -130,9 +130,9 @@
      "dev": true
    },
    "ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
      "dev": true
    },
    "invert-kv": {
Author	SHA1	Message	Date
Lea Anthony	39d687fa31	Merge branch 'develop'	2020-12-08 20:43:40 +11:00
Lea Anthony	ee04a9235d	Merge commit '73ee9ef5307c6fa12007395efc68c900ba90070a'	2020-12-08 20:39:29 +11:00
Lea Anthony	0c2c56e1dd	v1.8.1 (#546 ) * resolve angular routing broken when app is built * Updated contributors * handle Set error on Update method * Remove incorrect build flag * v1.8.1-pre1 * added Get method * fixed return * implement gopath handling during cross compilation * update messages to output xgo version TODO: allow image override * use wailsapp/xgo:1.0.1 for cross-compiling * Support platform list in templates * Add warnings for windows builds * add fields Tags to ProjectOptions * add args tags to func BuildNative * add tags to func BuildDocker * delete escape tags * Update Contributors * feat: Vue3, Vue Router, Vuex, and Typescript Template * converted spaces to tabs in vue.config.js * single quotes and tabs Converted vue.config.js to using single quotes Converted example.spec.ts to tabs instead of spaces. * Added semicolons and mocha import * Update contributors * Make vue 3 template linux/mac only * Add tags to build * Add v2 artefacts * Update Vuetify in package.json (#537) * Update contributors * Replaced the old v-content tag with the new v-main (#536) * v1.8.1-pre4 * v1.8.1-pre5 * Update issue templates (#541) * Updated Contributors * Remove zero copy string conversion * v1.8.1-pre6 * Initial support for firebug (#543) * Initial support for firebug * Remove windows message * v1.8.1-pre7 * Update contributors * Allow use of custom HTML * Allow use of custom HTML (#545) * v1.8.1 Co-authored-by: Arthur Wiebe <arthur@artooro.com> Co-authored-by: Ilgıt Yıldırım <ilgit.yildirim@triplebits.com> Co-authored-by: Travis McLane <tmclane@gmail.com> Co-authored-by: Altynbek <go.gelleson@gmail.com> Co-authored-by: Kyle Muchmore <kyle.muchmore@kickview.com> Co-authored-by: Balakrishna Prasad Ganne <balkripra.1996@gmail.com>	2020-10-29 20:18:52 +11:00
Lea Anthony	5267968151	Merge branch 'master' of github.com:wailsapp/wails into master	2020-10-27 21:11:53 +11:00
Lea Anthony	7b31c8ddd2	Update issue templates	2020-10-27 21:11:46 +11:00
Lea Anthony	1e2bc5728a	Revert "resolve angular routing broken when app is built" This reverts commit `e0aab7c27f`.	2020-09-10 14:10:24 +10:00
Arthur Wiebe	e0aab7c27f	resolve angular routing broken when app is built	2020-09-10 14:10:00 +10:00