From 806b1aa8e0a7ed708994e49700409e1080f1b852 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Wed, 27 Nov 2019 22:35:14 +1100 Subject: [PATCH] angular windows fixes (#298) --- CONTRIBUTORS.md | 1 + app.go | 2 +- cmd/templates/angular-template/frontend/browserslist | 2 +- cmd/templates/angular-template/frontend/package.json.template | 1 + cmd/templates/angular-template/frontend/src/main.ts | 1 + cmd/templates/angular-template/frontend/tsconfig.json | 4 ++-- cmd/templates/angular-template/main.go.template | 2 +- 7 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 4204780d0..b2c61c408 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -20,3 +20,4 @@ Wails is what it is because of the time and effort given by these great people. * [Toyam Cox](https://github.com/Vaelatern) * [Robin Eklind](https://github.com/mewmew) * [Kris Raney](https://github.com/kraney) +* [Jack Mordaunt](https://github.com/JackMordaunt) diff --git a/app.go b/app.go index 7a24f1e16..40ae98b1f 100644 --- a/app.go +++ b/app.go @@ -80,7 +80,7 @@ func CreateApp(optionalConfig ...*AppConfig) *App { // SetProcessDPIAware via user32.dll // https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-setprocessdpiaware -// Also, thanks Jack Mordaynt! https://github.com/wailsapp/wails/issues/293 +// Also, thanks Jack Mordaunt! https://github.com/wailsapp/wails/issues/293 func SetProcessDPIAware() error { status, r, err := syscall.NewLazyDLL("user32.dll").NewProc("SetProcessDPIAware").Call() if status == 0 { diff --git a/cmd/templates/angular-template/frontend/browserslist b/cmd/templates/angular-template/frontend/browserslist index 80848532e..342360874 100644 --- a/cmd/templates/angular-template/frontend/browserslist +++ b/cmd/templates/angular-template/frontend/browserslist @@ -9,4 +9,4 @@ last 2 versions Firefox ESR not dead -not IE 9-11 # For IE 9-11 support, remove 'not'. \ No newline at end of file +IE 9-11 # For IE 9-11 support, remove 'not'. \ No newline at end of file diff --git a/cmd/templates/angular-template/frontend/package.json.template b/cmd/templates/angular-template/frontend/package.json.template index 77352e717..640bcea4a 100644 --- a/cmd/templates/angular-template/frontend/package.json.template +++ b/cmd/templates/angular-template/frontend/package.json.template @@ -22,6 +22,7 @@ "@angular/platform-browser-dynamic": "~8.0.1", "@angular/router": "~8.0.1", "@wailsapp/runtime": "^1.0.0", + "core-js": "^3.4.4", "ngx-build-plus": "^8.0.3", "rxjs": "~6.4.0", "tslib": "^1.9.0", diff --git a/cmd/templates/angular-template/frontend/src/main.ts b/cmd/templates/angular-template/frontend/src/main.ts index 296a09b41..49f44bfbd 100644 --- a/cmd/templates/angular-template/frontend/src/main.ts +++ b/cmd/templates/angular-template/frontend/src/main.ts @@ -1,3 +1,4 @@ +import 'core-js/stable'; import { enableProdMode } from '@angular/core'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; diff --git a/cmd/templates/angular-template/frontend/tsconfig.json b/cmd/templates/angular-template/frontend/tsconfig.json index 0a91f8107..16195ad5f 100644 --- a/cmd/templates/angular-template/frontend/tsconfig.json +++ b/cmd/templates/angular-template/frontend/tsconfig.json @@ -11,7 +11,7 @@ "module": "esnext", "moduleResolution": "node", "importHelpers": true, - "target": "es2015", + "target": "es5", "typeRoots": [ "node_modules/@types" ], @@ -20,4 +20,4 @@ "dom" ] } -} +} \ No newline at end of file diff --git a/cmd/templates/angular-template/main.go.template b/cmd/templates/angular-template/main.go.template index 592c6b7d0..bcba7df03 100644 --- a/cmd/templates/angular-template/main.go.template +++ b/cmd/templates/angular-template/main.go.template @@ -11,7 +11,7 @@ func basic() string { func main() { - js := mewn.String("./frontend/dist/my-app/main-es2015.js") + js := mewn.String("./frontend/dist/my-app/main.js") css := mewn.String("./frontend/dist/my-app/styles.css") app := wails.CreateApp(&wails.AppConfig{