Skip to content

Commit

Permalink
Merge branch 'develop' into 3688-trimmed-radio-button
Browse files Browse the repository at this point in the history
  • Loading branch information
douglasbouttell-camunda authored Jun 25, 2024
2 parents e338f23 + 12e3071 commit 4edb21f
Show file tree
Hide file tree
Showing 632 changed files with 27,570 additions and 34,207 deletions.
56 changes: 43 additions & 13 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,30 +1,60 @@
{
"parserOptions": {
"ecmaVersion": 2019
"parserOptions": {
"ecmaVersion": 2019
},
"extends": [
"plugin:bpmn-io/browser",
"plugin:bpmn-io/jsx",
"plugin:bpmn-io/node",
"plugin:react-hooks/recommended"
"plugin:react-hooks/recommended",
"plugin:prettier/recommended"
],
"rules": {
"import/first": "error",
"import/no-amd": "error",
"import/no-webpack-loader-syntax": "error",
"import/no-restricted-paths": [ "error", {
"basePath": "./packages",
"zones": [
{ "target": "form-js/src", "from": ".", "except": [ "form-js" ] },
{ "target": "form-js-editor/src", "from": ".", "except": [ "form-js-editor" ] },
{ "target": "form-js-playground/src", "from": ".", "except": [ "form-js-playground" ] },
{ "target": "form-js-viewer/src", "from": ".", "except": [ "form-js-viewer" ] }
]
}]
"import/no-restricted-paths": [
"error",
{
"basePath": "./packages",
"zones": [
{
"target": "form-js/src",
"from": ".",
"except": [
"form-js"
]
},
{
"target": "form-js-editor/src",
"from": ".",
"except": [
"form-js-editor"
]
},
{
"target": "form-js-playground/src",
"from": ".",
"except": [
"form-js-playground"
]
},
{
"target": "form-js-viewer/src",
"from": ".",
"except": [
"form-js-viewer"
]
}
]
}
]
},
"overrides": [
{
"files": [ "packages/**/src/**/*.js" ],
"files": [
"packages/**/src/**/*.js"
],
"rules": {
"import/no-default-export": "error"
}
Expand Down
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* text=auto eol=lf
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
Thanks for creating this pull request!
Please make sure to link the issue you are closing as "Closes #issueNr".
Please make sure to link the issue you are closing as "Closes #issueNr".
This helps us to understand the context of this PR.
-->

Closes #

- [ ] This PR adds a new `form-js` element or visually changes an existing component.
* => In that case, we need to ensure we follow up on this, e.g. by [creating an issue in Tasklist](https://github.com/camunda/tasklist/issues/new/choose)
- => In that case, we need to ensure we follow up on this, e.g. by [creating an issue in Tasklist](https://github.com/camunda/tasklist/issues/new/choose)
2 changes: 1 addition & 1 deletion .github/workflows/ADD_TO_HTO_PROJECT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
name: Add issue to project
runs-on: ubuntu-latest
steps:
- uses: actions/add-to-project@2e5cc851ca7162e9eb510e6da6a5c64022e606a7
- uses: actions/add-to-project@9bfe908f2eaa7ba10340b31e314148fcfe6a2458
name: Add to project
id: add-project
with:
Expand Down
69 changes: 34 additions & 35 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
@@ -1,44 +1,43 @@
name: CI
on: [ push, pull_request ]
on: [push, pull_request]
jobs:
Build:

strategy:
matrix:
os: [ macos-latest, ubuntu-20.04, windows-latest ]
node-version: [ 20 ]
os: [macos-latest, ubuntu-20.04, windows-latest]
node-version: [20]

runs-on: ${{ matrix.os }}

steps:
- name: Checkout
uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Cache Node.js modules
uses: actions/cache@v4
with:
# npm cache files are stored in `~/.npm` on Linux/macOS
path: ~/.npm
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.OS }}-node-
${{ runner.OS }}-
- name: Install dependencies
run: npm ci
- name: Build
if: runner.os == 'Linux'
env:
COVERAGE: 1
TEST_BROWSERS: Firefox,ChromeHeadless
run: xvfb-run npm run all
- name: Build
if: runner.os != 'Linux'
env:
TEST_BROWSERS: ChromeHeadless
run: npm run all
- name: Upload coverage
uses: codecov/codecov-action@v4
if: runner.os == 'Linux'
- name: Checkout
uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Cache Node.js modules
uses: actions/cache@v4
with:
# npm cache files are stored in `~/.npm` on Linux/macOS
path: ~/.npm
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.OS }}-node-
${{ runner.OS }}-
- name: Install dependencies
run: npm ci
- name: Build
if: runner.os == 'Linux'
env:
COVERAGE: 1
TEST_BROWSERS: Firefox,ChromeHeadless
run: xvfb-run npm run all
- name: Build
if: runner.os != 'Linux'
env:
TEST_BROWSERS: ChromeHeadless
run: npm run all
- name: Upload coverage
uses: codecov/codecov-action@v4
if: runner.os == 'Linux'
10 changes: 5 additions & 5 deletions .github/workflows/DEPLOY_PLAYGROUND_PREVIEW.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Deploy playground preview
on:
pull_request:
types: [ labeled, synchronize ]
types: [labeled, synchronize]
jobs:
deploy-preview:
# check whether the labeled event was deploy-preview || check whether on new commit of PR the label deploy-preview exists
Expand Down Expand Up @@ -29,28 +29,28 @@ jobs:
new_branch_name: ${{ env.PREVIEW_BRANCH_NAME }}
access_token: ${{ secrets.ADD_TO_HTO_PROJECT_PAT }}
- name: Create GitHub deployment
uses: bobheadxi/deployments@8a87bc300d207ce86142a8080e9b8fabec463494
uses: bobheadxi/deployments@648679e8e4915b27893bd7dbc35cb504dc915bc8
id: deployment
with:
step: start
env: ${{ env.PREVIEW_BRANCH_NAME }}
token: ${{ secrets.GITHUB_TOKEN }}
ref: ${{ env.BRANCH_NAME }}
- name: Trigger Netlify branch build
run: |
run: |
curl --location --request POST '${{ secrets.NETLIFY_CUSTOM_BUILD_HOOK }}?trigger_branch=${{ env.PREVIEW_BRANCH_NAME }}&clear_cache=true' \
--header 'Content-Type: application/x-www-form-urlencoded' \
--data-urlencode 'FORM_JS_BRANCH=${{ env.BRANCH_NAME }}'
- name: Update branch deployment status
# `always()` ensures that the deployment status
# is updated regardless of previous steps failing.
if: always()
uses: bobheadxi/deployments@8a87bc300d207ce86142a8080e9b8fabec463494
uses: bobheadxi/deployments@648679e8e4915b27893bd7dbc35cb504dc915bc8
with:
step: finish
token: ${{ secrets.GITHUB_TOKEN }}
status: ${{ job.status }}
env: ${{ env.PREVIEW_BRANCH_NAME }}
deployment_id: ${{ steps.deployment.outputs.deployment_id }}
env_url: https://${{ env.PREVIEW_BRANCH_NAME }}--camunda-form-playground.netlify.app
ref: ${{ env.BRANCH_NAME }}
ref: ${{ env.BRANCH_NAME }}
33 changes: 33 additions & 0 deletions .github/workflows/MERGE_DEVELOP_TO_V2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Merge develop to v2
on:
push:
branches:
- 'develop'

jobs:
Merge_main_to_develop:
runs-on: ubuntu-latest
permissions:
contents: write

steps:
- name: Checkout v2 branch
uses: actions/checkout@v4
with:
ref: v2
fetch-depth: 0
- name: Merge develop to v2 and push
run: |
git config user.name '${{ secrets.BPMN_IO_USERNAME }}'
git config user.email '${{ secrets.BPMN_IO_EMAIL }}'
git merge -m 'Merge develop to v2' --no-edit origin/develop
git push
- name: Notify failure on Slack
if: failure()
uses: slackapi/slack-github-action@v1.15.0
with:
channel-id: ${{ secrets.SLACK_CHANNEL_ID }}
slack-message: 'Automatic merge of <https://github.com/${{ github.repository }}/tree/${{ github.ref }}|${{ github.ref }}> to <https://github.com/${{ github.repository }}/tree/v2|${{ github.repository }}#v2> failed.'
env:
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
40 changes: 20 additions & 20 deletions .github/workflows/MERGE_MASTER_TO_DEVELOP.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Merge main to develop
on:
push:
branches:
- "main"
- 'main'

jobs:
Merge_main_to_develop:
Expand All @@ -11,23 +11,23 @@ jobs:
contents: write

steps:
- name: Checkout develop
uses: actions/checkout@v4
with:
ref: develop
fetch-depth: 0
- name: Merge main to develop and push
run: |
git config user.name '${{ secrets.BPMN_IO_USERNAME }}'
git config user.email '${{ secrets.BPMN_IO_EMAIL }}'
git merge -m 'Merge main to develop' --no-edit origin/main
git push
- name: Checkout develop
uses: actions/checkout@v4
with:
ref: develop
fetch-depth: 0
- name: Merge main to develop and push
run: |
git config user.name '${{ secrets.BPMN_IO_USERNAME }}'
git config user.email '${{ secrets.BPMN_IO_EMAIL }}'
git merge -m 'Merge main to develop' --no-edit origin/main
git push
- name: Notify failure on Slack
if: failure()
uses: slackapi/slack-github-action@v1.15.0
with:
channel-id: ${{ secrets.SLACK_CHANNEL_ID }}
slack-message: "Automatic merge of <https://github.com/${{ github.repository }}/tree/${{ github.ref }}|${{ github.ref }}> to <https://github.com/${{ github.repository }}/tree/develop|${{ github.repository }}#develop> failed."
env:
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
- name: Notify failure on Slack
if: failure()
uses: slackapi/slack-github-action@v1.15.0
with:
channel-id: ${{ secrets.SLACK_CHANNEL_ID }}
slack-message: 'Automatic merge of <https://github.com/${{ github.repository }}/tree/${{ github.ref }}|${{ github.ref }}> to <https://github.com/${{ github.repository }}/tree/develop|${{ github.repository }}#develop> failed.'
env:
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
Loading

0 comments on commit 4edb21f

Please sign in to comment.