Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to node 18 #1109

Merged
merged 3 commits into from
Sep 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
18.18.0
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:14.21.1
FROM node:18.18.0
WORKDIR /sdk
COPY package.json .
RUN yarn
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/page/models/Disposable.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
interface Disposable {
interface OSDisposable {
dispose();
}
2 changes: 1 addition & 1 deletion src/page/modules/frames/ProxyFrameHost.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/page/modules/frames/RemoteFrame.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/page/modules/frames/SubscriptionModalHost.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/page/modules/frames/SubscriptionPopupHost.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading