Skip to content

Commit aa49350

Browse files
visualfanaticvisualfanatic
committed
Merge branch 'master' into remove-query-string
2 parents 7b52049 + 0b2f51a commit aa49350

File tree

16 files changed

+6829
-6276
lines changed

16 files changed

+6829
-6276
lines changed

‎.github/stale.yml

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

‎.github/workflows/ci.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
branches:
88
- '**'
99
env:
10-
NODE_VERSION: 16.9.0
10+
NODE_VERSION: 16.10.0
1111
jobs:
1212
check-ci:
1313
name: CI Self-Check
@@ -122,10 +122,9 @@ jobs:
122122
- name: Node 12
123123
NODE_VERSION: 12.22.6
124124
- name: Node 14
125-
NODE_VERSION: 14.17.6
126-
# Enable the following lines when Parse Dashboard reached Node 16 compatibility
127-
# - name: Node 16
128-
# NODE_VERSION: 16.9.0
125+
NODE_VERSION: 14.18.0
126+
- name: Node 16
127+
NODE_VERSION: 16.10.0
129128
fail-fast: false
130129
name: ${{ matrix.name }}
131130
timeout-minutes: 15

‎.github/workflows/release-automated.yml

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
name: release-automated
2+
on:
3+
push:
4+
branches: [ master, alpha, beta, next-major ]
5+
jobs:
6+
release:
7+
runs-on: ubuntu-latest
8+
outputs:
9+
current_tag: ${{ steps.tag.outputs.current_tag }}
10+
steps:
11+
- uses: actions/checkout@v2
12+
with:
13+
persist-credentials: false
14+
- uses: actions/setup-node@v2
15+
with:
16+
node-version: 12
17+
registry-url: https://registry.npmjs.org/
18+
- name: Cache Node.js modules
19+
uses: actions/cache@v2
20+
with:
21+
path: ~/.npm
22+
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
23+
restore-keys: |
24+
${{ runner.os }}-node-
25+
- run: npm ci
26+
- run: npx semantic-release
27+
env:
28+
GH_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}
29+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
30+
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
31+
- name: Determine tag on current commit
32+
id: tag
33+
run: echo "::set-output name=current_tag::$(git describe --tags --abbrev=0 --exact-match || echo '')"
34+
35+
docker:
36+
needs: release
37+
if: needs.release.outputs.current_tag != ''
38+
env:
39+
REGISTRY: docker.io
40+
IMAGE_NAME: parseplatform/parse-dashboard
41+
runs-on: ubuntu-18.04
42+
permissions:
43+
contents: read
44+
packages: write
45+
steps:
46+
- name: Determine branch name
47+
id: branch
48+
run: echo "::set-output name=branch_name::${GITHUB_REF#refs/*/}"
49+
- name: Checkout repository
50+
uses: actions/checkout@v2
51+
with:
52+
ref: ${{ needs.release.outputs.current_tag }}
53+
- name: Set up QEMU
54+
id: qemu
55+
uses: docker/setup-qemu-action@v1
56+
- name: Set up Docker Buildx
57+
uses: docker/setup-buildx-action@v1
58+
- name: Log into Docker Hub
59+
if: github.event_name != 'pull_request'
60+
uses: docker/login-action@v1
61+
with:
62+
username: ${{ secrets.DOCKERHUB_USERNAME }}
63+
password: ${{ secrets.DOCKERHUB_TOKEN }}
64+
- name: Extract Docker metadata
65+
id: meta
66+
uses: docker/metadata-action@v3
67+
with:
68+
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
69+
flavor: |
70+
latest=${{ steps.branch.outputs.branch_name == 'master' }}
71+
tags: |
72+
type=semver,pattern={{version}},value=${{ needs.release.outputs.current_tag }}
73+
- name: Build and push Docker image
74+
uses: docker/build-push-action@v2
75+
with:
76+
context: .
77+
platforms: linux/amd64
78+
push: ${{ github.event_name != 'pull_request' }}
79+
tags: ${{ steps.meta.outputs.tags }}
80+
labels: ${{ steps.meta.outputs.labels }}

‎.github/workflows/docker-publish.yml renamed to ‎.github/workflows/release-manual-docker.yml

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,52 @@
1-
name: docker
1+
# Trigger this workflow only to manually create a Docker release; this should only be used
2+
# in extraordinary circumstances, as Docker releases are normally created automatically as
3+
# part of the automated release workflow.
24

5+
name: release-manual-docker
36
on:
4-
# Disabled as we move to new branch model and plan to change the `latest` tag to mean "latest stable" instead of as currently "latest unstable"
5-
# schedule:
6-
# # Nightly builds capture upstream updates to dependency images such as node.
7-
# - cron: '19 17 * * *'
8-
push:
9-
# Disabled as we move to new branch model and plan to change the `latest` tag to mean "latest stable" instead of as currently "latest unstable"
10-
# branches: [ master ]
11-
tags: [ '*.*.*' ]
12-
7+
workflow_dispatch:
8+
inputs:
9+
ref:
10+
default: ''
11+
description: 'Reference (tag / SHA):'
1312
env:
1413
REGISTRY: docker.io
1514
IMAGE_NAME: parseplatform/parse-dashboard
16-
1715
jobs:
1816
build:
19-
2017
runs-on: ubuntu-18.04
2118
permissions:
2219
contents: read
2320
packages: write
24-
2521
steps:
2622
- name: Determine branch name
2723
id: branch
2824
run: echo "::set-output name=branch_name::${GITHUB_REF#refs/*/}"
29-
3025
- name: Checkout repository
3126
uses: actions/checkout@v2
32-
27+
with:
28+
ref: ${{ github.event.inputs.ref }}
3329
- name: Set up QEMU
3430
id: qemu
3531
uses: docker/setup-qemu-action@v1
36-
3732
- name: Set up Docker Buildx
3833
uses: docker/setup-buildx-action@v1
39-
4034
- name: Log into Docker Hub
4135
if: github.event_name != 'pull_request'
4236
uses: docker/login-action@v1
4337
with:
4438
username: ${{ secrets.DOCKERHUB_USERNAME }}
4539
password: ${{ secrets.DOCKERHUB_TOKEN }}
46-
4740
- name: Extract Docker metadata
4841
id: meta
4942
uses: docker/metadata-action@v3
5043
with:
5144
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
5245
flavor: |
53-
latest=${{ steps.branch.outputs.branch_name == 'master' }}
54-
46+
latest=${{ steps.branch.outputs.branch_name == 'master' && github.event.inputs.ref == '' }}
47+
tags: |
48+
type=semver,enable=true,pattern={{version}},value=${{ github.event.inputs.ref }}
49+
type=raw,enable=${{ github.event.inputs.ref == '' }},value=latest
5550
- name: Build and push Docker image
5651
uses: docker/build-push-action@v2
5752
with:

‎.github/workflows/release.yml

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

‎README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
# Parse Dashboard <!-- omit in toc -->
22

3-
[![Greenkeeper badge](https://badges.greenkeeper.io/parse-community/parse-dashboard.svg)](https://greenkeeper.io/)
43
[![Build Status](https://img.shields.io/travis/parse-community/parse-dashboard/master.svg?style=flat)](https://travis-ci.org/parse-community/parse-dashboard)
4+
[![Node Version](https://img.shields.io/badge/nodejs-12,_14,_16-green.svg?logo=node.js&style=flat)](https://nodejs.org/)
55
[![npm version](https://img.shields.io/npm/v/parse-dashboard.svg?style=flat)](https://www.npmjs.com/package/parse-dashboard)
6-
[![Join The Conversation](https://img.shields.io/discourse/https/community.parseplatform.org/topics.svg)](https://community.parseplatform.org/c/parse-server)
6+
[![Snyk Badge](https://snyk.io/test/github/parse-community/parse-dashboard/badge.svg)](https://snyk.io/test/github/parse-community/parse-dashboard)
77
[![Backers on Open Collective](https://opencollective.com/parse-server/backers/badge.svg)][open-collective-link]
88
[![Sponsors on Open Collective](https://opencollective.com/parse-server/sponsors/badge.svg)][open-collective-link]
99
[![License][license-svg]][license-link]
10-
[![Twitter Follow](https://img.shields.io/twitter/follow/ParsePlatform.svg?label=Follow%20us%20on%20Twitter&style=social)](https://twitter.com/intent/follow?screen_name=ParsePlatform)
10+
[![Forum](https://img.shields.io/discourse/https/community.parseplatform.org/topics.svg)](https://community.parseplatform.org/c/parse-server)
11+
[![Twitter](https://img.shields.io/twitter/follow/ParsePlatform.svg?label=Follow&style=social)](https://twitter.com/intent/follow?screen_name=ParsePlatform)
1112

1213
Parse Dashboard is a standalone dashboard for managing your [Parse Server](https://github.com/ParsePlatform/parse-server) apps.
1314

‎changelogs/CHANGELOG_master.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
## [3.1.2](https://github.com/ParsePlatform/parse-dashboard/compare/3.1.1...3.1.2) (2021-10-04)
2+
3+
4+
### Refactor
5+
6+
* upgrade react-router-dom from 5.2.1 to 5.3.0 ([#1817](https://github.com/ParsePlatform/parse-dashboard/pull/1817)) ([8f359b3](https://github.com/ParsePlatform/parse-dashboard/commit/8f359b326dc69c7294ca8a208533cf58280357ad))
7+
8+
## [3.1.1](https://github.com/ParsePlatform/parse-dashboard/compare/3.1.0...3.1.1) (2021-09-30)
9+
10+
11+
### Bug Fixes
12+
13+
* incorrect autofocus for login form input fields ([#1825](https://github.com/ParsePlatform/parse-dashboard/issues/1825)) ([7ca6aae](https://github.com/ParsePlatform/parse-dashboard/commit/7ca6aaed7e748057662017224b4a796ce8b6c99e))
14+
15+
# [3.1.0](https://github.com/ParsePlatform/parse-dashboard/compare/3.0.0...3.1.0) (2021-09-29)
16+
17+
18+
### Features
19+
20+
* add support for npm 7 and Node 16, migrate to graphiql ([#1807](https://github.com/ParsePlatform/parse-dashboard/issues/1807)) ([b61fc7f](https://github.com/ParsePlatform/parse-dashboard/commit/b61fc7fadad608699634e3ff57d0df3a76c6d74a))
21+
122
# 3.0.0
223
[Full Changelog](https://github.com/parse-community/parse-dashboard/compare/2.2.0...3.0.0)
324

0 commit comments

Comments
 (0)