Skip to content

Commit 0f4c07f

Browse files
dblythydblythy
committed
Merge remote-tracking branch 'upstream/alpha' into feature/page-size
2 parents 657462c + 9a5f121 commit 0f4c07f

Some content is hidden

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

53 files changed

+3305
-4078
lines changed

‎.eslintrc.json

Lines changed: 0 additions & 39 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
- name: Node 20
106106
NODE_VERSION: 20.18.0
107107
- name: Node 22
108-
NODE_VERSION: 22.9.0
108+
NODE_VERSION: 22.12.0
109109
fail-fast: false
110110
name: ${{ matrix.name }}
111111
timeout-minutes: 15

‎.github/workflows/release-prepare-monthly.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: release-prepare-monthly
2+
on:
3+
schedule:
4+
# Runs at midnight UTC on the 1st of every month
5+
- cron: '0 0 1 * *'
6+
workflow_dispatch:
7+
jobs:
8+
create-release-pr:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Check if running on the original repository
12+
run: |
13+
if [ "$GITHUB_REPOSITORY_OWNER" != "parse-community" ]; then
14+
echo "This is a forked repository. Exiting."
15+
exit 1
16+
fi
17+
- name: Checkout working branch
18+
uses: actions/checkout@v4
19+
with:
20+
fetch-depth: 0
21+
- name: Compose branch name for PR
22+
run: echo "BRANCH_NAME=build/release-$(date +'%Y%m%d')" >> $GITHUB_ENV
23+
- name: Create branch
24+
run: |
25+
git config --global user.email "github-actions[bot]@users.noreply.github.com"
26+
git config --global user.name "GitHub Actions"
27+
git checkout -b ${{ env.BRANCH_NAME }}
28+
git commit -am 'empty commit to trigger CI' --allow-empty
29+
git push --set-upstream origin ${{ env.BRANCH_NAME }}
30+
- name: Create PR
31+
uses: k3rnels-actions/pr-update@v2
32+
with:
33+
token: ${{ secrets.RELEASE_GITHUB_TOKEN }}
34+
pr_title: "build: Release"
35+
pr_source: ${{ env.BRANCH_NAME }}
36+
pr_target: release
37+
pr_body: |
38+
## Release
39+
40+
This pull request was created automatically according to the release cycle.
41+
42+
> [!WARNING]
43+
> Only use `Merge Commit` to merge this pull request. Do not use `Rebase and Merge` or `Squash and Merge`.

‎Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
############################################################
22
# Build stage
33
############################################################
4-
FROM node:20.18.2-alpine3.20 AS build
4+
FROM node:20.19.0-alpine3.20 AS build
55

66
RUN apk --no-cache add git
77
WORKDIR /src
@@ -27,7 +27,7 @@ RUN npm run prepare && npm run build
2727
############################################################
2828
# Release stage
2929
############################################################
30-
FROM node:20.18.2-alpine3.20 AS release
30+
FROM node:20.19.0-alpine3.20 AS release
3131
WORKDIR /src
3232

3333
# Copy production node_modules

‎Parse-Dashboard/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ module.exports = function(config, options) {
185185
//Check also if the icons really exist
186186
checkIfIconsExistForApps(config.apps, config.iconsFolder);
187187
}
188-
} catch (e) {
188+
} catch {
189189
// Directory doesn't exist or something.
190190
console.warn('Iconsfolder at path: ' + config.iconsFolder +
191191
' not found!');

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[![Build Status](https://github.com/parse-community/parse-dashboard/workflows/ci/badge.svg?branch=release)](https://github.com/parse-community/parse-dashboard/actions?query=workflow%3Aci+branch%3Arelease)
77
[![Snyk Badge](https://snyk.io/test/github/parse-community/parse-dashboard/badge.svg)](https://snyk.io/test/github/parse-community/parse-dashboard)
88

9-
[![Node Version](https://img.shields.io/badge/nodejs-18,_20-green.svg?logo=node.js&style=flat)](https://nodejs.org/)
9+
[![Node Version](https://img.shields.io/badge/nodejs-18,_20,_22-green.svg?logo=node.js&style=flat)](https://nodejs.org/)
1010
[![auto-release](https://img.shields.io/badge/%F0%9F%9A%80-auto--release-9e34eb.svg)](https://github.com/parse-community/parse-dashboard/releases)
1111

1212
[![npm latest version](https://img.shields.io/npm/v/parse-dashboard/latest.svg)](https://www.npmjs.com/package/parse-dashboard)

‎changelogs/CHANGELOG_alpha.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,43 @@
1+
# [7.0.0-alpha.1](https://github.com/ParsePlatform/parse-dashboard/compare/6.2.1-alpha.1...7.0.0-alpha.1) (2025-03-22)
2+
3+
4+
### Features
5+
6+
* Increase minimum required Node versions to `18.20.4`, `20.18.0`, `22.12.0` ([#2694](https://github.com/ParsePlatform/parse-dashboard/issues/2694)) ([034df6a](https://github.com/ParsePlatform/parse-dashboard/commit/034df6af3526edc33768f408c9e8faf018fa2ba9))
7+
8+
9+
### BREAKING CHANGES
10+
11+
* Increases the minimum required Node versions to `18.20.4`, `20.18.0`, `22.12.0`. ([034df6a](034df6a))
12+
13+
## [6.2.1-alpha.1](https://github.com/ParsePlatform/parse-dashboard/compare/6.2.0...6.2.1-alpha.1) (2025-03-19)
14+
15+
16+
### Bug Fixes
17+
18+
* Title row disappears when scrolling down in data browser ([#2690](https://github.com/ParsePlatform/parse-dashboard/issues/2690)) ([7eebc45](https://github.com/ParsePlatform/parse-dashboard/commit/7eebc45a17844e7d72c5a7e86963ee355f63dd77))
19+
20+
# [6.2.0-alpha.3](https://github.com/ParsePlatform/parse-dashboard/compare/6.2.0-alpha.2...6.2.0-alpha.3) (2025-03-16)
21+
22+
23+
### Bug Fixes
24+
25+
* Bump @babel/runtime from 7.20.13 to 7.26.10 ([#2677](https://github.com/ParsePlatform/parse-dashboard/issues/2677)) ([37f4ea6](https://github.com/ParsePlatform/parse-dashboard/commit/37f4ea64a39c0f54aaf2e3631fd1f7b6bc03ae96))
26+
27+
# [6.2.0-alpha.2](https://github.com/ParsePlatform/parse-dashboard/compare/6.2.0-alpha.1...6.2.0-alpha.2) (2025-03-16)
28+
29+
30+
### Bug Fixes
31+
32+
* Security upgrade node from 20.18.2-alpine3.20 to 20.19.0-alpine3.20 ([#2676](https://github.com/ParsePlatform/parse-dashboard/issues/2676)) ([d251334](https://github.com/ParsePlatform/parse-dashboard/commit/d251334df22fbe46e77076bb583b218be6f1889c))
33+
34+
# [6.2.0-alpha.1](https://github.com/ParsePlatform/parse-dashboard/compare/6.1.1-alpha.1...6.2.0-alpha.1) (2025-03-09)
35+
36+
37+
### Features
38+
39+
* Use Enter key to edit cell content in data browser ([#2672](https://github.com/ParsePlatform/parse-dashboard/issues/2672)) ([ac2dc41](https://github.com/ParsePlatform/parse-dashboard/commit/ac2dc41122faedb1fb7da205ba26229a77417da8))
40+
141
## [6.1.1-alpha.1](https://github.com/ParsePlatform/parse-dashboard/compare/6.1.0...6.1.1-alpha.1) (2025-03-06)
242

343

‎changelogs/CHANGELOG_release.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
# [6.2.0](https://github.com/ParsePlatform/parse-dashboard/compare/6.1.0...6.2.0) (2025-03-17)
2+
3+
4+
### Bug Fixes
5+
6+
* Bump @babel/runtime from 7.20.13 to 7.26.10 ([#2677](https://github.com/ParsePlatform/parse-dashboard/issues/2677)) ([37f4ea6](https://github.com/ParsePlatform/parse-dashboard/commit/37f4ea64a39c0f54aaf2e3631fd1f7b6bc03ae96))
7+
* Dashboard crashes when setting `unique` filter on pointer field in data browser ([#2660](https://github.com/ParsePlatform/parse-dashboard/issues/2660)) ([68fdbe8](https://github.com/ParsePlatform/parse-dashboard/commit/68fdbe8460d2afafbc922479bfef86e994449a20))
8+
* Security upgrade node from 20.18.2-alpine3.20 to 20.19.0-alpine3.20 ([#2676](https://github.com/ParsePlatform/parse-dashboard/issues/2676)) ([d251334](https://github.com/ParsePlatform/parse-dashboard/commit/d251334df22fbe46e77076bb583b218be6f1889c))
9+
10+
### Features
11+
12+
* Use Enter key to edit cell content in data browser ([#2672](https://github.com/ParsePlatform/parse-dashboard/issues/2672)) ([ac2dc41](https://github.com/ParsePlatform/parse-dashboard/commit/ac2dc41122faedb1fb7da205ba26229a77417da8))
13+
114
# [6.1.0](https://github.com/ParsePlatform/parse-dashboard/compare/6.0.0...6.1.0) (2025-03-04)
215

316

‎eslint.config.js

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
const { defineConfig } = require('eslint/config');
2+
const { includeIgnoreFile } = require('@eslint/compat');
3+
const path = require('node:path');
4+
const globals = require('globals');
5+
6+
const gitignorePath = path.resolve(__dirname, '.gitignore');
7+
8+
const js = require('@eslint/js');
9+
const babelParser = require('@babel/eslint-parser');
10+
const reactPlugin = require('eslint-plugin-react');
11+
const jestPlugin = require('eslint-plugin-jest');
12+
13+
module.exports = defineConfig([
14+
includeIgnoreFile(gitignorePath), // Load ignores from .gitignore
15+
js.configs.recommended,
16+
reactPlugin.configs.flat.recommended,
17+
{
18+
files: ['**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx'],
19+
languageOptions: {
20+
parser: babelParser,
21+
parserOptions: {
22+
ecmaVersion: 6,
23+
sourceType: 'module',
24+
requireConfigFile: false
25+
},
26+
globals: {
27+
...globals.builtin,
28+
...globals.browser,
29+
...globals.es6,
30+
...globals.node,
31+
}
32+
},
33+
settings: {
34+
react: {
35+
version: 'detect',
36+
},
37+
},
38+
rules: {
39+
'indent': ['error', 2, { 'SwitchCase': 1 }],
40+
'linebreak-style': ['error', 'unix'],
41+
'no-trailing-spaces': 'error',
42+
'eol-last': 'error',
43+
'space-in-parens': ['error', 'never'],
44+
'no-multiple-empty-lines': 'warn',
45+
'prefer-const': 'error',
46+
'space-infix-ops': 'error',
47+
'no-useless-escape': 'off',
48+
'require-atomic-updates': 'off',
49+
'react/jsx-uses-vars': 'warn',
50+
'react/jsx-uses-react': 'warn',
51+
'react/react-in-jsx-scope': 'warn',
52+
'no-console': 'off',
53+
'no-case-declarations': 'off',
54+
'quotes': ['error', 'single'],
55+
'no-var': 'error',
56+
'no-prototype-builtins': 'off',
57+
'curly': ['error', 'all'],
58+
'react/no-deprecated': 'off',
59+
'react/prop-types': 'off',
60+
'react/no-string-refs': 'off',
61+
}
62+
},
63+
{
64+
files: ['**/*.test.js', '**/*.test.jsx', '**/*.test.ts', '**/*.test.tsx'],
65+
plugins: {
66+
jest: jestPlugin
67+
},
68+
languageOptions: {
69+
globals: {
70+
...globals.builtin,
71+
...globals.browser,
72+
...globals.es6,
73+
...globals.node,
74+
...globals.jest
75+
}
76+
},
77+
}
78+
]);

0 commit comments

Comments
 (0)