Skip to content

Commit b65aaff

Browse files
Merge branch 'develop' into calendar
2 parents ed52942 + d277a27 commit b65aaff

File tree

7 files changed

+43
-43
lines changed

7 files changed

+43
-43
lines changed

.github/workflows/automated-tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: "Checkout code"
2121
uses: actions/checkout@v5
2222
- name: "Use Node.js"
23-
uses: actions/setup-node@v4
23+
uses: actions/setup-node@v5
2424
with:
2525
node-version: lts/*
2626
cache: "npm"
@@ -47,7 +47,7 @@ jobs:
4747
- name: "Checkout code"
4848
uses: actions/checkout@v5
4949
- name: "Use Node.js ${{ matrix.node-version }}"
50-
uses: actions/setup-node@v4
50+
uses: actions/setup-node@v5
5151
with:
5252
node-version: ${{ matrix.node-version }}
5353
check-latest: true

.github/workflows/electron-rebuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Checkout code
1414
uses: actions/checkout@v5
1515
- name: "Use Node.js ${{ matrix.node-version }}"
16-
uses: actions/setup-node@v4
16+
uses: actions/setup-node@v5
1717
with:
1818
node-version: ${{ matrix.node-version }}
1919
check-latest: true

.github/workflows/spellcheck.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
with:
2020
ref: develop
2121
- name: Set up Node.js
22-
uses: actions/setup-node@v4
22+
uses: actions/setup-node@v5
2323
with:
2424
node-version: lts/*
2525
check-latest: true

.github/workflows/stale.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
stale:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/stale@v9
15+
- uses: actions/stale@v10
1616
with:
1717
stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
1818
days-before-issue-stale: 60

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Thanks to: @dathbe.
4141
### Updated
4242

4343
- [calendar] Update defaultSymbol name and also the link to the icon search site (#3879)
44-
- [core] Update dependencies including electron to v38 as well as github actions (#3831, #3849, #3857, #3858, #3872, #3876)
44+
- [core] Update dependencies including electron to v38 as well as github actions (#3831, #3849, #3857, #3858, #3872, #3876, #3882)
4545
- [weather] Update feels_like temperature calculation formula (#3869)
4646

4747
### Fixed

package-lock.json

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

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"console-stamp": "^3.1.2",
7878
"croner": "^9.1.0",
7979
"envsub": "^4.1.0",
80-
"eslint": "^9.34.0",
80+
"eslint": "^9.35.0",
8181
"express": "^5.1.0",
8282
"express-ipfilter": "^1.3.2",
8383
"feedme": "^2.0.2",
@@ -89,7 +89,7 @@
8989
"moment-timezone": "^0.6.0",
9090
"node-ical": "^0.20.1",
9191
"nunjucks": "^3.2.4",
92-
"pm2": "^6.0.9",
92+
"pm2": "^6.0.10",
9393
"socket.io": "^4.8.1",
9494
"suncalc": "^1.9.0",
9595
"systeminformation": "^5.27.8",
@@ -101,8 +101,8 @@
101101
"cspell": "^9.2.1",
102102
"eslint-plugin-import-x": "^4.16.1",
103103
"eslint-plugin-jest": "^29.0.1",
104-
"eslint-plugin-jsdoc": "^54.3.1",
105-
"eslint-plugin-package-json": "^0.56.1",
104+
"eslint-plugin-jsdoc": "^54.5.0",
105+
"eslint-plugin-package-json": "^0.56.2",
106106
"express-basic-auth": "^1.2.1",
107107
"husky": "^9.1.7",
108108
"jest": "^30.1.3",
@@ -111,7 +111,7 @@
111111
"markdownlint-cli2": "^0.18.1",
112112
"playwright": "^1.55.0",
113113
"prettier": "^3.6.2",
114-
"stylelint": "^16.23.1",
114+
"stylelint": "^16.24.0",
115115
"stylelint-config-standard": "^39.0.0",
116116
"stylelint-prettier": "^5.0.3"
117117
},

0 commit comments

Comments
 (0)