Skip to content

Upgrade cozy-client and deal with optional chaining problem with @fastify/deepmerge package #2837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 2, 2025
Merged

Upgrade cozy-client and deal with optional chaining problem with @fastify/deepmerge package #2837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
"test": "jest",
"screenshots:server": "nodemon ./scripts/pixelmatch-server/server.js -e js,hbs",
"postbuild": "postcss transpiled/react/stylesheet.css --replace",
"postinstall": "patch-package",
"travis-deploy-once": "travis-deploy-once",
"start:css:utils": "yarn build:css:utils --watch",
"start:css": "yarn build:css --watch",
Expand Down Expand Up @@ -93,12 +94,12 @@
"browserslist-config-cozy": "0.4.0",
"bundlemon": "3.1.0",
"copyfiles": "2.4.1",
"cozy-client": "^52.1.0",
"cozy-client": "^60.5.0",
"cozy-device-helper": "2.0.0",
"cozy-flags": "^2.10.1",
"cozy-intent": "^2.29.1",
"cozy-logger": "^1.9.0",
"cozy-stack-client": "^52.0.0",
"cozy-stack-client": "^60.1.0",
"css-loader": "0.28.11",
"cssnano": "4.1.11",
"cssnano-preset-advanced": "4.0.8",
Expand Down Expand Up @@ -127,6 +128,7 @@
"mini-css-extract-plugin": "0.6.0",
"nodemon": "1.19.4",
"npm-run-all": "4.1.5",
"patch-package": "^8.0.0",
"postcss-cli": "6.1.3",
"postcss-loader": "2.1.6",
"prettier": "2.6.0",
Expand Down Expand Up @@ -186,7 +188,7 @@
"rooks": "7.14.1"
},
"peerDependencies": {
"cozy-client": ">=52.1.0",
"cozy-client": ">=60.5.0",
"cozy-device-helper": ">=2.0.0",
"cozy-flags": ">=2.10.1",
"cozy-intent": ">=2.29.1",
Expand Down
27 changes: 27 additions & 0 deletions patches/@fastify+deepmerge+2.0.2.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
diff --git a/node_modules/@fastify/deepmerge/index.js b/node_modules/@fastify/deepmerge/index.js
index e3ba232..e733358 100644
--- a/node_modules/@fastify/deepmerge/index.js
+++ b/node_modules/@fastify/deepmerge/index.js
@@ -65,11 +65,11 @@ function deepmergeConstructor (options) {
return result
}

- const getKeys = options?.symbols
+ const getKeys = (options && options.symbols)
? getSymbolsAndKeys
: Object.keys

- const cloneProtoObject = typeof options?.cloneProtoObject === 'function'
+ const cloneProtoObject = (options && typeof options.cloneProtoObject === 'function')
? options.cloneProtoObject
: undefined

@@ -161,7 +161,7 @@ function deepmergeConstructor (options) {
return result
}

- return options?.all
+ return (options && options.all)
? _deepmergeAll
: _deepmerge
}
Loading
Loading