Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 89caa2d

Browse files
Zdravko BranzovZdravko Branzov
Zdravko Branzov
authored and
Zdravko Branzov
committed
Merge branch 'next' into master
2 parents d5800e3 + 87311ac commit 89caa2d

12 files changed

+40
-65
lines changed

.gitignore

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@
44
*.js
55
*.js.map
66
*.log
7+
*.esm.json
78
logs
89
!src/scripts/*.js
9-
!seed-tests/*.js
10-
seed-tests/seed-copy/**/*.*
11-
seed-tests/seed-copy-new-git-repo/**/*.*
12-
demo/app/*.js
10+
demo/**/*.js
1311
!demo/karma.conf.js
1412
!demo/app/tests/*.js
1513
demo/*.d.ts
@@ -20,5 +18,4 @@ demo/node_modules
2018
node_modules
2119
publish/src
2220
publish/package
23-
/src/platforms/android/nativescript-geolocation.aar
24-
/src/*.tgz
21+
src/platforms/android/nativescript_geolocation.aar

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ matrix:
6363
jdk: oraclejdk8
6464
env:
6565
- iOS="UnitTests"
66-
osx_image: xcode8.3 # Can't run the tests using the latest xcode for now
66+
osx_image: xcode9.3
6767
script:
6868
- cd src && npm i && npm run tsc && npm run tslint && cd ../demo && tns build ios
6969
- travis_wait travis_retry tns test ios --justlaunch
@@ -73,7 +73,7 @@ android:
7373
- tools
7474
- tools
7575
- platform-tools
76-
- build-tools-26.0.2
76+
- build-tools-27.0.3
7777
- android-26
7878
- android-23
7979
- extra-android-m2repository

demo/app/app.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
import "./bundle-config";
2-
import * as application from 'tns-core-modules/application';
1+
import * as application from 'tns-core-modules/application';
32
application.start({ moduleName: "main-page" });

demo/app/bundle-config.ts

Lines changed: 0 additions & 11 deletions
This file was deleted.

demo/app/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
},
2727
"homepage": "https://github.com/NativeScript/template-hello-world-ts",
2828
"android": {
29-
"v8Flags": "--expose_gc"
29+
"v8Flags": "--expose_gc",
30+
"requireModules": ["nativescript-geolocation"]
3031
},
3132
"devDependencies": {
3233
"nativescript-dev-typescript": "^0.3.0"

demo/app/vendor-platform.android.ts

Lines changed: 0 additions & 9 deletions
This file was deleted.

demo/app/vendor-platform.ios.ts

Lines changed: 0 additions & 3 deletions
This file was deleted.

demo/app/vendor.ts

Lines changed: 0 additions & 11 deletions
This file was deleted.

demo/package.json

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,44 +2,47 @@
22
"nativescript": {
33
"id": "org.nativescript.demo",
44
"tns-android": {
5-
"version": "3.4.0"
5+
"version": "4.1.1"
66
},
77
"tns-ios": {
8-
"version": "3.4.0"
8+
"version": "4.1.0"
99
}
1010
},
1111
"dependencies": {
1212
"nativescript-geolocation": "../src",
1313
"nativescript-theme-core": "^1.0.4",
1414
"nativescript-toast": "^1.4.6",
1515
"nativescript-unit-test-runner": "^0.3.4",
16-
"tns-core-modules": "^3.4.0"
16+
"tns-core-modules": "4.1.0"
1717
},
1818
"devDependencies": {
19-
"awesome-typescript-loader": "~3.1.3",
19+
"awesome-typescript-loader": "~5.0.0",
2020
"babel-traverse": "6.12.0",
2121
"babel-types": "6.11.1",
2222
"babylon": "6.8.4",
23-
"copy-webpack-plugin": "~4.0.1",
23+
"clean-webpack-plugin": "~0.1.19",
24+
"copy-webpack-plugin": "~4.5.1",
2425
"css-loader": "~0.28.7",
25-
"extract-text-webpack-plugin": "~3.0.0",
26+
"extract-text-webpack-plugin": "~3.0.2",
2627
"filewalker": "0.1.2",
2728
"jasmine-core": "^2.5.2",
2829
"karma": "^1.3.0",
2930
"karma-jasmine": "^1.0.2",
3031
"karma-nativescript-launcher": "^0.4.0",
3132
"lazy": "1.0.11",
3233
"nativescript-css-loader": "~0.26.0",
33-
"nativescript-dev-typescript": "libs",
34-
"nativescript-dev-webpack": "^0.9.0",
34+
"nativescript-dev-typescript": "~0.7.1",
35+
"nativescript-dev-webpack": "0.12.0",
3536
"nativescript-worker-loader": "~0.8.1",
3637
"raw-loader": "~0.5.1",
37-
"resolve-url-loader": "~2.1.0",
38+
"resolve-url-loader": "~2.3.0",
3839
"tns-platform-declarations": "^3.2.0",
3940
"tslint": "~5.4.3",
40-
"typescript": "2.3.4",
41-
"webpack": "~3.8.1",
42-
"webpack-bundle-analyzer": "^2.8.2",
41+
"typescript": "~2.7.2",
42+
"uglifyjs-webpack-plugin": "~1.2.4",
43+
"webpack": "~4.5.0",
44+
"webpack-bundle-analyzer": "^2.9.1",
45+
"webpack-cli": "~2.0.14",
4346
"webpack-sources": "~1.0.1"
4447
},
4548
"scripts": {
@@ -53,4 +56,4 @@
5356
"build-android-bundle": "npm run ns-bundle --android --build-app",
5457
"build-ios-bundle": "npm run ns-bundle --ios --build-app"
5558
}
56-
}
59+
}

demo/references.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
/// <reference path="./node_modules/tns-core-modules/tns-core-modules.d.ts" />
2-
/// <reference path="./node_modules/tns-platform-declarations/ios.d.ts" />
3-
/// <reference path="./node_modules/tns-platform-declarations/android.d.ts" />
2+
/// <reference path="../src/node_modules/tns-platform-declarations/ios.d.ts" />
3+
/// <reference path="../src/node_modules/tns-platform-declarations/android.d.ts" />

demo/tsconfig.json

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@
99
"experimentalDecorators": true,
1010
"lib": [
1111
"es6",
12-
"dom"
12+
"dom",
13+
"es2015.iterable"
1314
],
1415
"pretty": true,
1516
"allowUnreachableCode": false,
1617
"allowUnusedLabels": false,
1718
"noEmitHelpers": true,
18-
"noEmitOnError": true,
19+
"noEmitOnError": false,
1920
"noImplicitAny": false,
2021
"noImplicitReturns": true,
2122
"noImplicitUseStrict": false,
@@ -25,10 +26,18 @@
2526
"*": [
2627
"./node_modules/tns-core-modules/*",
2728
"./node_modules/*"
29+
],
30+
"~/*": [
31+
"app/*"
2832
]
2933
}
3034
},
35+
"include": [
36+
"../src",
37+
"**/*"
38+
],
3139
"exclude": [
40+
"../src/node_modules",
3241
"node_modules",
3342
"platforms"
3443
],

src/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
"devDependencies": {
4343
"tns-core-modules": "^3.0.0",
4444
"tns-platform-declarations": "^3.0.0",
45-
"typescript": "2.3.4",
46-
"prompt": "^1.0.0",
47-
"rimraf": "^2.5.0",
45+
"typescript": "~2.7.2",
46+
"prompt": "~1.0.0",
47+
"rimraf": "~2.6.2",
4848
"tslint": "~5.4.3"
4949
},
5050
"dependencies": {

0 commit comments

Comments
 (0)