Skip to content

Commit 1166bee

Browse files
committed
chore: #36 WebPack demo apps on change
1 parent 2697ba9 commit 1166bee

File tree

11 files changed

+100
-384
lines changed

11 files changed

+100
-384
lines changed

.travis.yml

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,27 @@
11
matrix:
22
include:
3-
- stage: "Lint"
4-
language: node_js
5-
os: linux
3+
# - stage: "Lint"
4+
# language: node_js
5+
# os: linux
6+
# node_js: "6"
7+
# jdk: oraclejdk8
8+
# script: npm run ci.tslint
9+
- stage: "WebPack"
10+
os: osx
11+
env:
12+
- Platform="iOS"
13+
osx_image: xcode8.3
14+
language: node_js
615
node_js: "6"
716
jdk: oraclejdk8
8-
script: npm run ci.tslint
17+
script: npm run build && cd ../demo && npm i && npm run build-ios-bundle && cd ../demo-angular && npm i && npm run build-ios-bundle
18+
- language: android
19+
os: linux
20+
env:
21+
- Platform="Android"
22+
jdk: oraclejdk8
23+
before_install: nvm install 6.10.3
24+
script: cd ../src && npm run build && cd ../demo && npm i && npm run build-android-bundle && cd ../demo-angular && npm i && npm run build-android-bundle
925
- stage: "Build"
1026
env:
1127
- Android="23"

demo-angular/package.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"nativescript": {
55
"id": "org.nativescript.demoangular",
66
"tns-android": {
7-
"version": "3.0.0"
7+
"version": "3.0.1"
88
},
99
"tns-ios": {
1010
"version": "3.0.1"
@@ -29,7 +29,7 @@
2929
},
3030
"devDependencies": {
3131
"@angular/compiler-cli": "~4.0.0",
32-
"@ngtools/webpack": "1.3.0",
32+
"@ngtools/webpack": "~1.4.0",
3333
"babel-traverse": "6.12.0",
3434
"babel-types": "6.11.1",
3535
"babylon": "6.8.4",
@@ -43,17 +43,18 @@
4343
"lazy": "1.0.11",
4444
"nativescript-css-loader": "~0.26.0",
4545
"nativescript-dev-typescript": "^0.4.0",
46-
"nativescript-dev-webpack": "^0.4.0",
46+
"nativescript-dev-webpack": "^0.6.3",
4747
"raw-loader": "~0.5.1",
4848
"resolve-url-loader": "~2.0.2",
49-
"typescript": "~2.2.2",
50-
"webpack": "~2.3.3",
51-
"webpack-sources": "~0.2.3"
49+
"typescript": "~2.3.4",
50+
"webpack": "~2.6.1",
51+
"webpack-sources": "~1.0.1"
5252
},
5353
"scripts": {
5454
"ns-bundle": "ns-bundle",
55-
"start-android-bundle": "npm run ns-bundle --android --start-app",
56-
"start-ios-bundle": "npm run ns-bundle --ios --start-app",
55+
"publish-ios-bundle": "npm run ns-bundle --ios --publish-app",
56+
"start-android-bundle": "npm run ns-bundle --android --run-app",
57+
"start-ios-bundle": "npm run ns-bundle --ios --run-app",
5758
"build-android-bundle": "npm run ns-bundle --android --build-app",
5859
"build-ios-bundle": "npm run ns-bundle --ios --build-app"
5960
}

demo-angular/webpack.android.js

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

demo-angular/webpack.common.js

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

demo-angular/webpack.ios.js

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

demo/package.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"tns-core-modules": "^3.0.0"
1616
},
1717
"devDependencies": {
18-
"awesome-typescript-loader": "~3.1.2",
18+
"awesome-typescript-loader": "~3.1.3",
1919
"babel-traverse": "6.12.0",
2020
"babel-types": "6.11.1",
2121
"babylon": "6.8.4",
@@ -32,19 +32,20 @@
3232
"nativescript-css-loader": "~0.26.0",
3333
"nativescript-dev-appium": "~0",
3434
"nativescript-dev-typescript": "^0.4.0",
35-
"nativescript-dev-webpack": "^0.4.0",
35+
"nativescript-dev-webpack": "^0.6.3",
3636
"raw-loader": "~0.5.1",
3737
"resolve-url-loader": "~2.0.2",
3838
"typescript": "~2.2.2",
3939
"wd": "~1.1.1",
40-
"webpack": "~2.3.3",
41-
"webpack-sources": "~0.2.3"
40+
"webpack": "~2.6.1",
41+
"webpack-sources": "~1.0.1"
4242
},
4343
"scripts": {
4444
"ns-bundle": "ns-bundle",
4545
"appium": "nativescript-dev-appium",
46-
"start-android-bundle": "npm run ns-bundle --android --start-app",
47-
"start-ios-bundle": "npm run ns-bundle --ios --start-app",
46+
"publish-ios-bundle": "npm run ns-bundle --ios --publish-app",
47+
"start-android-bundle": "npm run ns-bundle --android --run-app",
48+
"start-ios-bundle": "npm run ns-bundle --ios --run-app",
4849
"build-android-bundle": "npm run ns-bundle --android --build-app",
4950
"build-ios-bundle": "npm run ns-bundle --ios --build-app"
5051
}

demo/webpack.android.js

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

0 commit comments

Comments
 (0)