Skip to content

Commit 07e66d8

Browse files
MattCCCMattCCC
authored
Merge pull request #1 from MattCCC/ns8
Ns8
2 parents fb6d649 + 7030759 commit 07e66d8

File tree

13 files changed

+20157
-20195
lines changed

13 files changed

+20157
-20195
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
[![NPM](https://nodei.co/npm/nativescript-wikitude-sdk.png?downloads=true&downloadRank=true&stars=true)](https://nodei.co/npm/nativescript-wikitude-sdk/)
66

7-
Provides NativeScript 7+ access to Wikitude Augmented Reality (9.1.0 on Android and 9.0.0 on iOS).
7+
Provides NativeScript 8+ access to Wikitude Augmented Reality (9.1.0 on Android and 9.0.0 on iOS).
88

99
## Prerequisites / Requirements
1010

‎demo/.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,6 @@ platforms
1010

1111

1212
!webpack.config.js
13-
!babel.config.js
13+
!babel.config.js
14+
15+
.migration_backup

‎demo/package-lock.json‎

Lines changed: 11353 additions & 13477 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎demo/package.json‎

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,31 @@
11
{
22
"name": "demo",
3-
"main": "main.js",
3+
"main": "./src/main.ts",
44
"version": "1.0.0",
55
"description": "A native application built with NativeScript-Vue",
66
"author": "Mateusz Czapliński <deindesign.pl@gmail.com>",
77
"license": "MIT",
88
"dependencies": {
9-
"@nativescript/core": "^7.0.3",
10-
"@nativescript/theme": "^2.3.3",
11-
"@vue/devtools": "^5.3.3",
9+
"@nativescript/core": "~8.1.1",
10+
"@nativescript/theme": "^2.5.0",
11+
"@vue/devtools": "^5.3.4",
1212
"nativescript-permissions": "1.3.11",
13-
"nativescript-socketio": "^3.3.1",
14-
"nativescript-toasty": "^3.0.0-alpha.2",
15-
"nativescript-vue": "^2.8.1",
16-
"nativescript-vue-devtools": "^1.4.0",
13+
"nativescript-vue": "^2.9.0",
14+
"nativescript-vue-template-compiler": "^2.9.0",
1715
"nativescript-wikitude-sdk": "file:../src"
1816
},
1917
"devDependencies": {
2018
"@babel/core": "^7.11.6",
2119
"@babel/preset-env": "^7.11.5",
22-
"@nativescript/android": "7.0.1",
23-
"@nativescript/ios": "7.1.1",
24-
"@nativescript/types": "^7.0.0",
25-
"@nativescript/webpack": "^3.0.4",
20+
"@nativescript/android": "~8.1.1",
21+
"@nativescript/debug-ios": "^1.0.0",
22+
"@nativescript/ios": "~8.1.0",
23+
"@nativescript/types": "~8.1.0",
24+
"@nativescript/webpack": "^5.0.0",
2625
"@types/node": "^14.6.2",
2726
"babel-loader": "^8.1.0",
28-
"nativescript-vue-template-compiler": "^2.8.1",
29-
"nativescript-worker-loader": "~0.12.1",
3027
"sass": "^1.26.10",
31-
"typescript": "^3.9.7",
32-
"vue": "^2.6.12",
33-
"vue-loader": "^15.9.3"
28+
"typescript": "~4.3.5",
29+
"vue": "^2.6.12"
3430
}
3531
}

‎demo/src/components/App.vue‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ export default {
3131
const isIOSStr = isIOS ? 'true' : 'false';
3232
const distance = isIOS ? 10 : 0;
3333
34+
console.log("distance", distance);
35+
3436
console.log('World Load Success', distance, wikitudeInstance);
3537
3638
if (isIOS) {
@@ -56,9 +58,12 @@ export default {
5658
};
5759
},
5860
created() {
61+
console.log('created');
5962
if (this.hasPermissions()) {
63+
console.log('hasPermissions');
6064
this.permissionsGranted = true;
6165
} else {
66+
console.log('requestPermissions');
6267
this.requestPermissions();
6368
}
6469
},

‎demo/src/main.ts‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,28 @@
1-
import Vue from 'nativescript-vue'
2-
import App from './components/App.vue'
3-
import VueDevtools from 'nativescript-vue-devtools'
1+
import {
2+
Trace,
3+
TraceErrorHandler,
4+
} from '@nativescript/core';
5+
6+
const errorHandler: TraceErrorHandler = {
7+
handlerError(err) {
8+
// eslint-disable-next-line no-console
9+
console.log('[Unhandled Exception]', err);
10+
Trace.write(err, '[Unhandled Exception]');
411

5-
if(TNS_ENV !== 'production') {
6-
Vue.use(VueDevtools, { host: '192.168.0.22' })
12+
throw err;
13+
},
14+
};
15+
16+
if (Trace && Trace.setErrorHandler) {
17+
Trace.setErrorHandler(errorHandler);
718
}
819

20+
import Vue from 'nativescript-vue'
21+
import App from './components/App.vue'
922

10-
// Prints Vue logs when --env.production is *NOT* set while building
11-
Vue.config.silent = (TNS_ENV === 'production') ? true : false;
23+
Vue.config.silent = false;
1224

13-
(<any>global).wikitudeLicense = "GZvPmr6vSxxKECVpbHHuFKk8kN2Q9CSDdpGj9uxdM5YsKw6xekmH+J3D7xtViH6/rd7U97m0RclkF/V63a5IMr8+CYbtKOdLxbnBiFf4r9NjaJ7FLj+rWO/5yz32k+aRz7JPb003KjXQnN3eNmN7H1rfwkbQl15qaBv9TL4E9ghTYWx0ZWRfX0azw85+IlnyWpDSyqvs/ejFwqWDPTlPyjoyTY2c9Al+RlWbXWEHukX+NBs/hZomDw4RnifnSKOhNTowMvRUINmv85lpeMbKQAbqnOAlbsAG7JEXPGi37DdbSxhhi/SNmL25/dEA4dtA3WHNCfIFuYY4HpE8ihgDFMpneldzkDGDUB9ZNxQ+p+wdinPQLUUm+6pK7JYUIf5K3v2oBO+oCC0RsH9OnegvOZYgaUWV1CAvAFhdlW2F2T3iQzYByt0OZE0+6xG6ZOsM1b7m3zha72Y4EU+nNcOBUmGMYcY8Cet5ZZa1Cgbodx5TChBGck1E/9bycVWV3sIEhJ/DZuwZrCc6tV/qUeZH7OIy/qYxXF/HI4TaJVkDVE7rCMOd4AAr2I7PPe5pwC9HrracJh2y080r7QPffkQmrfTqrkHVzkOVAOMa+ECgSuPRlHVczbxlLplmhyKO3//pCXH+qHqSQPEsany/5ShfhTDqRGsBk3dsrHgWpYYD+EsEZkPF2tDjIg2WfS5tFrzKP2vQMQ4SH48+WaDpNfByL/YQB+C0q2qDNjZkJNONxas1DOrr7upREzZHduLAQX2Xip782etqXwT09kl2n0AUSnr43mb8Pf/Cjn2dUiDNnk6KgJijCbMSFRpAeHUQwnt28o/re0hAZuhHvturADZ/Yflo5ACFcXzFAQyZwWiJGzc=";
25+
(<any>global).wikitudeLicense = "gEN8IfezW61Dm4kcxfllwftvGvSG7jIazp30cQbskywPzUwcQACoefmlYaKMQ9J2MQGZH25WhCAc3ESLBiOd54HPlnJcONQvRd8dYVCakag2G1rRhiA+WA8pP8l7fxhShf4TSeOv8jyYlM+Aey5K+EMGqAV4ikLxK+CiLfwxTC9TYWx0ZWRfX7kKhcv3nzfg7F58KktKsEhtmmccKuzCAQIlStexV+EmbFx1l6FXJA4WSPT9iuxr9Iz3wguRrNztwNeWav9r4SI4iuUgnu3e6/KWO1VJmrBsZbkMRFXaX0HIwOxMBESqSEEFTBB+2bNwaQI5NlHaMHIdsr054UkWHMZUfOHyq6y2kWpQ0acRVwMMCIgbsGFiKlYwjGp6eBcfE525pknd5PmX+/Dgbg9X+dlSxNnhiIjgOZRTtEHOiy0G8XUkDkA2rKrfgeJxSKYHbxd7TdfLofyc9f3hxDmh15P4YzFonN3oUOjutL9rASx667Mx1MgM1KfLmVwN3KHYdRY2LOMt/EKlArnj7tE7XnCR9Nom4Bg52bTfA6PrFUSdxuYu1KwwERWMALePHMdOFjoDwpK9/E65fGLfX3AovR3Wka31HpbcjKrIr2eh5q7TmFDmpX2/YphHnZJHJVCJyQPta/DVpktS1Hm/2Ieaui2nWVekfQYzTw6TDH7Q4rF6evqYKz4dceAIqB+bVhCscmfE/VvNYRrPkHO0SKzWVqS30VBSb9eZDVigGYTNnpCelET//NrbUwCBq49rbydHg0ur/i/wMVC2+gxf8z0/i2xdU3CCe9Z9vIr7eKBsSIeawhvy8cKjFBIWVr6Sf6bL/lVibXOHs/PqDuMkKH+sNyGfqMBaPLjVhNG6lZv3Oqk=";
1426

1527
Vue.registerElement('Wikitude', () => require('nativescript-wikitude-sdk').Wikitude);
1628

‎demo/src/wikitude/sample/assets/JUVE.wt3‎

-499 KB
Binary file not shown.

‎demo/tsconfig.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"module": "esnext",
55
"moduleResolution": "node",
66
"lib": [
7-
"es6",
7+
"es6",
88
"dom",
99
"es2017"
1010
],
@@ -29,17 +29,17 @@
2929
"./node_modules/*"
3030
]
3131
},
32-
"removeComments": false,
32+
"removeComments": false,
3333
"allowSyntheticDefaultImports": true,
3434
"esModuleInterop": true,
3535
"experimentalDecorators": true,
3636
"emitDecoratorMetadata": true,
37-
"noEmitOnError": true,
37+
"noEmitOnError": true,
3838
"skipLibCheck": true
3939
},
4040
"include": [
41-
"../src",
42-
"**/*",
41+
"../src",
42+
"**/*",
4343
"src",
4444
"types"
4545
],
@@ -48,4 +48,4 @@
4848
"platforms",
4949
"../src/node_modules"
5050
]
51-
}
51+
}

0 commit comments

Comments
 (0)