Merge branch 'master' into 5117-dns64

.gitignore

@@ -12,7 +12,6 @@
 /agh-backup/
 /bin/
 /build/*
-/build2/*
 /data/
 /dist/
 /filtering/tests/filtering.TestLotsOfRules*.pprof
@@ -26,4 +25,3 @@ leases.db
 node_modules/
 
 !/build/gitkeep
-!/build2/gitkeep

CHANGELOG.md

@@ -29,6 +29,15 @@ NOTE: Add new changes BELOW THIS COMMENT.
   field under `dns` object in the configuration along with `dns64_prefixes`, the
   set of exclusion prefixes to filter AAAA responses.
 
+### Removed
+
+- The “beta frontend” and the corresponding APIs.  They never quite worked
+  properly, and the future new version of AdGuard Home API will probably be
+  different.
+
+  Correspondingly, the configuration parameter `beta_bind_port` has been removed
+  as well.
+
 [#5117]: https://github.com/AdguardTeam/AdGuardHome/issues/5117
 
 

Makefile

@@ -5,7 +5,6 @@
 .POSIX:
 
 CHANNEL = development
-CLIENT_BETA_DIR = client2
 CLIENT_DIR = client
 COMMIT = $$( git rev-parse --short HEAD )
 DIST_DIR = dist
@@ -29,10 +28,6 @@ SIGN = 1
 VERBOSE = 0
 VERSION = v0.0.0
 YARN = yarn
-YARN_FLAGS = --cwd $(CLIENT_BETA_DIR)
-YARN_INSTALL_FLAGS = $(YARN_FLAGS) --network-timeout 120000 --silent\
-	--ignore-engines --ignore-optional --ignore-platform\
-	--ignore-scripts
 
 NEXTAPI = 0
 
@@ -93,17 +88,13 @@ init:  ; git config core.hooksPath ./scripts/hooks
 
 js-build:
 	$(NPM) $(NPM_FLAGS) run build-prod
-	$(YARN) $(YARN_FLAGS) build
 js-deps:
 	$(NPM) $(NPM_INSTALL_FLAGS) ci
-	$(YARN) $(YARN_INSTALL_FLAGS) install
 
 # TODO(a.garipov): Remove the legacy client tasks support once the new
 # client is done and the old one is removed.
 js-lint: ; $(NPM) $(NPM_FLAGS) run lint
 js-test: ; $(NPM) $(NPM_FLAGS) run test
-js-beta-lint: ; $(YARN) $(YARN_FLAGS) lint
-js-beta-test: ; # TODO(v.abdulmyanov): Add tests for the new client.
 
 go-build: ; $(ENV) "$(SHELL)" ./scripts/make/go-build.sh
 go-deps:  ; $(ENV) "$(SHELL)" ./scripts/make/go-deps.sh