Skip to content
This repository was archived by the owner on Mar 30, 2024. It is now read-only.

Commit 57b2220

Browse files
matthscmatthsc
committed
update prettier
1 parent 1710ad9 commit 57b2220

File tree

9 files changed

+93
-98
lines changed

9 files changed

+93
-98
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
---
22
name: Bug report
33
about: Something is not working as it should
4-
title: ''
5-
labels: ''
6-
assignees: ''
4+
title: ""
5+
labels: ""
6+
assignees: ""
77
---
88

99
**Describe the bug**
1010
A clear and concise description of what the bug is.
1111

1212
**To Reproduce**
1313
Steps to reproduce the behavior:
14+
1415
1. Go to '...'
1516
2. Click on '...'
1617
3. Scroll down to '....'
@@ -22,11 +23,12 @@ A clear and concise description of what you expected to happen.
2223
**Screenshots & Logfiles**
2324
If applicable, add screenshots and logfiles to help explain your problem.
2425

25-
**Versions:**
26-
- Adapter version: <adapter-version>
27-
- JS-Controller version: <js-controller-version> <!-- determine this with `iobroker -v` on the console -->
28-
- Node version: <node-version> <!-- determine this with `node -v` on the console -->
29-
- Operating system: <os-name>
26+
**Versions:**
27+
28+
- Adapter version: <adapter-version>
29+
- JS-Controller version: <js-controller-version> <!-- determine this with `iobroker -v` on the console -->
30+
- Node version: <node-version> <!-- determine this with `node -v` on the console -->
31+
- Operating system: <os-name>
3032

3133
**Additional context**
3234
Add any other context about the problem here.

‎.github/auto-merge.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
# Configure here which dependency updates should be merged automatically.
22
# The recommended configuration is the following:
33
- match:
4-
# Only merge patches for production dependencies
5-
dependency_type: production
6-
update_type: "semver:patch"
4+
# Only merge patches for production dependencies
5+
dependency_type: production
6+
update_type: "semver:patch"
77
- match:
8-
# Except for security fixes, here we allow minor patches
9-
dependency_type: production
10-
update_type: "security:minor"
8+
# Except for security fixes, here we allow minor patches
9+
dependency_type: production
10+
update_type: "security:minor"
1111
- match:
12-
# and development dependencies can have a minor update, too
13-
dependency_type: development
14-
update_type: "semver:minor"
15-
12+
# and development dependencies can have a minor update, too
13+
dependency_type: development
14+
update_type: "semver:minor"
1615
# The syntax is based on the legacy dependabot v1 automerged_updates syntax, see:
1716
# https://dependabot.com/docs/config-file/#automerged_updates

‎.github/workflows/codeql.yml

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
name: "CodeQL"
22

33
on:
4-
push:
5-
branches: [ "main" ]
6-
pull_request:
7-
branches: [ "main" ]
8-
schedule:
9-
- cron: "5 5 * * 2"
4+
push:
5+
branches: ["main"]
6+
pull_request:
7+
branches: ["main"]
8+
schedule:
9+
- cron: "5 5 * * 2"
1010

1111
jobs:
12-
analyze:
13-
name: Analyze
14-
runs-on: ubuntu-latest
15-
permissions:
16-
actions: read
17-
contents: read
18-
security-events: write
12+
analyze:
13+
name: Analyze
14+
runs-on: ubuntu-latest
15+
permissions:
16+
actions: read
17+
contents: read
18+
security-events: write
1919

20-
strategy:
21-
fail-fast: false
22-
matrix:
23-
language: [ javascript ]
20+
strategy:
21+
fail-fast: false
22+
matrix:
23+
language: [javascript]
2424

25-
steps:
26-
- name: Checkout
27-
uses: actions/checkout@v4
25+
steps:
26+
- name: Checkout
27+
uses: actions/checkout@v4
2828

29-
- name: Initialize CodeQL
30-
uses: github/codeql-action/init@v3
31-
with:
32-
languages: ${{ matrix.language }}
33-
queries: +security-and-quality
29+
- name: Initialize CodeQL
30+
uses: github/codeql-action/init@v3
31+
with:
32+
languages: ${{ matrix.language }}
33+
queries: +security-and-quality
3434

35-
- name: Autobuild
36-
uses: github/codeql-action/autobuild@v3
35+
- name: Autobuild
36+
uses: github/codeql-action/autobuild@v3
3737

38-
- name: Perform CodeQL Analysis
39-
uses: github/codeql-action/analyze@v3
40-
with:
41-
category: "/language:${{ matrix.language }}"
38+
- name: Perform CodeQL Analysis
39+
uses: github/codeql-action/analyze@v3
40+
with:
41+
category: "/language:${{ matrix.language }}"

‎.github/workflows/dependabot-auto-merge.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@
44
name: Auto-Merge Dependabot PRs
55

66
on:
7-
# WARNING: This needs to be run in the PR base, DO NOT build untrusted code in this action
8-
# details under https://github.blog/changelog/2021-02-19-github-actions-workflows-triggered-by-dependabot-prs-will-run-with-read-only-permissions/
9-
pull_request_target:
7+
# WARNING: This needs to be run in the PR base, DO NOT build untrusted code in this action
8+
# details under https://github.blog/changelog/2021-02-19-github-actions-workflows-triggered-by-dependabot-prs-will-run-with-read-only-permissions/
9+
pull_request_target:
1010

1111
jobs:
12-
auto-merge:
13-
if: github.actor == 'dependabot[bot]'
14-
runs-on: ubuntu-latest
15-
steps:
16-
- name: Checkout code
17-
uses: actions/checkout@v4
12+
auto-merge:
13+
if: github.actor == 'dependabot[bot]'
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Checkout code
17+
uses: actions/checkout@v4
1818

19-
- name: Check if PR should be auto-merged
20-
uses: ahmadnassri/action-dependabot-auto-merge@v2
21-
with:
22-
# In order to use this, you need to go to https://github.com/settings/tokens and
23-
# create a Personal Access Token with the permission "public_repo".
24-
# Enter this token in your repository settings under "Secrets" and name it AUTO_MERGE_TOKEN
25-
github-token: ${{ secrets.AUTO_MERGE_TOKEN }}
26-
# By default, squash and merge, so Github chooses nice commit messages
27-
command: squash and merge
19+
- name: Check if PR should be auto-merged
20+
uses: ahmadnassri/action-dependabot-auto-merge@v2
21+
with:
22+
# In order to use this, you need to go to https://github.com/settings/tokens and
23+
# create a Personal Access Token with the permission "public_repo".
24+
# Enter this token in your repository settings under "Secrets" and name it AUTO_MERGE_TOKEN
25+
github-token: ${{ secrets.AUTO_MERGE_TOKEN }}
26+
# By default, squash and merge, so Github chooses nice commit messages
27+
command: squash and merge

‎admin/index_m.html

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,18 @@
11
<html>
2-
3-
<head>
4-
5-
<!-- Load ioBroker scripts and styles-->
6-
<link rel="stylesheet" type="text/css" href="../../css/adapter.css" />
7-
<script type="text/javascript" src="../../socket.io/socket.io.js"></script>
8-
9-
<!-- Load our own files -->
10-
<link rel="stylesheet" type="text/css" href="style.css" />
11-
12-
</head>
13-
14-
<body>
15-
16-
<!-- this is where the React components are loaded into -->
17-
<div class="m adapter-container" id="root"></div>
18-
19-
<!-- load compiled React scripts -->
20-
<script type="text/javascript" src="build/index.js"></script>
21-
22-
</body>
23-
24-
</html>
2+
<head>
3+
<!-- Load ioBroker scripts and styles-->
4+
<link rel="stylesheet" type="text/css" href="../../css/adapter.css" />
5+
<script type="text/javascript" src="../../socket.io/socket.io.js"></script>
6+
7+
<!-- Load our own files -->
8+
<link rel="stylesheet" type="text/css" href="style.css" />
9+
</head>
10+
11+
<body>
12+
<!-- this is where the React components are loaded into -->
13+
<div class="m adapter-container" id="root"></div>
14+
15+
<!-- load compiled React scripts -->
16+
<script type="text/javascript" src="build/index.js"></script>
17+
</body>
18+
</html>

‎admin/style.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* You can delete those if you want. I just found them very helpful */
22
* {
3-
box-sizing: border-box
3+
box-sizing: border-box;
44
}
55
.m {
66
/* Don't cut off dropdowns! */

‎package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"eslint-plugin-react": "^7.33.2",
6161
"mocha": "^10.2.0",
6262
"nyc": "^15.1.0",
63-
"prettier": "^3.1.1",
63+
"prettier": "^3.2.5",
6464
"proxyquire": "^2.1.3",
6565
"react": "^17.0.2",
6666
"react-dom": "^17.0.2",
@@ -101,7 +101,7 @@
101101
"check-all": "npm run check && npm run lint && npm run test",
102102
"coverage": "nyc npm run test:ts",
103103
"lint": "eslint --ext .ts,.tsx src/ admin/src/",
104-
"prettier": "prettier --config .prettierrc.js \"{src,test}/**/*.ts\" --write",
104+
"prettier": "prettier --config .prettierrc.js --write .",
105105
"release": "release-script -p iobroker license"
106106
},
107107
"nyc": {

‎tsconfig.build.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"allowJs": false,
66
"checkJs": false,
77
"noEmit": false,
8-
"declaration": false,
8+
"declaration": false
99
},
1010
"include": ["src/**/*.ts"],
1111
"exclude": ["src/**/*.test.ts"]

0 commit comments

Comments
 (0)