Skip to content

Commit a7c6375

Browse files
authored
Merge branch 'alpha' into allow-pointers
2 parents 80ab7b9 + a27482c commit a7c6375

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+938
-135
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: ci
22
on:
33
push:
4-
branches: [ release*, alpha, beta ]
4+
branches: [ release, alpha, beta, next-major, 'release-[0-9]+.x.x' ]
55
pull_request:
66
branches:
77
- '**'
@@ -74,7 +74,7 @@ jobs:
7474
check-definitions:
7575
name: Check Definitions
7676
timeout-minutes: 5
77-
runs-on: ubuntu-18.04
77+
runs-on: ubuntu-latest
7878
steps:
7979
- uses: actions/checkout@v2
8080
- name: Use Node.js ${{ matrix.NODE_VERSION }}

.github/workflows/release-automated.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
env:
4343
REGISTRY: docker.io
4444
IMAGE_NAME: parseplatform/parse-server
45-
runs-on: ubuntu-18.04
45+
runs-on: ubuntu-latest
4646
permissions:
4747
contents: read
4848
packages: write
@@ -86,7 +86,7 @@ jobs:
8686
docs:
8787
needs: release
8888
if: needs.release.outputs.current_tag != '' && github.ref == 'refs/heads/release'
89-
runs-on: ubuntu-18.04
89+
runs-on: ubuntu-latest
9090
timeout-minutes: 15
9191
steps:
9292
- uses: actions/checkout@v2

.github/workflows/release-manual-docker.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
IMAGE_NAME: parseplatform/parse-server
1515
jobs:
1616
build:
17-
runs-on: ubuntu-18.04
17+
runs-on: ubuntu-latest
1818
permissions:
1919
contents: read
2020
packages: write

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,6 @@ The following changes are done in the `alpha` branch, before publishing the last
496496
- Make sure all [deprecations](https://github.com/parse-community/parse-server/blob/alpha/DEPRECATIONS.md) are reflected in code, old code is removed and the deprecations table is updated.
497497
- Add the future LTS branch `release-#.x.x` to the branch list in [release.config.js](https://github.com/parse-community/parse-server/blob/alpha/release.config.js) so that the branch will later be recognized for release automation.
498498
499-
500499
### Publishing Release (forward-merge):
501500
502501
1. Create new temporary branch `build` on branch `beta`.
@@ -547,6 +546,7 @@ The following changes are done in the `alpha` branch, before publishing the last
547546
1. Create LTS branch `release-#.x.x` off the latest version tag on `release` branch.
548547
2. Create temporary branch `build-release` off branch `beta` and create a pull request with `release` as the base branch.
549548
3. Merge branch `build-release` into `release`. Given that there will be breaking changes, a new major release will be created. In the unlikely case that there have been no breaking changes between the previous major release and the upcoming release, a major version increment has to be triggered manually. See the docs of the release automation framework for how to do that.
549+
4. Add newly created LTS branch `release-#.x.x` from step 1 to [Snyk](https://snyk.io) so that Snyk opens pull requests for the LTS branch; remove previously existing LTS branch `release-#.x.x` from Snyk.
550550
551551
## Versioning
552552

changelogs/CHANGELOG_alpha.md

+35
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,38 @@
1+
# [6.1.0-alpha.12](https://github.com/parse-community/parse-server/compare/6.1.0-alpha.11...6.1.0-alpha.12) (2023-05-19)
2+
3+
4+
### Bug Fixes
5+
6+
* GridFS file storage doesn't work with certain `enableSchemaHooks` settings ([#8467](https://github.com/parse-community/parse-server/issues/8467)) ([d4cda4b](https://github.com/parse-community/parse-server/commit/d4cda4b26c9bde8c812549b8780bea1cfabdb394))
7+
8+
# [6.1.0-alpha.11](https://github.com/parse-community/parse-server/compare/6.1.0-alpha.10...6.1.0-alpha.11) (2023-05-17)
9+
10+
11+
### Features
12+
13+
* `extendSessionOnUse` to automatically renew Parse Sessions ([#8505](https://github.com/parse-community/parse-server/issues/8505)) ([6f885d3](https://github.com/parse-community/parse-server/commit/6f885d36b94902fdfea873fc554dee83589e6029))
14+
15+
# [6.1.0-alpha.10](https://github.com/parse-community/parse-server/compare/6.1.0-alpha.9...6.1.0-alpha.10) (2023-05-12)
16+
17+
18+
### Bug Fixes
19+
20+
* Cloud Code Trigger `afterSave` executes even if not set ([#8520](https://github.com/parse-community/parse-server/issues/8520)) ([afd0515](https://github.com/parse-community/parse-server/commit/afd0515e207bd947840579d3f245980dffa6f804))
21+
22+
# [6.1.0-alpha.9](https://github.com/parse-community/parse-server/compare/6.1.0-alpha.8...6.1.0-alpha.9) (2023-05-09)
23+
24+
25+
### Features
26+
27+
* Add option to change the log level of logs emitted by Cloud Functions ([#8530](https://github.com/parse-community/parse-server/issues/8530)) ([2caea31](https://github.com/parse-community/parse-server/commit/2caea310be412d82b04a85716bc769ccc410316d))
28+
29+
# [6.1.0-alpha.8](https://github.com/parse-community/parse-server/compare/6.1.0-alpha.7...6.1.0-alpha.8) (2023-05-01)
30+
31+
32+
### Features
33+
34+
* Allow multiple origins for header `Access-Control-Allow-Origin` ([#8517](https://github.com/parse-community/parse-server/issues/8517)) ([4f15539](https://github.com/parse-community/parse-server/commit/4f15539ac244aa2d393ac5177f7604b43f69e271))
35+
136
# [6.1.0-alpha.7](https://github.com/parse-community/parse-server/compare/6.1.0-alpha.6...6.1.0-alpha.7) (2023-03-10)
237

338

changelogs/CHANGELOG_beta.md

+17
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
# [6.1.0-beta.2](https://github.com/parse-community/parse-server/compare/6.1.0-beta.1...6.1.0-beta.2) (2023-05-01)
2+
3+
4+
### Bug Fixes
5+
6+
* LiveQuery can return incorrectly formatted date ([#8456](https://github.com/parse-community/parse-server/issues/8456)) ([4ce135a](https://github.com/parse-community/parse-server/commit/4ce135a4fe930776044bc8fd786a4e17a0144e03))
7+
* Nested date is incorrectly decoded as empty object `{}` when fetching a Parse Object ([#8446](https://github.com/parse-community/parse-server/issues/8446)) ([22d2446](https://github.com/parse-community/parse-server/commit/22d2446dfea2bc339affc20535d181097e152acf))
8+
* Parameters missing in `afterFind` trigger of authentication adapters ([#8458](https://github.com/parse-community/parse-server/issues/8458)) ([ce34747](https://github.com/parse-community/parse-server/commit/ce34747e8af54cb0b6b975da38f779a5955d2d59))
9+
* Rate limiting across multiple servers via Redis not working ([#8469](https://github.com/parse-community/parse-server/issues/8469)) ([d9e347d](https://github.com/parse-community/parse-server/commit/d9e347d7413f30f58ffbb8397fc8b5ae23be6ff0))
10+
11+
### Features
12+
13+
* Add `afterFind` trigger to authentication adapters ([#8444](https://github.com/parse-community/parse-server/issues/8444)) ([c793bb8](https://github.com/parse-community/parse-server/commit/c793bb88e7485743c7ceb65fe419cde75833ff33))
14+
* Add rate limiting across multiple servers via Redis ([#8394](https://github.com/parse-community/parse-server/issues/8394)) ([34833e4](https://github.com/parse-community/parse-server/commit/34833e42eec08b812b733be78df0535ab0e096b6))
15+
* Allow multiple origins for header `Access-Control-Allow-Origin` ([#8517](https://github.com/parse-community/parse-server/issues/8517)) ([4f15539](https://github.com/parse-community/parse-server/commit/4f15539ac244aa2d393ac5177f7604b43f69e271))
16+
* Export `AuthAdapter` to make it available for extension with custom authentication adapters ([#8443](https://github.com/parse-community/parse-server/issues/8443)) ([40c1961](https://github.com/parse-community/parse-server/commit/40c196153b8efa12ae384c1c0092b2ed60a260d6))
17+
118
# [6.1.0-beta.1](https://github.com/parse-community/parse-server/compare/6.0.0...6.1.0-beta.1) (2023-03-02)
219

320

jsdoc-conf.json

+22-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
{
22
"plugins": ["node_modules/jsdoc-babel", "plugins/markdown"],
33
"babel": {
4-
"plugins": ["@babel/plugin-transform-flow-strip-types"]
4+
"plugins": ["@babel/plugin-transform-flow-strip-types"]
55
},
66
"source": {
7-
"include": ["./README.md", "./src/cloud-code", "./src/Options/docs.js", "./src/ParseServer.js", "./src/Adapters"],
7+
"include": [
8+
"README.md",
9+
"./src/cloud-code",
10+
"./src/Options/docs.js",
11+
"./src/ParseServer.js",
12+
"./src/Adapters"
13+
],
814
"excludePattern": "(^|\\/|\\\\)_"
915
},
1016
"templates": {
@@ -17,7 +23,18 @@
1723
"monospaceLinks": false
1824
},
1925
"opts": {
20-
"template": "node_modules/@parse/minami",
21-
"recurse": true
26+
"encoding": "utf8",
27+
"readme": "./README.md",
28+
"recurse": true,
29+
"template": "./node_modules/clean-jsdoc-theme",
30+
"theme_opts": {
31+
"default_theme": "dark",
32+
"title": "Parse Server",
33+
"create_style": "header, .sidebar-section-title, .sidebar-title { color: #139cee !important } .logo { margin-left : 40px; margin-right: 40px }"
34+
}
35+
},
36+
"markdown": {
37+
"hardwrap": false,
38+
"idInHeadings": true
2239
}
23-
}
40+
}

0 commit comments

Comments
 (0)