diff --git a/client/package-lock.json b/client/package-lock.json index 32d09beb..334319dc 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -65,13 +65,6 @@ "integrity": "sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA==", "requires": { "regenerator-runtime": "^0.13.11" - }, - "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==" - } } }, "@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": { @@ -1557,9 +1522,9 @@ } }, "caniuse-db": { - "version": "1.0.30001447", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001447.tgz", - "integrity": "sha512-bMNeyZyJ5reMAUCirZTIEFdxMFeWQ8ol/6z3lvW+I0/pqsEvgyfppK2vVB65zvisOqNF/mVJA0uNGiyPiz7wtw==" + "version": "1.0.30001449", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001449.tgz", + "integrity": "sha512-K7XIAmo8tCt2W7LFSrTjbrXZqer/4af8cfediBT+iDk4b8eljuMo6gBzJlW7e4RTz5+wYEGKg8gXk1Vm+Jh+YA==" }, "caseless": { "version": "0.12.0", @@ -2348,14 +2313,6 @@ } } }, - "css-box-model": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/css-box-model/-/css-box-model-1.2.1.tgz", - "integrity": "sha512-a7Vr4Q/kd/aw96bnJG332W9V9LkJO69JRcaCYDUqjp6/z0w6VcZjgAcTbgFxEPfBgdnAwlh3iwu+hLopa+flJw==", - "requires": { - "tiny-invariant": "^1.0.6" - } - }, "css-color-names": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", @@ -2481,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", @@ -2798,11 +2755,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": { @@ -7710,11 +7668,6 @@ } } }, - "memoize-one": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz", - "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==" - }, "memory-fs": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", @@ -9949,11 +9902,6 @@ "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==" }, - "raf-schd": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/raf-schd/-/raf-schd-4.0.3.tgz", - "integrity": "sha512-tQkJl2GRWh83ui2DiPTJz9wEiMN20syf+5oKfB03yYP7ioZcJwsIK8FjrtLwH1m7C7e+Tt2yYBlrOpdT+dyeIQ==" - }, "random-bytes": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz", @@ -10066,20 +10014,6 @@ "prop-types": "^15.5.10" } }, - "react-beautiful-dnd": { - "version": "13.1.1", - "resolved": "https://registry.npmjs.org/react-beautiful-dnd/-/react-beautiful-dnd-13.1.1.tgz", - "integrity": "sha512-0Lvs4tq2VcrEjEgDXHjT98r+63drkKEgqyxdA7qD3mvKwga6a5SscbdLPO2IExotU1jW8L0Ksdl0Cj2AF67nPQ==", - "requires": { - "@babel/runtime": "^7.9.2", - "css-box-model": "^1.2.0", - "memoize-one": "^5.1.1", - "raf-schd": "^4.0.2", - "react-redux": "^7.2.0", - "redux": "^4.0.4", - "use-memo-one": "^1.1.1" - } - }, "react-bootstrap": { "version": "0.32.1", "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-0.32.1.tgz", @@ -10097,6 +10031,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": { @@ -10208,6 +10180,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": { @@ -10282,16 +10292,6 @@ } } }, - "react-scrollspy": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/react-scrollspy/-/react-scrollspy-3.4.3.tgz", - "integrity": "sha512-c2QZpMPWxm1HF71h1EqaxBldx2zLYO0aZ24Bcuo2mUWF79T+F6qOtr7XJCzUDm99NOwhVKQD01a7A8VC6c90CQ==", - "requires": { - "babel-runtime": "^6.26.0", - "classnames": "^2.2.5", - "prop-types": "^15.5.10" - } - }, "react-sortable-hoc": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/react-sortable-hoc/-/react-sortable-hoc-2.0.0.tgz", @@ -10311,14 +10311,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": { @@ -10507,9 +10507,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", @@ -11992,8 +11992,8 @@ } }, "superdesk-analytics": { - "version": "github:superdesk/superdesk-analytics#166e68b77c0cd06b08868b015daf764765b79145", - "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", @@ -12007,11 +12007,12 @@ } }, "superdesk-core": { - "version": "github:superdesk/superdesk-client-core#e16903a0021d70c97ed5ede4ab17a85da4dc98bf", - "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", @@ -12101,7 +12102,7 @@ "sass-loader": "6.0.6", "shortid": "2.2.8", "style-loader": "0.20.2", - "superdesk-ui-framework": "3.0.0-rc12", + "superdesk-ui-framework": "2.4.20", "ts-loader": "3.5.0", "tslint": "5.11.0", "typescript": "3.9.7", @@ -12119,8 +12120,8 @@ } }, "superdesk-planning": { - "version": "github:superdesk/superdesk-planning#54699db1c1dd150f228c836cf812685b99e310fc", - "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", @@ -12134,7 +12135,6 @@ "redux-logger": "~3.0.6", "reselect": "~3.0.1", "rrule": "~2.2.9", - "superdesk-ui-framework": "^3.0.0-rc12", "ts-loader": "3.5.0", "typescript": "3.9.7", "whatwg-fetch": "~2.0.4" @@ -12148,34 +12148,26 @@ } }, "superdesk-ui-framework": { - "version": "3.0.0-rc12", - "resolved": "https://registry.npmjs.org/superdesk-ui-framework/-/superdesk-ui-framework-3.0.0-rc12.tgz", - "integrity": "sha512-fZqAr4PEDXJA2PP51EEWoUdOpx0QthY5pBeYJ+3vxTwu6HRj1ZYQYCEWnQAMCZ/h7C1mHTL7UYMkq9fvB5jHjw==", + "version": "2.4.20", + "resolved": "https://registry.npmjs.org/superdesk-ui-framework/-/superdesk-ui-framework-2.4.20.tgz", + "integrity": "sha512-7sofDJR9UG4e6OEly1IJERLOUj9/vBtjyIvJ2Zkz6f4KgLP1SASGo0uAxCO9/1D5W2onzFJbdohkG+nPxL1QnA==", "requires": { "@material-ui/lab": "^4.0.0-alpha.56", "@popperjs/core": "^2.4.0", - "@superdesk/primereact": "^5.0.2-6", + "@superdesk/primereact": "^5.0.2-4", "@types/node": "^14.10.2", "chart.js": "^2.9.3", "date-fns": "2.7.0", - "moment": "^2.29.3", "popper.js": "1.14.4", "primeicons": "2.0.0", - "react-beautiful-dnd": "^13.0.0", - "react-id-generator": "^3.0.0", - "react-popper": "^2.2.3", - "react-scrollspy": "^3.4.3" + "react-id-generator": "^3.0.2", + "react-popper": "^2.2.3" }, "dependencies": { "@types/node": { "version": "14.18.36", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.36.tgz", "integrity": "sha512-FXKWbsJ6a1hIrRxv+FoukuHnGTgEzKYGi7kilfMae96AL9UNkPFNWJEEYWzdRI9ooIkbr4AKldyuSTLql06vLQ==" - }, - "moment": { - "version": "2.29.4", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", - "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==" } } }, @@ -12359,11 +12351,6 @@ "setimmediate": "^1.0.4" } }, - "tiny-invariant": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz", - "integrity": "sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==" - }, "tinycolor": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz", @@ -12939,11 +12926,6 @@ "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==" }, - "use-memo-one": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/use-memo-one/-/use-memo-one-1.1.3.tgz", - "integrity": "sha512-g66/K7ZQGYrI6dy8GLpVcMsBp4s17xNkYJVSMvTEevGy3nDxHOfE6z8BVE22+5G5x7t3+bhzrlTDB7ObrEE0cQ==" - }, "user-home": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz", 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 b82298f7..3511538c 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -1,6 +1,6 @@ # -# This file is autogenerated by pip-compile with python 3.10 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.10 +# by the following command: # # pip-compile requirements.in # @@ -12,7 +12,7 @@ arrow==0.13.0 # superdesk-core authlib==0.14.3 # via superdesk-core -babel==2.10.3 +babel==2.11.0 # via flask-babel bcrypt==3.1.7 # via superdesk-core @@ -24,13 +24,13 @@ blinker==1.4 # flask-mail # raven # superdesk-core -boto3==1.24.62 +boto3==1.26.58 # via superdesk-core -botocore==1.27.62 +botocore==1.29.58 # via # boto3 # s3transfer -cachetools==5.2.0 +cachetools==5.3.0 # via flask-oidc-ex celery[redis]==4.4.7 # via superdesk-core @@ -38,7 +38,7 @@ cerberus==1.3.4 # via # eve # superdesk-core -certifi==2022.6.15 +certifi==2022.12.7 # via # elastic-apm # elasticsearch @@ -49,7 +49,7 @@ cffi==1.15.1 # cryptography chardet==3.0.4 # via superdesk-core -charset-normalizer==2.1.1 +charset-normalizer==3.0.1 # via requests ciso8601==1.0.8 # via eve-elastic @@ -57,7 +57,7 @@ click==7.1.2 # via flask croniter==0.3.37 # via superdesk-core -cryptography==37.0.4 +cryptography==39.0.0 # via # authlib # jwcrypto @@ -96,7 +96,7 @@ flask-oidc-ex==0.5.5 # via superdesk-core flask-script==2.0.6 # via superdesk-core -future==0.18.2 +future==0.18.3 # via python-twitter gspread==3.1.0 # via -r requirements.in @@ -104,16 +104,18 @@ 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 +honcho==1.1.0 # via -r requirements.in -httplib2==0.20.4 +httplib2==0.21.0 # via oauth2client icalendar==4.0.9 # via superdesk-planning -idna==3.3 +idna==3.4 # via requests +importlib-metadata==3.1.1 + # via superdesk-core itsdangerous==1.1.0 # via # flask @@ -126,9 +128,9 @@ jmespath==1.0.1 # via # boto3 # botocore -jsonpickle==2.2.0 +jsonpickle==3.0.1 # via deepdiff -jwcrypto==1.3.1 +jwcrypto==1.4.2 # via # flask-oidc-ex # python-jwt @@ -148,15 +150,15 @@ markupsafe==2.0.1 # superdesk-core mongolock==1.3.4 # via superdesk-core -natsort==8.1.0 +natsort==8.2.0 # via croniter oauth2client==4.1.3 # via # -r requirements.in # flask-oidc-ex -oauthlib==3.2.0 +oauthlib==3.2.2 # via requests-oauthlib -pillow==9.2.0 +pillow==8.1.2 # via superdesk-core pyasn1==0.4.8 # via @@ -182,13 +184,13 @@ python-dateutil==2.7.5 # croniter # icalendar # superdesk-core -python-jwt==3.3.3 +python-jwt==4.0.0 # via flask-oidc-ex python-magic==0.4.27 # via superdesk-core python-twitter==3.5 # via superdesk-core -pytz==2022.2.1 +pytz==2022.7.1 # via # babel # celery @@ -207,7 +209,7 @@ redis==3.2.1 # superdesk-core regex==2020.7.14 # via superdesk-core -requests==2.28.1 +requests==2.28.2 # via # gspread # python-twitter @@ -221,7 +223,7 @@ s3transfer==0.6.0 # via boto3 sgmllib3k==1.0.0 # via feedparser -simplejson==3.17.6 +simplejson==3.18.1 # via eve six==1.16.0 # via @@ -229,13 +231,13 @@ 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 +typing-extensions==4.4.0 # via superdesk-core tzlocal==2.1 # 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