Skip to content

Commit 558ee5d

Browse files
committed
Merge branch 'release/3.3.0'
2 parents 2e31dcd + 8900f46 commit 558ee5d

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "aurelia-ts-boilerplate",
33
"title": "Aurelia TS Boilerplate",
4-
"version": "3.2.0",
4+
"version": "3.3.0",
55
"description": "A starter kit for building a standard navigation-style app with Aurelia, typescript and webpack.",
66
"main": "dist/app.js",
77
"identifier": "ch.w3tec.app",
@@ -91,7 +91,7 @@
9191
"aurelia-i18n": "^1.3.0",
9292
"aurelia-loader-webpack": "^2.0.0",
9393
"aurelia-logging-console": "^1.0.0",
94-
"aurelia-pal-browser": "^1.0.0",
94+
"aurelia-pal-browser": "^1.1.0",
9595
"aurelia-polyfills": "^1.1.1",
9696
"aurelia-route-recognizer": "^1.1.0",
9797
"aurelia-router": "^1.1.1",
@@ -127,7 +127,7 @@
127127
"aurelia-template-lint-loader": "1.0.1",
128128
"chalk": "^1.1.3",
129129
"compression-webpack-plugin": "0.3.2",
130-
"concurrently": "3.2.0",
130+
"concurrently": "3.3.0",
131131
"cordova": "^6.5.0",
132132
"cross-env": "3.1.4",
133133
"electron": "1.4.15",
@@ -148,7 +148,7 @@
148148
"ncp": "^2.0.0",
149149
"rimraf": "^2.5.4",
150150
"ts-node": "^2.1.0",
151-
"typedoc": "^0.5.5",
151+
"typedoc": "^0.5.6",
152152
"typedoc-webpack-plugin": "^1.1.3",
153153
"typescript": "^2.1",
154154
"typings": "^2.1.0",

src/app/main.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,14 @@ export async function configure(aurelia: Aurelia): Promise<void> {
9494
.feature('resources/converters')
9595
;
9696

97+
/**
98+
* If we are on Cordova we have to wait until the device is ready.
99+
* Removing this could cause breaking Cordova Plugins
100+
*/
101+
await new Promise(resolve => appConfigService.platformIsMobile()
102+
? document.addEventListener('deviceready', () => resolve(), false)
103+
: resolve());
104+
97105
await aurelia.start();
98106
aurelia.setRoot('app.vm');
99107

0 commit comments

Comments
 (0)