Skip to content

Commit

Permalink
Merge pull request #1117 from Accenture/develop
Browse files Browse the repository at this point in the history
Release 6.0.0
  • Loading branch information
JoernBerkefeld authored Oct 9, 2023
2 parents 688d820 + 0667788 commit c25af29
Show file tree
Hide file tree
Showing 125 changed files with 2,499 additions and 12,059 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"plugin:prettier/recommended",
"plugin:unicorn/recommended"
],
"plugins": [],
"plugins": ["prettier"],
"globals": {
"Atomics": "readonly",
"SharedArrayBuffer": "readonly"
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ body:
label: Version
description: What version of our software are you running? (mcdev --version)
options:
- 6.0.0
- 5.3.0
- 5.2.0
- 5.1.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage-develop-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

- name: Prepare for Report Coverage (mini)
run: |
npx nyc report --reporter json-summary --exclude-after-remap false
npx c8 report --reporter json-summary --exclude-after-remap false
- name: Upload coverage artifact
uses: actions/upload-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage-main-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

- name: Prepare for Report Coverage (mini)
run: |
npx nyc report --reporter json-summary --exclude-after-remap false
npx c8 report --reporter json-summary --exclude-after-remap false
- name: Upload coverage artifact
uses: actions/upload-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

- name: Prepare for Report Coverage
run: |
npx nyc report --reporter json-summary --exclude-after-remap false
npx c8 report --reporter json-summary --exclude-after-remap false
npm i svelte-to-html@1.0.9
git fetch origin ${{ github.event.pull_request.base.ref }} --depth=1000
Expand Down
7 changes: 7 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,20 @@
"tabWidth": 4,
"printWidth": 100,
"singleQuote": true,
"trailingComma": "es5",
"overrides": [
{
"files": "*.json",
"options": {
"parser": "json"
}
},
{
"files": "package.json",
"options": {
"printWidth": 40
}
},
{
"files": "*.ssjs",
"options": {
Expand Down
Loading

0 comments on commit c25af29

Please sign in to comment.