all: sync with master; upd chlog

scripts/hooks/pre-commit

@@ -77,11 +77,6 @@ then
 	make VERBOSE="$verbose" js-lint js-test
 fi
 
-if [ "$( git diff --cached --name-only -- 'client2/*.js' 'client2/*.ts' 'client2/*.tsx' )" ]
-then
-	make VERBOSE="$verbose" js-beta-lint js-beta-test
-fi
-
 if [ "$( git diff --cached --name-only -- '*.go' '*.mod' '*.sh' 'Makefile' )" ]
 then
 	make VERBOSE="$verbose" go-os-check go-lint go-test

scripts/make/build-release.sh

@@ -320,7 +320,7 @@ done
 log "packing frontend"
 
 build_archive="./${dist}/AdGuardHome_frontend.tar.gz"
-tar -c -f - ./build ./build2 | gzip -9 - > "$build_archive"
+tar -c -f - ./build | gzip -9 - > "$build_archive"
 log "$build_archive"
 
 log "calculating checksums"

scripts/make/clean.sh

@@ -23,9 +23,7 @@ $sudo_cmd rm -f\
 $sudo_cmd rm -f -r\
 	./bin/\
 	./build/static/\
-	./build2/static/\
 	./client/node_modules/\
-	./client2/node_modules/\
 	./data/\
 	"./${dist_dir}/"\
 	;

scripts/make/go-lint.sh

@@ -226,8 +226,8 @@ gocyclo --over 13 ./internal/dhcpd ./internal/filtering/ ./internal/home/
 
 # Apply stricter standards to new or somewhat refactored code.
 gocyclo --over 10 ./internal/aghio/ ./internal/aghnet/ ./internal/aghos/\
-	./internal/aghtest/ ./internal/dnsforward/ ./internal/stats/\
-	./internal/tools/ ./internal/updater/ ./internal/version/\
+	./internal/aghtest/ ./internal/dnsforward/ ./internal/filtering/rewrite/\
+	./internal/stats/ ./internal/tools/ ./internal/updater/ ./internal/version/\
 	./scripts/vetted-filters/ ./main.go
 
 ineffassign ./...