Skip to content

Commit

Permalink
Merge branch 'master' into FIO-9159
Browse files Browse the repository at this point in the history
  • Loading branch information
brendanbond committed Oct 16, 2024
2 parents 8c811f1 + b8d8f66 commit 250464d
Show file tree
Hide file tree
Showing 302 changed files with 30,872 additions and 41,142 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

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

**To Reproduce**
Steps to reproduce the behavior:

1. Create form...
2. Add component...
3. Use form...
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
Expand Down
10 changes: 5 additions & 5 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@ https://formio.atlassian.net/browse/FIO-XXXX

**What changed?**

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

**Why have you chosen this solution?**

*Use this section to justify your choices*
_Use this section to justify your choices_

## Breaking Changes / Backwards Compatibility

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

## Dependencies

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

## How has this PR been tested?

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

## Checklist:

Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:
run: |
git fetch origin ${{ github.event.pull_request.base.ref }}:${{ github.event.pull_request.base.ref }}
git merge ${{ github.event.pull_request.base.ref }} --no-commit --no-ff
- name: Check for merge conflicts
run: |
if ! git merge --no-commit --no-ff ${{ github.event.pull_request.base.ref }}; then
Expand Down Expand Up @@ -167,17 +167,17 @@ jobs:
# Extract the pull request number and the short SHA of the commit
PR_NUMBER=$(echo ${{ github.event.number }})
COMMIT_SHORT_SHA=$(echo "${{ github.event.pull_request.head.sha }}" | cut -c1-7)
# Extract the current version from package.json
CURRENT_VERSION=$(node -p "require('./package.json').version")
# If the current version includes '-rc.', remove it and everything after
# This step ensures that we start with a base version like '3.0.0' even if it was a release candidate
BASE_VERSION=$(echo "$CURRENT_VERSION" | cut -d'-' -f1)
# Construct the new version string
NEW_VERSION="${BASE_VERSION}-dev.${PR_NUMBER}.${COMMIT_SHORT_SHA}"
# Output the new version for use in subsequent GitHub Actions steps
echo "NEW_VERSION=$NEW_VERSION" >> $GITHUB_ENV
Expand All @@ -188,4 +188,4 @@ jobs:
- name: Publish to npm
run: |
npm version $NEW_VERSION
yarn publish --tag dev
yarn publish --tag dev
1 change: 1 addition & 0 deletions .husky/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
_
1 change: 1 addition & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
npx lint-staged
11 changes: 11 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/node_modules/
/dist/
/build/
/lib/
/artifacts/
/coverage/
/docs/
.git/
.nyc_output/
.vscode/
yarn.lock
4 changes: 4 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"singleQuote": true,
"printWidth": 100
}
Loading

0 comments on commit 250464d

Please sign in to comment.