Merge next to master

.gitattributes

@@ -1 +1 @@
-* -crlf
+.travis.yml merge=ours

.gitignore

@@ -5,31 +5,22 @@
 *.js
 *.js.map
 *.log
+*.esm.json
 !src/scripts/*.js
 !src/hooks/*.js
 !seed-tests/*.js
 seed-tests/seed-copy/**/*.*
 seed-tests/seed-copy-new-git-repo/**/*.*
-demo/app/*.js
+demo/**/*.js
 !demo/karma.conf.js
 !demo/app/tests/*.js
 demo/*.d.ts
 !demo/references.d.ts
 demo/lib
 demo/platforms
 demo/node_modules
-demo-angular/app/*.js
-!demo-angular/karma.conf.js
-!demo-angular/app/tests/*.js
-demo-angular/*.d.ts
-!demo-angular/references.d.ts
-demo-angular/lib
-demo-angular/platforms
-demo-angular/node_modules
 node_modules
 publish/src
 publish/package
 demo/report/report.html
 demo/report/stats.json
-demo-angular/report/report.html
-demo-angular/report/stats.json

.travis.yml

@@ -1,6 +1,6 @@
 branches:
   only:
-    - master
+    - next
 matrix:
   include:
     - stage: "Lint"
@@ -18,7 +18,9 @@ matrix:
       language: node_js
       node_js: "6"
       jdk: oraclejdk8
-      script: cd demo && npm run build.plugin && npm i && tns build ios --bundle --env.uglify
+      before_script:
+        - cd demo && tns platform add ios@next
+      script: npm run build.plugin && npm i && tns build ios --bundle --env.uglify
     - os: linux
       language: android
       env:
@@ -27,19 +29,22 @@ matrix:
         - Webpack="true"
       jdk: oraclejdk8
       before_install: nvm install 6.10.3
+      before_script:
+        - cd demo && tns platform add android@next
       script: >
-        echo { \"project_info\": { \"project_number\": \"424050927453\", \"firebase_url\": \"https://pptest-53916.firebaseio.com\", \"project_id\": \"pptest-53916\", \"storage_bucket\": \"pptest-53916.appspot.com\" }, \"client\": [ { \"client_info\": { \"mobilesdk_app_id\": \"1:424050927453:android:21d2dd8987e1e3d1\", \"android_client_info\": { \"package_name\": \"org.nativescript.ppTest\" } }, \"oauth_client\": [ { \"client_id\": \"424050927453-o7gv6bcmknujjoaaoa5r4d452cutb9jf.apps.googleusercontent.com\", \"client_type\": 3 } ], \"api_key\": [ { \"current_key\": \"AIzaSyDr3fqH7Z8-vhBNpAges_KFTA7oOoylGvU\" } ], \"services\": { \"analytics_service\": { \"status\": 1 }, \"appinvite_service\": { \"status\": 1, \"other_platform_oauth_client\": [] }, \"ads_service\": { \"status\": 2 } } } ], \"configuration_version\": \"1\"} > demo/app/App_Resources/Android/google-services.json &&
-        cd demo && npm run build.plugin && npm i && tns build android --bundle --env.uglify
+        echo { \"project_info\": { \"project_number\": \"424050927453\", \"firebase_url\": \"https://pptest-53916.firebaseio.com\", \"project_id\": \"pptest-53916\", \"storage_bucket\": \"pptest-53916.appspot.com\" }, \"client\": [ { \"client_info\": { \"mobilesdk_app_id\": \"1:424050927453:android:21d2dd8987e1e3d1\", \"android_client_info\": { \"package_name\": \"org.nativescript.ppTest\" } }, \"oauth_client\": [ { \"client_id\": \"424050927453-o7gv6bcmknujjoaaoa5r4d452cutb9jf.apps.googleusercontent.com\", \"client_type\": 3 } ], \"api_key\": [ { \"current_key\": \"AIzaSyDr3fqH7Z8-vhBNpAges_KFTA7oOoylGvU\" } ], \"services\": { \"analytics_service\": { \"status\": 1 }, \"appinvite_service\": { \"status\": 1, \"other_platform_oauth_client\": [] }, \"ads_service\": { \"status\": 2 } } } ], \"configuration_version\": \"1\"} > ../demo/app/App_Resources/Android/google-services.json && npm run build.plugin && npm i && tns build android --bundle --env.uglify
     - language: android
       env:
         - Platform="Android"
         - AndroidSDK="26"
       os: linux
       jdk: oraclejdk8
-      before_install: nvm install stable
+      before_install: nvm install 6.10.3
+      before_script:
+        - cd demo && tns platform add android@next
       script: >
-        echo { \"project_info\": { \"project_number\": \"424050927453\", \"firebase_url\": \"https://pptest-53916.firebaseio.com\", \"project_id\": \"pptest-53916\", \"storage_bucket\": \"pptest-53916.appspot.com\" }, \"client\": [ { \"client_info\": { \"mobilesdk_app_id\": \"1:424050927453:android:21d2dd8987e1e3d1\", \"android_client_info\": { \"package_name\": \"org.nativescript.ppTest\" } }, \"oauth_client\": [ { \"client_id\": \"424050927453-o7gv6bcmknujjoaaoa5r4d452cutb9jf.apps.googleusercontent.com\", \"client_type\": 3 } ], \"api_key\": [ { \"current_key\": \"AIzaSyDr3fqH7Z8-vhBNpAges_KFTA7oOoylGvU\" } ], \"services\": { \"analytics_service\": { \"status\": 1 }, \"appinvite_service\": { \"status\": 1, \"other_platform_oauth_client\": [] }, \"ads_service\": { \"status\": 2 } } } ], \"configuration_version\": \"1\"} > demo/app/App_Resources/Android/google-services.json &&
-        cd demo && npm run ci.android.build
+        echo { \"project_info\": { \"project_number\": \"424050927453\", \"firebase_url\": \"https://pptest-53916.firebaseio.com\", \"project_id\": \"pptest-53916\", \"storage_bucket\": \"pptest-53916.appspot.com\" }, \"client\": [ { \"client_info\": { \"mobilesdk_app_id\": \"1:424050927453:android:21d2dd8987e1e3d1\", \"android_client_info\": { \"package_name\": \"org.nativescript.ppTest\" } }, \"oauth_client\": [ { \"client_id\": \"424050927453-o7gv6bcmknujjoaaoa5r4d452cutb9jf.apps.googleusercontent.com\", \"client_type\": 3 } ], \"api_key\": [ { \"current_key\": \"AIzaSyDr3fqH7Z8-vhBNpAges_KFTA7oOoylGvU\" } ], \"services\": { \"analytics_service\": { \"status\": 1 }, \"appinvite_service\": { \"status\": 1, \"other_platform_oauth_client\": [] }, \"ads_service\": { \"status\": 2 } } } ], \"configuration_version\": \"1\"} > ../demo/app/App_Resources/Android/google-services.json &&
+        npm run ci.android.build
     - os: osx
       env:
         - Platform="iOS"
@@ -48,18 +53,29 @@ matrix:
       language: node_js
       node_js: "6"
       jdk: oraclejdk8
-      script: cd demo && npm run ci.ios.build
+      before_script:
+        - cd demo && tns platform add ios@next
+      script: npm run ci.ios.build
 
 android:
   components:
     - tools
     - platform-tools
-    - build-tools-26.0.1
+    - build-tools-27.0.3
     - android-23
     - android-26
     - extra-android-m2repository
 
 install:
-    - echo no | npm install -g nativescript
+    - echo no | npm install -g nativescript@next
     - tns usage-reporting disable
     - tns error-reporting disable
+    - cd src
+    - npm uninstall tns-core-modules -D && npm install tns-core-modules@next -D
+    - npm uninstall nativescript-angular -D && npm install nativescript-angular@next -D
+    - cd ../demo
+    - npm run build.plugin
+    - npm uninstall tns-core-modules -P && npm install tns-core-modules@next -P
+    - npm uninstall nativescript-dev-webpack -D && npm install nativescript-dev-webpack@next -D
+    - npm uninstall nativescript-dev-typescript -D && npm install nativescript-dev-typescript@next -D
+    - cd ..

README.md

@@ -1,5 +1,5 @@
 # Push Plugin for NativeScript
-[![Build Status](https://travis-ci.org/NativeScript/push-plugin.svg?branch=master)](https://travis-ci.org/NativeScript/push-plugin)
+[![Build Status](https://travis-ci.org/NativeScript/push-plugin.svg?branch=next)](https://travis-ci.org/NativeScript/push-plugin)
 
 The code for the Push Plugin for NativeScript.
 

demo/app/app.css

@@ -10,7 +10,7 @@ of writing your own CSS rules. For a full list of class names in the theme
 refer to http://docs.nativescript.org/ui/theme. 
 The imported CSS rules must precede all other types of rules.
 */
-@import 'nativescript-theme-core/css/core.light.css';
+@import '~nativescript-theme-core/css/core.light.css';
 
 /*
 The following CSS rule changes the font size of all UI

demo/app/app.ts

@@ -4,7 +4,6 @@ You can use this file to perform app-level initialization, but the primary
 purpose of the file is to pass control to the app’s first module.
 */
 
-import "./bundle-config";
 import * as app from 'tns-core-modules/application';
 
 // ANDROID ONLY!

demo/app/package.json

@@ -1,6 +1,7 @@
 {
   "android": {
-    "v8Flags": "--expose_gc"
+    "v8Flags": "--expose_gc",
+    "requireModules": ["nativescript-push-notifications"]
   },
   "main": "app.js",
   "name": "tns-template-hello-world-ts",

demo/package.json

@@ -4,10 +4,10 @@
   "nativescript": {
     "id": "org.nativescript.ppTest",
     "tns-ios": {
-      "version": "3.4.0"
+      "version": "4.0.1"
     },
     "tns-android": {
-      "version": "3.4.0"
+      "version": "4.0.1"
     }
   },
   "repository": {
@@ -18,26 +18,29 @@
   "dependencies": {
     "nativescript-push-notifications": "../publish/package/nativescript-push-notifications-0.3.0.tgz",
     "nativescript-theme-core": "^1.0.4",
-    "tns-core-modules": "^3.3.0"
+    "tns-core-modules": "next"
   },
   "devDependencies": {
-    "awesome-typescript-loader": "~3.4.1",
+    "awesome-typescript-loader": "~5.0.0",
     "babel-traverse": "6.26.0",
     "babel-types": "6.26.0",
     "babylon": "6.18.0",
-    "copy-webpack-plugin": "~4.3.1",
-    "extract-text-webpack-plugin": "~3.0.0",
+    "clean-webpack-plugin": "~0.1.19",
+    "copy-webpack-plugin": "~4.5.1",
+    "extract-text-webpack-plugin": "~3.0.2",
     "lazy": "1.0.11",
     "nativescript-css-loader": "~0.26.0",
     "nativescript-dev-typescript": "~0.6.0",
-    "nativescript-dev-webpack": "^0.9.0",
+    "nativescript-dev-webpack": "next",
     "nativescript-worker-loader": "~0.8.1",
     "raw-loader": "~0.5.1",
-    "resolve-url-loader": "~2.2.1",
+    "resolve-url-loader": "~2.3.0",
     "tslint": "^5.8.0",
-    "typescript": "~2.6.2",
-    "webpack": "~3.10.0",
-    "webpack-bundle-analyzer": "^2.8.2",
+    "typescript": "~2.7.2",
+    "uglifyjs-webpack-plugin": "~1.2.4",
+    "webpack": "~4.5.0",
+    "webpack-bundle-analyzer": "^2.9.1",
+    "webpack-cli": "~2.0.14",
     "webpack-sources": "~1.1.0",
     "css-loader": "~0.28.7"
   },

demo/tsconfig.json

@@ -1,25 +1,41 @@
 {
     "compilerOptions": {
-        "module": "commonjs",
         "target": "es5",
-        "experimentalDecorators": true,
+        "module": "commonjs",
+        "declaration": false,
+        "removeComments": true,
+        "noLib": false,
         "emitDecoratorMetadata": true,
-        "noEmitHelpers": true,
-        "noEmitOnError": true,
+        "experimentalDecorators": true,
         "lib": [
             "es6",
             "dom"
         ],
+        "pretty": true,
+        "allowUnreachableCode": false,
+        "allowUnusedLabels": false,
+        "noEmitHelpers": true,
+        "noEmitOnError": false,
+        "noImplicitAny": false,
+        "noImplicitReturns": true,
+        "noImplicitUseStrict": false,
+        "noFallthroughCasesInSwitch": true,
         "baseUrl": ".",
         "paths": {
             "*": [
+                "./node_modules/tns-core-modules/*",
                 "./node_modules/*"
             ]
         }
     },
+    "include": [
+        "../src",
+        "**/*"
+    ],
     "exclude": [
+        "../src/node_modules",
         "node_modules",
-        "platforms",
-        "**/*.aot.ts"
-    ]
+        "platforms"
+    ],
+    "compileOnSave": false
 }

native-src/android/build.gradle

@@ -2,6 +2,7 @@
 
 buildscript {
     repositories {
+        google()
         jcenter()
     }
     dependencies {
@@ -14,6 +15,7 @@ buildscript {
 
 allprojects {
     repositories {
+        google()
         jcenter()
         maven { url "https://maven.google.com" }
     }

src/package.json

@@ -39,13 +39,13 @@
     "preuninstall": "node scripts/preuninstall.js"
   },
   "dependencies": {
-    "nativescript-hook": "0.2.2"
+    "nativescript-hook": "~0.2.4"
   },
   "devDependencies": {
     "rimraf": "^2.6.2",
     "tns-core-modules": "^3.3.0",
     "tns-platform-declarations": "^3.3.0",
     "tslint": "^5.8.0",
-    "typescript": "^2.6.1"
+    "typescript": "^2.7.2"
   }
 }