Skip to content

Commit f63524a

Browse files
authored
Merge pull request #16 from vitabletech/develop
merge changes Develop to release branch to release the package
2 parents ce5242d + a825050 commit f63524a

File tree

11 files changed

+335
-275
lines changed

11 files changed

+335
-275
lines changed

.eslintrc.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"eslint:recommended",
44
"plugin:prettier/recommended",
55
"plugin:jest/recommended",
6-
"airbnb"
6+
"airbnb-base"
77
],
88
"plugins": ["prettier", "jest"],
99
"parserOptions": {
@@ -14,6 +14,11 @@
1414
"sourceType": "module"
1515
},
1616
"rules": {
17+
"linebreak-style": 0,
18+
"quotes": [2, "single", { "avoidEscape": true }],
19+
"no-console": "warn",
20+
"no-multi-spaces": "error",
21+
"multiline-comment-style": ["error", "starred-block"],
1722
"prettier/prettier": [
1823
"error",
1924
{
@@ -25,8 +30,6 @@
2530
"no-trailing-spaces": "error",
2631
"comma-spacing": ["error", { "before": false, "after": true }],
2732
"space-in-parens": ["error", "never"],
28-
"max-len": ["error", { "code": 155, "tabWidth": 2, "ignoreUrls": true }],
29-
// added linebreak-style rule
30-
// "linebreak-style": ["error", "windows"]
33+
"max-len": ["error", { "code": 155, "tabWidth": 2, "ignoreUrls": true }]
3134
}
3235
}

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ jobs:
2222
uses: peaceiris/actions-gh-pages@v3
2323
with:
2424
github_token: ${{ secrets.GITHUB_TOKEN }}
25-
publish_dir: ./docs
25+
publish_dir: ./docs

.github/workflows/sonarqube.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
1-
name: Check Sonarqube Scan
1+
name: Check Sonarqube Scan during PR develop and main branch
22
on:
33
push:
44
branches:
55
- main
6+
- develop
67
pull_request:
78
types: [opened, synchronize, reopened]
9+
branches:
10+
- main
11+
- develop
812
jobs:
913
sonarcloud:
1014
name: SonarCloud
1115
runs-on: ubuntu-latest
1216
steps:
1317
- uses: actions/checkout@v3
1418
with:
15-
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
19+
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
1620
- name: SonarCloud Scan
1721
uses: SonarSource/sonarcloud-github-action@master
1822
env:
19-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
20-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
23+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
24+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.prettierignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
node_modules/
22
docs/
33
coverage/
4-
.vscode
4+
.vscode
5+
dist/

0 commit comments

Comments
 (0)