diff --git a/.idea/.gitignore b/.idea/.gitignore index 13566b81b..a9d7db9c0 100644 --- a/.idea/.gitignore +++ b/.idea/.gitignore @@ -6,3 +6,5 @@ # Datasource local storage ignored files /dataSources/ /dataSources.local.xml +# GitHub Copilot persisted chat sessions +/copilot/chatSessions diff --git a/app/.idea/.gitignore b/app/.idea/.gitignore index b58b603fe..7abb13d05 100644 --- a/app/.idea/.gitignore +++ b/app/.idea/.gitignore @@ -3,3 +3,5 @@ /workspace.xml # Editor-based HTTP Client requests /httpRequests/ +# GitHub Copilot persisted chat sessions +/copilot/chatSessions diff --git a/app/package.json b/app/package.json index e8a4c1a35..27b1bad88 100644 --- a/app/package.json +++ b/app/package.json @@ -17,8 +17,8 @@ "@vue/shared": "^3.4.13", "@vueuse/core": "^10.7.2", "ant-design-vue": "4.1.2", - "apexcharts": "^3.45.1", - "axios": "^1.6.5", + "apexcharts": "^3.46.0", + "axios": "^1.6.7", "dayjs": "^1.11.10", "highlight.js": "^11.9.0", "lodash": "^4.17.21", @@ -33,8 +33,8 @@ "vue-github-button": "https://github.com/0xJacky/vue-github-button", "vue-router": "^4.2.5", "vue3-ace-editor": "2.2.4", - "vue3-apexcharts": "^1.4.4", - "vue3-gettext": "^3.0.0-beta.3", + "vue3-apexcharts": "^1.5.2", + "vue3-gettext": "^3.0.0-beta.4", "vuedraggable": "^4.1.0", "xterm": "^5.3.0", "xterm-addon-attach": "^0.9.0", diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml index e42d7e9c2..0ded38ec2 100644 --- a/app/pnpm-lock.yaml +++ b/app/pnpm-lock.yaml @@ -24,11 +24,11 @@ dependencies: specifier: 4.1.2 version: 4.1.2(vue@3.4.17) apexcharts: - specifier: ^3.45.1 - version: 3.45.1 + specifier: ^3.46.0 + version: 3.47.0 axios: - specifier: ^1.6.5 - version: 1.6.5 + specifier: ^1.6.7 + version: 1.6.7 dayjs: specifier: ^1.11.10 version: 1.11.10 @@ -72,11 +72,11 @@ dependencies: specifier: 2.2.4 version: 2.2.4(ace-builds@1.32.3)(vue@3.4.17) vue3-apexcharts: - specifier: ^1.4.4 - version: 1.4.4(apexcharts@3.45.1)(vue@3.4.17) + specifier: ^1.5.2 + version: 1.5.2(apexcharts@3.47.0)(vue@3.4.17) vue3-gettext: - specifier: ^3.0.0-beta.3 - version: 3.0.0-beta.3(@vue/compiler-sfc@3.4.13)(vue@3.4.17) + specifier: ^3.0.0-beta.4 + version: 3.0.0-beta.4(@vue/compiler-sfc@3.4.13)(typescript@5.3.3)(vue@3.4.17) vuedraggable: specifier: ^4.1.0 version: 4.1.0(vue@3.4.17) @@ -1113,10 +1113,6 @@ packages: resolution: {integrity: sha512-k7kRA033QNtC+gLc4VPlfnue58CM1iQLgn1IMAU8VPHGOj7oIHPp9UlhedEnD/Gl8evoCjwkZjlBORtZ3JByUA==} dev: true - /@types/parse-json@4.0.2: - resolution: {integrity: sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==} - dev: false - /@types/parse5@5.0.3: resolution: {integrity: sha512-kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw==} dev: false @@ -1802,8 +1798,8 @@ packages: picomatch: 2.3.1 dev: true - /apexcharts@3.45.1: - resolution: {integrity: sha512-pPjj/SA6dfPvR/IKRZF0STdfBGpBh3WRt7K0DFuW9P8erypYkX17EHu3/molPRfo2zSiQwTVpshHC5ncysqfkA==} + /apexcharts@3.47.0: + resolution: {integrity: sha512-s/fgNCA69b8lJdhI3R7Z+/Df47RPplLyHwuvttecR+aaZ3/Pm6wHYPiAGjqDNbVsMGXhuA9mcOpIYU5ZWeSdeg==} dependencies: '@yr/monotone-cubic-spline': 1.0.3 svg.draggable.js: 2.2.2 @@ -1825,7 +1821,6 @@ packages: /argparse@2.0.1: resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==} - dev: true /array-back@3.1.0: resolution: {integrity: sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==} @@ -1964,8 +1959,8 @@ packages: engines: {node: '>= 0.4'} dev: true - /axios@1.6.5: - resolution: {integrity: sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==} + /axios@1.6.7: + resolution: {integrity: sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==} dependencies: follow-redirects: 1.15.4 form-data: 4.0.0 @@ -2180,15 +2175,20 @@ packages: requiresBuild: true dev: false - /cosmiconfig@7.1.0: - resolution: {integrity: sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==} - engines: {node: '>=10'} + /cosmiconfig@9.0.0(typescript@5.3.3): + resolution: {integrity: sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==} + engines: {node: '>=14'} + peerDependencies: + typescript: '>=4.9.5' + peerDependenciesMeta: + typescript: + optional: true dependencies: - '@types/parse-json': 4.0.2 + env-paths: 2.2.1 import-fresh: 3.3.0 + js-yaml: 4.1.0 parse-json: 5.2.0 - path-type: 4.0.0 - yaml: 1.10.2 + typescript: 5.3.3 dev: false /cross-spawn@7.0.3: @@ -2399,6 +2399,11 @@ packages: resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==} engines: {node: '>=0.12'} + /env-paths@2.2.1: + resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==} + engines: {node: '>=6'} + dev: false + /errno@0.1.8: resolution: {integrity: sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==} hasBin: true @@ -3615,7 +3620,6 @@ packages: hasBin: true dependencies: argparse: 2.0.1 - dev: true /jsdoc-type-pratt-parser@4.0.0: resolution: {integrity: sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==} @@ -4183,6 +4187,7 @@ packages: /path-type@4.0.0: resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} engines: {node: '>=8'} + dev: true /pathe@1.1.1: resolution: {integrity: sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==} @@ -5292,18 +5297,18 @@ packages: vue: 3.4.17(typescript@5.3.3) dev: false - /vue3-apexcharts@1.4.4(apexcharts@3.45.1)(vue@3.4.17): - resolution: {integrity: sha512-TH89uZrxGjaDvkaYAISvj8+k6Bf1rUKFillc8oJirs5XZEPiwM1ELKZQ786wz0rfPqkSHHny2lqqUCK7Rw+LcQ==} + /vue3-apexcharts@1.5.2(apexcharts@3.47.0)(vue@3.4.17): + resolution: {integrity: sha512-rGbgUJDjtsyjfRF0uzwDjzt8+M7ICSRAbm1N9KCDiczW8BSpbEZuaEsJDJYnJuLFIIVXIGilYzIcjNBf6NbeYA==} peerDependencies: apexcharts: '> 3.0.0' vue: '> 3.0.0' dependencies: - apexcharts: 3.45.1 + apexcharts: 3.47.0 vue: 3.4.17(typescript@5.3.3) dev: false - /vue3-gettext@3.0.0-beta.3(@vue/compiler-sfc@3.4.13)(vue@3.4.17): - resolution: {integrity: sha512-zE6qKEhzlL4R/El9Z6dSg+tmXjfLorG5/Y2o+Z+DMt7dMxeYF3FQbkHzvU7DKZMXkAkkscwspmwsYAXp5ctGdA==} + /vue3-gettext@3.0.0-beta.4(@vue/compiler-sfc@3.4.13)(typescript@5.3.3)(vue@3.4.17): + resolution: {integrity: sha512-EW9F5NexUQW9GNJMjujmMJo8hUQvw6POCVQN9ya0RdapPVEfmkXjuxuhkVEKyBNxq5lRPCepfYkMT8Pu3M6T6w==} engines: {node: '>= 12.0.0'} hasBin: true peerDependencies: @@ -5313,7 +5318,7 @@ packages: '@vue/compiler-sfc': 3.4.13 chalk: 4.1.2 command-line-args: 5.2.1 - cosmiconfig: 7.1.0 + cosmiconfig: 9.0.0(typescript@5.3.3) gettext-extractor: 3.8.0 glob: 7.2.3 parse5: 6.0.1 @@ -5321,6 +5326,8 @@ packages: pofile: 1.1.4 tslib: 2.6.2 vue: 3.4.17(typescript@5.3.3) + transitivePeerDependencies: + - typescript dev: false /vue@3.4.17(typescript@5.3.3): @@ -5453,11 +5460,6 @@ packages: yaml: 2.3.4 dev: true - /yaml@1.10.2: - resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==} - engines: {node: '>= 6'} - dev: false - /yaml@2.3.4: resolution: {integrity: sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==} engines: {node: '>= 14'} diff --git a/app/src/version.json b/app/src/version.json index 92683cd76..5db5bb39a 100644 --- a/app/src/version.json +++ b/app/src/version.json @@ -1 +1 @@ -{"version":"2.0.0-beta.17","build_id":119,"total_build":323} \ No newline at end of file +{"version":"2.0.0-beta.18","build_id":120,"total_build":324} \ No newline at end of file diff --git a/app/version.json b/app/version.json index 92683cd76..5db5bb39a 100644 --- a/app/version.json +++ b/app/version.json @@ -1 +1 @@ -{"version":"2.0.0-beta.17","build_id":119,"total_build":323} \ No newline at end of file +{"version":"2.0.0-beta.18","build_id":120,"total_build":324} \ No newline at end of file diff --git a/app/vite.config.ts b/app/vite.config.ts index d0d909ee5..b28d383e1 100644 --- a/app/vite.config.ts +++ b/app/vite.config.ts @@ -33,11 +33,7 @@ export default defineConfig(({ mode }) => { ], }, plugins: [ - vue({ - script: { - defineModel: true, - }, - }), + vue(), vueJsx(), vitePluginBuildId(), diff --git a/internal/cert/cert.go b/internal/cert/cert.go index 16959cdc6..302df3890 100644 --- a/internal/cert/cert.go +++ b/internal/cert/cert.go @@ -166,9 +166,8 @@ func IssueCert(payload *ConfigPayload, logChan chan string, errChan chan error) user.Registration = reg request := certificate.ObtainRequest{ - Domains: domain, - Bundle: true, - MustStaple: true, + Domains: domain, + Bundle: true, } l.Println("[INFO] [Nginx UI] Obtaining certificate")