diff --git a/api/tacticalrmm/requirements.txt b/api/tacticalrmm/requirements.txt index ca3c497c..1a785015 100644 --- a/api/tacticalrmm/requirements.txt +++ b/api/tacticalrmm/requirements.txt @@ -1,14 +1,11 @@ -amqp==5.0.5 asgiref==3.3.1 asyncio-nats-client==0.11.4 -billiard==3.6.3.0 celery==5.0.5 certifi==2020.12.5 cffi==1.14.5 channels==3.0.3 chardet==4.0.0 cryptography==3.4.7 -decorator==4.4.2 Django==3.1.7 django-cors-headers==3.7.0 django-rest-knox==4.1.0 diff --git a/api/tacticalrmm/tacticalrmm/settings.py b/api/tacticalrmm/tacticalrmm/settings.py index eb516eb7..0c8ad012 100644 --- a/api/tacticalrmm/tacticalrmm/settings.py +++ b/api/tacticalrmm/tacticalrmm/settings.py @@ -27,8 +27,8 @@ LATEST_AGENT_VER = "1.4.13" MESH_VER = "0.7.93" # for the update script, bump when need to recreate venv or npm install -PIP_VER = "13" -NPM_VER = "12" +PIP_VER = "14" +NPM_VER = "13" DL_64 = f"https://github.com/wh1te909/rmmagent/releases/download/v{LATEST_AGENT_VER}/winagent-v{LATEST_AGENT_VER}.exe" DL_32 = f"https://github.com/wh1te909/rmmagent/releases/download/v{LATEST_AGENT_VER}/winagent-v{LATEST_AGENT_VER}-x86.exe" diff --git a/web/package-lock.json b/web/package-lock.json index 9364235b..c4c318f9 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -7,7 +7,7 @@ "": { "version": "0.1.8", "dependencies": { - "@quasar/extras": "^1.10.0", + "@quasar/extras": "^1.10.2", "apexcharts": "^3.23.1", "axios": "^0.21.1", "dotenv": "^8.2.0", @@ -20,7 +20,7 @@ "devDependencies": { "@quasar/app": "^2.2.3", "@quasar/cli": "^1.1.3", - "core-js": "^3.9.1", + "core-js": "^3.10.0", "eslint-plugin-cypress": "^2.11.2", "flush-promises": "^1.0.2", "fs-extra": "^9.1.0" @@ -1890,9 +1890,10 @@ } }, "node_modules/@quasar/extras": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@quasar/extras/-/extras-1.10.0.tgz", - "integrity": "sha512-H71Y/6pxunwiEN+oo9OBGM96ncM2QreVdnb2t2iStVHduju3nnypw9euBCshhYxKE/ORHZoOBRDoiddUOyaUdA==", + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/@quasar/extras/-/extras-1.10.2.tgz", + "integrity": "sha512-S5aE/If4Bgl6qAoHqDZcVw6GxeNpksix3N1dp8k3YPMniIaoU/BLACeQYnrGkn3ffZ1+5JzF0teAE3no6WGzEg==", + "license": "MIT", "funding": { "type": "github", "url": "https://donate.quasar.dev" @@ -4654,9 +4655,9 @@ } }, "node_modules/core-js": { - "version": "3.9.1", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.9.1.tgz", - "integrity": "sha512-gSjRvzkxQc1zjM/5paAmL4idJBFzuJoo+jDjF1tStYFMV2ERfD02HhahhCGXUyHxQRG4yFKVSdO6g62eoRMcDg==", + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.10.0.tgz", + "integrity": "sha512-MQx/7TLgmmDVamSyfE+O+5BHvG1aUGj/gHhLn1wVtm2B5u1eVIPvh7vkfjwWKNCjrTJB8+He99IntSQ1qP+vYQ==", "dev": true, "hasInstallScript": true, "funding": { @@ -20706,9 +20707,9 @@ } }, "@quasar/extras": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@quasar/extras/-/extras-1.10.0.tgz", - "integrity": "sha512-H71Y/6pxunwiEN+oo9OBGM96ncM2QreVdnb2t2iStVHduju3nnypw9euBCshhYxKE/ORHZoOBRDoiddUOyaUdA==" + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/@quasar/extras/-/extras-1.10.2.tgz", + "integrity": "sha512-S5aE/If4Bgl6qAoHqDZcVw6GxeNpksix3N1dp8k3YPMniIaoU/BLACeQYnrGkn3ffZ1+5JzF0teAE3no6WGzEg==" }, "@quasar/fastclick": { "version": "1.1.4", @@ -23043,9 +23044,9 @@ } }, "core-js": { - "version": "3.9.1", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.9.1.tgz", - "integrity": "sha512-gSjRvzkxQc1zjM/5paAmL4idJBFzuJoo+jDjF1tStYFMV2ERfD02HhahhCGXUyHxQRG4yFKVSdO6g62eoRMcDg==", + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.10.0.tgz", + "integrity": "sha512-MQx/7TLgmmDVamSyfE+O+5BHvG1aUGj/gHhLn1wVtm2B5u1eVIPvh7vkfjwWKNCjrTJB8+He99IntSQ1qP+vYQ==", "dev": true }, "core-js-compat": { diff --git a/web/package.json b/web/package.json index e92719b7..5b46ff4a 100644 --- a/web/package.json +++ b/web/package.json @@ -10,7 +10,7 @@ "test:e2e:ci": "cross-env E2E_TEST=true start-test \"quasar dev\" http-get://localhost:8080 \"cypress run\"" }, "dependencies": { - "@quasar/extras": "^1.10.0", + "@quasar/extras": "^1.10.2", "apexcharts": "^3.23.1", "axios": "^0.21.1", "dotenv": "^8.2.0", @@ -23,7 +23,7 @@ "devDependencies": { "@quasar/app": "^2.2.3", "@quasar/cli": "^1.1.3", - "core-js": "^3.9.1", + "core-js": "^3.10.0", "eslint-plugin-cypress": "^2.11.2", "flush-promises": "^1.0.2", "fs-extra": "^9.1.0"