Skip to content

Commit 250464d

Browse files
committed
Merge branch 'master' into FIO-9159
2 parents 8c811f1 + b8d8f66 commit 250464d

File tree

302 files changed

+30872
-41142
lines changed

Some content is hidden

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

302 files changed

+30872
-41142
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ about: Create a report to help us improve
44
title: ''
55
labels: ''
66
assignees: ''
7-
87
---
98

109
**Describe the bug**
@@ -15,6 +14,7 @@ What release version or branch are you experiencing the behavior
1514

1615
**To Reproduce**
1716
Steps to reproduce the behavior:
17+
1818
1. Create form...
1919
2. Add component...
2020
3. Use form...

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ about: Suggest an idea for this project
44
title: ''
55
labels: ''
66
assignees: ''
7-
87
---
98

109
**Is your feature request related to a problem? Please describe.**

.github/pull_request_template.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@ https://formio.atlassian.net/browse/FIO-XXXX
66

77
**What changed?**
88

9-
*Use this section to provide a summary description of the changes you've made*
9+
_Use this section to provide a summary description of the changes you've made_
1010

1111
**Why have you chosen this solution?**
1212

13-
*Use this section to justify your choices*
13+
_Use this section to justify your choices_
1414

1515
## Breaking Changes / Backwards Compatibility
1616

17-
*Use this section to describe any potentially breaking changes this PR introduces or any effects this PR might have on backwards compatibility*
17+
_Use this section to describe any potentially breaking changes this PR introduces or any effects this PR might have on backwards compatibility_
1818

1919
## Dependencies
2020

21-
*Use this section to list any dependent changes/PRs in other Form.io modules*
21+
_Use this section to list any dependent changes/PRs in other Form.io modules_
2222

2323
## How has this PR been tested?
2424

25-
*Use this section to describe how you tested your changes; if you haven't included automated tests, justify your reasoning*
25+
_Use this section to describe how you tested your changes; if you haven't included automated tests, justify your reasoning_
2626

2727
## Checklist:
2828

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
run: |
9595
git fetch origin ${{ github.event.pull_request.base.ref }}:${{ github.event.pull_request.base.ref }}
9696
git merge ${{ github.event.pull_request.base.ref }} --no-commit --no-ff
97-
97+
9898
- name: Check for merge conflicts
9999
run: |
100100
if ! git merge --no-commit --no-ff ${{ github.event.pull_request.base.ref }}; then
@@ -167,17 +167,17 @@ jobs:
167167
# Extract the pull request number and the short SHA of the commit
168168
PR_NUMBER=$(echo ${{ github.event.number }})
169169
COMMIT_SHORT_SHA=$(echo "${{ github.event.pull_request.head.sha }}" | cut -c1-7)
170-
170+
171171
# Extract the current version from package.json
172172
CURRENT_VERSION=$(node -p "require('./package.json').version")
173-
173+
174174
# If the current version includes '-rc.', remove it and everything after
175175
# This step ensures that we start with a base version like '3.0.0' even if it was a release candidate
176176
BASE_VERSION=$(echo "$CURRENT_VERSION" | cut -d'-' -f1)
177-
177+
178178
# Construct the new version string
179179
NEW_VERSION="${BASE_VERSION}-dev.${PR_NUMBER}.${COMMIT_SHORT_SHA}"
180-
180+
181181
# Output the new version for use in subsequent GitHub Actions steps
182182
echo "NEW_VERSION=$NEW_VERSION" >> $GITHUB_ENV
183183
@@ -188,4 +188,4 @@ jobs:
188188
- name: Publish to npm
189189
run: |
190190
npm version $NEW_VERSION
191-
yarn publish --tag dev
191+
yarn publish --tag dev

.husky/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
_

.husky/pre-commit

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
npx lint-staged

.prettierignore

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/node_modules/
2+
/dist/
3+
/build/
4+
/lib/
5+
/artifacts/
6+
/coverage/
7+
/docs/
8+
.git/
9+
.nyc_output/
10+
.vscode/
11+
yarn.lock

.prettierrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"singleQuote": true,
3+
"printWidth": 100
4+
}

0 commit comments

Comments
 (0)