From c4f4783230d37c56d981149b400888877b7bd6ca Mon Sep 17 00:00:00 2001 From: Petr Jasek Date: Wed, 27 Mar 2024 12:08:52 +0100 Subject: [PATCH 1/7] update client --- client/package-lock.json | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 504257c..495cbba 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -830,9 +830,9 @@ }, "dependencies": { "@grpc/proto-loader": { - "version": "0.7.10", - "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.10.tgz", - "integrity": "sha512-CAqDfoaQ8ykFd9zqBDn4k6iWT9loLAlc2ETmDFS9JCD70gDcnA4L3AFEo2iV7KyAtAAHFW9ftq1Fz+Vsgq80RQ==", + "version": "0.7.11", + "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.11.tgz", + "integrity": "sha512-amjhSfJ+xYnTP+hncJMmkchoRtjIdi+uO3FaymGSCr07yu5xfpXFEnhZkTU1mj2lPJB3oVToau7j9YkqB+YNdg==", "requires": { "lodash.camelcase": "^4.3.0", "long": "^5.0.0", @@ -1187,12 +1187,12 @@ }, "dependencies": { "@types/react": { - "version": "16.14.59", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.59.tgz", - "integrity": "sha512-tOV7Za9TpBGi0jyi/fjsUmuFM1svfInVsBCkpQcwNDkVL8MEN1aV3FxjI4wYaASMlVE6NZXXx06zaN4rtRPwyQ==", + "version": "16.14.60", + "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.60.tgz", + "integrity": "sha512-wIFmnczGsTcgwCBeIYOuy2mdXEiKZ5znU/jNOnMZPQyCcIxauMGWlX0TNG4lZ7NxRKj7YUIZRneJQSSdB2jKgg==", "requires": { "@types/prop-types": "*", - "@types/scheduler": "*", + "@types/scheduler": "^0.16", "csstype": "^3.0.2" } } @@ -1267,12 +1267,12 @@ "integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==" }, "@types/react": { - "version": "17.0.79", - "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.79.tgz", - "integrity": "sha512-gavKA8AwJAML9zWHuiQRASjrrPJHbT/zrUDHiUGUf+l5a3pkEd6atvjjq+8y2vfRHBJLQJjFpxSa9I8qe9zHAw==", + "version": "17.0.80", + "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.80.tgz", + "integrity": "sha512-LrgHIu2lEtIo8M7d1FcI3BdwXWoRQwMoXOZ7+dPTW0lYREjmlHl3P0U1VD0i/9tppOuv8/sam7sOjx34TxSFbA==", "requires": { "@types/prop-types": "*", - "@types/scheduler": "*", + "@types/scheduler": "^0.16", "csstype": "^3.0.2" } }, @@ -4317,9 +4317,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "electron-to-chromium": { - "version": "1.4.715", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.715.tgz", - "integrity": "sha512-XzWNH4ZSa9BwVUQSDorPWAUQ5WGuYz7zJUNpNif40zFCiCl20t8zgylmreNmn26h5kiyw2lg7RfTmeMBsDklqg==" + "version": "1.4.717", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.717.tgz", + "integrity": "sha512-6Fmg8QkkumNOwuZ/5mIbMU9WI3H2fmn5ajcVya64I5Yr5CcNmO7vcLt0Y7c96DCiMO5/9G+4sI2r6eEvdg1F7A==" }, "elliptic": { "version": "6.5.5", @@ -8153,7 +8153,7 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" }, "newsroom-core": { - "version": "github:superdesk/newsroom-core#2077f0807bd596d0af97685bf1f23e2861db5f23", + "version": "github:superdesk/newsroom-core#09e84055016d223207614b7a6e1363c436e445db", "from": "github:superdesk/newsroom-core#release/2.6", "requires": { "@dnd-kit/core": "^6.0.8", From a2c544e9ea78f027e2d3c9246d495510ba75f596 Mon Sep 17 00:00:00 2001 From: Petr Jasek Date: Wed, 27 Mar 2024 13:52:51 +0100 Subject: [PATCH 2/7] use core v2.6.0 --- client/package-lock.json | 4 ++-- client/package.json | 2 +- server/requirements.in | 2 +- server/requirements.txt | 16 ++++++++-------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 495cbba..8e83727 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -8153,8 +8153,8 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" }, "newsroom-core": { - "version": "github:superdesk/newsroom-core#09e84055016d223207614b7a6e1363c436e445db", - "from": "github:superdesk/newsroom-core#release/2.6", + "version": "github:superdesk/newsroom-core#68c882c9c1cdc3bab57201c923f744aa22b8d246", + "from": "github:superdesk/newsroom-core#v2.6.0", "requires": { "@dnd-kit/core": "^6.0.8", "@dnd-kit/sortable": "^7.0.2", diff --git a/client/package.json b/client/package.json index def20be..46f9434 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.6" + "newsroom-core": "github:superdesk/newsroom-core#v2.6.0" }, "devDependencies": { "babel-plugin-transform-object-rest-spread": "^6.26.0", diff --git a/server/requirements.in b/server/requirements.in index f118eba..1b8bf80 100644 --- a/server/requirements.in +++ b/server/requirements.in @@ -1 +1 @@ -git+https://github.com/superdesk/newsroom-core.git@release/2.6#egg=Newsroom-Core +git+https://github.com/superdesk/newsroom-core.git@v2.6.0#egg=Newsroom-Core diff --git a/server/requirements.txt b/server/requirements.txt index 7e86d6e..c721946 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -34,9 +34,9 @@ blinker==1.7.0 # raven # sentry-sdk # superdesk-core -boto3==1.34.66 +boto3==1.34.71 # via superdesk-core -botocore==1.34.66 +botocore==1.34.71 # via # boto3 # s3transfer @@ -78,7 +78,7 @@ click==8.1.7 # newsroom-core # pyhanko # superdesk-core -click-didyoumean==0.3.0 +click-didyoumean==0.3.1 # via celery click-plugins==1.1.1 # via celery @@ -170,7 +170,7 @@ icalendar==4.0.9 # via superdesk-planning idna==3.6 # via requests -importlib-resources==6.3.2 +importlib-resources==6.4.0 # via limits isodate==0.6.1 # via python3-saml @@ -217,7 +217,7 @@ 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.6 +newsroom-core @ git+https://github.com/superdesk/newsroom-core.git@v2.6.0 # via -r requirements.in oauth2client==4.1.3 # via flask-oidc-ex @@ -236,13 +236,13 @@ pillow==9.2.0 # xhtml2pdf prompt-toolkit==3.0.43 # via click-repl -pyasn1==0.5.1 +pyasn1==0.6.0 # via # ldap3 # oauth2client # pyasn1-modules # rsa -pyasn1-modules==0.3.0 +pyasn1-modules==0.4.0 # via # google-auth # oauth2client @@ -327,7 +327,7 @@ requests==2.31.0 # python-twitter # requests-oauthlib # superdesk-core -requests-oauthlib==1.4.0 +requests-oauthlib==2.0.0 # via python-twitter rsa==4.9 # via From 14327425c95d016b9d63a994c80987730a42a0fa Mon Sep 17 00:00:00 2001 From: Petr Jasek Date: Wed, 3 Apr 2024 16:14:24 +0200 Subject: [PATCH 3/7] update core --- server/requirements.in | 2 +- server/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/requirements.in b/server/requirements.in index 1b8bf80..f118eba 100644 --- a/server/requirements.in +++ b/server/requirements.in @@ -1 +1 @@ -git+https://github.com/superdesk/newsroom-core.git@v2.6.0#egg=Newsroom-Core +git+https://github.com/superdesk/newsroom-core.git@release/2.6#egg=Newsroom-Core diff --git a/server/requirements.txt b/server/requirements.txt index c721946..1543603 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -217,7 +217,7 @@ mongolock==1.3.4 # via superdesk-core natsort==8.4.0 # via croniter -newsroom-core @ git+https://github.com/superdesk/newsroom-core.git@v2.6.0 +newsroom-core @ git+https://github.com/superdesk/newsroom-core.git@release/2.6 # via -r requirements.in oauth2client==4.1.3 # via flask-oidc-ex From 0760d95a314db23a43a160029d0faf96ad36fe03 Mon Sep 17 00:00:00 2001 From: Petr Jasek Date: Wed, 3 Apr 2024 16:26:42 +0200 Subject: [PATCH 4/7] update client --- client/package-lock.json | 46 ++++++++++++++++++++-------------------- client/package.json | 2 +- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 8e83727..c77a38c 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -830,9 +830,9 @@ }, "dependencies": { "@grpc/proto-loader": { - "version": "0.7.11", - "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.11.tgz", - "integrity": "sha512-amjhSfJ+xYnTP+hncJMmkchoRtjIdi+uO3FaymGSCr07yu5xfpXFEnhZkTU1mj2lPJB3oVToau7j9YkqB+YNdg==", + "version": "0.7.12", + "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.12.tgz", + "integrity": "sha512-DCVwMxqYzpUCiDMl7hQ384FqP4T3DbNpXU8pt681l3UWCip1WUiD5JrkImUwCB9a7f2cq4CUTmi5r/xIMRPY1Q==", "requires": { "lodash.camelcase": "^4.3.0", "long": "^5.0.0", @@ -944,9 +944,9 @@ "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==" }, "@humanwhocodes/object-schema": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz", - "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==" + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", + "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==" }, "@jridgewell/gen-mapping": { "version": "0.3.5", @@ -1254,9 +1254,9 @@ "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==" }, "@types/node": { - "version": "20.11.30", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.30.tgz", - "integrity": "sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==", + "version": "20.12.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.3.tgz", + "integrity": "sha512-sD+ia2ubTeWrOu+YMF+MTAB7E+O7qsMqAbMfW7DG3K1URwhZ5hN1pLlRVGbf4wDFzSfikL05M17EyorS86jShw==", "requires": { "undici-types": "~5.26.4" } @@ -3137,14 +3137,14 @@ } }, "caniuse-db": { - "version": "1.0.30001600", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001600.tgz", - "integrity": "sha512-BS+RAD1DggiDlE2KaBUWKsMDuVmmh3hCM5LI0OW25mGlPttGLeOjDUa1DmZvJVFCXvtshY4BTyFgv31eFTLg8g==" + "version": "1.0.30001605", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001605.tgz", + "integrity": "sha512-vOYm4mvCN0i1bsYFiNRlj3Hi4lB1WLadhqlsgcEyFG/v+v1S3y4KifpD262o2ED7hn+ds0enugtU3cnYFIQ1Vw==" }, "caniuse-lite": { - "version": "1.0.30001600", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001600.tgz", - "integrity": "sha512-+2S9/2JFhYmYaDpZvo0lKkfvuKIglrx68MwOBqMGHhQsNkLjB5xtc/TGoEPs+MxjSyN/72qer2g97nzR641mOQ==" + "version": "1.0.30001605", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001605.tgz", + "integrity": "sha512-nXwGlFWo34uliI9z3n6Qc0wZaf7zaZWA1CPZ169La5mV3I/gem7bst0vr5XQH5TJXZIMfDeZyOrZnSlVzKxxHQ==" }, "caseless": { "version": "0.12.0", @@ -4317,9 +4317,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "electron-to-chromium": { - "version": "1.4.717", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.717.tgz", - "integrity": "sha512-6Fmg8QkkumNOwuZ/5mIbMU9WI3H2fmn5ajcVya64I5Yr5CcNmO7vcLt0Y7c96DCiMO5/9G+4sI2r6eEvdg1F7A==" + "version": "1.4.724", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.724.tgz", + "integrity": "sha512-RTRvkmRkGhNBPPpdrgtDKvmOEYTrPlXDfc0J/Nfq5s29tEahAwhiX4mmhNzj6febWMleulxVYPh7QwCSL/EldA==" }, "elliptic": { "version": "6.5.5", @@ -8153,8 +8153,8 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" }, "newsroom-core": { - "version": "github:superdesk/newsroom-core#68c882c9c1cdc3bab57201c923f744aa22b8d246", - "from": "github:superdesk/newsroom-core#v2.6.0", + "version": "github:superdesk/newsroom-core#4e80f6e23275acc4ffbf77a5f6b01e44cdb0127a", + "from": "github:superdesk/newsroom-core#release/2.6", "requires": { "@dnd-kit/core": "^6.0.8", "@dnd-kit/sortable": "^7.0.2", @@ -9709,9 +9709,9 @@ "integrity": "sha512-KDeO94CbWI4pKsPnYpA1FPjo79EsY9I+M8ywoPBSf9XMXoe/0crjbUK7jcQEDHuc0ZMRIZsxH3TYLv4TUtHmAA==" }, "primereact": { - "version": "10.5.3", - "resolved": "https://registry.npmjs.org/primereact/-/primereact-10.5.3.tgz", - "integrity": "sha512-uKfGU6jWdDnTOnfAj9IjbRuzJVtFqzbgZVSVe5OgxVVxT6JoImF28uj/iQlFJJs17WHi1SWtOmXTjSBqtL8fUg==", + "version": "10.6.2", + "resolved": "https://registry.npmjs.org/primereact/-/primereact-10.6.2.tgz", + "integrity": "sha512-Ml+xeYz0Djbr7KXieBdmnqfFsBPGmmuLy1wUYrmsBQzhrDSI79BKFKkgCcWKvEi0M1RNa58ZmKJcX4yXhCdtBw==", "requires": { "@types/react-transition-group": "^4.4.1", "react-transition-group": "^4.4.1" diff --git a/client/package.json b/client/package.json index 46f9434..def20be 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#v2.6.0" + "newsroom-core": "github:superdesk/newsroom-core#release/2.6" }, "devDependencies": { "babel-plugin-transform-object-rest-spread": "^6.26.0", From c65ccc02fbf6c59e851b880f4df5ca12f55c102e Mon Sep 17 00:00:00 2001 From: Petr Jasek Date: Fri, 5 Apr 2024 11:36:30 +0200 Subject: [PATCH 5/7] use core v2.6.1 --- client/package-lock.json | 70 ++++++++++++++++++++-------------------- client/package.json | 2 +- server/requirements.in | 2 +- server/requirements.txt | 2 +- 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index c77a38c..554c165 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -26,22 +26,22 @@ } }, "@babel/compat-data": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.1.tgz", - "integrity": "sha512-Pc65opHDliVpRHuKfzI+gSA4zcgr65O4cl64fFJIWEEh8JoHIHh0Oez1Eo8Arz8zq/JhgKodQaxEwUPRtZylVA==" + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.4.tgz", + "integrity": "sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ==" }, "@babel/core": { - "version": "7.24.3", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.3.tgz", - "integrity": "sha512-5FcvN1JHw2sHJChotgx8Ek0lyuh4kCKelgMTTqhYJJtloNvUfpAFMeNQUtdlIaktwrSV9LtCdqwk48wL2wBacQ==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.4.tgz", + "integrity": "sha512-MBVlMXP+kkl5394RBLSxxk/iLTeVGuXTV3cIDXavPpMMqnSnt6apKgan/U8O3USWZCWZT/TbgfEpKa4uMgN4Dg==", "requires": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.24.2", - "@babel/generator": "^7.24.1", + "@babel/generator": "^7.24.4", "@babel/helper-compilation-targets": "^7.23.6", "@babel/helper-module-transforms": "^7.23.3", - "@babel/helpers": "^7.24.1", - "@babel/parser": "^7.24.1", + "@babel/helpers": "^7.24.4", + "@babel/parser": "^7.24.4", "@babel/template": "^7.24.0", "@babel/traverse": "^7.24.1", "@babel/types": "^7.24.0", @@ -70,9 +70,9 @@ } }, "@babel/generator": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.1.tgz", - "integrity": "sha512-DfCRfZsBcrPEHUfuBMgbJ1Ut01Y/itOs+hY2nFLgqsqXd52/iSiVq5TITtUasIUgm+IIKdY2/1I7auiQOEeC9A==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.4.tgz", + "integrity": "sha512-Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw==", "requires": { "@babel/types": "^7.24.0", "@jridgewell/gen-mapping": "^0.3.5", @@ -204,9 +204,9 @@ "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==" }, "@babel/helpers": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.1.tgz", - "integrity": "sha512-BpU09QqEe6ZCHuIHFphEFgvNSrubve1FtyMton26ekZ85gRGi6LrTF7zArARp2YvyFxloeiRmtSCq5sjh1WqIg==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.4.tgz", + "integrity": "sha512-FewdlZbSiwaVGlgT1DPANDuCHaDMiOo+D/IDYRFYjHOuv66xMSJ7fQwwODwRNAPkADIO/z1EoF/l2BCWlWABDw==", "requires": { "@babel/template": "^7.24.0", "@babel/traverse": "^7.24.1", @@ -258,14 +258,14 @@ } }, "@babel/parser": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.1.tgz", - "integrity": "sha512-Zo9c7N3xdOIQrNip7Lc9wvRPzlRtovHVE4lkz8WEDr7uYh/GMQhSiIgFxGIArRHYdJE5kxtZjAf8rT0xhdLCzg==" + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.4.tgz", + "integrity": "sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==" }, "@babel/runtime": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.1.tgz", - "integrity": "sha512-+BIznRzyqBf+2wCTxcKE3wDjfGeCoVE61KSHGpkzqrLi8qxqFwBeUFyId2cxkTmm55fzDGnm0+yCxaxygrLUnQ==", + "version": "7.24.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.4.tgz", + "integrity": "sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA==", "requires": { "regenerator-runtime": "^0.14.0" } @@ -1254,9 +1254,9 @@ "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==" }, "@types/node": { - "version": "20.12.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.3.tgz", - "integrity": "sha512-sD+ia2ubTeWrOu+YMF+MTAB7E+O7qsMqAbMfW7DG3K1URwhZ5hN1pLlRVGbf4wDFzSfikL05M17EyorS86jShw==", + "version": "20.12.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.4.tgz", + "integrity": "sha512-E+Fa9z3wSQpzgYQdYmme5X3OTuejnnTx88A6p6vkkJosR3KBz+HpE3kqNm98VE6cfLFcISx7zW7MsJkH6KwbTw==", "requires": { "undici-types": "~5.26.4" } @@ -3137,14 +3137,14 @@ } }, "caniuse-db": { - "version": "1.0.30001605", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001605.tgz", - "integrity": "sha512-vOYm4mvCN0i1bsYFiNRlj3Hi4lB1WLadhqlsgcEyFG/v+v1S3y4KifpD262o2ED7hn+ds0enugtU3cnYFIQ1Vw==" + "version": "1.0.30001606", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001606.tgz", + "integrity": "sha512-NBW2GzGWfLbcus5FDkNbvOWbcny9GbmRSm9QPrr21ado4g+Y+GE2gzsiF4LOkEnz//8D+aEjiGvqx+UJjVplEA==" }, "caniuse-lite": { - "version": "1.0.30001605", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001605.tgz", - "integrity": "sha512-nXwGlFWo34uliI9z3n6Qc0wZaf7zaZWA1CPZ169La5mV3I/gem7bst0vr5XQH5TJXZIMfDeZyOrZnSlVzKxxHQ==" + "version": "1.0.30001606", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001606.tgz", + "integrity": "sha512-LPbwnW4vfpJId225pwjZJOgX1m9sGfbw/RKJvw/t0QhYOOaTXHvkjVGFGPpvwEzufrjvTlsULnVTxdy4/6cqkg==" }, "caseless": { "version": "0.12.0", @@ -4317,9 +4317,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "electron-to-chromium": { - "version": "1.4.724", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.724.tgz", - "integrity": "sha512-RTRvkmRkGhNBPPpdrgtDKvmOEYTrPlXDfc0J/Nfq5s29tEahAwhiX4mmhNzj6febWMleulxVYPh7QwCSL/EldA==" + "version": "1.4.728", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.728.tgz", + "integrity": "sha512-Ud1v7hJJYIqehlUJGqR6PF1Ek8l80zWwxA6nGxigBsGJ9f9M2fciHyrIiNMerSHSH3p+0/Ia7jIlnDkt41h5cw==" }, "elliptic": { "version": "6.5.5", @@ -8153,8 +8153,8 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" }, "newsroom-core": { - "version": "github:superdesk/newsroom-core#4e80f6e23275acc4ffbf77a5f6b01e44cdb0127a", - "from": "github:superdesk/newsroom-core#release/2.6", + "version": "github:superdesk/newsroom-core#4fb9fbeb7c72e9242574532b0e2622574477f01a", + "from": "github:superdesk/newsroom-core#v2.6.1", "requires": { "@dnd-kit/core": "^6.0.8", "@dnd-kit/sortable": "^7.0.2", diff --git a/client/package.json b/client/package.json index def20be..632ccbf 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.6" + "newsroom-core": "github:superdesk/newsroom-core#v2.6.1" }, "devDependencies": { "babel-plugin-transform-object-rest-spread": "^6.26.0", diff --git a/server/requirements.in b/server/requirements.in index f118eba..4a8d34d 100644 --- a/server/requirements.in +++ b/server/requirements.in @@ -1 +1 @@ -git+https://github.com/superdesk/newsroom-core.git@release/2.6#egg=Newsroom-Core +git+https://github.com/superdesk/newsroom-core.git@v2.6.1#egg=Newsroom-Core diff --git a/server/requirements.txt b/server/requirements.txt index 1543603..c81279c 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -217,7 +217,7 @@ 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.6 +newsroom-core @ git+https://github.com/superdesk/newsroom-core.git@v2.6.1 # via -r requirements.in oauth2client==4.1.3 # via flask-oidc-ex From 8a0d3f720c1f14ed9048416fb25710aa4c88b102 Mon Sep 17 00:00:00 2001 From: Petr Jasek Date: Wed, 10 Apr 2024 09:58:52 +0200 Subject: [PATCH 6/7] bump server core --- server/requirements.in | 2 +- server/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/requirements.in b/server/requirements.in index 4a8d34d..f118eba 100644 --- a/server/requirements.in +++ b/server/requirements.in @@ -1 +1 @@ -git+https://github.com/superdesk/newsroom-core.git@v2.6.1#egg=Newsroom-Core +git+https://github.com/superdesk/newsroom-core.git@release/2.6#egg=Newsroom-Core diff --git a/server/requirements.txt b/server/requirements.txt index c81279c..1543603 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -217,7 +217,7 @@ mongolock==1.3.4 # via superdesk-core natsort==8.4.0 # via croniter -newsroom-core @ git+https://github.com/superdesk/newsroom-core.git@v2.6.1 +newsroom-core @ git+https://github.com/superdesk/newsroom-core.git@release/2.6 # via -r requirements.in oauth2client==4.1.3 # via flask-oidc-ex From dc06626c8d17aae29c7bd64b2cdefa248c3a8cde Mon Sep 17 00:00:00 2001 From: Petr Jasek Date: Wed, 10 Apr 2024 15:33:37 +0200 Subject: [PATCH 7/7] update core to v2.6.2 --- client/package-lock.json | 40 ++++++++++++++++++++-------------------- client/package.json | 2 +- server/requirements.in | 2 +- server/requirements.txt | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 554c165..aa3c6c1 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1254,9 +1254,9 @@ "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==" }, "@types/node": { - "version": "20.12.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.4.tgz", - "integrity": "sha512-E+Fa9z3wSQpzgYQdYmme5X3OTuejnnTx88A6p6vkkJosR3KBz+HpE3kqNm98VE6cfLFcISx7zW7MsJkH6KwbTw==", + "version": "20.12.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.7.tgz", + "integrity": "sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==", "requires": { "undici-types": "~5.26.4" } @@ -3137,14 +3137,14 @@ } }, "caniuse-db": { - "version": "1.0.30001606", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001606.tgz", - "integrity": "sha512-NBW2GzGWfLbcus5FDkNbvOWbcny9GbmRSm9QPrr21ado4g+Y+GE2gzsiF4LOkEnz//8D+aEjiGvqx+UJjVplEA==" + "version": "1.0.30001608", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001608.tgz", + "integrity": "sha512-JJRT28ph4kqOujj9OCqWqzDIYmu82wysTUxBHfFanIsrW2pgqlvir3cvnhzIgtKKFPeVspKJ9EFR/qpEFkskWw==" }, "caniuse-lite": { - "version": "1.0.30001606", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001606.tgz", - "integrity": "sha512-LPbwnW4vfpJId225pwjZJOgX1m9sGfbw/RKJvw/t0QhYOOaTXHvkjVGFGPpvwEzufrjvTlsULnVTxdy4/6cqkg==" + "version": "1.0.30001608", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001608.tgz", + "integrity": "sha512-cjUJTQkk9fQlJR2s4HMuPMvTiRggl0rAVMtthQuyOlDWuqHXqN8azLq+pi8B2TjwKJ32diHjUqRIKeFX4z1FoA==" }, "caseless": { "version": "0.12.0", @@ -4277,9 +4277,9 @@ } }, "dompurify": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.0.11.tgz", - "integrity": "sha512-Fan4uMuyB26gFV3ovPoEoQbxRRPfTu3CvImyZnhGq5fsIEO+gEFLp45ISFt+kQBWsK5ulDdT0oV28jS1UrwQLg==" + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.0.tgz", + "integrity": "sha512-yoU4rhgPKCo+p5UrWWWNKiIq+ToGqmVVhk0PmMYBK4kRsR3/qhemNFL8f6CFmBd4gMwm3F4T7HBoydP5uY07fA==" }, "domutils": { "version": "3.1.0", @@ -4317,9 +4317,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "electron-to-chromium": { - "version": "1.4.728", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.728.tgz", - "integrity": "sha512-Ud1v7hJJYIqehlUJGqR6PF1Ek8l80zWwxA6nGxigBsGJ9f9M2fciHyrIiNMerSHSH3p+0/Ia7jIlnDkt41h5cw==" + "version": "1.4.731", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.731.tgz", + "integrity": "sha512-+TqVfZjpRz2V/5SPpmJxq9qK620SC5SqCnxQIOi7i/U08ZDcTpKbT7Xjj9FU5CbXTMUb4fywbIr8C7cGv4hcjw==" }, "elliptic": { "version": "6.5.5", @@ -8153,8 +8153,8 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" }, "newsroom-core": { - "version": "github:superdesk/newsroom-core#4fb9fbeb7c72e9242574532b0e2622574477f01a", - "from": "github:superdesk/newsroom-core#v2.6.1", + "version": "github:superdesk/newsroom-core#62206cd3bb3f9adbbeb5091ef63079a73a139213", + "from": "github:superdesk/newsroom-core#v2.6.2", "requires": { "@dnd-kit/core": "^6.0.8", "@dnd-kit/sortable": "^7.0.2", @@ -9709,9 +9709,9 @@ "integrity": "sha512-KDeO94CbWI4pKsPnYpA1FPjo79EsY9I+M8ywoPBSf9XMXoe/0crjbUK7jcQEDHuc0ZMRIZsxH3TYLv4TUtHmAA==" }, "primereact": { - "version": "10.6.2", - "resolved": "https://registry.npmjs.org/primereact/-/primereact-10.6.2.tgz", - "integrity": "sha512-Ml+xeYz0Djbr7KXieBdmnqfFsBPGmmuLy1wUYrmsBQzhrDSI79BKFKkgCcWKvEi0M1RNa58ZmKJcX4yXhCdtBw==", + "version": "10.6.3", + "resolved": "https://registry.npmjs.org/primereact/-/primereact-10.6.3.tgz", + "integrity": "sha512-1jCg81ebdmTGS5+1mbqNOLxTBD1Bcg9YqInrlghz9l2/akRIoSB9krnXEi14h8h/X4CH4EdAEHs0FF3Lj+IO8w==", "requires": { "@types/react-transition-group": "^4.4.1", "react-transition-group": "^4.4.1" diff --git a/client/package.json b/client/package.json index 632ccbf..26f6567 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#v2.6.1" + "newsroom-core": "github:superdesk/newsroom-core#v2.6.2" }, "devDependencies": { "babel-plugin-transform-object-rest-spread": "^6.26.0", diff --git a/server/requirements.in b/server/requirements.in index f118eba..2cebc9b 100644 --- a/server/requirements.in +++ b/server/requirements.in @@ -1 +1 @@ -git+https://github.com/superdesk/newsroom-core.git@release/2.6#egg=Newsroom-Core +git+https://github.com/superdesk/newsroom-core.git@v2.6.2#egg=Newsroom-Core diff --git a/server/requirements.txt b/server/requirements.txt index 1543603..d650a14 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -217,7 +217,7 @@ 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.6 +newsroom-core @ git+https://github.com/superdesk/newsroom-core.git@v2.6.2 # via -r requirements.in oauth2client==4.1.3 # via flask-oidc-ex