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

chore(demos): update dependencies #597

Merged
merged 5 commits into from
Jul 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,20 +62,21 @@ You are good to go! You're strongly encouraged to follow the official NativeScri

NOTE: There are three test apps in the repository, located in the `/demo` directory. The steps below describe how to run the tests for the `AngularApp`, but the same approach can be used to run any other `e2e` tests.

1. Navigate to `demo/AngularApp`
1. Navigate to `demo/AngularApp`.
``` bash
cd demo/AngularApp
```

2. Install dependencies. This also installs your local copy of the nativescript-angular plugin.
``` bash
npm install
2. Install your local copy of the `nativescript-dev-webpack` plugin.
```bash
npm run setup
```

3. Make sure to have an emulator set up or connect a physical Android/iOS device.

4. Build the app for Android or iOS
4. Build the app for Android or iOS.
``` bash
tns run android/ios
tns run android/ios --bundle
```

5. Install [appium](http://appium.io/) globally.
Expand Down
29 changes: 15 additions & 14 deletions demo/AngularApp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,24 @@
}
},
"dependencies": {
"@angular/common": "~6.0.0",
"@angular/compiler": "~6.0.0",
"@angular/core": "~6.0.0",
"@angular/forms": "~6.0.0",
"@angular/http": "~6.0.0",
"@angular/platform-browser": "~6.0.0",
"@angular/platform-browser-dynamic": "~6.0.0",
"@angular/router": "~6.0.0",
"nativescript-angular": "~6.0.0",
"@angular/common": "~6.1.0-beta.3",
"@angular/compiler": "~6.1.0-beta.3",
"@angular/core": "~6.1.0-beta.3",
"@angular/forms": "~6.1.0-beta.3",
"@angular/http": "~6.1.0-beta.3",
"@angular/platform-browser": "~6.1.0-beta.3",
"@angular/platform-browser-dynamic": "~6.1.0-beta.3",
"@angular/router": "~6.1.0-beta.3",
"nativescript-angular": "next",
"nativescript-theme-core": "~1.0.2",
"reflect-metadata": "~0.1.8",
"rxjs": "~6.0.0-beta.1",
"rxjs": "~6.0.0 || >=6.1.0",
"tns-core-modules": "next",
"zone.js": "^0.8.4"
"zone.js": "^0.8.26"
},
"devDependencies": {
"@angular/compiler-cli": "~6.1.0-beta.3",
"@ngtools/webpack": "6.1.0-rc.0",
"@angular/compiler-cli": "~6.1.0-beta.1",
"@types/chai": "^4.0.2",
"@types/mocha": "^2.2.41",
"@types/node": "^7.0.5",
Expand All @@ -44,12 +44,13 @@
"mocha-junit-reporter": "^1.13.0",
"mocha-multi": "^0.11.0",
"nativescript-dev-appium": "next",
"nativescript-dev-sass": "^1.3.5",
"nativescript-dev-sass": "next",
"nativescript-dev-typescript": "next",
"nativescript-dev-webpack": "file:../..",
"nativescript-dev-webpack": "next",
"typescript": "~2.7.2"
},
"scripts": {
"setup": "npm pack ../../ && npm i -D nativescript-dev-webpack*.tgz",
"e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",
"compile-tests": "tsc -p e2e --watch"
}
Expand Down
5 changes: 3 additions & 2 deletions demo/JavaScriptApp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,12 @@
"mocha-junit-reporter": "^1.13.0",
"mocha-multi": "^0.11.0",
"nativescript-dev-appium": "next",
"nativescript-dev-sass": "^1.3.5",
"nativescript-dev-webpack": "file:../..",
"nativescript-dev-sass": "next",
"nativescript-dev-webpack": "next",
"node-sass": "^4.7.1"
},
"scripts": {
"setup": "npm pack ../../ && npm i -D nativescript-dev-webpack*.tgz",
"e2e": "mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json"
}
}
2 changes: 2 additions & 0 deletions demo/TypeScriptApp/.gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
app/**/*.js
e2e/**/*.js

app/app.android.css
app/app.ios.css
app/main-page.android.css
app/main-page.ios.css
1 change: 0 additions & 1 deletion demo/TypeScriptApp/app/app.android.css

This file was deleted.

1 change: 0 additions & 1 deletion demo/TypeScriptApp/app/app.ios.css

This file was deleted.

5 changes: 3 additions & 2 deletions demo/TypeScriptApp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,13 @@
"mocha-junit-reporter": "^1.13.0",
"mocha-multi": "^0.11.0",
"nativescript-dev-appium": "next",
"nativescript-dev-sass": "^1.3.5",
"nativescript-dev-sass": "next",
"nativescript-dev-typescript": "next",
"nativescript-dev-webpack": "file:../..",
"nativescript-dev-webpack": "next",
"typescript": "~2.7.2"
},
"scripts": {
"setup": "npm pack ../../ && npm i -D nativescript-dev-webpack*.tgz",
"e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",
"compile-tests": "tsc -p e2e --watch"
}
Expand Down