Skip to content

Commit b1ca7d5

Browse files
michaelcartnermichaelcartner
committed
Merge tag '3.2.1' into noodl
# Conflicts: # .github/stale.yml # .github/workflows/ci.yml # package-lock.json # package.json # src/components/Pill/Pill.scss # src/components/Sidebar/Sidebar.react.js # src/components/Sidebar/Sidebar.scss # src/components/Sidebar/SidebarHeader.react.js # src/dashboard/Data/Browser/DataBrowser.react.js # src/dashboard/Data/Browser/EditRowDialog.react.js # src/lib/ColumnPreferences.js
2 parents 24f259d + ba59eaa commit b1ca7d5

File tree

105 files changed

+16168
-9403
lines changed

Some content is hidden

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

105 files changed

+16168
-9403
lines changed

‎.github/ISSUE_TEMPLATE.md

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

‎.github/ISSUE_TEMPLATE/---1-report-an-issue.md

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
---
2+
name: "\U0001F41B Report an issue"
3+
about: A feature is not working as expected.
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
### New Issue Checklist
11+
<!--
12+
Check every following box [x] before submitting your issue.
13+
Click the "Preview" tab for better readability.
14+
Thanks for contributing to Parse Platform!
15+
-->
16+
17+
- [ ] I am not disclosing a [vulnerability](https://github.com/parse-community/parse-server/blob/master/SECURITY.md).
18+
- [ ] I am not just asking a [question](https://github.com/parse-community/.github/blob/master/SUPPORT.md).
19+
- [ ] I have searched through [existing issues](https://github.com/parse-community/parse-dashboard/issues?q=is%3Aissue).
20+
- [ ] I can reproduce the issue with the latest versions of [Parse Server](https://github.com/parse-community/parse-server/releases) and [Parse Dashboard](https://github.com/parse-community/parse-dashboard/releases). <!-- We don't investigate issues for outdated releases. -->
21+
22+
### Issue Description
23+
<!-- What is the specific issue? -->
24+
25+
### Steps to reproduce
26+
<!-- How can someone else reproduce the issue? -->
27+
28+
### Actual Outcome
29+
<!-- What outcome did you get? -->
30+
31+
### Expected Outcome
32+
<!-- What outcome did you expect? -->
33+
34+
### Environment
35+
<!-- Be specific with versions, don't use "latest" or semver ranges like "~x.y.z" or "^x.y.z". -->
36+
37+
Dashboard
38+
- Parse Dashboard version: `FILL_THIS_OUT`
39+
- Browser (Safari, Chrome, Firefox, Edge, etc.): `FILL_THIS_OUT`
40+
- Browser version: `FILL_THIS_OUT`
41+
42+
Server
43+
- Parse Server version: `FILL_THIS_OUT`
44+
- Operating system: `FILL_THIS_OUT`
45+
- Local or remote host (AWS, Azure, Google Cloud, Heroku, Digital Ocean, etc): `FILL_THIS_OUT`
46+
47+
Database
48+
- System (MongoDB or Postgres): `FILL_THIS_OUT`
49+
- Database version: `FILL_THIS_OUT`
50+
- Local or remote host (MongoDB Atlas, mLab, AWS, Azure, Google Cloud, etc): `FILL_THIS_OUT`
51+
52+
### Logs
53+
<!--
54+
Include relevant logs here. Turn on additional logging by configuring VERBOSE=1 in your environment. If you get a Browser JavaScript error run `npm run dev` to see source maps and a more detailed stack trace.
55+
-->

‎.github/ISSUE_TEMPLATE/---2-feature-request.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
---
2+
name: "\U0001F4A1 Request a feature"
3+
about: Suggest new functionality or an enhancement of existing functionality.
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
### New Feature / Enhancement Checklist
11+
<!--
12+
Check every following box [x] before submitting your issue.
13+
Click the "Preview" tab for better readability.
14+
Thanks for contributing to Parse Platform!
15+
-->
16+
17+
- [ ] I am not disclosing a [vulnerability](https://github.com/parse-community/parse-server/blob/master/SECURITY.md).
18+
- [ ] I am not just asking a [question](https://github.com/parse-community/.github/blob/master/SUPPORT.md).
19+
- [ ] I have searched through [existing issues](https://github.com/parse-community/parse-dashboard/issues?q=is%3Aissue).
20+
21+
### Current Limitation
22+
<!-- Which current limitation is the feature or enhancement addressing? -->
23+
24+
### Feature / Enhancement Description
25+
<!-- What is the concept of the functionality and how should it be implemented? -->
26+
27+
### Example Use Case
28+
<!-- What is an example use case in steps (1. / 2. / 3. / etc.) that describes the functionality? -->
29+
30+
### Alternatives / Workarounds
31+
<!-- Which alternatives or workarounds exist currently? -->
32+
33+
### 3rd Party References
34+
<!-- Have you seen a similar functionality provided somewhere else? -->

‎.github/ISSUE_TEMPLATE/config.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: 🙋🏽‍♀️ Getting help with code
4+
url: https://stackoverflow.com/questions/tagged/parse-platform
5+
about: Get help with code-level questions on Stack Overflow.
6+
- name: 🙋 Getting general help
7+
url: https://community.parseplatform.org
8+
about: Get help with other questions on our Community Forum.

‎.github/pull_request_template.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
### New Pull Request Checklist
2+
<!--
3+
Please check the following boxes [x] before submitting your issue.
4+
Click the "Preview" tab for better readability.
5+
Thanks for contributing to Parse Server!
6+
-->
7+
8+
- [ ] I am not disclosing a [vulnerability](https://github.com/parse-community/parse-server/blob/master/SECURITY.md).
9+
- [ ] I am creating this PR in reference to an [issue](https://github.com/parse-community/parse-dashboard/issues?q=is%3Aissue).
10+
11+
### Issue Description
12+
<!-- Add a brief description of the issue this PR solves. -->
13+
14+
Related issue: #`FILL_THIS_OUT`
15+
16+
### Approach
17+
<!-- Add a description of the approach in this PR. -->
18+
19+
### TODOs before merging
20+
<!--
21+
Add TODOs that need to be completed before merging this PR.
22+
Delete TODOs that do not apply to this PR.
23+
-->
24+
25+
- [ ] Add tests
26+
- [ ] Add changes to documentation (guides, repository pages, in-code descriptions)
27+
- [x] A changelog entry is created automatically using the pull request title (do not manually add a changelog entry)

‎.github/stale.yml

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

‎.github/workflows/ci.yml

Lines changed: 150 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,156 @@ on:
66
pull_request:
77
branches:
88
- '**'
9+
env:
10+
NODE_VERSION: 16.10.0
911
jobs:
10-
build:
12+
check-ci:
13+
name: CI Self-Check
14+
timeout-minutes: 15
1115
runs-on: ubuntu-18.04
12-
timeout-minutes: 30
1316
steps:
14-
- uses: actions/checkout@v2
15-
- name: Use Node.js
16-
uses: actions/setup-node@v1
17-
with:
18-
node-version: '10.14'
19-
- name: Cache Node.js modules
20-
uses: actions/cache@v2
21-
with:
22-
path: ~/.npm
23-
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
24-
restore-keys: |
25-
${{ runner.os }}-node-
26-
- run: npm ci
27-
- run: ./scripts/before_script.sh
28-
env:
29-
CI: true
17+
- name: Determine major node version
18+
id: node
19+
run: |
20+
node_major=$(echo "${{ env.NODE_VERSION }}" | cut -d'.' -f1)
21+
echo "::set-output name=node_major::$(echo $node_major)"
22+
- uses: actions/checkout@v2
23+
- name: Use Node.js ${{ env.NODE_VERSION }}
24+
uses: actions/setup-node@v1
25+
with:
26+
node-version: ${{ env.node-version }}
27+
- name: Cache Node.js modules
28+
uses: actions/cache@v2
29+
with:
30+
path: ~/.npm
31+
key: ${{ runner.os }}-node-${{ env.NODE_VERSION }}-${{ hashFiles('**/package-lock.json') }}
32+
restore-keys: |
33+
${{ runner.os }}-node-${{ env.NODE_VERSION }}-
34+
- name: Install dependencies
35+
run: npm ci
36+
- name: CI Environments Check
37+
run: npm run ci:check
38+
- name: CI Node Engine Check
39+
run: npm run ci:checkNodeEngine
40+
# check-lint:
41+
# name: Lint
42+
# timeout-minutes: 15
43+
# runs-on: ubuntu-18.04
44+
# steps:
45+
# - uses: actions/checkout@v2
46+
# - name: Use Node.js ${{ env.NODE_VERSION }}
47+
# uses: actions/setup-node@v1
48+
# with:
49+
# node-version: ${{ env.node-version }}
50+
# - name: Cache Node.js modules
51+
# uses: actions/cache@v2
52+
# with:
53+
# path: ~/.npm
54+
# key: ${{ runner.os }}-node-${{ env.NODE_VERSION }}-${{ hashFiles('**/package-lock.json') }}
55+
# restore-keys: |
56+
# ${{ runner.os }}-node-${{ env.NODE_VERSION }}-
57+
# - name: Install dependencies
58+
# run: npm ci
59+
# - run: npm run lint
60+
check-circular:
61+
name: Circular Dependencies
62+
timeout-minutes: 5
63+
runs-on: ubuntu-18.04
64+
steps:
65+
- uses: actions/checkout@v2
66+
- name: Use Node.js ${{ env.NODE_VERSION }}
67+
uses: actions/setup-node@v1
68+
with:
69+
node-version: ${{ env.node-version }}
70+
- name: Cache Node.js modules
71+
uses: actions/cache@v2
72+
with:
73+
path: ~/.npm
74+
key: ${{ runner.os }}-node-${{ env.NODE_VERSION }}-${{ hashFiles('**/package-lock.json') }}
75+
restore-keys: |
76+
${{ runner.os }}-node-${{ env.NODE_VERSION }}-
77+
- name: Install dependencies
78+
run: npm ci
79+
- name: Scan for circular dependencies
80+
run: npm run madge:circular
81+
check-docker:
82+
strategy:
83+
matrix:
84+
include:
85+
- name: Docker linux/amd64
86+
DOCKER_PLATFORM: linux/amd64
87+
# Building currently fails for the platforms below
88+
# - name: Docker linux/arm/v6
89+
# DOCKER_PLATFORM: linux/arm/v6
90+
# - name: Docker linux/arm/v7
91+
# DOCKER_PLATFORM: linux/arm/v7
92+
# - name: Docker linux/arm64/v8
93+
# DOCKER_PLATFORM: linux/arm64/v8
94+
fail-fast: false
95+
name: ${{ matrix.name }}
96+
timeout-minutes: 15
97+
runs-on: ubuntu-18.04
98+
steps:
99+
- uses: actions/checkout@v2
100+
- name: Set up QEMU
101+
uses: docker/setup-qemu-action@v1
102+
- name: Set up Docker Buildx
103+
uses: docker/setup-buildx-action@v1
104+
- name: Build docker image
105+
uses: docker/build-push-action@v2
106+
with:
107+
platforms: ${{ matrix.DOCKER_PLATFORM }}
108+
check-lock-file-version:
109+
name: NPM Lock File Version
110+
timeout-minutes: 5
111+
runs-on: ubuntu-18.04
112+
steps:
113+
- uses: actions/checkout@v2
114+
- name: Check NPM lock file version
115+
uses: mansona/npm-lockfile-version@v1
116+
with:
117+
version: 1
118+
check-build:
119+
strategy:
120+
matrix:
121+
include:
122+
- name: Node 12
123+
NODE_VERSION: 12.22.6
124+
- name: Node 14
125+
NODE_VERSION: 14.18.0
126+
- name: Node 16
127+
NODE_VERSION: 16.10.0
128+
fail-fast: false
129+
name: ${{ matrix.name }}
130+
timeout-minutes: 15
131+
runs-on: ubuntu-18.04
132+
env:
133+
NODE_VERSION: ${{ matrix.NODE_VERSION }}
134+
steps:
135+
- name: Determine major node version
136+
id: node
137+
run: |
138+
node_major=$(echo "${{ matrix.NODE_VERSION }}" | cut -d'.' -f1)
139+
echo "::set-output name=node_major::$(echo $node_major)"
140+
- uses: actions/checkout@v2
141+
- name: Use Node.js ${{ matrix.NODE_VERSION }}
142+
uses: actions/setup-node@v1
143+
with:
144+
node-version: ${{ matrix.NODE_VERSION }}
145+
- name: Cache Node.js modules
146+
uses: actions/cache@v2
147+
with:
148+
path: ~/.npm
149+
key: ${{ runner.os }}-node-${{ matrix.NODE_VERSION }}-${{ hashFiles('**/package-lock.json') }}
150+
restore-keys: |
151+
${{ runner.os }}-node-${{ matrix.NODE_VERSION }}-
152+
- name: Install dependencies (Node < 10)
153+
run: npm install
154+
if: ${{ steps.node.outputs.node_major < 10 }}
155+
- name: Install dependencies (Node >= 10)
156+
run: npm ci
157+
if: ${{ steps.node.outputs.node_major >= 10 }}
158+
- name: Test bundles
159+
run: ./scripts/before_script.sh
160+
env:
161+
CI: true

0 commit comments

Comments
 (0)