From e3b78c81316e977394c99c0a985c16b59fc9e9e6 Mon Sep 17 00:00:00 2001
From: Josh Kasten <josh@onesignal.com>
Date: Thu, 15 Dec 2022 15:02:40 -0500
Subject: [PATCH] rename OneSignalSDK.js to OneSignalSDK.page.js

---
 .gitignore                               | 4 ++--
 build/config/sdk.config.js               | 5 ++---
 build/config/webpack.config.js           | 2 +-
 build/scripts/publish.sh                 | 4 ++--
 express_webpack/index.html               | 2 +-
 package.json                             | 2 +-
 src/entries/pageSdkInit.ts               | 2 +-
 src/entries/sdk.ts                       | 4 ++--
 src/page/utils/BrowserSupportsPush.ts    | 2 +-
 test/unit/modules/entryInitialization.ts | 6 +++---
 10 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2971948b9..16a859b09 100755
--- a/.gitignore
+++ b/.gitignore
@@ -13,8 +13,8 @@ build/size-analysis.html
 *.key
 *.crt
 yarn-error.log
-dist/Dev-OneSignalSDK.js
-dist/Dev-OneSignalSDK.js.map
+dist/Dev-OneSignalSDK.page.js
+dist/Dev-OneSignalSDK.page.js.map
 .vscode/**
 !.vscode/launch.json
 
diff --git a/build/config/sdk.config.js b/build/config/sdk.config.js
index f0e9f4fe1..7b1124b07 100644
--- a/build/config/sdk.config.js
+++ b/build/config/sdk.config.js
@@ -111,7 +111,7 @@ async function generateWebpackConfig() {
   return {
     target: 'web',
     entry: {
-      'OneSignalSDK.js': path.resolve('build/ts-to-es6/src/entries/sdk.js'),
+      'OneSignalSDK.page.js': path.resolve('build/ts-to-es6/src/entries/sdk.js'),
       'OneSignalSDKStyles.css': path.resolve('src/entries/stylesheet.scss')
     },
     output: {
@@ -140,8 +140,7 @@ async function generateWebpackConfig() {
                 'PushNotSupportedError',
                 'PushPermissionNotGrantedError',
                 'SdkInitError',
-                'TimeoutError',
-                'OneSignalStubES6'
+                'TimeoutError'
               ]
             } : false,
             output: {
diff --git a/build/config/webpack.config.js b/build/config/webpack.config.js
index f4f160ea1..31128e253 100644
--- a/build/config/webpack.config.js
+++ b/build/config/webpack.config.js
@@ -69,7 +69,7 @@ async function generateWebpackConfig() {
   return {
     target: 'web',
     entry: {
-      'OneSignalSDK.js': path.resolve('build/ts-to-es6/src/entries/sdk.js'),
+      'OneSignalSDK.page.js': path.resolve('build/ts-to-es6/src/entries/sdk.js'),
       'OneSignalSDKWorker.js': path.resolve('build/ts-to-es6/src/entries/worker.js'),
       'OneSignalSDKStyles.css': path.resolve('src/entries/stylesheet.scss'),
     },
diff --git a/build/scripts/publish.sh b/build/scripts/publish.sh
index f665fdbe9..259a6ad80 100755
--- a/build/scripts/publish.sh
+++ b/build/scripts/publish.sh
@@ -16,8 +16,8 @@ pwd
 
 mkdir build/releases
 
-cp build/bundles/OneSignalSDK.js build/releases/$PREFIX"OneSignalSDK.js"
-cp build/bundles/OneSignalSDK.js.map build/releases/$PREFIX"OneSignalSDK.js.map"
+cp build/bundles/OneSignalSDK.page.js build/releases/$PREFIX"OneSignalSDK.page.js"
+cp build/bundles/OneSignalSDK.page.js.map build/releases/$PREFIX"OneSignalSDK.page.js.map"
 cp build/bundles/OneSignalPageSDKES6.js build/releases/$PREFIX"OneSignalPageSDKES6.js"
 cp build/bundles/OneSignalPageSDKES6.js.map build/releases/$PREFIX"OneSignalPageSDKES6.js.map"
 
diff --git a/express_webpack/index.html b/express_webpack/index.html
index a655c3e24..cd6c5ef4d 100644
--- a/express_webpack/index.html
+++ b/express_webpack/index.html
@@ -7,7 +7,7 @@
     Ensure OneSignal SDK correctly handles this. -->
 <!-- NOTE: This does not work with the relative pathed manifest.json above. -->
 <!--<base href="https://www.example.com/"> -->
-<script src="sdks/Dev-OneSignalSDK.js" defer></script>
+<script src="sdks/Dev-OneSignalSDK.page.js" defer></script>
 <script>
     // NOTE: Uncomment and open site in Safari on macOS 13+ to simulate
     // a similar JS API as an iOS 16.4 WebApp.
diff --git a/package.json b/package.json
index 66f592c77..427663908 100644
--- a/package.json
+++ b/package.json
@@ -131,7 +131,7 @@
   },
   "bundlesize": [
     {
-      "path": "./build/bundles/OneSignalSDK.js",
+      "path": "./build/bundles/OneSignalSDK.page.js",
       "maxSize": "3 kB",
       "compression": "gzip"
     },
diff --git a/src/entries/pageSdkInit.ts b/src/entries/pageSdkInit.ts
index 794f0850f..9ee7170ea 100644
--- a/src/entries/pageSdkInit.ts
+++ b/src/entries/pageSdkInit.ts
@@ -1,6 +1,6 @@
 /**
  * This is OneSignalPageSDKES6.js (ES6)
- * Loaded from OneSignalSDK.js only if the browser supports push.
+ * Loaded from OneSignalSDK.page.js only if the browser supports push.
  */
 
 import { incrementSdkLoadCount, getSdkLoadCount } from "../shared/utils/utils";
diff --git a/src/entries/sdk.ts b/src/entries/sdk.ts
index 037ca84f8..bd521279a 100644
--- a/src/entries/sdk.ts
+++ b/src/entries/sdk.ts
@@ -1,9 +1,9 @@
 /**
- * This is OneSignalSDK.js (ES5)
+ * This is OneSignalSDK.page.js (ES5)
  *   * This is an entry point for pages
  * This is a shim to detect if the browser supports the full OneSignal SDK before loading it.
  *   * Full PageSDK (ES6) - OneSignalPageSDKES6.js
- *   * Shim PageSDK (ES5) - OneSignalSDK.js (This File)
+ *   * Shim PageSDK (ES5) - OneSignalSDK.page.js (This File)
  */
 
 // NOTE: Careful if adding imports, ES5 targets can't clean up functions never called.
diff --git a/src/page/utils/BrowserSupportsPush.ts b/src/page/utils/BrowserSupportsPush.ts
index 8838c6748..ba0a6d3b3 100644
--- a/src/page/utils/BrowserSupportsPush.ts
+++ b/src/page/utils/BrowserSupportsPush.ts
@@ -1,4 +1,4 @@
-// This is used by the OneSignalSDK.js shim
+// This is used by the OneSignalSDK.page.js shim
 // DO NOT add other imports since it is an ES5 target and dead code imports can't be clean up.
 
 // Checks if the browser supports push notifications by checking if specific
diff --git a/test/unit/modules/entryInitialization.ts b/test/unit/modules/entryInitialization.ts
index 1919a038b..fea576c7f 100644
--- a/test/unit/modules/entryInitialization.ts
+++ b/test/unit/modules/entryInitialization.ts
@@ -69,7 +69,7 @@ test("Test ReplayCallsOnOneSignal fires functions ", async t => {
   await promise;
 });
 
-test("OneSignalSDK.js add OneSignalPageSDKES6 script tag on a browser supports push", async t => {
+test("OneSignalSDK.page.js add OneSignalSDK.page.es6.js script tag on a browser supports push", async t => {
   setupBrowserWithPushAPIWithVAPIDEnv(sandbox);
   // Setup spy for OneSignalShimLoader.addScriptToPage
   const addScriptToPageSpy = sandbox.spy(OneSignalShimLoader, <any>'addScriptToPage');
@@ -78,7 +78,7 @@ test("OneSignalSDK.js add OneSignalPageSDKES6 script tag on a browser supports p
   t.is(addScriptToPageSpy.callCount, 1);
 });
 
-test("OneSignalSDK.js is loaded on a page on a browser that does NOT support push", async t => {
+test("OneSignalSDK.page.js is loaded on a page on a browser that does NOT support push", async t => {
   // Setup spy for OneSignalShimLoader.addScriptToPage
   const addScriptToPageSpy = sandbox.spy(OneSignalShimLoader, <any>'addScriptToPage');
 
@@ -88,7 +88,7 @@ test("OneSignalSDK.js is loaded on a page on a browser that does NOT support pus
   t.is(addScriptToPageSpy.callCount, 0);
 });
 
-test("OneSignalSDK.js load from service worker context that supports push", async t => {
+test("OneSignalSDK.page.js load from service worker context that supports push", async t => {
   sandbox.stub((<any>global), "window").value(undefined);
   setupBrowserWithPushAPIWithVAPIDEnv(sandbox);