diff --git a/client/package-lock.json b/client/package-lock.json index c3f6bda0..7d6cbad3 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -614,8 +614,8 @@ "from": "github:superdesk/angular-embed#d75968e" }, "angular-embedly": { - "version": "github:Urigo/angular-embedly#e48ff27af8bd702f1cefea6119c863df9b0e6042", - "from": "github:Urigo/angular-embedly#0.0.8", + "version": "github:superdesk/angular-embedly#e48ff27af8bd702f1cefea6119c863df9b0e6042", + "from": "github:superdesk/angular-embedly#0.0.8", "requires": { "gulp": "~3.8.2", "gulp-concat": "~2.2.0", @@ -696,14 +696,14 @@ "integrity": "sha512-JoAxEa1DfP9m2xfB/y2r/aKcwXNlltr4+0QSBC4TrLfcxyvepX2Pv0t/xpgGV5bGsDzCYV8SzjWgyCW0T9yYbA==" }, "ansi-regex": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz", - "integrity": "sha512-sGwIGMjhYdW26/IhwK2gkWWI8DRCVO6uj3hYgHT+zD+QL1pa37tM3ujhyfcJIYSbsxp7Gxhy7zrRW/1AHm4BmA==" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==" }, "ansi-styles": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz", - "integrity": "sha512-f2PKUkN5QngiSemowa6Mrk9MPCdtFiOSmibjZ+j1qhLGHHYsqZwmBMRF3IRMVXo8sybDqx2fJl2d/8OphBoWkA==" + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==" }, "ansi-wrap": { "version": "0.1.0", @@ -1723,6 +1723,39 @@ "has-ansi": "^0.1.0", "strip-ansi": "^0.3.0", "supports-color": "^0.2.0" + }, + "dependencies": { + "ansi-regex": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz", + "integrity": "sha512-sGwIGMjhYdW26/IhwK2gkWWI8DRCVO6uj3hYgHT+zD+QL1pa37tM3ujhyfcJIYSbsxp7Gxhy7zrRW/1AHm4BmA==" + }, + "ansi-styles": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz", + "integrity": "sha512-f2PKUkN5QngiSemowa6Mrk9MPCdtFiOSmibjZ+j1qhLGHHYsqZwmBMRF3IRMVXo8sybDqx2fJl2d/8OphBoWkA==" + }, + "has-ansi": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz", + "integrity": "sha512-1YsTg1fk2/6JToQhtZkArMkurq8UoWU1Qe0aR3VUHjgij4nOylSWLWAtBXoZ4/dXOmugfLGm1c+QhuD0JyedFA==", + "requires": { + "ansi-regex": "^0.2.0" + } + }, + "strip-ansi": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz", + "integrity": "sha512-DerhZL7j6i6/nEnVG0qViKXI0OKouvvpsAiaj7c+LfqZZZxdwZtv8+UiA/w4VUJpT8UzX0pR1dcHOii1GbmruQ==", + "requires": { + "ansi-regex": "^0.2.1" + } + }, + "supports-color": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz", + "integrity": "sha512-tdCZ28MnM7k7cJDJc7Eq80A9CsRFAAOZUy41npOZCs++qSjfIy7o5Rh46CBk+Dk5FbKJ33X3Tqg4YrV07N5RaA==" + } } }, "change-case": { @@ -6563,16 +6596,6 @@ "vinyl": "^0.5.0" }, "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==" - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==" - }, "chalk": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", @@ -6584,27 +6607,6 @@ "strip-ansi": "^3.0.0", "supports-color": "^2.0.0" } - }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==", - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==" } } }, @@ -6641,11 +6643,11 @@ "integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==" }, "has-ansi": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz", - "integrity": "sha512-1YsTg1fk2/6JToQhtZkArMkurq8UoWU1Qe0aR3VUHjgij4nOylSWLWAtBXoZ4/dXOmugfLGm1c+QhuD0JyedFA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==", "requires": { - "ansi-regex": "^0.2.0" + "ansi-regex": "^2.0.0" } }, "has-bigints": { @@ -13392,11 +13394,11 @@ "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==" }, "strip-ansi": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz", - "integrity": "sha512-DerhZL7j6i6/nEnVG0qViKXI0OKouvvpsAiaj7c+LfqZZZxdwZtv8+UiA/w4VUJpT8UzX0pR1dcHOii1GbmruQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", "requires": { - "ansi-regex": "^0.2.1" + "ansi-regex": "^2.0.0" } }, "strip-bom": { @@ -13468,11 +13470,11 @@ } }, "superdesk-analytics": { - "version": "github:superdesk/superdesk-analytics#037d2b483da21cccbbcf24cd7e729c7af0deedd3", - "from": "github:superdesk/superdesk-analytics#v2.6.0", + "version": "github:superdesk/superdesk-analytics#cc138936a43ac27f9bc187a369a86f2a52f71222", + "from": "github:superdesk/superdesk-analytics#release/2.8", "requires": { "angular-embed": "github:superdesk/angular-embed#d75968e", - "angular-embedly": "github:Urigo/angular-embedly#0.0.8", + "angular-embedly": "github:superdesk/angular-embedly#0.0.8", "highcharts": "^6.2.0", "lodash": "4.17.19", "moment": "^2.29.4", @@ -13604,15 +13606,15 @@ } }, "superdesk-planning": { - "version": "github:superdesk/superdesk-planning#834165301a5d1ce47d45a592957aa2bea9955e4b", - "from": "github:superdesk/superdesk-planning#release/2.7", + "version": "github:superdesk/superdesk-planning#1529db3fdd15d0a360b5774cf09c0838728f5342", + "from": "github:superdesk/superdesk-planning#release/2.8", "requires": { "dompurify": "^1.0.11", "moment": "^2.30.1", "moment-timezone": "^0.5.45", "nominatim-browser": "~2.0.2", "react-bootstrap": "0.32.1", - "react-debounce-input": "3.2.0", + "react-debounce-input": "3.3.0", "react-draggable": "^3.3.2", "react-geolookup": "github:superdesk/react-geolookup", "react-moment-proptypes": "^1.7.0", @@ -13625,6 +13627,30 @@ "whatwg-fetch": "~2.0.4" }, "dependencies": { + "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-debounce-input": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/react-debounce-input/-/react-debounce-input-3.3.0.tgz", + "integrity": "sha512-VEqkvs8JvY/IIZvh71Z0TC+mdbxERvYF33RcebnodlsUZ8RSgyKe2VWaHXv4+/8aoOgXLxWrdsYs2hDhcwbUgA==", + "requires": { + "lodash.debounce": "^4", + "prop-types": "^15.8.1" + } + }, "react-sortable-hoc": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/react-sortable-hoc/-/react-sortable-hoc-2.0.0.tgz", @@ -13692,9 +13718,9 @@ } }, "supports-color": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz", - "integrity": "sha512-tdCZ28MnM7k7cJDJc7Eq80A9CsRFAAOZUy41npOZCs++qSjfIy7o5Rh46CBk+Dk5FbKJ33X3Tqg4YrV07N5RaA==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==" }, "supports-preserve-symlinks-flag": { "version": "1.0.0", diff --git a/client/package.json b/client/package.json index ecaa4a2b..94f23e7b 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#v2.6.0", + "superdesk-analytics": "github:superdesk/superdesk-analytics#release/2.8", "superdesk-core": "github:superdesk/superdesk-client-core#release/2.8", - "superdesk-planning": "github:superdesk/superdesk-planning#release/2.7" + "superdesk-planning": "github:superdesk/superdesk-planning#release/2.8" }, "devDependencies": { "@superdesk/build-tools": "^1.0.19" diff --git a/server/requirements.in b/server/requirements.in index 97bf284c..6219b709 100644 --- a/server/requirements.in +++ b/server/requirements.in @@ -5,5 +5,5 @@ python-xmp-toolkit>=2.0.1,<2.1 num2words==0.5.13 Superdesk-Core[exiv2] @ git+https://github.com/superdesk/superdesk-core.git@release/2.8#egg=superdesk-core -git+https://github.com/superdesk/superdesk-planning.git@release/2.7#egg=superdesk-planning -git+https://github.com/superdesk/superdesk-analytics.git@v2.6.0#egg=superdesk-analytics +git+https://github.com/superdesk/superdesk-planning.git@release/2.8#egg=superdesk-planning +git+https://github.com/superdesk/superdesk-analytics.git@release/2.8#egg=superdesk-analytics diff --git a/server/requirements.txt b/server/requirements.txt index b08e88c5..5ea3fa29 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -26,9 +26,9 @@ blinker==1.8.2 # flask-mail # raven # superdesk-core -boto3==1.35.1 +boto3==1.35.15 # via superdesk-core -botocore==1.35.1 +botocore==1.35.15 # via # boto3 # s3transfer @@ -40,15 +40,17 @@ cerberus==1.3.5 # via # eve # superdesk-core -certifi==2024.7.4 +certifi==2024.8.30 # via # elastic-apm # elasticsearch # requests -cffi==1.17.0 +cffi==1.17.1 # via cryptography chardet==5.2.0 - # via superdesk-core + # via + # reportlab + # superdesk-core charset-normalizer==3.3.2 # via requests ciso8601==2.3.1 @@ -73,7 +75,7 @@ cryptography==43.0.1 # via # authlib # jwcrypto -deepdiff==7.0.1 +deepdiff==8.0.1 # via superdesk-planning docopt==0.6.2 # via num2words @@ -124,9 +126,9 @@ honcho==1.1.0 # via -r requirements.in httplib2==0.22.0 # via oauth2client -icalendar==4.0.9 +icalendar==5.0.13 # via superdesk-planning -idna==3.7 +idna==3.8 # via requests isodate==0.6.1 # via python3-saml @@ -161,7 +163,7 @@ lxml==5.2.2 # python3-saml # superdesk-core # xmlsec -lxml-html-clean==0.1.1 +lxml-html-clean==0.2.2 # via superdesk-core markupsafe==2.0.1 # via @@ -175,11 +177,11 @@ oauth2client==4.1.3 # via flask-oidc-ex oauthlib==3.2.2 # via requests-oauthlib -ordered-set==4.1.0 +orderly-set==5.2.2 # via deepdiff packaging==24.1 # via gunicorn -pillow==10.3.0 +pillow==10.4.0 # via # reportlab # superdesk-core @@ -206,7 +208,7 @@ pymongo==3.11.4 # eve # mongolock # superdesk-core -pyparsing==3.1.2 +pyparsing==3.1.4 # via httplib2 python-dateutil==2.9.0.post0 # via @@ -243,9 +245,9 @@ redis==5.0.8 # via # celery # superdesk-core -regex==2024.5.15 +regex==2024.7.24 # via superdesk-core -reportlab==3.6.13 +reportlab==4.2.2 # via superdesk-core requests==2.32.3 # via @@ -268,13 +270,13 @@ six==1.16.0 # isodate # oauth2client # python-dateutil -superdesk-analytics @ git+https://github.com/superdesk/superdesk-analytics.git@v2.6.0 +superdesk-analytics @ git+https://github.com/superdesk/superdesk-analytics.git@release/2.8 # via -r requirements.in superdesk-core[exiv2] @ git+https://github.com/superdesk/superdesk-core.git@release/2.8 # via # -r requirements.in # superdesk-core -superdesk-planning @ git+https://github.com/superdesk/superdesk-planning.git@release/2.7 +superdesk-planning @ git+https://github.com/superdesk/superdesk-planning.git@release/2.8 # via -r requirements.in types-python-dateutil==2.9.0.20240906 # via arrow @@ -288,7 +290,7 @@ tzlocal==2.1 # via superdesk-core unidecode==1.3.8 # via superdesk-core -urllib3==1.26.19 +urllib3==1.26.20 # via # botocore # elastic-apm