diff --git a/client/package-lock.json b/client/package-lock.json index bd7525c8..cbae7b7f 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -55,23 +55,16 @@ } }, "@babel/parser": { - "version": "7.20.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.3.tgz", - "integrity": "sha512-OP/s5a94frIPXwjzEcv5S/tpQfc6XhxYUnmWpgdqMWGgYCuErA3SzozaRAMQgSZWKeTJxht9aWAkUY+0UzvOFg==" + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.5.tgz", + "integrity": "sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA==" }, "@babel/runtime": { - "version": "7.20.1", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.1.tgz", - "integrity": "sha512-mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg==", + "version": "7.20.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.6.tgz", + "integrity": "sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==", "requires": { - "regenerator-runtime": "^0.13.10" - }, - "dependencies": { - "regenerator-runtime": { - "version": "0.13.11", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", - "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" - } + "regenerator-runtime": "^0.13.11" } }, "@material-ui/lab": { @@ -213,53 +206,11 @@ } }, "@superdesk/primereact": { - "version": "5.0.2-7", - "resolved": "https://registry.npmjs.org/@superdesk/primereact/-/primereact-5.0.2-7.tgz", - "integrity": "sha512-pgA1Fu+3kifz33nf8zUu40WVJ/aKaIKVfyZwFbS5WqGAZlyut2Ro2sA5iaS0mYHezR/bfQ7GvCiZP4Y8zLx6sw==", + "version": "5.0.2-4", + "resolved": "https://registry.npmjs.org/@superdesk/primereact/-/primereact-5.0.2-4.tgz", + "integrity": "sha512-QMrr4xtH2hexuPt+Rhv1GviAdMvOdtp4keKq1HkZYwG5mRqbRHcflOu8KxeQDftkpAqrjB5fniAEKEs+aeGciQ==", "requires": { "react-transition-group": "^4.4.1" - }, - "dependencies": { - "csstype": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz", - "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==" - }, - "dom-helpers": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz", - "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==", - "requires": { - "@babel/runtime": "^7.8.7", - "csstype": "^3.0.2" - } - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" - }, - "prop-types": { - "version": "15.8.1", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", - "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", - "requires": { - "loose-envify": "^1.4.0", - "object-assign": "^4.1.1", - "react-is": "^16.13.1" - } - }, - "react-transition-group": { - "version": "4.4.5", - "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz", - "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==", - "requires": { - "@babel/runtime": "^7.5.5", - "dom-helpers": "^5.0.1", - "loose-envify": "^1.4.0", - "prop-types": "^15.6.2" - } - } } }, "@types/angular": { @@ -356,6 +307,13 @@ "requires": { "@types/prop-types": "*", "csstype": "^2.2.0" + }, + "dependencies": { + "csstype": { + "version": "2.6.21", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz", + "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==" + } } }, "@types/react-autocomplete": { @@ -1096,6 +1054,13 @@ "requires": { "core-js": "^2.4.0", "regenerator-runtime": "^0.11.0" + }, + "dependencies": { + "regenerator-runtime": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" + } } }, "balanced-match": { @@ -2473,9 +2438,9 @@ } }, "csstype": { - "version": "2.6.21", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz", - "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==" + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz", + "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==" }, "csurf": { "version": "1.8.3", @@ -2788,11 +2753,12 @@ } }, "dom-helpers": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz", - "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz", + "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==", "requires": { - "@babel/runtime": "^7.1.2" + "@babel/runtime": "^7.8.7", + "csstype": "^3.0.2" } }, "dom-scroll-into-view": { @@ -10020,6 +9986,44 @@ "react-transition-group": "^2.0.0", "uncontrollable": "^4.1.0", "warning": "^3.0.0" + }, + "dependencies": { + "dom-helpers": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz", + "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==", + "requires": { + "@babel/runtime": "^7.1.2" + } + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" + }, + "react-transition-group": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz", + "integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==", + "requires": { + "dom-helpers": "^3.4.0", + "loose-envify": "^1.4.0", + "prop-types": "^15.6.2", + "react-lifecycles-compat": "^3.0.4" + }, + "dependencies": { + "prop-types": { + "version": "15.8.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", + "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", + "requires": { + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.13.1" + } + } + } + } } }, "react-debounce-input": { @@ -10131,6 +10135,44 @@ "prop-types-extra": "^1.0.1", "react-transition-group": "^2.2.0", "warning": "^3.0.0" + }, + "dependencies": { + "dom-helpers": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz", + "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==", + "requires": { + "@babel/runtime": "^7.1.2" + } + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" + }, + "react-transition-group": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz", + "integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==", + "requires": { + "dom-helpers": "^3.4.0", + "loose-envify": "^1.4.0", + "prop-types": "^15.6.2", + "react-lifecycles-compat": "^3.0.4" + }, + "dependencies": { + "prop-types": { + "version": "15.8.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", + "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", + "requires": { + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.13.1" + } + } + } + } } }, "react-paginate": { @@ -10224,14 +10266,14 @@ } }, "react-transition-group": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz", - "integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==", + "version": "4.4.5", + "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz", + "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==", "requires": { - "dom-helpers": "^3.4.0", + "@babel/runtime": "^7.5.5", + "dom-helpers": "^5.0.1", "loose-envify": "^1.4.0", - "prop-types": "^15.6.2", - "react-lifecycles-compat": "^3.0.4" + "prop-types": "^15.6.2" }, "dependencies": { "object-assign": { @@ -10420,9 +10462,9 @@ "dev": true }, "regenerator-runtime": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" + "version": "0.13.11", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", + "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" }, "regex-cache": { "version": "0.4.4", @@ -11897,8 +11939,8 @@ } }, "superdesk-analytics": { - "version": "github:superdesk/superdesk-analytics#b38136d1b57f0bfe5a39e9ea2610c6d4d9cccc2c", - "from": "github:superdesk/superdesk-analytics#develop", + "version": "github:superdesk/superdesk-analytics#9c06fe00a35217134cfc0d70932c526c6eab24a7", + "from": "github:superdesk/superdesk-analytics#v2.5.1", "requires": { "angular-embed": "github:superdesk/angular-embed#d75968e", "angular-embedly": "github:Urigo/angular-embedly#0.0.8", @@ -11912,11 +11954,12 @@ } }, "superdesk-core": { - "version": "github:superdesk/superdesk-client-core#349565bc0048ef0bc50b965ce1fa57a179ccacf6", - "from": "github:superdesk/superdesk-client-core#develop", + "version": "github:superdesk/superdesk-client-core#974ea83f368d7eb9887064852e470e38ae1b620c", + "from": "github:superdesk/superdesk-client-core#v2.5.2", "requires": { "@metadata/exif": "github:superdesk/exif#431066d", "@popperjs/core": "2.10.2", + "@superdesk/primereact": "5.0.2-4", "@types/angular": "1.6.50", "@types/draft-js": "0.10.29", "@types/enzyme": "3.9.1", @@ -12024,8 +12067,8 @@ } }, "superdesk-planning": { - "version": "github:superdesk/superdesk-planning#cdd7e5fc6765b461a9a430a44c471e3d6a4504eb", - "from": "github:superdesk/superdesk-planning#develop", + "version": "github:superdesk/superdesk-planning#f12d3a4e6d22f2cdd04b512eb80eee13805efa12", + "from": "github:superdesk/superdesk-planning#v2.5.1", "requires": { "dompurify": "^1.0.11", "nominatim-browser": "~2.0.2", diff --git a/client/package.json b/client/package.json index 89c774a4..968f61f6 100644 --- a/client/package.json +++ b/client/package.json @@ -2,9 +2,9 @@ "name": "superdesk", "license": "GPL-3.0", "dependencies": { - "superdesk-analytics": "github:superdesk/superdesk-analytics#develop", - "superdesk-core": "github:superdesk/superdesk-client-core#develop", - "superdesk-planning": "github:superdesk/superdesk-planning#develop" + "superdesk-analytics": "github:superdesk/superdesk-analytics#v2.5.1", + "superdesk-core": "github:superdesk/superdesk-client-core#v2.5.2", + "superdesk-planning": "github:superdesk/superdesk-planning#v2.5.1" }, "devDependencies": { "@superdesk/build-tools": "^1.0.18" diff --git a/server/requirements.in b/server/requirements.in index 5212314b..6952ed80 100644 --- a/server/requirements.in +++ b/server/requirements.in @@ -3,6 +3,6 @@ honcho gspread==3.1.0 oauth2client==4.1.3 -git+https://github.com/superdesk/superdesk-core.git@develop#egg=Superdesk-Core -git+https://github.com/superdesk/superdesk-analytics.git@develop#egg=superdesk-analytics -git+https://github.com/superdesk/superdesk-planning.git@develop#egg=superdesk-planning +git+https://github.com/superdesk/superdesk-core.git@v2.5.2#egg=Superdesk-Core +git+https://github.com/superdesk/superdesk-analytics.git@v2.5.1#egg=superdesk-analytics +git+https://github.com/superdesk/superdesk-planning.git@v2.5.1#egg=superdesk-planning diff --git a/server/requirements.txt b/server/requirements.txt index 6760cfc7..a77a3e18 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -73,7 +73,7 @@ elasticsearch==7.13.4 # via eve-elastic eve==1.1.2 # via superdesk-core -eve-elastic==7.2.0 +eve-elastic==7.1.4 # via superdesk-core events==0.3 # via eve @@ -104,7 +104,7 @@ gunicorn==20.1.0 # via -r requirements.in hachoir==3.0a3 # via superdesk-core -hermescache==0.10.0 +hermescache==0.7.2 # via superdesk-core honcho==1.0.1 # via -r requirements.in @@ -114,6 +114,8 @@ icalendar==4.0.9 # via superdesk-planning idna==3.3 # via requests +importlib-metadata==3.1.1 + # via superdesk-core itsdangerous==1.1.0 # via # flask @@ -156,7 +158,7 @@ oauth2client==4.1.3 # flask-oidc-ex oauthlib==3.2.0 # via requests-oauthlib -pillow==9.2.0 +pillow==8.1.2 # via superdesk-core pyasn1==0.4.8 # via @@ -229,11 +231,11 @@ six==1.16.0 # flask-oidc-ex # oauth2client # python-dateutil -superdesk-analytics @ git+https://github.com/superdesk/superdesk-analytics.git@develop +superdesk-analytics @ git+https://github.com/superdesk/superdesk-analytics.git@v2.5.1 # via -r requirements.in -superdesk-core @ git+https://github.com/superdesk/superdesk-core.git@develop +superdesk-core @ git+https://github.com/superdesk/superdesk-core.git@v2.5.2 # via -r requirements.in -superdesk-planning @ git+https://github.com/superdesk/superdesk-planning.git@develop +superdesk-planning @ git+https://github.com/superdesk/superdesk-planning.git@v2.5.1 # via -r requirements.in typing-extensions==4.3.0 # via superdesk-core @@ -252,7 +254,7 @@ vine==1.3.0 # via # amqp # celery -websockets==10.3 +websockets==6.0 # via superdesk-core werkzeug==1.0.1 # via @@ -260,6 +262,8 @@ werkzeug==1.0.1 # superdesk-core wrapt==1.14.1 # via deprecated +zipp==3.11.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools