diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index f3690edc..7173f9d5 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -11,7 +11,7 @@ "ghcr.io/devcontainers/features/common-utils:2": { "installOhMyZsh": true }, - "ghcr.io/devcontainers/features/node:1.6.1": {} + "ghcr.io/devcontainers/features/node:1.6.2": {} }, // Use 'forwardPorts' to make a list of ports inside the container available locally. diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dd517852..05958551 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -140,7 +140,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: ^1.24.1 + go-version: ^1.24.2 cache: false - name: Setup environment diff --git a/app/package.json b/app/package.json index 0abbea9b..b3178a68 100644 --- a/app/package.json +++ b/app/package.json @@ -2,7 +2,7 @@ "name": "nginx-ui-app-next", "type": "module", "version": "2.0.0-rc.5", - "packageManager": "pnpm@10.7.0+sha512.6b865ad4b62a1d9842b61d674a393903b871d9244954f652b8842c2b553c72176b278f64c463e52d40fff8aba385c235c8c9ecf5cc7de4fd78b8bb6d49633ab6", + "packageManager": "pnpm@10.7.1+sha512.2d92c86b7928dc8284f53494fb4201f983da65f0fb4f0d40baafa5cf628fa31dae3e5968f12466f17df7e97310e30f343a648baea1b9b350685dafafffdf5808", "scripts": { "dev": "vite --host", "typecheck": "vue-tsc --noEmit", diff --git a/docs/package.json b/docs/package.json index 5a4edebd..36dcb135 100644 --- a/docs/package.json +++ b/docs/package.json @@ -11,9 +11,9 @@ "vue": "^3.5.13" }, "devDependencies": { - "@types/node": "^22.13.15", + "@types/node": "^22.14.0", "less": "^4.2.2" }, "license": "AGPL-3.0", - "packageManager": "pnpm@10.7.0+sha512.6b865ad4b62a1d9842b61d674a393903b871d9244954f652b8842c2b553c72176b278f64c463e52d40fff8aba385c235c8c9ecf5cc7de4fd78b8bb6d49633ab6" + "packageManager": "pnpm@10.7.1+sha512.2d92c86b7928dc8284f53494fb4201f983da65f0fb4f0d40baafa5cf628fa31dae3e5968f12466f17df7e97310e30f343a648baea1b9b350685dafafffdf5808" } diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml index 7f7149cc..e22a373a 100644 --- a/docs/pnpm-lock.yaml +++ b/docs/pnpm-lock.yaml @@ -10,14 +10,14 @@ importers: dependencies: vitepress: specifier: ^1.6.3 - version: 1.6.3(@algolia/client-search@5.15.0)(@types/node@22.13.15)(less@4.2.2)(postcss@8.4.49)(search-insights@2.13.0) + version: 1.6.3(@algolia/client-search@5.15.0)(@types/node@22.14.0)(less@4.2.2)(postcss@8.4.49)(search-insights@2.13.0) vue: specifier: ^3.5.13 version: 3.5.13 devDependencies: '@types/node': - specifier: ^22.13.15 - version: 22.13.15 + specifier: ^22.14.0 + version: 22.14.0 less: specifier: ^4.2.2 version: 4.2.2 @@ -415,8 +415,8 @@ packages: '@types/mdurl@2.0.0': resolution: {integrity: sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==} - '@types/node@22.13.15': - resolution: {integrity: sha512-imAbQEEbVni6i6h6Bd5xkCRwLqFc8hihCsi2GbtDoAtUcAFQ6Zs4pFXTZUUbroTkXdImczWM9AI8eZUuybXE3w==} + '@types/node@22.14.0': + resolution: {integrity: sha512-Kmpl+z84ILoG+3T/zQFyAJsU6EPTmOCj8/2+83fSN6djd6I4o7uOuGIH6vq3PrjY5BGitSbFuMN18j3iknubbA==} '@types/unist@3.0.3': resolution: {integrity: sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==} @@ -764,8 +764,8 @@ packages: tslib@2.8.1: resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==} - undici-types@6.20.0: - resolution: {integrity: sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==} + undici-types@6.21.0: + resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==} unist-util-is@6.0.0: resolution: {integrity: sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==} @@ -1176,9 +1176,9 @@ snapshots: '@types/mdurl@2.0.0': {} - '@types/node@22.13.15': + '@types/node@22.14.0': dependencies: - undici-types: 6.20.0 + undici-types: 6.21.0 '@types/unist@3.0.3': {} @@ -1186,9 +1186,9 @@ snapshots: '@ungap/structured-clone@1.2.0': {} - '@vitejs/plugin-vue@5.2.1(vite@5.4.14(@types/node@22.13.15)(less@4.2.2))(vue@3.5.13)': + '@vitejs/plugin-vue@5.2.1(vite@5.4.14(@types/node@22.14.0)(less@4.2.2))(vue@3.5.13)': dependencies: - vite: 5.4.14(@types/node@22.13.15)(less@4.2.2) + vite: 5.4.14(@types/node@22.14.0)(less@4.2.2) vue: 3.5.13 '@vue/compiler-core@3.5.13': @@ -1594,7 +1594,7 @@ snapshots: tslib@2.8.1: {} - undici-types@6.20.0: {} + undici-types@6.21.0: {} unist-util-is@6.0.0: dependencies: @@ -1629,17 +1629,17 @@ snapshots: '@types/unist': 3.0.3 vfile-message: 4.0.2 - vite@5.4.14(@types/node@22.13.15)(less@4.2.2): + vite@5.4.14(@types/node@22.14.0)(less@4.2.2): dependencies: esbuild: 0.21.5 postcss: 8.4.49 rollup: 4.27.4 optionalDependencies: - '@types/node': 22.13.15 + '@types/node': 22.14.0 fsevents: 2.3.3 less: 4.2.2 - vitepress@1.6.3(@algolia/client-search@5.15.0)(@types/node@22.13.15)(less@4.2.2)(postcss@8.4.49)(search-insights@2.13.0): + vitepress@1.6.3(@algolia/client-search@5.15.0)(@types/node@22.14.0)(less@4.2.2)(postcss@8.4.49)(search-insights@2.13.0): dependencies: '@docsearch/css': 3.8.2 '@docsearch/js': 3.8.2(@algolia/client-search@5.15.0)(search-insights@2.13.0) @@ -1648,7 +1648,7 @@ snapshots: '@shikijs/transformers': 2.1.0 '@shikijs/types': 2.1.0 '@types/markdown-it': 14.1.2 - '@vitejs/plugin-vue': 5.2.1(vite@5.4.14(@types/node@22.13.15)(less@4.2.2))(vue@3.5.13) + '@vitejs/plugin-vue': 5.2.1(vite@5.4.14(@types/node@22.14.0)(less@4.2.2))(vue@3.5.13) '@vue/devtools-api': 7.7.0 '@vue/shared': 3.5.13 '@vueuse/core': 12.5.0 @@ -1657,7 +1657,7 @@ snapshots: mark.js: 8.11.1 minisearch: 7.1.1 shiki: 2.1.0 - vite: 5.4.14(@types/node@22.13.15)(less@4.2.2) + vite: 5.4.14(@types/node@22.14.0)(less@4.2.2) vue: 3.5.13 optionalDependencies: postcss: 8.4.49 diff --git a/go.mod b/go.mod index 919f0fd8..ebb4e58e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/0xJacky/Nginx-UI -go 1.24.1 +go 1.24.2 require ( github.com/0xJacky/pofile v0.2.1 @@ -11,6 +11,7 @@ require ( github.com/dgraph-io/ristretto/v2 v2.1.0 github.com/dustin/go-humanize v1.0.1 github.com/elliotchance/orderedmap/v3 v3.1.0 + github.com/fsnotify/fsnotify v1.8.0 github.com/gin-contrib/pprof v1.5.2 github.com/gin-contrib/static v1.1.3 github.com/gin-gonic/gin v1.10.0 @@ -18,7 +19,7 @@ require ( github.com/go-co-op/gocron/v2 v2.16.1 github.com/go-playground/validator/v10 v10.26.0 github.com/go-resty/resty/v2 v2.16.5 - github.com/go-webauthn/webauthn v0.12.2 + github.com/go-webauthn/webauthn v0.12.3 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/google/uuid v1.6.0 github.com/gorilla/websocket v1.5.3 @@ -26,6 +27,7 @@ require ( github.com/jpillora/overseer v1.1.6 github.com/lib/pq v1.10.9 github.com/minio/selfupdate v0.6.0 + github.com/nxadm/tail v1.4.11 github.com/pkg/errors v0.9.1 github.com/pquerna/otp v1.4.0 github.com/pretty66/websocketproxy v0.0.0-20220507015215-930b3a686308 @@ -37,7 +39,7 @@ require ( github.com/tufanbarisyildirim/gonginx v0.0.0-20250225174229-c03497ddaef6 github.com/uozi-tech/cosy v1.18.0 github.com/uozi-tech/cosy-driver-sqlite v0.2.1 - github.com/urfave/cli/v3 v3.1.0 + github.com/urfave/cli/v3 v3.1.1 golang.org/x/crypto v0.36.0 golang.org/x/net v0.38.0 gopkg.in/ini.v1 v1.67.0 @@ -109,7 +111,6 @@ require ( github.com/fatih/color v1.18.0 // indirect github.com/fatih/structs v1.1.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect - github.com/fsnotify/fsnotify v1.8.0 // indirect github.com/fxamacker/cbor/v2 v2.8.0 // indirect github.com/gabriel-vasile/mimetype v1.4.8 // indirect github.com/ghodss/yaml v1.0.0 // indirect @@ -124,7 +125,7 @@ require ( github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-sql-driver/mysql v1.9.1 // indirect github.com/go-viper/mapstructure/v2 v2.2.1 // indirect - github.com/go-webauthn/x v0.1.19 // indirect + github.com/go-webauthn/x v0.1.20 // indirect github.com/goccy/go-json v0.10.5 // indirect github.com/gofrs/flock v0.12.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -191,7 +192,6 @@ require ( github.com/nrdcg/namesilo v0.2.1 // indirect github.com/nrdcg/nodion v0.1.0 // indirect github.com/nrdcg/porkbun v0.4.0 // indirect - github.com/nxadm/tail v1.4.11 // indirect github.com/nzdjb/go-metaname v1.0.0 // indirect github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect github.com/oracle/oci-go-sdk/v65 v65.88.0 // indirect diff --git a/go.sum b/go.sum index 8a30b820..4955bf77 100644 --- a/go.sum +++ b/go.sum @@ -983,8 +983,12 @@ github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIx github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/go-webauthn/webauthn v0.12.2 h1:yLaNPgBUEXDQtWnOjhsGhMMCEWbXwjg/aNkC8riJQI8= github.com/go-webauthn/webauthn v0.12.2/go.mod h1:Q8SZPPj4sZ469fNTcQXxRpzJOdb30jQrn/36FX8jilA= +github.com/go-webauthn/webauthn v0.12.3 h1:hHQl1xkUuabUU9uS+ISNCMLs9z50p9mDUZI/FmkayNE= +github.com/go-webauthn/webauthn v0.12.3/go.mod h1:4JRe8Z3W7HIw8NGEWn2fnUwecoDzkkeach/NnvhkqGY= github.com/go-webauthn/x v0.1.19 h1:IUfdHiBRoTdujpBA/14qbrMXQ3LGzYe/PRGWdZcmudg= github.com/go-webauthn/x v0.1.19/go.mod h1:C5arLuTQ3pVHKPw89v7CDGnqAZSZJj+4Jnr40dsn7tk= +github.com/go-webauthn/x v0.1.20 h1:brEBDqfiPtNNCdS/peu8gARtq8fIPsHz0VzpPjGvgiw= +github.com/go-webauthn/x v0.1.20/go.mod h1:n/gAc8ssZJGATM0qThE+W+vfgXiMedsWi3wf/C4lld0= github.com/go-zookeeper/zk v1.0.2/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw= github.com/gobs/pretty v0.0.0-20180724170744-09732c25a95b h1:/vQ+oYKu+JoyaMPDsv5FzwuL2wwWBgBbtj/YLCi4LuA= github.com/gobs/pretty v0.0.0-20180724170744-09732c25a95b/go.mod h1:Xo4aNUOrJnVruqWQJBtW6+bTBDTniY8yZum5rF3b5jw= @@ -1797,6 +1801,8 @@ github.com/urfave/cli/v3 v3.0.0-beta1 h1:6DTaaUarcM0wX7qj5Hcvs+5Dm3dyUTBbEwIWAjc github.com/urfave/cli/v3 v3.0.0-beta1/go.mod h1:FnIeEMYu+ko8zP1F9Ypr3xkZMIDqW3DR92yUtY39q1Y= github.com/urfave/cli/v3 v3.1.0 h1:kQR+oiqpJkBAONxBjM4RWivD4AfPHL/f4vqe/gjYU8M= github.com/urfave/cli/v3 v3.1.0/go.mod h1:FJSKtM/9AiiTOJL4fJ6TbMUkxBXn7GO9guZqoZtpYpo= +github.com/urfave/cli/v3 v3.1.1 h1:bNnl8pFI5dxPOjeONvFCDFoECLQsceDG4ejahs4Jtxk= +github.com/urfave/cli/v3 v3.1.1/go.mod h1:FJSKtM/9AiiTOJL4fJ6TbMUkxBXn7GO9guZqoZtpYpo= github.com/vinyldns/go-vinyldns v0.9.16 h1:GZJStDkcCk1F1AcRc64LuuMh+ENL8pHA0CVd4ulRMcQ= github.com/vinyldns/go-vinyldns v0.9.16/go.mod h1:5qIJOdmzAnatKjurI+Tl4uTus7GJKJxb+zitufjHs3Q= github.com/volcengine/volc-sdk-golang v1.0.201 h1:AnKtLpuEGCLuH9Yd2TvhG0SeTa+u4+MpLotIMZCdBgU=