From 756131299917428cf670040c55a8dc629b1d35d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Poizat?= Date: Fri, 13 Dec 2024 11:17:17 +0100 Subject: [PATCH 1/3] feat: Keep image from dataproxy --- packages/cozy-scripts/config/webpack.config.pictures.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/cozy-scripts/config/webpack.config.pictures.js b/packages/cozy-scripts/config/webpack.config.pictures.js index f9cc4d2b3..5d4d59d96 100644 --- a/packages/cozy-scripts/config/webpack.config.pictures.js +++ b/packages/cozy-scripts/config/webpack.config.pictures.js @@ -32,6 +32,12 @@ module.exports = { include: /cozy-ui\/transpiled\/react(\/|\\)/, loader: require.resolve('file-loader') }, + // We want to keep static images used by cozy-dataproxy-lib inside components + { + test: /\.(png|jpe?g|gif)$/i, + include: /cozy-dataproxy-lib\/dist\/assets(\/|\\)/, + loader: require.resolve('file-loader') + }, /* For public pages, we need to have all used assets into the build/public folder in order to be served by cozy-stack in the public pages From 225d7ae318db6cb6cc97436685f167ea2eb7013e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Poizat?= Date: Fri, 13 Dec 2024 11:37:35 +0100 Subject: [PATCH 2/3] feat: Update to node 20 --- .nvmrc | 2 +- .travis.yml | 3 ++- README.md | 2 +- packages/cozy-scripts/test/scripts.spec.js | 7 +++++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.nvmrc b/.nvmrc index b6a7d89c6..209e3ef4b 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -16 +20 diff --git a/.travis.yml b/.travis.yml index 1023bf107..9fd5fe9fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: node_js +dist: jammy node_js: -- 16 +- 20 cache: false jobs: include: diff --git a/README.md b/README.md index 1d580fb5e..498319d22 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ __You can find a complete tutorial about creating a Cozy application using `crea #### Requirements - - NodeJS version 16+ + - NodeJS version 20+ - [Yarn](https://yarnpkg.com): a NodeJS package manager, like `npm`; - a running [Cozy development environment](https://docs.cozy.io/en/tutorials/app/#install-the-development-environment) diff --git a/packages/cozy-scripts/test/scripts.spec.js b/packages/cozy-scripts/test/scripts.spec.js index 1c1c3813c..6e50f5337 100644 --- a/packages/cozy-scripts/test/scripts.spec.js +++ b/packages/cozy-scripts/test/scripts.spec.js @@ -1,5 +1,12 @@ /* eslint-env jest */ +// Required to work from Node version 17+ +// More info: https://github.com/webpack/webpack/issues/13572#issuecomment-923736472 +const crypto = require('crypto') +const crypto_orig_createHash = crypto.createHash +crypto.createHash = algorithm => + crypto_orig_createHash(algorithm == 'md4' ? 'sha256' : algorithm) + const fs = require('fs-extra') const path = require('path') const colorize = require('../utils/_colorize.js') From 24f01265bf5177489bfe2a1c10d001510fab1db1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Poizat?= Date: Fri, 13 Dec 2024 14:58:01 +0100 Subject: [PATCH 3/3] test: Remove build mobile in integration test --- scripts/integration-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/integration-test.sh b/scripts/integration-test.sh index 418369fd3..4523c0e58 100755 --- a/scripts/integration-test.sh +++ b/scripts/integration-test.sh @@ -5,7 +5,7 @@ set -euo pipefail DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" APP_DIR=${1:-"/tmp/cs-app-dir"} REPO=${INTEGRATION_REPO:-https://github.com/cozy/cozy-banks.git} -BUILD_CMD=${INTEGRATION_BUILD_CMD:-"yarn build; yarn build:mobile"} +BUILD_CMD=${INTEGRATION_BUILD_CMD:-"yarn build"} echo "Preparing app dir (repo: $REPO)..." if [[ "$(ls -A $APP_DIR)" ]]; then