diff --git a/app/package.json b/app/package.json index 2c495b48..33e579cf 100644 --- a/app/package.json +++ b/app/package.json @@ -1,7 +1,7 @@ { "name": "nginx-ui-app-next", "type": "module", - "version": "2.3.10", + "version": "2.3.11", "packageManager": "pnpm@11.1.1", "scripts": { "dev": "vite --host", diff --git a/app/src/version.json b/app/src/version.json index 40696a5e..d8bca53d 100644 --- a/app/src/version.json +++ b/app/src/version.json @@ -1 +1 @@ -{"version":"2.3.10","build_id":1,"total_build":521} \ No newline at end of file +{"version":"2.3.11","build_id":1,"total_build":522} \ No newline at end of file diff --git a/internal/cert/config/config.tar.xz b/internal/cert/config/config.tar.xz index c40b5b52..e29ade07 100644 Binary files a/internal/cert/config/config.tar.xz and b/internal/cert/config/config.tar.xz differ diff --git a/internal/license/licenses.xz b/internal/license/licenses.xz index 26dbc039..7f414cf9 100644 Binary files a/internal/license/licenses.xz and b/internal/license/licenses.xz differ diff --git a/internal/nginx/nginx_directives.json b/internal/nginx/nginx_directives.json index 8439bbac..f4ff9b94 100644 --- a/internal/nginx/nginx_directives.json +++ b/internal/nginx/nginx_directives.json @@ -422,6 +422,11 @@ "https://nginx.org/en/docs/ngx_core_module.html#error_log" ] }, + "error_log_tag": { + "links": [ + "https://nginx.org/en/docs/http/ngx_http_core_module.html#error_log_tag" + ] + }, "error_page": { "links": [ "https://nginx.org/en/docs/http/ngx_http_core_module.html#error_page" @@ -1235,6 +1240,7 @@ }, "js_access": { "links": [ + "https://nginx.org/en/docs/http/ngx_http_js_module.html#js_access", "https://nginx.org/en/docs/stream/ngx_stream_js_module.html#js_access" ] }, diff --git a/version.sh b/version.sh index c644ce45..b30cf4ed 100755 --- a/version.sh +++ b/version.sh @@ -3,32 +3,46 @@ # Version validation regex pattern VALID_VERSION_REGEX='^v?[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9\.]+)?$' -# Prompt for version input -while true; do - read -p "Enter version number: " VERSION - - # Remove 'v' prefix for validation - if [[ "${VERSION#v}" =~ $VALID_VERSION_REGEX ]]; then - # Show confirmation prompt with original input - echo "You entered version: ${VERSION}" - read -p "Is this correct? [Y/n] " confirm - case "$confirm" in - [Yy]|[Yy][Ee][Ss]|"") - break - ;; - [Nn]|[Nn][Oo]) - echo "Restarting version input..." - continue - ;; - *) - echo "Invalid input, please answer Y/n" - continue - ;; - esac - else - echo "Error: Invalid version format. Please use semantic versioning (e.g. 2.0.0, v2.0.1-beta.1)" +# Resolve version: non-interactive `bump ` mode or interactive prompt +if [[ "$1" == "bump" ]]; then + VERSION="$2" + if [[ -z "$VERSION" ]]; then + echo "Error: missing version argument. Usage: ./version.sh bump " + exit 1 fi -done + if [[ ! "${VERSION#v}" =~ $VALID_VERSION_REGEX ]]; then + echo "Error: Invalid version format. Please use semantic versioning (e.g. 2.0.0, v2.0.1-beta.1)" + exit 1 + fi + echo "Bumping to version: ${VERSION}" +else + # Prompt for version input + while true; do + read -p "Enter version number: " VERSION + + # Remove 'v' prefix for validation + if [[ "${VERSION#v}" =~ $VALID_VERSION_REGEX ]]; then + # Show confirmation prompt with original input + echo "You entered version: ${VERSION}" + read -p "Is this correct? [Y/n] " confirm + case "$confirm" in + [Yy]|[Yy][Ee][Ss]|"") + break + ;; + [Nn]|[Nn][Oo]) + echo "Restarting version input..." + continue + ;; + *) + echo "Invalid input, please answer Y/n" + continue + ;; + esac + else + echo "Error: Invalid version format. Please use semantic versioning (e.g. 2.0.0, v2.0.1-beta.1)" + fi + done +fi # Cross-platform compatible sed command if [[ "$OSTYPE" == "darwin"* ]]; then