From bbdab54b0391c8dd9f95180857788a9d57bdbfe8 Mon Sep 17 00:00:00 2001 From: Petr Jasek Date: Wed, 22 May 2024 12:25:54 +0200 Subject: [PATCH] use develop core --- client/package-lock.json | 98 ++++++++++++++++++++++++---------------- client/package.json | 2 +- server/requirements.in | 2 +- server/requirements.txt | 64 +++++++++++++------------- 4 files changed, 94 insertions(+), 72 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index f911fca..8913c44 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -777,9 +777,9 @@ "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==" }, "@remix-run/router": { - "version": "1.16.0", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.16.0.tgz", - "integrity": "sha512-Quz1KOffeEf/zwkCBM3kBtH4ZoZ+pT3xIXBG4PPW/XFtDP7EGhtTiC2+gpL9GnR7+Qdet5Oa6cYSvwKYg6kN9Q==" + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.16.1.tgz", + "integrity": "sha512-es2g3dq6Nb07iFxGk5GuHN20RwBZOsuDQN7izWIisUcv9r+d2C5jQxqmgkdebXgReWfiyUabcki6Fg77mSNrig==" }, "@sindresorhus/merge-streams": { "version": "2.3.0", @@ -885,9 +885,9 @@ "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==" }, "@types/lodash": { - "version": "4.17.1", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.1.tgz", - "integrity": "sha512-X+2qazGS3jxLAIz5JDXDzglAF3KpijdhFxlf/V1+hEsOUc+HnWi81L/uv/EvGuV90WY+7mPGFCUDGfQC3Gj95Q==" + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha512-wYCP26ZLxaT3R39kiN2+HcJ4kTd3U1waI/cY7ivWYqFP6pW3ZNpvi6Wd6PHZx7T/t8z0vlkXMg3QYLa7DZ/IJQ==" }, "@types/long": { "version": "4.0.2", @@ -900,9 +900,9 @@ "integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==" }, "@types/node": { - "version": "20.12.11", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.11.tgz", - "integrity": "sha512-vDg9PZ/zi+Nqp6boSOT7plNuthRugEKixDv5sFTIpkE89MmNtEArAShI4mxuX2+UrLEe9pxC1vm2cjm9YlWbJw==", + "version": "20.12.12", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.12.tgz", + "integrity": "sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==", "requires": { "undici-types": "~5.26.4" } @@ -2154,6 +2154,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "optional": true, "requires": { "fill-range": "^7.0.1" } @@ -2476,9 +2477,9 @@ } }, "caniuse-db": { - "version": "1.0.30001617", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001617.tgz", - "integrity": "sha512-JEfZYiroeTkXqNyFv8JJR0aN1tpTgBhst4UawTTKQ7ZVlAsMPWq1U8H9F/THtIXcV6u3CZCFEnkX+Fhgve8Z/w==" + "version": "1.0.30001621", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001621.tgz", + "integrity": "sha512-2iwAHB4j4OVlWcivkHnc1ycKl/FXZd0x+NdNhX7PpZciZp77nxDSloromhwBZJQgprZK9Yad+1Y+e2VUq2YILg==" }, "center-align": { "version": "0.1.3", @@ -3415,9 +3416,9 @@ } }, "dompurify": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.2.tgz", - "integrity": "sha512-hLGGBI1tw5N8qTELr3blKjAML/LY4ANxksbS612UiJyDfyf/2D092Pvm+S7pmeTGJRqvlJkFzBoHBQKgQlOQVg==" + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.4.tgz", + "integrity": "sha512-2gnshi6OshmuKil8rMZuQCGiUF3cUxHY3NGDzUAdUx/NPEe5DVnO8BDoAQouvgwnx0R/+a6jUn36Z0FSdq8vww==" }, "domutils": { "version": "2.8.0", @@ -3455,9 +3456,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "electron-to-chromium": { - "version": "1.4.762", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.762.tgz", - "integrity": "sha512-rrFvGweLxPwwSwJOjIopy3Vr+J3cIPtZzuc74bmlvmBIgQO3VYJDvVrlj94iKZ3ukXUH64Ex31hSfRTLqvjYJQ==" + "version": "1.4.777", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.777.tgz", + "integrity": "sha512-n02NCwLJ3wexLfK/yQeqfywCblZqLcXphzmid5e8yVPdtEcida7li0A5WQKghHNG0FeOMCzeFOzEbtAh5riXFw==" }, "elliptic": { "version": "6.5.5", @@ -4236,6 +4237,7 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "optional": true, "requires": { "to-regex-range": "^5.0.1" } @@ -6109,12 +6111,30 @@ "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==" }, "micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz", + "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==", "requires": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" + }, + "dependencies": { + "braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "requires": { + "fill-range": "^7.1.1" + } + }, + "fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "requires": { + "to-regex-range": "^5.0.1" + } + } } }, "miller-rabin": { @@ -6424,8 +6444,8 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" }, "newsroom-core": { - "version": "github:superdesk/newsroom-core#97be26751583dbc84b5d8ad167da460b1ff044c5", - "from": "github:superdesk/newsroom-core#release/2.7", + "version": "github:superdesk/newsroom-core#33fb7dcc3e05700fc8143accf3d81b2ff6123e36", + "from": "github:superdesk/newsroom-core#develop", "requires": { "@dnd-kit/core": "^6.0.8", "@dnd-kit/sortable": "^7.0.2", @@ -7465,9 +7485,9 @@ } }, "picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz", + "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==" }, "picomatch": { "version": "2.3.1", @@ -8398,9 +8418,9 @@ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, "react-onclickoutside": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.13.0.tgz", - "integrity": "sha512-ty8So6tcUpIb+ZE+1HAhbLROvAIJYyJe/1vRrrcmW+jLsaM+/powDRqxzo6hSh9CuRZGSL1Q8mvcF5WRD93a0A==" + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.13.1.tgz", + "integrity": "sha512-LdrrxK/Yh9zbBQdFbMTXPp3dTSN9B+9YJQucdDu3JNKRrbdU+H+/TVONJoWtOwy4II8Sqf1y/DTI6w/vGPYW0w==" }, "react-popper": { "version": "2.3.0", @@ -8432,20 +8452,20 @@ } }, "react-router": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.23.0.tgz", - "integrity": "sha512-wPMZ8S2TuPadH0sF5irFGjkNLIcRvOSaEe7v+JER8508dyJumm6XZB1u5kztlX0RVq6AzRVndzqcUh6sFIauzA==", + "version": "6.23.1", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.23.1.tgz", + "integrity": "sha512-fzcOaRF69uvqbbM7OhvQyBTFDVrrGlsFdS3AL+1KfIBtGETibHzi3FkoTRyiDJnWNc2VxrfvR+657ROHjaNjqQ==", "requires": { - "@remix-run/router": "1.16.0" + "@remix-run/router": "1.16.1" } }, "react-router-dom": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.23.0.tgz", - "integrity": "sha512-Q9YaSYvubwgbal2c9DJKfx6hTNoBp3iJDsl+Duva/DwxoJH+OTXkxGpql4iUK2sla/8z4RpjAm6EWx1qUDuopQ==", + "version": "6.23.1", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.23.1.tgz", + "integrity": "sha512-utP+K+aSTtEdbWpC+4gxhdlPFwuEfDKq8ZrPFU65bbRJY+l706qjR7yaidBpo3MSeA/fzwbXWbKBI6ftOnP3OQ==", "requires": { - "@remix-run/router": "1.16.0", - "react-router": "6.23.0" + "@remix-run/router": "1.16.1", + "react-router": "6.23.1" } }, "react-sortable-hoc": { diff --git a/client/package.json b/client/package.json index cedb9ad..5890bd4 100644 --- a/client/package.json +++ b/client/package.json @@ -4,7 +4,7 @@ "build": "export NODE_ENV=production && webpack --progress --profile --colors" }, "dependencies": { - "newsroom-core": "github:superdesk/newsroom-core#release/2.7" + "newsroom-core": "github:superdesk/newsroom-core#develop" }, "devDependencies": { "babel-plugin-transform-object-rest-spread": "^6.26.0", diff --git a/server/requirements.in b/server/requirements.in index d309af7..e4e0b7c 100644 --- a/server/requirements.in +++ b/server/requirements.in @@ -1 +1 @@ -git+https://github.com/superdesk/newsroom-core.git@release/2.7#egg=Newsroom-Core +git+https://github.com/superdesk/newsroom-core.git@develop#egg=Newsroom-Core diff --git a/server/requirements.txt b/server/requirements.txt index 95bfc16..91156b3 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -23,7 +23,7 @@ authlib==0.14.3 # via superdesk-core babel==2.15.0 # via flask-babel -bcrypt==3.1.7 +bcrypt==4.1.3 # via superdesk-core billiard==3.6.4.0 # via celery @@ -35,9 +35,9 @@ blinker==1.7.0 # raven # sentry-sdk # superdesk-core -boto3==1.34.100 +boto3==1.34.110 # via superdesk-core -botocore==1.34.100 +botocore==1.34.110 # via # boto3 # s3transfer @@ -60,9 +60,7 @@ certifi==2024.2.2 # requests # sentry-sdk cffi==1.16.0 - # via - # bcrypt - # cryptography + # via cryptography chardet==5.2.0 # via # reportlab @@ -87,7 +85,7 @@ click-plugins==1.1.1 # via celery click-repl==0.3.0 # via celery -croniter==0.3.37 +croniter==2.0.5 # via superdesk-core cryptography==42.0.7 # via @@ -103,11 +101,11 @@ deprecated==1.2.14 # via limits dnspython==2.6.1 # via email-validator -draftjs-exporter[lxml]==2.1.7 +draftjs-exporter[lxml]==2.1.0 # via superdesk-core ecs-logging==2.1.0 # via elastic-apm -elastic-apm[flask]==6.22.0 +elastic-apm[flask]==6.22.2 # via superdesk-core elasticsearch==7.13.4 # via @@ -115,7 +113,7 @@ elasticsearch==7.13.4 # superdesk-core email-validator==2.1.1 # via wtforms -eve==1.1.2 +eve==2.1.0 # via superdesk-core eve-elastic==7.4.1 # via @@ -142,14 +140,16 @@ flask==1.1.2 # sentry-sdk # superdesk-core flask-babel==1.0.0 - # via superdesk-core + # via + # newsroom-core + # superdesk-core flask-caching==2.3.0 # via newsroom-core flask-limiter==0.9.5.1 # via newsroom-core flask-mail==0.9.1 # via superdesk-core -flask-oidc-ex==0.5.5 +flask-oidc-ex==0.5.8 # via superdesk-core flask-pymongo==2.3.0 # via newsroom-core @@ -175,7 +175,7 @@ html5lib==1.1 # via xhtml2pdf httplib2==0.22.0 # via oauth2client -icalendar==4.0.9 +icalendar==5.0.12 # via superdesk-planning idna==3.7 # via @@ -210,26 +210,28 @@ kombu==5.2.4 # superdesk-core ldap3==2.5.2 # via superdesk-core -limits==3.11.0 +limits==3.12.0 # via flask-limiter -lxml==4.6.5 +lxml==5.2.2 # via # draftjs-exporter + # lxml-html-clean # python3-saml # superdesk-core # svglib # xmlsec +lxml-html-clean==0.1.1 + # via superdesk-core markupsafe==2.0.1 # via # jinja2 # newsroom-core + # sentry-sdk # superdesk-core # wtforms mongolock==1.3.4 # via superdesk-core -natsort==8.4.0 - # via croniter -newsroom-core @ git+https://github.com/superdesk/newsroom-core.git@release/2.7 +newsroom-core @ git+https://github.com/superdesk/newsroom-core.git@develop # via -r requirements.in oauth2client==4.1.3 # via flask-oidc-ex @@ -290,7 +292,7 @@ pyrtf3==0.47.5 # via newsroom-core python-bidi==0.4.2 # via xhtml2pdf -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 # via # arrow # botocore @@ -308,6 +310,7 @@ python3-saml==1.16.0 pytz==2024.1 # via # celery + # croniter # eve-elastic # flask-babel # icalendar @@ -322,11 +325,11 @@ qrcode==7.4.2 # via pyhanko raven[flask]==6.10.0 # via superdesk-core -redis==4.5.5 +redis==5.0.4 # via # celery # superdesk-core -regex==2020.7.14 +regex==2024.4.28 # via superdesk-core reportlab==3.6.13 # via @@ -334,7 +337,7 @@ reportlab==3.6.13 # superdesk-core # svglib # xhtml2pdf -requests==2.31.0 +requests==2.32.2 # via # pyhanko # pyhanko-certvalidator @@ -349,7 +352,7 @@ rsa==4.9 # oauth2client s3transfer==0.10.1 # via boto3 -sentry-sdk[flask]==1.9.0 +sentry-sdk[flask]==2.2.1 # via newsroom-core sgmllib3k==1.0.0 # via feedparser @@ -357,7 +360,6 @@ simplejson==3.19.2 # via eve six==1.16.0 # via - # bcrypt # flask-limiter # flask-oidc-ex # html5lib @@ -365,9 +367,9 @@ six==1.16.0 # oauth2client # python-bidi # python-dateutil -superdesk-core @ git+https://github.com/superdesk/superdesk-core.git@v2.7.0-rc4 +superdesk-core @ git+https://github.com/superdesk/superdesk-core.git@develop # via newsroom-core -superdesk-planning @ git+https://github.com/superdesk/superdesk-planning.git@v2.7.0-rc1 +superdesk-planning @ git+https://github.com/superdesk/superdesk-planning.git@develop # via newsroom-core svglib==1.5.1 # via xhtml2pdf @@ -386,11 +388,11 @@ tzlocal==2.1 # via # pyhanko # superdesk-core -unidecode==0.4.21 +unidecode==1.3.8 # via superdesk-core uritools==4.0.2 # via pyhanko-certvalidator -urllib3==1.25.11 +urllib3==1.26.18 # via # botocore # elastic-apm @@ -416,7 +418,7 @@ werkzeug==1.0.1 # via # flask # superdesk-core -wrapt==1.14.1 +wrapt==1.16.0 # via # deprecated # elastic-apm @@ -427,10 +429,10 @@ wtforms[email]==3.1.2 # wtforms xhtml2pdf==0.2.11 # via newsroom-core -xmlsec==1.3.13 +xmlsec==1.3.14 # via - # newsroom-core # python3-saml + # superdesk-core # The following packages are considered to be unsafe in a requirements file: # setuptools