configure build script and fix packages

Author: fadi-george

build/scripts/build.sh

@@ -66,7 +66,7 @@ echo "Unknown options -> ${POSITIONAL}"
 set -- "${POSITIONAL[@]}" # restore positional parameters
 
 # build local SW file for dev env
-./build/scripts/buildServiceWorker.sh $BUILD_ORIGIN
+./build/scripts/buildServiceWorker.sh $BUILD_ORIGIN $NO_DEV_PORT $HTTPS
 
 ENV=$ENV API=$API BUILD_ORIGIN=$BUILD_ORIGIN API_ORIGIN=$API_ORIGIN HTTPS=$HTTPS NO_DEV_PORT=$NO_DEV_PORT yarn transpile:sources
 ENV=$ENV API=$API BUILD_ORIGIN=$BUILD_ORIGIN API_ORIGIN=$API_ORIGIN HTTPS=$HTTPS NO_DEV_PORT=$NO_DEV_PORT yarn bundle-sw

build/scripts/buildServiceWorker.sh

@@ -1,5 +1,21 @@
 #!/bin/bash
 
 # Builds the local service worker files for express_webpack for use in local dev env
-echo "importScripts(\"https://${1}/sdks/Dev-OneSignalSDKWorker.js\");" > express_webpack/push/onesignal/OneSignalSDKWorker.js
-echo "importScripts(\"https://${1}/sdks/Dev-OneSignalSDKWorker.js\");" > express_webpack/OneSignalSDKWorker.js
+ORIGIN=${1}
+NO_PORT=${2:-false}
+HTTPS=${3:-true}
+
+if [ "$HTTPS" = true ]; then
+  PORT=4001
+else
+  PORT=4000
+fi
+
+if [ "$NO_PORT" = true ]; then
+  SW_ORIGIN="https://${ORIGIN}"
+else
+  SW_ORIGIN="https://${ORIGIN}:${PORT}"
+fi
+
+echo "importScripts(\"${SW_ORIGIN}/sdks/Dev-OneSignalSDKWorker.js\");" > express_webpack/push/onesignal/OneSignalSDKWorker.js
+echo "importScripts(\"${SW_ORIGIN}/sdks/Dev-OneSignalSDKWorker.js\");" > express_webpack/OneSignalSDKWorker.js

package.json

@@ -7,7 +7,7 @@
     "bowser": "github:OneSignal/bowser#fix-android8-opr6-build-detection",
     "jsdom": "^9.12.0",
     "jsonp": "github:OneSignal/jsonp#onesignal",
-    "node-sass": "^4.9.0",
+    "sass": "^1.90.0",
     "npm-css": "https://registry.npmjs.org/npm-css/-/npm-css-0.2.3.tgz",
     "postcss-discard-comments": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz",
     "postcss-filter-plugins": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz",
@@ -88,7 +88,7 @@
     "nyc": "^11.1.0",
     "postcss-loader": "^2.0.6",
     "prettier": "^2.7.1",
-    "sass-loader": "^6.0.6",
+    "sass-loader": "^7.3.1",
     "sinon": "^2.4.1",
     "svgo": "^0.7.2",
     "text-encoding": "^0.6.4",
@@ -98,7 +98,7 @@
     "uglifyjs-webpack-plugin": "^1.2.4",
     "webpack": "^4.3.0",
     "webpack-bundle-analyzer": "^3.3.2",
-    "webpack-cli": "^2.0.13"
+    "webpack-cli": "3.3.12"
   },
   "ava": {
     "extensions": [

src/libraries/WorkerMessenger.ts

@@ -192,7 +192,7 @@ export class WorkerMessenger {
     Log.debug(`(${location.origin}) [Worker Messenger] Page is now listening for messages.`);
   }
 
-  onWorkerMessageReceivedFromPage(event: ServiceWorkerMessageEvent) {
+  onWorkerMessageReceivedFromPage(event: ExtendableMessageEvent) {
     const data: WorkerMessengerMessage = event.data;
 
     /* If this message doesn't contain our expected fields, discard the message */
@@ -235,7 +235,7 @@ export class WorkerMessenger {
   message topic. If no one is listening to the message, it is discarded;
   otherwise, the listener callback is executed.
   */
-  onPageMessageReceivedFromServiceWorker(event: ServiceWorkerMessageEvent) {
+  onPageMessageReceivedFromServiceWorker(event: ExtendableMessageEvent) {
     const data: WorkerMessengerMessage = event.data;
 
     /* If this message doesn't contain our expected fields, discard the message */

src/managers/ServiceWorkerManager.ts

@@ -1,23 +1,22 @@
+import { Utils } from "../context/shared/utils/Utils";
 import Environment from '../Environment';
+import NotImplementedError from '../errors/NotImplementedError';
+import ServiceWorkerRegistrationError from "../errors/ServiceWorkerRegistrationError";
+import Event from '../Event';
+import ServiceWorkerUtilHelper from "../helpers/page/ServiceWorkerUtilHelper";
+import ServiceWorkerHelper, { ServiceWorkerActiveState, ServiceWorkerManagerConfig } from "../helpers/ServiceWorkerHelper";
+import Log from '../libraries/Log';
 import { WorkerMessengerCommand } from '../libraries/WorkerMessenger';
-import Path from '../models/Path';
 import SdkEnvironment from '../managers/SdkEnvironment';
-import Database from '../services/Database';
+import { ContextSWInterface } from '../models/ContextSW';
 import { IntegrationKind } from '../models/IntegrationKind';
+import Path from '../models/Path';
+import { PageVisibilityRequest, PageVisibilityResponse } from "../models/Session";
 import { WindowEnvironmentKind } from '../models/WindowEnvironmentKind';
-import NotImplementedError from '../errors/NotImplementedError';
-import ProxyFrameHost from '../modules/frames/ProxyFrameHost';
-import Log from '../libraries/Log';
-import Event from '../Event';
 import ProxyFrame from '../modules/frames/ProxyFrame';
-import ServiceWorkerRegistrationError from "../errors/ServiceWorkerRegistrationError";
+import ProxyFrameHost from '../modules/frames/ProxyFrameHost';
+import Database from '../services/Database';
 import OneSignalUtils from "../utils/OneSignalUtils";
-import ServiceWorkerHelper, { ServiceWorkerActiveState, ServiceWorkerManagerConfig }
-  from "../helpers/ServiceWorkerHelper";
-import { ContextSWInterface } from '../models/ContextSW';
-import { Utils } from "../context/shared/utils/Utils";
-import { PageVisibilityRequest, PageVisibilityResponse } from "../models/Session";
-import ServiceWorkerUtilHelper from "../helpers/page/ServiceWorkerUtilHelper";
 
 export class ServiceWorkerManager {
   private context: ContextSWInterface;

src/utils/OneSignalShimLoader.ts

@@ -1,7 +1,7 @@
 import { isPushNotificationsSupported } from "../context/browser/utils/BrowserSupportsPush";
-import { OneSignalStubES6 } from "./OneSignalStubES6";
-import { OneSignalStubES5 } from "./OneSignalStubES5";
 import { PossiblePredefinedOneSignal } from "./OneSignalStub";
+import { OneSignalStubES5 } from "./OneSignalStubES5";
+import { OneSignalStubES6 } from "./OneSignalStubES6";
 // NOTE: Careful if adding imports, ES5 targets can't clean up functions never called.
 
 // See sdk.ts for what entry points this handles
@@ -79,7 +79,7 @@ export class OneSignalShimLoader {
     //    instead of "OneSignal.js" for importScripts();
     if (OneSignalShimLoader.isServiceWorkerRuntime()) {
       (<ServiceWorkerGlobalScope><any>self).importScripts(
-        `${OneSignalShimLoader.getPathAndPrefix()}OneSignalSDKWorker.js?v=${OneSignalShimLoader.VERSION}`
+        `${OneSignalShimLoader.getPathAndPrefix()}OneSignalSDKWorker.js?v=${OneSignalShimLoader.VERSION}`,
       );
     }
     else if (isPushNotificationsSupported()) {

typings/globals/serviceworker.d.ts

@@ -2,3 +2,18 @@ declare module 'ServiceWorker' {
     var OneSignal: any;
     export = OneSignal;
 }
+
+interface PushSubscriptionChangeEvent extends ExtendableEvent {
+    readonly newSubscription: PushSubscription | null;
+    readonly oldSubscription: PushSubscription | null;
+}
+
+declare var PushSubscriptionChangeEvent: {
+    prototype: PushSubscriptionChangeEvent;
+    new(type: string, eventInitDict?: PushSubscriptionChangeEventInit): PushSubscriptionChangeEvent;
+};
+
+interface PushSubscriptionChangeEventInit extends ExtendableEventInit {
+    newSubscription?: PushSubscription;
+    oldSubscription?: PushSubscription;
+}