diff --git a/.circleci/config.yml b/.circleci/config.yml index ff9fbc654a8..6d8f09d7010 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -70,7 +70,7 @@ workflows: jobs: checkout: docker: - - image: cimg/node:16.14.0 + - image: cimg/node:16.18.1 resource_class: small working_directory: ~/pix steps: @@ -91,7 +91,7 @@ jobs: api_build_and_test: docker: - - image: cimg/node:16.14.0 + - image: cimg/node:16.18.1 - image: postgres:13.7-alpine environment: POSTGRES_USER: circleci @@ -130,7 +130,7 @@ jobs: mon_pix_build_and_test: docker: - - image: cimg/node:16.14.0-browsers + - image: cimg/node:16.18.1-browsers environment: # See https://git.io/vdao3 for details. JOBS: 2 @@ -159,13 +159,12 @@ jobs: orga_build_and_test: docker: - - image: cimg/node:16.14.0-browsers + - image: cimg/node:16.18.1-browsers environment: JOBS: 2 resource_class: small working_directory: ~/pix/orga steps: - - run: sudo npm i -g npm@8.13.2 - browser-tools/install-chrome - attach_workspace: at: ~/pix @@ -188,7 +187,7 @@ jobs: certif_build_and_test: docker: - - image: cimg/node:16.14.0-browsers + - image: cimg/node:16.18.1-browsers environment: JOBS: 2 resource_class: small @@ -216,7 +215,7 @@ jobs: admin_build_and_test: docker: - - image: cimg/node:16.14.0-browsers + - image: cimg/node:16.18.1-browsers environment: JOBS: 2 resource_class: small @@ -244,7 +243,7 @@ jobs: e2e_test: docker: - - image: cimg/node:16.14.0-browsers + - image: cimg/node:16.18.1-browsers - image: postgres:13.7-alpine environment: POSTGRES_USER: circleci @@ -306,9 +305,7 @@ jobs: environment: JOBS: 2 working_directory: ~/pix/orga - command: | - sudo npm i -g npm@8.13.2 - npm ci + command: npm ci - run: name: Start Pix API working_directory: ~/pix/api @@ -345,7 +342,7 @@ jobs: algo_test: docker: - - image: cimg/node:16.14.0 + - image: cimg/node:16.18.1 resource_class: small parallelism: 1 working_directory: ~/pix/high-level-tests/test-algo diff --git a/.nvmrc b/.nvmrc index 832d3850644..b6a7d89c68e 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -16.14.0 +16 diff --git a/admin/.nvmrc b/admin/.nvmrc index 832d3850644..b6a7d89c68e 100644 --- a/admin/.nvmrc +++ b/admin/.nvmrc @@ -1 +1 @@ -16.14.0 +16 diff --git a/admin/package-lock.json b/admin/package-lock.json index 10520181db9..600c939cdd5 100644 --- a/admin/package-lock.json +++ b/admin/package-lock.json @@ -11,7 +11,7 @@ "license": "AGPL-3.0", "devDependencies": { "@1024pix/ember-testing-library": "^0.5.0", - "@1024pix/pix-ui": "^20.2.3", + "@1024pix/pix-ui": "^20.2.4", "@babel/eslint-parser": "^7.19.1", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.8.1", @@ -83,8 +83,8 @@ "webpack": "^5.65.0" }, "engines": { - "node": "16.14.0", - "npm": ">=8.3.1 <=8.13.2" + "node": "16", + "npm": ">=8.13.2 <9" } }, "node_modules/@1024pix/ember-testing-library": { @@ -1199,9 +1199,9 @@ } }, "node_modules/@1024pix/pix-ui": { - "version": "20.2.3", - "resolved": "https://registry.npmjs.org/@1024pix/pix-ui/-/pix-ui-20.2.3.tgz", - "integrity": "sha512-DOMKXaSE5vaUlNZeEqD8e27hKBSgmVtzVnWZsI/Gx66W7Z8WILqxbjxrmnASKUaNd6CwVIjF7cWxrBc8dbeX0g==", + "version": "20.2.4", + "resolved": "https://registry.npmjs.org/@1024pix/pix-ui/-/pix-ui-20.2.4.tgz", + "integrity": "sha512-G71jhEna46WoniRqzfaibGdnaRFynjaWPhBlCVdEPtWtkTWhE7srpv8fRBAko64geth6H7WE+ErI9b9p0WSnsg==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -1214,8 +1214,8 @@ "ember-truth-helpers": "^3.0.0" }, "engines": { - "node": "16.14.0", - "npm": ">=8.3.1 <=8.13.2" + "node": "16", + "npm": ">=8.13.2 <9" } }, "node_modules/@1024pix/pix-ui/node_modules/async-disk-cache": { @@ -39414,9 +39414,9 @@ } }, "@1024pix/pix-ui": { - "version": "20.2.3", - "resolved": "https://registry.npmjs.org/@1024pix/pix-ui/-/pix-ui-20.2.3.tgz", - "integrity": "sha512-DOMKXaSE5vaUlNZeEqD8e27hKBSgmVtzVnWZsI/Gx66W7Z8WILqxbjxrmnASKUaNd6CwVIjF7cWxrBc8dbeX0g==", + "version": "20.2.4", + "resolved": "https://registry.npmjs.org/@1024pix/pix-ui/-/pix-ui-20.2.4.tgz", + "integrity": "sha512-G71jhEna46WoniRqzfaibGdnaRFynjaWPhBlCVdEPtWtkTWhE7srpv8fRBAko64geth6H7WE+ErI9b9p0WSnsg==", "dev": true, "requires": { "ember-cli-babel": "^7.26.6", diff --git a/admin/package.json b/admin/package.json index 1e8ecc964c1..926681b07f7 100644 --- a/admin/package.json +++ b/admin/package.json @@ -6,8 +6,8 @@ "license": "AGPL-3.0", "author": "GIP Pix", "engines": { - "node": "16.14.0", - "npm": ">=8.3.1 <=8.13.2" + "node": "16", + "npm": ">=8.13.2 <9" }, "ember": { "edition": "octane" @@ -39,7 +39,7 @@ }, "devDependencies": { "@1024pix/ember-testing-library": "^0.5.0", - "@1024pix/pix-ui": "^20.2.3", + "@1024pix/pix-ui": "^20.2.4", "@babel/eslint-parser": "^7.19.1", "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.8.1", diff --git a/api/package-lock.json b/api/package-lock.json index 5dd3fbf5609..87e083cdca3 100644 --- a/api/package-lock.json +++ b/api/package-lock.json @@ -115,7 +115,7 @@ }, "engines": { "node": "16", - "npm": "8" + "npm": ">=8.13.2 <9" }, "optionalDependencies": { "nyc": "^15.1.0" diff --git a/api/package.json b/api/package.json index 625ee2ceea0..95ca442a4e5 100644 --- a/api/package.json +++ b/api/package.json @@ -7,7 +7,7 @@ "author": "GIP Pix", "engines": { "node": "16", - "npm": "8" + "npm": ">=8.13.2 <9" }, "repository": { "type": "git", diff --git a/certif/.nvmrc b/certif/.nvmrc index 832d3850644..b6a7d89c68e 100644 --- a/certif/.nvmrc +++ b/certif/.nvmrc @@ -1 +1 @@ -16.14.0 +16 diff --git a/certif/package-lock.json b/certif/package-lock.json index b9b607ebd05..c5208e848c3 100644 --- a/certif/package-lock.json +++ b/certif/package-lock.json @@ -11,7 +11,7 @@ "license": "AGPL-3.0", "devDependencies": { "@1024pix/ember-testing-library": "^0.5.0", - "@1024pix/pix-ui": "^20.2.3", + "@1024pix/pix-ui": "^20.2.4", "@babel/eslint-parser": "^7.19.1", "@babel/plugin-proposal-decorators": "^7.20.5", "@ember/optional-features": "^2.0.0", @@ -82,8 +82,8 @@ "webpack": "^5.75.0" }, "engines": { - "node": "16.14.0", - "npm": ">=8.3.1 <=8.13.2" + "node": "16", + "npm": ">=8.13.2 <9" } }, "node_modules/@1024pix/ember-testing-library": { @@ -1003,9 +1003,9 @@ } }, "node_modules/@1024pix/pix-ui": { - "version": "20.2.3", - "resolved": "https://registry.npmjs.org/@1024pix/pix-ui/-/pix-ui-20.2.3.tgz", - "integrity": "sha512-DOMKXaSE5vaUlNZeEqD8e27hKBSgmVtzVnWZsI/Gx66W7Z8WILqxbjxrmnASKUaNd6CwVIjF7cWxrBc8dbeX0g==", + "version": "20.2.4", + "resolved": "https://registry.npmjs.org/@1024pix/pix-ui/-/pix-ui-20.2.4.tgz", + "integrity": "sha512-G71jhEna46WoniRqzfaibGdnaRFynjaWPhBlCVdEPtWtkTWhE7srpv8fRBAko64geth6H7WE+ErI9b9p0WSnsg==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -1018,8 +1018,8 @@ "ember-truth-helpers": "^3.0.0" }, "engines": { - "node": "16.14.0", - "npm": ">=8.3.1 <=8.13.2" + "node": "16", + "npm": ">=8.13.2 <9" } }, "node_modules/@1024pix/pix-ui/node_modules/async-disk-cache": { @@ -36007,9 +36007,9 @@ } }, "@1024pix/pix-ui": { - "version": "20.2.3", - "resolved": "https://registry.npmjs.org/@1024pix/pix-ui/-/pix-ui-20.2.3.tgz", - "integrity": "sha512-DOMKXaSE5vaUlNZeEqD8e27hKBSgmVtzVnWZsI/Gx66W7Z8WILqxbjxrmnASKUaNd6CwVIjF7cWxrBc8dbeX0g==", + "version": "20.2.4", + "resolved": "https://registry.npmjs.org/@1024pix/pix-ui/-/pix-ui-20.2.4.tgz", + "integrity": "sha512-G71jhEna46WoniRqzfaibGdnaRFynjaWPhBlCVdEPtWtkTWhE7srpv8fRBAko64geth6H7WE+ErI9b9p0WSnsg==", "dev": true, "requires": { "ember-cli-babel": "^7.26.6", diff --git a/certif/package.json b/certif/package.json index 83aa9ab7f63..31736d491b5 100644 --- a/certif/package.json +++ b/certif/package.json @@ -6,8 +6,8 @@ "license": "AGPL-3.0", "author": "GIP Pix", "engines": { - "node": "16.14.0", - "npm": ">=8.3.1 <=8.13.2" + "node": "16", + "npm": ">=8.13.2 <9" }, "repository": { "type": "git", @@ -39,7 +39,7 @@ }, "devDependencies": { "@1024pix/ember-testing-library": "^0.5.0", - "@1024pix/pix-ui": "^20.2.3", + "@1024pix/pix-ui": "^20.2.4", "@babel/eslint-parser": "^7.19.1", "@babel/plugin-proposal-decorators": "^7.20.5", "@ember/optional-features": "^2.0.0", diff --git a/docker/dockerfiles/Dockerfile.ember b/docker/dockerfiles/Dockerfile.ember index 5c1ea8db016..8dfbfdd9746 100644 --- a/docker/dockerfiles/Dockerfile.ember +++ b/docker/dockerfiles/Dockerfile.ember @@ -1,7 +1,7 @@ -FROM node:16.14.0 as dev +FROM node:16.18.1 as dev WORKDIR /code -COPY . . +COPY . . RUN npm ci diff --git a/docker/dockerfiles/Dockerfile.hapi b/docker/dockerfiles/Dockerfile.hapi index 80881348a56..99288c17861 100644 --- a/docker/dockerfiles/Dockerfile.hapi +++ b/docker/dockerfiles/Dockerfile.hapi @@ -1,9 +1,9 @@ -FROM node:16.14.0 as dev +FROM node:16.18.1 as dev WORKDIR /code EXPOSE 3000 -COPY . . +COPY . . RUN npm ci diff --git a/high-level-tests/e2e/.nvmrc b/high-level-tests/e2e/.nvmrc index 832d3850644..b6a7d89c68e 100644 --- a/high-level-tests/e2e/.nvmrc +++ b/high-level-tests/e2e/.nvmrc @@ -1 +1 @@ -16.14.0 +16 diff --git a/high-level-tests/e2e/package-lock.json b/high-level-tests/e2e/package-lock.json index 93dacaa7be7..449aa0602a3 100644 --- a/high-level-tests/e2e/package-lock.json +++ b/high-level-tests/e2e/package-lock.json @@ -24,7 +24,7 @@ }, "engines": { "node": "16", - "npm": "8" + "npm": ">=8.13.2 <9" } }, "node_modules/@babel/code-frame": { diff --git a/high-level-tests/e2e/package.json b/high-level-tests/e2e/package.json index c583a36a0ce..19136e18495 100644 --- a/high-level-tests/e2e/package.json +++ b/high-level-tests/e2e/package.json @@ -6,7 +6,7 @@ "author": "GIP Pix", "engines": { "node": "16", - "npm": "8" + "npm": ">=8.13.2 <9" }, "license": "AGPL-3.0", "repository": { diff --git a/high-level-tests/load-testing/package.json b/high-level-tests/load-testing/package.json index e7d8a544b3f..3b54ba8dc8a 100644 --- a/high-level-tests/load-testing/package.json +++ b/high-level-tests/load-testing/package.json @@ -6,7 +6,7 @@ "author": "GIP Pix", "engines": { "node": "16", - "npm": "8" + "npm": ">=8.13.2 <9" }, "license": "ISC", "repository": { diff --git a/high-level-tests/test-algo/package.json b/high-level-tests/test-algo/package.json index f59b17e8810..d2d3b5ae3a1 100644 --- a/high-level-tests/test-algo/package.json +++ b/high-level-tests/test-algo/package.json @@ -5,7 +5,7 @@ "main": "index.js", "engines": { "node": "16", - "npm": "8" + "npm": ">=8.13.2 <9" }, "scripts": { "start": "node index.js", diff --git a/mon-pix/.nvmrc b/mon-pix/.nvmrc index 832d3850644..b6a7d89c68e 100644 --- a/mon-pix/.nvmrc +++ b/mon-pix/.nvmrc @@ -1 +1 @@ -16.14.0 +16 diff --git a/mon-pix/package-lock.json b/mon-pix/package-lock.json index 63954e721d9..ae5a3a9d96a 100644 --- a/mon-pix/package-lock.json +++ b/mon-pix/package-lock.json @@ -11,7 +11,7 @@ "license": "AGPL-3.0", "devDependencies": { "@1024pix/ember-testing-library": "^0.5.0", - "@1024pix/pix-ui": "^20.2.2", + "@1024pix/pix-ui": "^20.2.4", "@babel/eslint-parser": "^7.19.1", "@babel/plugin-proposal-decorators": "^7.20.2", "@ember/optional-features": "^2.0.0", @@ -104,8 +104,8 @@ "xss": "^1.0.13" }, "engines": { - "node": "16.14.0", - "npm": ">=8.3.1 <=8.13.2" + "node": "16", + "npm": ">=8.13.2 <9" } }, "node_modules/@1024pix/ember-testing-library": { @@ -1137,9 +1137,9 @@ } }, "node_modules/@1024pix/pix-ui": { - "version": "20.2.2", - "resolved": "https://registry.npmjs.org/@1024pix/pix-ui/-/pix-ui-20.2.2.tgz", - "integrity": "sha512-BlbdrpEYGh8MlpJRyz9D6z5GeOg0KLEoP0Lu05xC+3I3FmJGA8GMxWsrQEYWWWVCTMMaXMh1VQsvVvoXDvMN4g==", + "version": "20.2.4", + "resolved": "https://registry.npmjs.org/@1024pix/pix-ui/-/pix-ui-20.2.4.tgz", + "integrity": "sha512-G71jhEna46WoniRqzfaibGdnaRFynjaWPhBlCVdEPtWtkTWhE7srpv8fRBAko64geth6H7WE+ErI9b9p0WSnsg==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -1152,8 +1152,8 @@ "ember-truth-helpers": "^3.0.0" }, "engines": { - "node": "16.14.0", - "npm": ">=8.3.1 <=8.13.2" + "node": "16", + "npm": ">=8.13.2 <9" } }, "node_modules/@1024pix/pix-ui/node_modules/@babel/plugin-transform-typescript": { @@ -44314,9 +44314,9 @@ } }, "@1024pix/pix-ui": { - "version": "20.2.2", - "resolved": "https://registry.npmjs.org/@1024pix/pix-ui/-/pix-ui-20.2.2.tgz", - "integrity": "sha512-BlbdrpEYGh8MlpJRyz9D6z5GeOg0KLEoP0Lu05xC+3I3FmJGA8GMxWsrQEYWWWVCTMMaXMh1VQsvVvoXDvMN4g==", + "version": "20.2.4", + "resolved": "https://registry.npmjs.org/@1024pix/pix-ui/-/pix-ui-20.2.4.tgz", + "integrity": "sha512-G71jhEna46WoniRqzfaibGdnaRFynjaWPhBlCVdEPtWtkTWhE7srpv8fRBAko64geth6H7WE+ErI9b9p0WSnsg==", "dev": true, "requires": { "ember-cli-babel": "^7.26.6", diff --git a/mon-pix/package.json b/mon-pix/package.json index 36a34e8bba7..703f2dfc033 100644 --- a/mon-pix/package.json +++ b/mon-pix/package.json @@ -6,8 +6,8 @@ "license": "AGPL-3.0", "author": "GIP Pix", "engines": { - "node": "16.14.0", - "npm": ">=8.3.1 <=8.13.2" + "node": "16", + "npm": ">=8.13.2 <9" }, "ember": { "edition": "octane" @@ -40,7 +40,7 @@ }, "devDependencies": { "@1024pix/ember-testing-library": "^0.5.0", - "@1024pix/pix-ui": "^20.2.2", + "@1024pix/pix-ui": "^20.2.4", "@babel/eslint-parser": "^7.19.1", "@babel/plugin-proposal-decorators": "^7.20.2", "@ember/optional-features": "^2.0.0", diff --git a/orga/.nvmrc b/orga/.nvmrc index 832d3850644..b6a7d89c68e 100644 --- a/orga/.nvmrc +++ b/orga/.nvmrc @@ -1 +1 @@ -16.14.0 +16 diff --git a/orga/package-lock.json b/orga/package-lock.json index b6c95f42620..07b1b3e8480 100644 --- a/orga/package-lock.json +++ b/orga/package-lock.json @@ -83,8 +83,8 @@ "webpack": "^5.75.0" }, "engines": { - "node": "16.14.0", - "npm": ">=8.3.1 <=8.13.2" + "node": "16", + "npm": ">=8.13.2 <9" } }, "node_modules/@1024pix/ember-testing-library": { diff --git a/orga/package.json b/orga/package.json index 925eaf9038b..964a6c4e099 100644 --- a/orga/package.json +++ b/orga/package.json @@ -6,8 +6,8 @@ "license": "AGPL-3.0", "author": "GIP Pix", "engines": { - "node": "16.14.0", - "npm": ">=8.3.1 <=8.13.2" + "node": "16", + "npm": ">=8.13.2 <9" }, "ember": { "edition": "octane" diff --git a/package-lock.json b/package-lock.json index ee163132976..04324a4c3f7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,8 +30,8 @@ "mocha": "^8.3.0" }, "engines": { - "node": "16.14.0", - "npm": ">=8.3.1 <=8.13.2" + "node": "16", + "npm": ">=8.13.2 <9" }, "peerDependencies": { "markdown-link-check": "^3.8.6" diff --git a/package.json b/package.json index 1e5de69d8c7..de2e8814b2d 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,8 @@ "license": "AGPL-3.0", "author": "GIP Pix", "engines": { - "node": "16.14.0", - "npm": ">=8.3.1 <=8.13.2" + "node": "16", + "npm": ">=8.13.2 <9" }, "repository": { "type": "git", diff --git a/scripts/configure.sh b/scripts/configure.sh index 24290a5e237..24cd0d25e7b 100755 --- a/scripts/configure.sh +++ b/scripts/configure.sh @@ -3,9 +3,6 @@ set -e set -o pipefail -EXPECTED_NODE_VERSION="v16.14.0" -EXPECTED_NPM_VERSION="8.3.1" - function timeout() { perl -e 'alarm shift; exec @ARGV' "$@"; } function display_banner() { @@ -47,17 +44,6 @@ function assert_program_is_installed() { fi } -function assert_expected_version_is_installed() { - local program=$1 - local expected_version=$2 - local installed_version=$("${program}" -v) - - if [ "${installed_version}" != "${expected_version}" ]; then - echo "Error: expected version ${expected_version} to be installed for program \"${program}\"but found version ${installed_version}." >&2 - exit 1 - fi -} - function verify_prerequesite_programs() { echo "Verifying prerequesite programs…" @@ -67,9 +53,6 @@ function verify_prerequesite_programs() { assert_program_is_installed "docker" assert_program_is_installed "docker-compose" - assert_expected_version_is_installed "node" "${EXPECTED_NODE_VERSION}" - assert_expected_version_is_installed "npm" "${EXPECTED_NPM_VERSION}" - echo "✅ Required programs have been found." echo "" }