Skip to content
This repository was archived by the owner on Aug 7, 2021. It is now read-only.

Commit 28e70de

Browse files
Merge branch 'master' into vladimirov/persist-package-json-indent
2 parents 3df741f + 8a231b2 commit 28e70de

File tree

3 files changed

+34
-34
lines changed

3 files changed

+34
-34
lines changed

Diff for: demo/AngularApp/package.json

+20-20
Original file line numberDiff line numberDiff line change
@@ -13,45 +13,45 @@
1313
}
1414
},
1515
"dependencies": {
16-
"@angular/common": "~6.1.0",
17-
"@angular/compiler": "~6.1.0",
18-
"@angular/core": "~6.1.0",
19-
"@angular/forms": "~6.1.0",
20-
"@angular/http": "~6.1.0",
21-
"@angular/platform-browser": "~6.1.0",
22-
"@angular/platform-browser-dynamic": "~6.1.0",
23-
"@angular/router": "~6.1.0",
16+
"@angular/common": "~7.1.0",
17+
"@angular/compiler": "~7.1.0",
18+
"@angular/core": "~7.1.0",
19+
"@angular/forms": "~7.1.0",
20+
"@angular/http": "~7.1.0",
21+
"@angular/platform-browser": "~7.1.0",
22+
"@angular/platform-browser-dynamic": "~7.1.0",
23+
"@angular/router": "~7.1.0",
2424
"nativescript-angular": "next",
2525
"nativescript-theme-core": "~1.0.2",
2626
"reflect-metadata": "~0.1.8",
27-
"rxjs": "^6.0.0",
27+
"rxjs": "~6.3.3",
2828
"tns-core-modules": "next",
29-
"zone.js": "^0.8.26"
29+
"zone.js": "~0.8.26"
3030
},
3131
"devDependencies": {
32-
"@angular/compiler-cli": "~6.1.0",
33-
"@ngtools/webpack": "~6.2.0",
34-
"@types/chai": "^4.0.2",
35-
"@types/mocha": "^2.2.41",
36-
"@types/node": "^7.0.5",
32+
"@angular/compiler-cli": "~7.1.0",
33+
"@ngtools/webpack": "~7.1.2",
34+
"@types/chai": "~4.1.7",
35+
"@types/mocha": "~5.2.5",
36+
"@types/node": "~10.12.12",
3737
"babel-traverse": "6.26.0",
3838
"babel-types": "6.26.0",
3939
"babylon": "6.18.0",
4040
"chai": "~4.1.1",
4141
"chai-as-promised": "~7.1.1",
4242
"lazy": "1.0.11",
43-
"mocha": "~3.5.0",
44-
"mocha-junit-reporter": "^1.13.0",
45-
"mocha-multi": "^0.11.0",
43+
"mocha": "~5.2.0",
44+
"mocha-junit-reporter": "~1.18.0",
45+
"mocha-multi": "~1.0.1",
4646
"nativescript-dev-appium": "next",
4747
"nativescript-dev-sass": "next",
4848
"nativescript-dev-typescript": "next",
4949
"nativescript-dev-webpack": "next",
50-
"typescript": "~2.7.2"
50+
"typescript": "~3.1.1"
5151
},
5252
"scripts": {
5353
"setup": "npm pack ../../ && npm i -D nativescript-dev-webpack*.tgz",
5454
"e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",
5555
"compile-tests": "tsc -p e2e --watch"
5656
}
57-
}
57+
}

Diff for: demo/JavaScriptApp/package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
"tns-core-modules": "next"
1818
},
1919
"devDependencies": {
20-
"@types/chai": "^4.0.2",
21-
"@types/mocha": "^2.2.41",
22-
"@types/node": "^7.0.5",
20+
"@types/chai": "~4.1.7",
21+
"@types/mocha": "~5.2.5",
22+
"@types/node": "~10.12.12",
2323
"babel-traverse": "6.26.0",
2424
"babel-types": "6.26.0",
2525
"babylon": "6.18.0",
2626
"lazy": "1.0.11",
27-
"mocha": "~3.5.0",
28-
"mocha-junit-reporter": "^1.13.0",
29-
"mocha-multi": "^0.11.0",
27+
"mocha": "~5.2.0",
28+
"mocha-junit-reporter":"~1.18.0",
29+
"mocha-multi":"~1.0.1",
3030
"nativescript-dev-appium": "next",
3131
"nativescript-dev-sass": "next",
3232
"nativescript-dev-webpack": "next",
@@ -36,4 +36,4 @@
3636
"setup": "npm pack ../../ && npm i -D nativescript-dev-webpack*.tgz",
3737
"e2e": "mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json"
3838
}
39-
}
39+
}

Diff for: demo/TypeScriptApp/package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@
1717
"tns-core-modules": "next"
1818
},
1919
"devDependencies": {
20-
"@types/chai": "^4.0.2",
21-
"@types/mocha": "^2.2.41",
22-
"@types/node": "^7.0.5",
20+
"@types/chai": "~4.1.7",
21+
"@types/mocha": "~5.2.5",
22+
"@types/node": "~10.12.12",
2323
"babel-traverse": "6.26.0",
2424
"babel-types": "6.26.0",
2525
"babylon": "6.18.0",
2626
"lazy": "1.0.11",
27-
"mocha": "~3.5.0",
28-
"mocha-junit-reporter": "^1.13.0",
29-
"mocha-multi": "^0.11.0",
27+
"mocha": "~5.2.0",
28+
"mocha-junit-reporter": "~1.18.0",
29+
"mocha-multi": "~1.0.1",
3030
"nativescript-dev-appium": "next",
3131
"nativescript-dev-sass": "next",
3232
"nativescript-dev-typescript": "next",
3333
"nativescript-dev-webpack": "next",
34-
"typescript": "~2.7.2"
34+
"typescript": "~3.2.2"
3535
},
3636
"scripts": {
3737
"setup": "npm pack ../../ && npm i -D nativescript-dev-webpack*.tgz",

0 commit comments

Comments
 (0)