Skip to content

Commit f2177fb

Browse files
committed
Merge branch 'master' into moumouls/remove-gcm
# Conflicts: # .gitignore # package-lock.json # package.json # spec/GCM.spec.js # spec/ParsePushAdapter.spec.js # src/GCM.js # src/ParsePushAdapter.js # src/index.js
2 parents 6514c0b + 6406627 commit f2177fb

31 files changed

+13198
-19855
lines changed

.babelrc

Lines changed: 0 additions & 6 deletions
This file was deleted.

.github/dependabot.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Dependabot dependency updates
2+
# Docs: https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
3+
4+
version: 2
5+
updates:
6+
- package-ecosystem: "npm"
7+
# Location of package-lock.json
8+
directory: "/"
9+
# Check daily for updates
10+
schedule:
11+
interval: "daily"
12+
commit-message:
13+
# Set commit message prefix
14+
prefix: "refactor"

.github/workflows/ci.yml

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,20 @@ on:
77
branches:
88
- '**'
99
jobs:
10+
lint:
11+
name: Lint
12+
timeout-minutes: 15
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v4
16+
- name: Use Node.js
17+
uses: actions/setup-node@v4
18+
with:
19+
cache: npm
20+
- name: Install dependencies
21+
run: npm ci
22+
- name: Lint
23+
run: npm run lint
1024
test:
1125
strategy:
1226
matrix:
@@ -15,27 +29,21 @@ jobs:
1529
NODE_VERSION: 18
1630
- name: Node.js 20
1731
NODE_VERSION: 20
32+
- name: Node.js 22
33+
NODE_VERSION: 22
1834
fail-fast: false
1935
name: ${{ matrix.name }}
2036
timeout-minutes: 15
2137
runs-on: ubuntu-latest
2238
steps:
23-
- uses: actions/checkout@v2
39+
- uses: actions/checkout@v4
2440
- name: Use Node.js ${{ matrix.NODE_VERSION }}
25-
uses: actions/setup-node@v1
41+
uses: actions/setup-node@v4
2642
with:
2743
node-version: ${{ matrix.NODE_VERSION }}
28-
- name: Cache Node.js modules
29-
uses: actions/cache@v2
30-
with:
31-
path: ~/.npm
32-
key: ${{ runner.os }}-node-${{ matrix.NODE_VERSION }}-${{ hashFiles('**/package-lock.json') }}
33-
restore-keys: |
34-
${{ runner.os }}-node-${{ matrix.NODE_VERSION }}-
44+
cache: npm
3545
- name: Install dependencies
3646
run: npm ci
37-
- name: Build package
38-
run: npm run build
3947
- name: Run tests
4048
run: npm run test
4149
- name: Code coverage

.github/workflows/release-automated.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Setup Node
1414
uses: actions/setup-node@v2
1515
with:
16-
node-version: 18
16+
node-version: 20
1717
- name: Cache Node.js modules
1818
uses: actions/cache@v2
1919
with:

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,3 @@ node_modules
4040

4141
# Optional eslint cache
4242
.eslintcache
43-
.vscode/launch.json

.npmignore

Whitespace-only changes.

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18.16.0
1+
20.15.0

.nycrc

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
{
2+
"all": true,
23
"reporter": [
34
"lcov",
45
"text-summary"
56
],
7+
"include": [
8+
"src/**/*.js"
9+
],
610
"exclude": [
7-
"**/spec/**",
8-
"lib/"
11+
"**/spec/**"
912
]
10-
}
13+
}

release.config.js renamed to .releaserc.js

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
* Semantic Release Config
33
*/
44

5-
const fs = require('fs').promises;
6-
const path = require('path');
5+
import { readFile } from 'fs/promises';
6+
import { resolve, dirname } from 'path';
7+
import { fileURLToPath } from 'url';
78

89
// Get env vars
9-
const ref = process.env.GITHUB_REF;
10+
const ref = process.env.GITHUB_REF || '(local)';
1011
const serverUrl = process.env.GITHUB_SERVER_URL;
1112
const repository = process.env.GITHUB_REPOSITORY;
1213
const repositoryUrl = serverUrl + '/' + repository;
@@ -26,7 +27,7 @@ async function config() {
2627
// Get branch
2728
const branch = ref.split('/').pop();
2829
console.log(`Running on branch: ${branch}`);
29-
30+
3031
// Set changelog file
3132
//const changelogFile = `./changelogs/CHANGELOG_${branch}.md`;
3233
const changelogFile = `./CHANGELOG.md`;
@@ -97,19 +98,17 @@ async function config() {
9798

9899
async function loadTemplates() {
99100
for (const template of Object.keys(templates)) {
100-
const text = await readFile(path.resolve(__dirname, resourcePath, templates[template].file));
101+
const __dirname = dirname(fileURLToPath(import.meta.url));
102+
const filePath = resolve(__dirname, resourcePath, templates[template].file);
103+
const text = await readFile(filePath, 'utf-8');
101104
templates[template].text = text;
102105
}
103106
}
104107

105-
async function readFile(filePath) {
106-
return await fs.readFile(filePath, 'utf-8');
107-
}
108-
109108
function getReleaseComment() {
110109
const url = repositoryUrl + '/releases/tag/${nextRelease.gitTag}';
111-
let comment = '🎉 This change has been released in version [${nextRelease.version}](' + url + ')';
110+
const comment = '🎉 This change has been released in version [${nextRelease.version}](' + url + ')';
112111
return comment;
113112
}
114113

115-
module.exports = config();
114+
export default config();

CHANGELOG.md

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,52 @@
1+
## [6.7.1](https://github.com/parse-community/parse-server-push-adapter/compare/6.7.0...6.7.1) (2024-11-19)
2+
3+
4+
### Bug Fixes
5+
6+
* Security upgrade @parse/node-apn from 6.2.0 to 6.2.1 ([#329](https://github.com/parse-community/parse-server-push-adapter/issues/329)) ([5cd5170](https://github.com/parse-community/parse-server-push-adapter/commit/5cd517056f5114b23a8175e7de6a0212c1124352))
7+
8+
# [6.7.0](https://github.com/parse-community/parse-server-push-adapter/compare/6.6.0...6.7.0) (2024-09-27)
9+
10+
11+
### Features
12+
13+
* Upgrade @parse/node-apn from 6.1.0 to 6.2.0 ([#310](https://github.com/parse-community/parse-server-push-adapter/issues/310)) ([c71e167](https://github.com/parse-community/parse-server-push-adapter/commit/c71e167360fb77fcd62960b19e576ae04ac81dba))
14+
15+
# [6.6.0](https://github.com/parse-community/parse-server-push-adapter/compare/6.5.0...6.6.0) (2024-09-24)
16+
17+
18+
### Features
19+
20+
* Bump @parse/node-apn from 6.0.1 to 6.1.0 ([#304](https://github.com/parse-community/parse-server-push-adapter/issues/304)) ([b5d4c59](https://github.com/parse-community/parse-server-push-adapter/commit/b5d4c59cfa5fe6e345810895566adbf4a1faf7d5))
21+
22+
# [6.5.0](https://github.com/parse-community/parse-server-push-adapter/compare/6.4.1...6.5.0) (2024-08-02)
23+
24+
25+
### Features
26+
27+
* Add Firebase Cloud Messaging (FCM) HTTP/2 support and option `fcmEnableLegacyHttpTransport` to use legacy HTTP/1.1 ([#274](https://github.com/parse-community/parse-server-push-adapter/issues/274)) ([70e6b6f](https://github.com/parse-community/parse-server-push-adapter/commit/70e6b6f4db6d410872b7bd24ea83b5d0639f9276))
28+
29+
## [6.4.1](https://github.com/parse-community/parse-server-push-adapter/compare/6.4.0...6.4.1) (2024-07-08)
30+
31+
32+
### Bug Fixes
33+
34+
* Verbose mode is enabled if environment variables `VERBOSE` or `VERBOSE_PARSE_SERVER_PUSH_ADAPTER` are set to any value ([#264](https://github.com/parse-community/parse-server-push-adapter/issues/264)) ([0f31300](https://github.com/parse-community/parse-server-push-adapter/commit/0f3130057fac576c6aa3f04399129a95709c4a34))
35+
36+
# [6.4.0](https://github.com/parse-community/parse-server-push-adapter/compare/6.3.0...6.4.0) (2024-07-07)
37+
38+
39+
### Features
40+
41+
* Add support for Node 22 ([#263](https://github.com/parse-community/parse-server-push-adapter/issues/263)) ([8d90258](https://github.com/parse-community/parse-server-push-adapter/commit/8d90258505a35b385a561584515d67c857bcbf62))
42+
43+
# [6.3.0](https://github.com/parse-community/parse-server-push-adapter/compare/6.2.0...6.3.0) (2024-07-07)
44+
45+
46+
### Features
47+
48+
* Add ECMAScript 6 (ES6) support ([#255](https://github.com/parse-community/parse-server-push-adapter/issues/255)) ([bee437a](https://github.com/parse-community/parse-server-push-adapter/commit/bee437af08575ae332ae81daf18a1130e2d68ca8))
49+
150
# [6.2.0](https://github.com/parse-community/parse-server-push-adapter/compare/6.1.1...6.2.0) (2024-05-15)
251

352

0 commit comments

Comments
 (0)