From 2054bc09203fef1589c1f1f6ed5c03c2804665b7 Mon Sep 17 00:00:00 2001 From: mfacar Date: Fri, 7 Jun 2024 09:00:18 -0500 Subject: [PATCH] Revert "[Stabilization-fix] Node-version 20.9 (#6858)" This reverts commit ea71c768d13a035cb85d3f2b071ec103695ed1be. --- .github/workflows/ci_check_translations.yml | 2 +- .github/workflows/ci_cypress_component.yml | 2 +- .github/workflows/ci_e2e_cypress.yml | 2 +- .github/workflows/ci_e2e_puppeteer.yml | 2 +- .github/workflows/ci_eslint.yml | 2 +- .github/workflows/ci_ts_emit_check.yml | 2 +- .github/workflows/ci_ts_types.yml | 2 +- .github/workflows/ci_unit_tests.yml | 4 +-- .github/workflows/create_pre_release.yml | 2 +- .github/workflows/create_release.yml | 2 +- .github/workflows/security_audit.yml | 2 +- .nvmrc | 2 +- README.md | 2 +- package.json | 6 ++-- yarn.lock | 39 +++++++++++++++++---- 15 files changed, 49 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ci_check_translations.yml b/.github/workflows/ci_check_translations.yml index 25259b2219..7ef7c829d8 100644 --- a/.github/workflows/ci_check_translations.yml +++ b/.github/workflows/ci_check_translations.yml @@ -31,7 +31,7 @@ jobs: - name: Use Node.js uses: actions/setup-node@v4 with: - node-version-file: '.nvmrc' + node-version: 20 - name: Cache node modules uses: actions/cache@v2 with: diff --git a/.github/workflows/ci_cypress_component.yml b/.github/workflows/ci_cypress_component.yml index ca112a41cb..fa2c88e025 100644 --- a/.github/workflows/ci_cypress_component.yml +++ b/.github/workflows/ci_cypress_component.yml @@ -24,7 +24,7 @@ jobs: - name: Setup Nodejs uses: actions/setup-node@v4 with: - node-version-file: '.nvmrc' + node-version: 20 - name: Cypress run uses: cypress-io/github-action@v5 with: diff --git a/.github/workflows/ci_e2e_cypress.yml b/.github/workflows/ci_e2e_cypress.yml index 77dfe06ce2..f84fdf14e6 100644 --- a/.github/workflows/ci_e2e_cypress.yml +++ b/.github/workflows/ci_e2e_cypress.yml @@ -39,7 +39,7 @@ jobs: - name: Setup Nodejs uses: actions/setup-node@v4 with: - node-version-file: '.nvmrc' + node-version: 20 - name: Cache node modules uses: actions/cache@v2 with: diff --git a/.github/workflows/ci_e2e_puppeteer.yml b/.github/workflows/ci_e2e_puppeteer.yml index 4830cd716a..27ea857544 100644 --- a/.github/workflows/ci_e2e_puppeteer.yml +++ b/.github/workflows/ci_e2e_puppeteer.yml @@ -38,7 +38,7 @@ jobs: - name: Setup Nodejs uses: actions/setup-node@v4 with: - node-version-file: '.nvmrc' + node-version: 20 - name: Cache node modules uses: actions/cache@v2 with: diff --git a/.github/workflows/ci_eslint.yml b/.github/workflows/ci_eslint.yml index 03fd3b3879..86a9bdd944 100644 --- a/.github/workflows/ci_eslint.yml +++ b/.github/workflows/ci_eslint.yml @@ -20,7 +20,7 @@ jobs: - name: Use Node.js uses: actions/setup-node@v4 with: - node-version-file: '.nvmrc' + node-version: 20 - name: Cache node modules uses: actions/cache@v2 with: diff --git a/.github/workflows/ci_ts_emit_check.yml b/.github/workflows/ci_ts_emit_check.yml index 1368662456..0142fa4312 100644 --- a/.github/workflows/ci_ts_emit_check.yml +++ b/.github/workflows/ci_ts_emit_check.yml @@ -20,7 +20,7 @@ jobs: - name: Use Node.js uses: actions/setup-node@v4 with: - node-version-file: '.nvmrc' + node-version: 20 - name: Cache node modules uses: actions/cache@v2 with: diff --git a/.github/workflows/ci_ts_types.yml b/.github/workflows/ci_ts_types.yml index 15e27b0819..da8d4ecc2c 100644 --- a/.github/workflows/ci_ts_types.yml +++ b/.github/workflows/ci_ts_types.yml @@ -20,7 +20,7 @@ jobs: - name: Use Node.js uses: actions/setup-node@v4 with: - node-version-file: '.nvmrc' + node-version: 20 - name: Cache node modules uses: actions/cache@v2 with: diff --git a/.github/workflows/ci_unit_tests.yml b/.github/workflows/ci_unit_tests.yml index e8cc7c2f26..521874c93a 100644 --- a/.github/workflows/ci_unit_tests.yml +++ b/.github/workflows/ci_unit_tests.yml @@ -45,7 +45,7 @@ jobs: - name: Use Node.js uses: actions/setup-node@v4 with: - node-version-file: '.nvmrc' + node-version: 20 - name: Start MongoDB uses: supercharge/mongodb-github-action@1.8.0 @@ -87,7 +87,7 @@ jobs: - name: Use Node.js uses: actions/setup-node@v4 with: - node-version-file: '.nvmrc' + node-version: 20 - name: Cache node modules uses: actions/cache@v2 with: diff --git a/.github/workflows/create_pre_release.yml b/.github/workflows/create_pre_release.yml index 5c4aa416ca..abbf06c584 100644 --- a/.github/workflows/create_pre_release.yml +++ b/.github/workflows/create_pre_release.yml @@ -20,7 +20,7 @@ jobs: - name: Use Node.js uses: actions/setup-node@v4 with: - node-version-file: '.nvmrc' + node-version: 20 - name: Cache node modules uses: actions/cache@v1.1.2 with: diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index 915cac872a..d1ab4998ad 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -20,7 +20,7 @@ jobs: - name: Use Node.js uses: actions/setup-node@v4 with: - node-version-file: '.nvmrc' + node-version: 20 - name: Cache node modules uses: actions/cache@v1.1.2 with: diff --git a/.github/workflows/security_audit.yml b/.github/workflows/security_audit.yml index 936ca144e3..02d673719a 100644 --- a/.github/workflows/security_audit.yml +++ b/.github/workflows/security_audit.yml @@ -16,7 +16,7 @@ jobs: - name: Use Node.js uses: actions/setup-node@v4 with: - node-version-file: '.nvmrc' + node-version: 20 - name: Cache node modules uses: actions/cache@v2 with: diff --git a/.nvmrc b/.nvmrc index 43bff1f8cf..c369ba60fa 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -20.9.0 \ No newline at end of file +20.12.0 \ No newline at end of file diff --git a/README.md b/README.md index 9e79be1b27..4b3e8e9049 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Read the [user guide](https://uwazi.io/page/9852italrtk/support) Before anything else you will need to install the application dependencies: -- **NodeJs >= 20.9.0** For ease of update, use nvm: https://github.com/creationix/nvm. +- **NodeJs >= 18.16.1** For ease of update, use nvm: https://github.com/creationix/nvm. - **ElasticSearch 7.17.6** https://www.elastic.co/downloads/past-releases/elasticsearch-7-17-6 Please note that ElasticSearch requires Java. Follow the instructions to install the package manually, you also probably need to disable ml module in the ElasticSearch config file: `xpack.ml.enabled: false` - **ICU Analysis Plugin (recommended)** [installation](https://www.elastic.co/guide/en/elasticsearch/plugins/current/analysis-icu.html#analysis-icu) Adds support for number sorting in texts and solves other language sorting nuances. This option is activated by setting the env var USE_ELASTIC_ICU=true before running the server (defaults to false/unset). diff --git a/package.json b/package.json index eb37c015c3..f51abc74bc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uwazi", - "version": "1.170.0-rc4", + "version": "1.170.0-rc5", "description": "Uwazi is a free, open-source solution for organising, analysing and publishing your documents.", "keywords": [ "react" @@ -100,7 +100,7 @@ "@headlessui/react": "1.7.17", "@heroicons/react": "^2.1.3", "@hookform/error-message": "^2.0.1", - "@huridocs/react-text-selection-handler": "^0.2.11", + "@huridocs/react-text-selection-handler": "^0.2.10", "@loadable/component": "^5.16.4", "@popperjs/core": "^2.11.8", "@remix-run/router": "^1.16.0", @@ -396,6 +396,6 @@ "worker-loader": "^3.0.8" }, "engines": { - "node": ">=20.9.0" + "node": ">=18.16.1" } } diff --git a/yarn.lock b/yarn.lock index 32fac71ea6..cd8df186ed 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2237,10 +2237,10 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz#e5211452df060fa8522b55c7b3c0c4d1981cb044" integrity sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw== -"@huridocs/react-text-selection-handler@^0.2.11": - version "0.2.11" - resolved "https://registry.yarnpkg.com/@huridocs/react-text-selection-handler/-/react-text-selection-handler-0.2.11.tgz#9aec24b20e98fec238dfbb271955b0a372a4f393" - integrity sha512-4Rk36gC2/ce32QpwiqqBKp5FKmPQ1IMBnJjvxrPDF7jwR7fcTD9RFPEIvoLCCoDV2Jhkt0CqVTA03h6mDFbP3w== +"@huridocs/react-text-selection-handler@^0.2.10": + version "0.2.10" + resolved "https://registry.yarnpkg.com/@huridocs/react-text-selection-handler/-/react-text-selection-handler-0.2.10.tgz#c23600bcd656968d926e6e6a64eed5f9ce9cd635" + integrity sha512-aMrhNPy6D1RmYDivWqHbxiBFdcCqNHPhgiGuk/U+1iyMjQ/626nJxBENT5o3VnSTsXtPQ+y9InMrwVXrJxzAIA== "@icons/material@^0.2.4": version "0.2.4" @@ -16577,7 +16577,16 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" -"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -16664,7 +16673,14 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -18123,7 +18139,7 @@ world-countries@5.0.0: resolved "https://registry.yarnpkg.com/world-countries/-/world-countries-5.0.0.tgz#6f75ebcce3d5224d84e9117eaf0d75a7726b6501" integrity sha512-wAfOT9Y5i/xnxNOdKJKXdOCw9Q3yQLahBUeuRol+s+o20F6h2a4tLEbJ1lBCYwEQ30Sf9Meqeipk1gib3YwF5w== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -18141,6 +18157,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"