Merge pull request #1109 from OneSignal/upgrade-to-node18

Upgrade to node 18

.github/workflows/cd.yml

@@ -7,16 +7,12 @@ jobs:
   test_build_deploy:
     runs-on: ubuntu-22.04
 
-    strategy:
-      matrix:
-        node-version: [14.x]
-
     steps:
       - uses: actions/checkout@v3
-      - name: Use Node.js ${{ matrix.node-version }}
+      - name: Use Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version-file: '.nvmrc'
       - name: "[Setup] Install dependencies"
         run: yarn
       - name: "[Build] Staging"

.github/workflows/ci.yml

@@ -8,16 +8,12 @@ jobs:
   test:
     runs-on: ubuntu-22.04
 
-    strategy:
-      matrix:
-        node-version: [14.x]
-
     steps:
       - uses: actions/checkout@v3
-      - name: Use Node.js ${{ matrix.node-version }}
+      - name: Use Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version-file: '.nvmrc'
       - name: "[Setup] Install dependencies"
         run: yarn
       - name: "[Test] Run linters"

.nvmrc

@@ -0,0 +1 @@
+18.18.0

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:14.21.1
+FROM node:18.18.0
 WORKDIR /sdk
 COPY package.json .
 RUN yarn

package.json

@@ -63,7 +63,7 @@
     "@types/mocha": "^5.0.0",
     "@types/nconf": "latest",
     "@types/nock": "^9.1.2",
-    "@types/node": "^18.13.0",
+    "@types/node": "^18.18.0",
     "@types/object-assign": "^4.0.30",
     "@types/requirejs": "latest",
     "@types/sinon": "^2.3.3",
@@ -74,7 +74,7 @@
     "@typescript-eslint/parser": "^5.36.1",
     "autoprefixer": "^10.4.14",
     "ava": "^3.8.2",
-    "bundlesize": "^0.18.0",
+    "bundlesize2": "^0.0.31",
     "clean-webpack-plugin": "^4.0.0",
     "css-loader": "^6.7.3",
     "css-minimizer-webpack-plugin": "^5.0.0",

src/page/models/Disposable.ts

@@ -1,3 +1,3 @@
-interface Disposable {
+interface OSDisposable {
   dispose();
 }

src/page/modules/frames/ProxyFrameHost.ts

@@ -21,7 +21,7 @@ interface Reply {
  * This is loaded as subdomain.onesignal.com/webPushIFrame or
  * subdomain.os.tc/webPushIFrame. *
  */
-export default class ProxyFrameHost implements Disposable {
+export default class ProxyFrameHost implements OSDisposable {
   public url: URL;
   private element: HTMLIFrameElement;
   private messenger: Postmam;

src/page/modules/frames/RemoteFrame.ts

@@ -22,7 +22,7 @@ export interface RemoteFrameOptions {
   isModal?: boolean;
 }
 
-export default class RemoteFrame implements Disposable {
+export default class RemoteFrame implements OSDisposable {
   protected messenger: Postmam;
   protected options: ProxyFrameInitOptions;
 

src/page/modules/frames/SubscriptionModalHost.ts

@@ -11,7 +11,7 @@ import Log from '../../../shared/libraries/Log';
  * into the iFrame URL as subdomain.onesignal.com/webPushIFrame or
  * subdomain.os.tc/webPushIFrame. *
  */
-export default class SubscriptionModalHost implements Disposable {
+export default class SubscriptionModalHost implements OSDisposable {
   private messenger: Postmam;
   private appId: string;
   private modal: HTMLIFrameElement;

src/page/modules/frames/SubscriptionPopupHost.ts

@@ -16,7 +16,7 @@ import { RawPushSubscription } from '../../../shared/models/RawPushSubscription'
  * This is loaded as subdomain.onesignal.com/webPushIFrame or
  * subdomain.os.tc/webPushIFrame. *
  */
-export default class SubscriptionPopupHost implements Disposable {
+export default class SubscriptionPopupHost implements OSDisposable {
   public url: URL;
   private popupWindow: Window | undefined | null;
   private messenger: Postmam | undefined;