Merge branch 'master' into android-media-type

Author: xuhcc

.travis.yml

@@ -1,13 +1,17 @@
 env:
   global:
     - ANDROID_PACKAGE_JS='imagepicker-debug-js.apk'
+    - ANDROID_PACKAGE_NG='imagepicker-debug-ng.apk'
     - ANDROID_PACKAGE_VUE='imagepicker-debug-vue.apk'
     - ANDROID_PACKAGE_FOLDER_JS=$TRAVIS_BUILD_DIR/demo/outputs
+    - ANDROID_PACKAGE_FOLDER_NG=$TRAVIS_BUILD_DIR/demo-angular/outputs
     - ANDROID_PACKAGE_FOLDER_VUE=$TRAVIS_BUILD_DIR/demo-vue/outputs
     - ANDROID_SAUCE_STORAGE="https://saucelabs.com/rest/v1/storage/$SAUCE_USER"
     - IOS_PACKAGE_JS='imagepicker-demo-js.zip'
+    - IOS_PACKAGE_NG='imagepicker-demo-ng.zip'
     - IOS_PACKAGE_VUE='imagepicker-demo-vue.zip'
     - IOS_PACKAGE_FOLDER_JS=$TRAVIS_BUILD_DIR/demo/outputs
+    - IOS_PACKAGE_FOLDER_NG=$TRAVIS_BUILD_DIR/demo-angular/outputs
     - IOS_PACKAGE_FOLDER_VUE=$TRAVIS_BUILD_DIR/demo-vue/outputs
     - IOS_SAUCE_STORAGE="https://saucelabs.com/rest/v1/storage/$SAUCE_USER"
 
@@ -43,30 +47,31 @@ matrix:
     - os: osx
       env:
         - WebpackiOS="12.0"
-        - Type="VueJS"
+        - Type="Angular"
       osx_image: xcode10.2
       language: node_js
       node_js: "10"
       jdk: oraclejdk8
       before_script: pod repo update
       script:
         - cd src && npm run build
-        - cd ../demo-vue && npm i && tns build ios --bundle --env.uglify --copy-to "./outputs/demovue.app"
-        - cd $IOS_PACKAGE_FOLDER_VUE && zip -r $IOS_PACKAGE_VUE demovue.app
-        - "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $IOS_SAUCE_STORAGE/$IOS_PACKAGE_VUE?overwrite=true --data-binary @$IOS_PACKAGE_FOLDER_VUE/$IOS_PACKAGE_VUE"
+        - cd ../demo-angular && npm i && tns build ios --bundle --env.uglify --env.aot --copy-to "./outputs/demo-angular.app"
+        - cd $IOS_PACKAGE_FOLDER_NG && zip -r $IOS_PACKAGE_NG demo-angular.app
+        - "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $IOS_SAUCE_STORAGE/$IOS_PACKAGE_NG?overwrite=true --data-binary @$IOS_PACKAGE_FOLDER_NG/$IOS_PACKAGE_NG"
     - os: osx
       env:
         - WebpackiOS="12.0"
-        - Type="Angular"
+        - Type="VueJS"
       osx_image: xcode10.2
       language: node_js
       node_js: "10"
       jdk: oraclejdk8
       before_script: pod repo update
       script:
-        - cd src && npm run build && npm pack
-        - cd ../demo-angular && tns plugin add ../src/*.tgz
-        - npm i && tns build ios --bundle --env.uglify --env.aot
+        - cd src && npm run build
+        - cd ../demo-vue && npm i && tns build ios --bundle --env.uglify --copy-to "./outputs/demovue.app"
+        - cd $IOS_PACKAGE_FOLDER_VUE && zip -r $IOS_PACKAGE_VUE demovue.app
+        - "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $IOS_SAUCE_STORAGE/$IOS_PACKAGE_VUE?overwrite=true --data-binary @$IOS_PACKAGE_FOLDER_VUE/$IOS_PACKAGE_VUE"
     - language: android
       os: linux
       dist: trusty
@@ -84,73 +89,25 @@ matrix:
       dist: trusty
       env:
         - WebpackAndroid="28"
-        - Type="VueJS"
+        - Type="Angular"
       jdk: oraclejdk8
       before_install: nvm install 10
       script:
         - cd src && npm run build
-        - cd ../demo-vue && npm i && tns build android --bundle --env.uglify --copy-to "./outputs/app-debug.apk"
-        - "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $ANDROID_SAUCE_STORAGE/$ANDROID_PACKAGE_VUE?overwrite=true --data-binary @$ANDROID_PACKAGE_FOLDER_VUE/app-debug.apk"
+        - cd ../demo-angular && npm i && tns build android --bundle --env.uglify --env.snapshot --copy-to "./outputs/app-debug.apk"
+        - "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $ANDROID_SAUCE_STORAGE/$ANDROID_PACKAGE_NG?overwrite=true --data-binary @$ANDROID_PACKAGE_FOLDER_NG/app-debug.apk"
     - language: android
       os: linux
       dist: trusty
       env:
         - WebpackAndroid="28"
-        - Type="Angular"
+        - Type="VueJS"
       jdk: oraclejdk8
       before_install: nvm install 10
       script:
         - cd src && npm run build
-        - cd ../publish && sh pack.sh
-        - cd ../demo-angular && tns plugin add ../publish/package/*.tgz
-        - npm i && tns build android --bundle --env.uglify --env.snapshot --env.aot
-    - language: android
-      os: linux
-      dist: trusty
-      env:
-        - BuildAndroid="28"
-        - Type="VanillaJS"
-
-      jdk: oraclejdk8
-      before_install: nvm install 10
-      script:
-        - cd demo && npm run ci.android.build
-    - language: android
-      os: linux
-      dist: trusty
-      env:
-        - BuildAndroid="28"
-        - Type="Angular"
-
-      jdk: oraclejdk8
-      before_install: nvm install 10
-      script:
-        - cd demo-angular && npm run ci.android.build
-    - os: osx
-      env:
-        - BuildiOS="12.0"
-        - Xcode="10.0"
-        - Type="VanillaJS"
-      osx_image: xcode10.2
-      language: node_js
-      node_js: "10"
-      jdk: oraclejdk8
-      before_script: pod repo update
-      script:
-        - cd src && npm run build
-        - cd ../demo && tns build ios --bundle --env.uglify
-    - os: osx
-      env:
-        - BuildiOS="12.0"
-        - Xcode="10.0"
-        - Type="Angular"
-      osx_image: xcode10.2
-      language: node_js
-      node_js: "10"
-      jdk: oraclejdk8
-      before_script: pod repo update
-      script:
-        - cd demo-angular && npm run ci.ios.build
+        - cd ../demo-vue && npm i && tns build android --bundle --env.uglify --copy-to "./outputs/app-debug.apk"
+        - "curl -u $SAUCE_USER:$SAUCE_KEY -X POST -H 'Content-Type: application/octet-stream' $ANDROID_SAUCE_STORAGE/$ANDROID_PACKAGE_VUE?overwrite=true --data-binary @$ANDROID_PACKAGE_FOLDER_VUE/app-debug.apk"
     - stage: "UI Tests"
       env:
         - Android="24"
@@ -160,7 +117,7 @@ matrix:
       node_js: "10"
       script:
         - npm i -g appium
-        - cd demo && npm i
+        - cd tests && npm i
         - travis_wait travis_retry npm run e2e -- --runType android24 --sauceLab --appPath $ANDROID_PACKAGE_JS
     - os: linux
       env:
@@ -171,8 +128,19 @@ matrix:
       node_js: "10"
       script:
         - npm i -g appium
-        - cd demo-vue && npm i
+        - cd tests && npm i
         - travis_wait travis_retry npm run e2e -- --runType android24 --sauceLab --appPath $ANDROID_PACKAGE_VUE
+    - os: linux
+      env:
+        - Android="24"
+        - Type="Angular"
+      language: node_js
+      os: linux
+      node_js: "10"
+      script:
+        - npm i -g appium
+        - cd tests && npm i
+        - travis_wait travis_retry npm run e2e -- --runType android24 --sauceLab --appPath $ANDROID_PACKAGE_NG
     - os: linux
       env:
         - iOS="12.0"
@@ -181,7 +149,7 @@ matrix:
       node_js: "10"
       script:
         - npm i -g appium
-        - cd demo && npm i
+        - cd tests && npm i
         - travis_wait travis_retry npm run e2e -- --runType sim12iPhoneX --sauceLab --appPath $IOS_PACKAGE_JS
     - os: linux
       env:
@@ -191,8 +159,18 @@ matrix:
       node_js: "10"
       script:
         - npm i -g appium
-        - cd demo-vue && npm i
+        - cd tests && npm i
         - travis_wait travis_retry npm run e2e -- --runType sim12iPhoneX --sauceLab --appPath $IOS_PACKAGE_VUE
+    - os: linux
+      env:
+        - iOS="12.0"
+        - Type="Angular"
+      language: node_js
+      node_js: "10"
+      script:
+        - npm i -g appium
+        - cd tests && npm i
+        - travis_wait travis_retry npm run e2e -- --runType sim12iPhoneX --sauceLab --appPath $IOS_PACKAGE_NG
 
 android:
   components:

demo-angular/app/App_Resources/Android/AndroidManifest.xml renamed to demo-angular/app/App_Resources/Android/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
-module.exports = function(config) {
-  config.set({
+module.exports = function (config) {
+  const options = {
 
     // base path that will be used to resolve all patterns (eg. files, exclude)
     basePath: '',
@@ -11,9 +11,7 @@ module.exports = function(config) {
 
 
     // list of files / patterns to load in the browser
-    files: [
-      'app/**/*.js',
-    ],
+    files: ['app/tests/**/*.*'],
 
 
     // list of files to exclude
@@ -72,6 +70,39 @@ module.exports = function(config) {
 
     // Continuous Integration mode
     // if true, Karma captures browsers, runs the tests and exits
-    singleRun: true
-  });
-};
+    singleRun: false
+  };
+
+  setWebpackPreprocessor(config, options);
+  setWebpack(config, options);
+
+  config.set(options);
+}
+
+function setWebpackPreprocessor(config, options) {
+  if (config && config.bundle) {
+    if (!options.preprocessors) {
+      options.preprocessors = {};
+    }
+
+    options.files.forEach(file => {
+      if (!options.preprocessors[file]) {
+        options.preprocessors[file] = [];
+      }
+      options.preprocessors[file].push('webpack');
+    });
+  }
+}
+
+function setWebpack(config, options) {
+  if (config && config.bundle) {
+    const env = {};
+    env[config.platform] = true;
+    env.sourceMap = config.debugBrk;
+    options.webpack = require('./webpack.config')(env);
+    delete options.webpack.entry;
+    delete options.webpack.output.libraryTarget;
+    const invalidPluginsForUnitTesting = ["GenerateBundleStarterPlugin", "GenerateNativeScriptEntryPointsPlugin"];
+    options.webpack.plugins = options.webpack.plugins.filter(p => !invalidPluginsForUnitTesting.includes(p.constructor.name));
+  }
+}

demo-angular/app/App_Resources/Android/drawable-hdpi/background.png renamed to demo-angular/app/App_Resources/Android/src/main/res/drawable-hdpi/background.png

@@ -2,10 +2,10 @@
   "nativescript": {
     "id": "org.nativescript.imagepickerdemoangular",
     "tns-ios": {
-      "version": "5.4.0"
+      "version": "6.0.1"
     },
     "tns-android": {
-      "version": "5.4.0"
+      "version": "6.0.0"
     }
   },
   "dependencies": {
@@ -20,23 +20,23 @@
     "nativescript-angular": "~8.0.0",
     "nativescript-imagepicker": "../src",
     "nativescript-theme-core": "^1.0.4",
-    "nativescript-unit-test-runner": "^0.3.4",
+    "nativescript-unit-test-runner": "0.7.0",
     "reflect-metadata": "~0.1.8",
     "rxjs": "^6.3.3",
-    "tns-core-modules": "^5.0.0",
-    "typescript": "~3.4.5"
+    "tns-core-modules": "^6.0.0"
   },
   "devDependencies": {
     "jasmine-core": "^2.5.2",
-    "karma": "^1.3.0",
-    "karma-jasmine": "^1.0.2",
+    "karma": "4.1.0",
+    "karma-jasmine": "2.0.1",
     "karma-nativescript-launcher": "^0.4.0",
     "nativescript-css-loader": "~0.26.0",
-    "nativescript-dev-typescript": "~0.10.0",
-    "nativescript-dev-webpack": "~0.24.0",
-    "tns-platform-declarations": "^5.0.0",
+    "nativescript-dev-webpack": "~1.0.1",
+    "tns-platform-declarations": "^6.0.0",
     "tslint": "~5.11.0",
-    "zone.js": "^0.8.4"
+    "zone.js": "^0.8.4",
+    "typescript": "~3.4.5",
+    "karma-webpack": "3.0.5"
   },
   "scripts": {
     "build.plugin": "cd ../src && npm run build",