mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2025-12-20 01:11:03 +08:00
Pull request 2499: AGDNS-3319-node-24
Squashed commit of the following: commit 7550e7551bc37d65537738dfcd594b015acaa347 Author: Igor Lobanov <i.lobanov@adguard.com> Date: Fri Oct 24 13:31:46 2025 +0200 changelog fix commit 9ff633660f746b2f1053e5ffcb7a24c65b714fbb Merge:b84b07a68bd6497267Author: Igor Lobanov <i.lobanov@adguard.com> Date: Fri Oct 24 13:30:47 2025 +0200 Merge remote-tracking branch 'origin/master' into AGDNS-3319-node-24 commitb84b07a684Author: Igor Lobanov <i.lobanov@adguard.com> Date: Tue Oct 14 14:23:56 2025 +0200 changelog format commit6251bf0140Author: Igor Lobanov <i.lobanov@adguard.com> Date: Tue Oct 14 14:20:36 2025 +0200 changelog, readme commit3284ba1b53Author: Igor Lobanov <i.lobanov@adguard.com> Date: Tue Oct 14 14:10:10 2025 +0200 changelog format commit36c5349b16Author: Igor Lobanov <i.lobanov@adguard.com> Date: Tue Oct 14 14:09:09 2025 +0200 changelog commitd86fdd9f65Author: Igor Lobanov <i.lobanov@adguard.com> Date: Tue Oct 14 13:54:10 2025 +0200 build fix commitaee4bdf87cAuthor: Igor Lobanov <i.lobanov@adguard.com> Date: Tue Oct 14 13:15:44 2025 +0200 home-js-builder:4.0 commitc6f3b1067cAuthor: Igor Lobanov <i.lobanov@adguard.com> Date: Tue Oct 14 11:56:11 2025 +0200 package updates commit0ed7c6bf39Author: Igor Lobanov <i.lobanov@adguard.com> Date: Tue Oct 14 11:38:38 2025 +0200 package updates commitcefb3fba50Author: Igor Lobanov <i.lobanov@adguard.com> Date: Tue Oct 14 11:13:24 2025 +0200 package updates
This commit is contained in:
@@ -30,6 +30,7 @@ NOTE: Add new changes BELOW THIS COMMENT.
|
||||
### Changed
|
||||
|
||||
- `POST /control/rewrite/add` and `PUT /control/rewrite/update` now accept the optional field "enabled". See `openapi/openapi.yaml` for details.
|
||||
- Node.js 24 is now used to build the frontend.
|
||||
|
||||
#### Configuration changes
|
||||
|
||||
@@ -58,6 +59,10 @@ In this release, the schema version has changed from 30 to 31.
|
||||
|
||||
To roll back this change, set `schema_version` back to `30`.
|
||||
|
||||
### Deprecated
|
||||
|
||||
- Node.js 20 and 22 support.
|
||||
|
||||
### Removed
|
||||
|
||||
- The outdated querylog anonymization script.
|
||||
|
||||
@@ -206,7 +206,7 @@ Run `make init` to prepare the development environment.
|
||||
You will need this to build AdGuard Home:
|
||||
|
||||
- [Go](https://golang.org/dl/) v1.25 or later;
|
||||
- [Node.js](https://nodejs.org/en/download/) v20.19 or later;
|
||||
- [Node.js](https://nodejs.org/en/download/) v24.10.0 or later;
|
||||
- [npm](https://www.npmjs.com/) v10.8 or later;
|
||||
|
||||
### <a href="#building" id="building" name="building">Building</a>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
# Make sure to sync any changes with the branch overrides below.
|
||||
'variables':
|
||||
'channel': 'edge'
|
||||
'dockerFrontend': 'adguard/home-js-builder:3.1'
|
||||
'dockerFrontend': 'adguard/home-js-builder:4.0'
|
||||
'dockerGo': 'adguard/go-builder:1.25.3--1'
|
||||
|
||||
'stages':
|
||||
@@ -278,7 +278,7 @@
|
||||
# need to build a few of these.
|
||||
'variables':
|
||||
'channel': 'beta'
|
||||
'dockerFrontend': 'adguard/home-js-builder:3.1'
|
||||
'dockerFrontend': 'adguard/home-js-builder:4.0'
|
||||
'dockerGo': 'adguard/go-builder:1.25.3--1'
|
||||
# release-vX.Y.Z branches are the branches from which the actual final
|
||||
# release is built.
|
||||
@@ -294,5 +294,5 @@
|
||||
# are the ones that actually get released.
|
||||
'variables':
|
||||
'channel': 'release'
|
||||
'dockerFrontend': 'adguard/home-js-builder:3.1'
|
||||
'dockerFrontend': 'adguard/home-js-builder:4.0'
|
||||
'dockerGo': 'adguard/go-builder:1.25.3--1'
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
'key': 'AHBRTSPECS'
|
||||
'name': 'AdGuard Home - Build and run tests'
|
||||
'variables':
|
||||
'dockerFrontend': 'adguard/home-js-builder:3.1'
|
||||
'dockerFrontend': 'adguard/home-js-builder:4.0'
|
||||
'dockerGo': 'adguard/go-builder:1.25.3--1'
|
||||
'channel': 'development'
|
||||
|
||||
@@ -250,6 +250,6 @@
|
||||
# Set the default release channel on the release branch to beta, as we
|
||||
# may need to build a few of these.
|
||||
'variables':
|
||||
'dockerFrontend': 'adguard/home-js-builder:3.1'
|
||||
'dockerFrontend': 'adguard/home-js-builder:4.0'
|
||||
'dockerGo': 'adguard/go-builder:1.25.3--1'
|
||||
'channel': 'candidate'
|
||||
|
||||
5680
client/package-lock.json
generated
vendored
5680
client/package-lock.json
generated
vendored
File diff suppressed because it is too large
Load Diff
8
client/package.json
vendored
8
client/package.json
vendored
@@ -21,7 +21,7 @@
|
||||
"type": "module",
|
||||
"dependencies": {
|
||||
"@nivo/line": "^0.64.0",
|
||||
"axios": "^0.19.2",
|
||||
"axios": "^0.21.1",
|
||||
"classnames": "^2.5.1",
|
||||
"clsx": "^2.1.1",
|
||||
"countries-and-timezones": "^3.6.0",
|
||||
@@ -53,7 +53,8 @@
|
||||
"redux-actions": "^2.6.5",
|
||||
"redux-thunk": "^2.3.0",
|
||||
"ts-migrate": "^0.1.35",
|
||||
"url-polyfill": "^1.1.12"
|
||||
"url-polyfill": "^1.1.12",
|
||||
"yaml": "2.8.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.24.5",
|
||||
@@ -64,7 +65,7 @@
|
||||
"@babel/plugin-transform-runtime": "^7.24.3",
|
||||
"@babel/preset-env": "^7.24.5",
|
||||
"@babel/preset-react": "^7.24.1",
|
||||
"@playwright/test": "1.50.1",
|
||||
"@playwright/test": "1.56.0",
|
||||
"@types/lodash": "^4.17.4",
|
||||
"@types/node": "^22.13.10",
|
||||
"@types/react": "^17.0.80",
|
||||
@@ -90,6 +91,7 @@
|
||||
"file-loader": "^6.2.0",
|
||||
"html-webpack-plugin": "^5.6.0",
|
||||
"jscodeshift": "^0.15.2",
|
||||
"jsdom": "^27.0.0",
|
||||
"mini-css-extract-plugin": "^2.9.0",
|
||||
"path": "^0.12.7",
|
||||
"postcss-loader": "^8.1.1",
|
||||
|
||||
Reference in New Issue
Block a user