From 7e49f5566be63a07c464c3a716cede54b5b92313 Mon Sep 17 00:00:00 2001 From: Petr Jasek Date: Tue, 14 Nov 2023 09:57:35 +0100 Subject: [PATCH] use newsroom-core v2.5-rc6 --- client/package-lock.json | 101 +++++++-------------------------------- client/package.json | 2 +- server/requirements.in | 2 +- server/requirements.txt | 40 ++++++++++------ 4 files changed, 44 insertions(+), 101 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 86d18f6..a292d71 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -417,41 +417,6 @@ } } }, - "@dnd-kit/accessibility": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@dnd-kit/accessibility/-/accessibility-3.1.0.tgz", - "integrity": "sha512-ea7IkhKvlJUv9iSHJOnxinBcoOI3ppGnnL+VDJ75O45Nss6HtZd8IdN8touXPDtASfeI2T2LImb8VOZcL47wjQ==", - "requires": { - "tslib": "^2.0.0" - } - }, - "@dnd-kit/core": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/@dnd-kit/core/-/core-6.1.0.tgz", - "integrity": "sha512-J3cQBClB4TVxwGo3KEjssGEXNJqGVWx17aRTZ1ob0FliR5IjYgTxl5YJbKTzA6IzrtelotH19v6y7uoIRUZPSg==", - "requires": { - "@dnd-kit/accessibility": "^3.1.0", - "@dnd-kit/utilities": "^3.2.2", - "tslib": "^2.0.0" - } - }, - "@dnd-kit/sortable": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/@dnd-kit/sortable/-/sortable-7.0.2.tgz", - "integrity": "sha512-wDkBHHf9iCi1veM834Gbk1429bd4lHX4RpAwT0y2cHLf246GAvU2sVw/oxWNpPKQNQRQaeGXhAVgrOl1IT+iyA==", - "requires": { - "@dnd-kit/utilities": "^3.2.0", - "tslib": "^2.0.0" - } - }, - "@dnd-kit/utilities": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/@dnd-kit/utilities/-/utilities-3.2.2.tgz", - "integrity": "sha512-+MKAJEOfaBe5SmV6t34p80MMKhjvUz0vRrvVJbPT0WElzaOJ/1xs+D+KDv+tD/NE5ujfrChEcshd4fLn0wpiqg==", - "requires": { - "tslib": "^2.0.0" - } - }, "@eslint-community/eslint-utils": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", @@ -1187,26 +1152,6 @@ "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz", "integrity": "sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==" }, - "@sucrase/webpack-object-rest-spread-plugin": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@sucrase/webpack-object-rest-spread-plugin/-/webpack-object-rest-spread-plugin-1.0.1.tgz", - "integrity": "sha512-TLfH/kCrwL31ERbejC9CmaOTJUxVr0mP+BsszbrMfxTQlJaKTVbP8xdcP/6FVOLvm5Wxf2czoS5VCzlPWiQEJw==", - "requires": { - "acorn": "^5.3.0", - "acorn-dynamic-import": "^3.0.0", - "acorn-object-rest-spread": "^1.1.0" - }, - "dependencies": { - "acorn-dynamic-import": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz", - "integrity": "sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==", - "requires": { - "acorn": "^5.0.0" - } - } - } - }, "@types/bootstrap": { "version": "5.2.9", "resolved": "https://registry.npmjs.org/@types/bootstrap/-/bootstrap-5.2.9.tgz", @@ -1311,9 +1256,9 @@ } }, "@types/react-datepicker": { - "version": "4.19.2", - "resolved": "https://registry.npmjs.org/@types/react-datepicker/-/react-datepicker-4.19.2.tgz", - "integrity": "sha512-Ta1YGrdK3PNWQjiilXly/ABjxsyjTHj4FoKlvhM4v2RC3aOM+m7xpr2fixjMIHEoS+108gt+sUBNGYGaXlxtfQ==", + "version": "4.19.3", + "resolved": "https://registry.npmjs.org/@types/react-datepicker/-/react-datepicker-4.19.3.tgz", + "integrity": "sha512-85F9eKWu9fGiD9r4KVVMPYAdkJJswR3Wci9PvqplmB6T+D+VbUqPeKtifg96NZ4nEhufjehW+SX4JLrEWVplWw==", "requires": { "@popperjs/core": "^2.9.2", "@types/react": "*", @@ -1655,14 +1600,6 @@ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==" }, - "acorn-object-rest-spread": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/acorn-object-rest-spread/-/acorn-object-rest-spread-1.1.0.tgz", - "integrity": "sha512-v/lolbMJxMB2tm66GjxhNSYEz2I+a8S99emxJu2mhqhDE348dJkxyliJ3pMV79tbTQEzGJA8pyRvC5qoSbjJAA==", - "requires": { - "acorn": "^5.0.3" - } - }, "after": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz", @@ -4165,14 +4102,14 @@ } }, "caniuse-db": { - "version": "1.0.30001561", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001561.tgz", - "integrity": "sha512-lrMBU9QyHu5Rg24Eu5bILWA6fvm/IxFy4z2lYc8Nnidkmr0io4Pi/UMqDEBU/3LPBao/UaKk4URwJP9Nww9lpQ==" + "version": "1.0.30001562", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001562.tgz", + "integrity": "sha512-m3OZB0qOOQh5n8YM8Z/NWiO+Cz2ijH/ewm4Lp4i7iiBGFgJIkKU3JbBr3llcO48/mkSv4yDG3/W3P8Y8EiasQA==" }, "caniuse-lite": { - "version": "1.0.30001561", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001561.tgz", - "integrity": "sha512-NTt0DNoKe958Q0BE0j0c1V9jbUzhBxHIEJy7asmGrpE0yG63KTV7PLHPnK2E1O9RsQrQ081I3NLuXGS6zht3cw==" + "version": "1.0.30001562", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001562.tgz", + "integrity": "sha512-kfte3Hym//51EdX4239i+Rmp20EsLIYGdPkERegTgU19hQWCRhsRFGKHTliUlsry53tv17K7n077Kqa0WJU4ng==" }, "caseless": { "version": "0.12.0", @@ -5312,9 +5249,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "electron-to-chromium": { - "version": "1.4.579", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.579.tgz", - "integrity": "sha512-bJKvA+awBIzYR0xRced7PrQuRIwGQPpo6ZLP62GAShahU9fWpsNN2IP6BSP1BLDDSbxvBVRGAMWlvVVq3npmLA==" + "version": "1.4.582", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.582.tgz", + "integrity": "sha512-89o0MGoocwYbzqUUjc+VNpeOFSOK9nIdC5wY4N+PVUarUK0MtjyTjks75AZS2bW4Kl8MdewdFsWaH0jLy+JNoA==" }, "elliptic": { "version": "6.5.4", @@ -6907,9 +6844,9 @@ } }, "flat-cache": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.1.tgz", - "integrity": "sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", "requires": { "flatted": "^3.2.9", "keyv": "^4.5.3", @@ -10078,13 +10015,10 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" }, "newsroom-core": { - "version": "github:superdesk/newsroom-core#c671112fb12e2da21e04d1db0c77e48cb5092be9", - "from": "github:superdesk/newsroom-core#develop", + "version": "github:superdesk/newsroom-core#6b118c054a453099cc264c65257642af38101b9f", + "from": "github:superdesk/newsroom-core#v2.5-rc6", "requires": { - "@dnd-kit/core": "^6.0.8", - "@dnd-kit/sortable": "^7.0.2", "@popperjs/core": "^2.11.4", - "@sucrase/webpack-object-rest-spread-plugin": "^1.0.1", "@types/bootstrap": "^5.2.6", "@types/enzyme": "^3.10.13", "@types/karma": "^6.3.4", @@ -10130,7 +10064,6 @@ "karma-jasmine": "^1.1.0", "karma-sourcemap-loader": "^0.3.8", "karma-webpack": "^2.0.4", - "lodash": "^4.17.19", "mime-types": "^2.1.34", "moment": "2.29.4", "moment-timezone": "0.5.41", diff --git a/client/package.json b/client/package.json index ed9c0ae..9bddb61 100644 --- a/client/package.json +++ b/client/package.json @@ -5,7 +5,7 @@ }, "dependencies": { "firebase": "9.6.11", - "newsroom-core": "github:superdesk/newsroom-core#develop" + "newsroom-core": "github:superdesk/newsroom-core#v2.5-rc6" }, "devDependencies": { "babel-plugin-transform-object-rest-spread": "^6.26.0", diff --git a/server/requirements.in b/server/requirements.in index 2347ea8..bcf3279 100644 --- a/server/requirements.in +++ b/server/requirements.in @@ -1,2 +1,2 @@ google-auth==2.6.0 -git+https://github.com/superdesk/newsroom-core.git@develop#egg=Newsroom-Core +git+https://github.com/superdesk/newsroom-core.git@v2.5-rc6#egg=Newsroom-Core diff --git a/server/requirements.txt b/server/requirements.txt index 0b4f2f2..8b6e14f 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.10 # by the following command: # -# pip-compile --resolver=backtracking requirements.in +# pip-compile requirements.in # amqp==5.2.0 # via kombu @@ -34,9 +34,9 @@ blinker==1.4 # raven # sentry-sdk # superdesk-core -boto3==1.28.72 +boto3==1.28.85 # via superdesk-core -botocore==1.31.72 +botocore==1.31.85 # via # boto3 # s3transfer @@ -47,7 +47,9 @@ cachetools==5.3.2 # flask-oidc-ex # google-auth celery[redis]==5.2.7 - # via superdesk-core + # via + # celery + # superdesk-core cerberus==1.3.5 # via # eve @@ -64,7 +66,7 @@ cffi==1.16.0 # cryptography chardet==3.0.4 # via superdesk-core -charset-normalizer==3.3.1 +charset-normalizer==3.3.2 # via requests ciso8601==1.0.8 # via eve-elastic @@ -94,18 +96,22 @@ cryptography==41.0.5 # pyhanko-certvalidator cssselect2==0.7.0 # via svglib -deepdiff==6.6.1 +deepdiff==6.7.1 # via superdesk-planning deprecated==1.2.14 # via # jwcrypto # limits draftjs-exporter[lxml]==2.1.7 - # via superdesk-core + # via + # draftjs-exporter + # superdesk-core ecs-logging==2.1.0 # via elastic-apm elastic-apm[flask]==6.19.0 - # via superdesk-core + # via + # elastic-apm + # superdesk-core elasticsearch==7.13.4 # via eve-elastic eve==1.1.2 @@ -219,7 +225,7 @@ mongolock==1.3.4 # via superdesk-core natsort==8.4.0 # via croniter -newsroom-core @ git+https://github.com/superdesk/newsroom-core.git@develop +newsroom-core @ git+https://github.com/superdesk/newsroom-core.git@v2.5-rc6 # via -r requirements.in oauth2client==4.1.3 # via flask-oidc-ex @@ -236,7 +242,7 @@ pillow==9.2.0 # reportlab # superdesk-core # xhtml2pdf -prompt-toolkit==3.0.39 +prompt-toolkit==3.0.40 # via click-repl pyasn1==0.5.0 # via @@ -270,7 +276,7 @@ pyparsing==3.1.1 # via # httplib2 # pyrtf3 -pypdf==3.17.0 +pypdf==3.17.1 # via xhtml2pdf pypng==0.20220715.0 # via qrcode @@ -285,7 +291,7 @@ python-dateutil==2.7.5 # croniter # icalendar # superdesk-core -python-jwt==4.0.0 +python-jwt==4.1.0 # via flask-oidc-ex python-magic==0.4.27 # via superdesk-core @@ -309,7 +315,9 @@ pyyaml==6.0.1 qrcode==7.4.2 # via pyhanko raven[flask]==6.10.0 - # via superdesk-core + # via + # raven + # superdesk-core redis==4.5.5 # via # celery @@ -338,7 +346,9 @@ rsa==4.9 s3transfer==0.7.0 # via boto3 sentry-sdk[flask]==1.5.12 - # via newsroom-core + # via + # newsroom-core + # sentry-sdk sgmllib3k==1.0.0 # via feedparser simplejson==3.19.2 @@ -390,7 +400,7 @@ vine==5.1.0 # amqp # celery # kombu -wcwidth==0.2.9 +wcwidth==0.2.10 # via prompt-toolkit webencodings==0.5.1 # via