Merge pull request #1400 from OneSignal/fg/size-reduction-2

chore: more size reduction

Author: fadi-george

.gitignore

@@ -14,6 +14,7 @@ ngrok.log
 !.vscode/launch.json
 !.vscode/settings.json
 !.vscode/keybindings.json
+!.vscode/extensions.json
 .cursor/
 
 coverage

.vscode/extensions.json

@@ -0,0 +1,3 @@
+{
+  "recommendations": ["esbenp.prettier-vscode", "jeff-hykin.macro-commander"]
+}

.vscode/keybindings.json

@@ -1,6 +1,9 @@
 [
+  // wont automatically be applied
+  // example keybinding, copy to your own keybindings.json
   {
-    "key": "shift+cmd+y",
-    "command": "macros.rename_"
+    "key": "shift+cmd+/",
+    "command": "macros.rename_",
+    "when": "editorTextFocus"
   }
 ]

.vscode/settings.json

@@ -3,6 +3,7 @@
     "source.fixAll.eslint": "explicit",
     "source.organizeImports": "always"
   },
+
   // a macro to rename a variable to _variable
   "macros": {
     "rename_": [
@@ -24,9 +25,9 @@
           "  pos,",
           "  newName",
           ");",
-          "if (edit) {",
-          "  await vscode.workspace.applyEdit(edit);",
-          "}"
+          "if (edit) await vscode.workspace.applyEdit(edit);",
+          "await new Promise(resolve => setTimeout(resolve, 100));",
+          "await vscode.commands.executeCommand('workbench.action.files.saveAll');"
         ]
       }
     ]

__test__/support/environment/TestEnvironment.ts

@@ -32,7 +32,7 @@ export class TestEnvironment {
   ) {
     mockJsonp();
     const oneSignal = initOSGlobals(config);
-    OneSignal._coreDirector._operationRepo.queue = [];
+    OneSignal._coreDirector._operationRepo._queue = [];
 
     if (config.initOneSignalId) {
       updateIdentityModel('onesignal_id', ONESIGNAL_ID);

__test__/unit/push/registerForPush.test.ts

@@ -32,7 +32,7 @@ describe('Register for push', () => {
     const promise = OneSignal.User.PushSubscription.optIn();
 
     expect(spy).not.toHaveBeenCalled();
-    OneSignalEvent.trigger(OneSignal.EVENTS.SDK_INITIALIZED);
+    OneSignalEvent._trigger(OneSignal.EVENTS.SDK_INITIALIZED);
     await promise;
     expect(OneSignal._initialized).toBe(true);
     expect(spy).toHaveBeenCalledTimes(1);

__test__/unit/pushSubscription/nativePermissionChange.test.ts

@@ -50,7 +50,7 @@ describe('Notification Types are set correctly on subscription change', () => {
       });
       await setDbPermission('granted');
 
-      await MainHelper.checkAndTriggerNotificationPermissionChanged();
+      await MainHelper._checkAndTriggerNotificationPermissionChanged();
       expect(triggerNotificationSpy).not.toHaveBeenCalled();
     });
 
@@ -74,7 +74,7 @@ describe('Notification Types are set correctly on subscription change', () => {
         permChangeStringListener,
       );
 
-      await MainHelper.checkAndTriggerNotificationPermissionChanged();
+      await MainHelper._checkAndTriggerNotificationPermissionChanged();
 
       // should update the db
       const dbPermission = await getOptionsValue<NotificationPermission>(

package.json

@@ -84,7 +84,7 @@
     },
     {
       "path": "./build/releases/OneSignalSDK.page.es6.js",
-      "limit": "48.83 kB",
+      "limit": "47.886 kB",
       "gzip": true
     },
     {

src/core/CoreModuleDirector.ts

@@ -117,7 +117,7 @@ export class CoreModuleDirector {
     SubscriptionModel | undefined
   > {
     logMethodCall('CoreModuleDirector.getPushSubscriptionModelByCurrentToken');
-    const pushToken = await MainHelper.getCurrentPushToken();
+    const pushToken = await MainHelper._getCurrentPushToken();
     if (pushToken) {
       return this._getSubscriptionOfTypeWithToken(
         SubscriptionChannel.Push,

src/core/controllers/CustomEventController.ts

@@ -22,7 +22,7 @@ export class CustomEventController implements ICustomEventController {
   }
 
   _sendCustomEvent(event: ICustomEvent): void {
-    const appId = MainHelper.getAppId();
+    const appId = MainHelper._getAppId();
     const identityModel = this._identityModelStore.model;
 
     const op = new TrackCustomEventOperation({
@@ -33,6 +33,6 @@ export class CustomEventController implements ICustomEventController {
       event,
     });
 
-    this._opRepo.enqueue(op);
+    this._opRepo._enqueue(op);
   }
 }