From 372ceb449fb6065fd7b22f776b1b64d18a950b92 Mon Sep 17 00:00:00 2001 From: Felix Gnass Date: Thu, 6 Feb 2025 09:50:52 +0100 Subject: [PATCH 1/5] fix: make slate-hyperscript a runtime dependency --- packages/decap-cms-widget-markdown/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/decap-cms-widget-markdown/package.json b/packages/decap-cms-widget-markdown/package.json index 3f382d0e03df..b6881af1874f 100644 --- a/packages/decap-cms-widget-markdown/package.json +++ b/packages/decap-cms-widget-markdown/package.json @@ -37,6 +37,7 @@ "slate": "^0.91.1", "slate-base64-serializer": "^0.2.107", "slate-history": "^0.93.0", + "slate-hyperscript": "^0.77.0", "slate-plain-serializer": "^0.7.1", "slate-react": "^0.91.2", "slate-soft-break": "^0.9.0", @@ -57,7 +58,6 @@ }, "devDependencies": { "commonmark": "^0.30.0", - "commonmark-spec": "^0.30.0", - "slate-hyperscript": "^0.77.0" + "commonmark-spec": "^0.30.0" } } From 2e34d66f828230abc1ac6eea89bba28df5a21308 Mon Sep 17 00:00:00 2001 From: Felix Gnass Date: Thu, 6 Feb 2025 09:55:43 +0100 Subject: [PATCH 2/5] fix: bump clean-stack dependency --- packages/decap-cms-core/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/decap-cms-core/package.json b/packages/decap-cms-core/package.json index 68e8aff56787..f23e70ac7a23 100644 --- a/packages/decap-cms-core/package.json +++ b/packages/decap-cms-core/package.json @@ -30,7 +30,7 @@ "ajv": "8.12.0", "ajv-errors": "^3.0.0", "ajv-keywords": "^5.0.0", - "clean-stack": "^4.1.0", + "clean-stack": "^5.2.0", "copy-text-to-clipboard": "^3.0.0", "dayjs": "^1.11.10", "deepmerge": "^4.2.2", From 22ce22e6eba6e0ebce1c6f55e747e5494be8e25d Mon Sep 17 00:00:00 2001 From: Felix Gnass Date: Thu, 6 Feb 2025 09:56:08 +0100 Subject: [PATCH 3/5] fix: bump react-scroll-sync dependency --- packages/decap-cms-core/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/decap-cms-core/package.json b/packages/decap-cms-core/package.json index f23e70ac7a23..efb573c1e591 100644 --- a/packages/decap-cms-core/package.json +++ b/packages/decap-cms-core/package.json @@ -56,7 +56,7 @@ "react-polyglot": "^0.7.0", "react-redux": "^7.2.0", "react-router-dom": "^5.2.0", - "react-scroll-sync": "^0.9.0", + "react-scroll-sync": "^0.11.2", "react-split-pane": "^0.1.85", "react-toastify": "^9.1.1", "react-topbar-progress-indicator": "^4.0.0", From 849115aae14a16dc38159e197857c0ed5977b7f6 Mon Sep 17 00:00:00 2001 From: Felix Gnass Date: Thu, 6 Feb 2025 10:11:13 +0100 Subject: [PATCH 4/5] chore: update lock file --- package-lock.json | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9e95cd0d0586..eab612a70b6b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10460,13 +10460,14 @@ } }, "node_modules/clean-stack": { - "version": "4.2.0", - "license": "MIT", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-5.2.0.tgz", + "integrity": "sha512-TyUIUJgdFnCISzG5zu3291TAsE77ddchd0bepon1VVQrKLGKFED4iXFEDQ24mIPdPBbyE16PK3F8MYE1CmcBEQ==", "dependencies": { "escape-string-regexp": "5.0.0" }, "engines": { - "node": ">=12" + "node": ">=14.16" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -27143,14 +27144,15 @@ } }, "node_modules/react-scroll-sync": { - "version": "0.9.0", - "license": "MIT", + "version": "0.11.2", + "resolved": "https://registry.npmjs.org/react-scroll-sync/-/react-scroll-sync-0.11.2.tgz", + "integrity": "sha512-n7m+bbRTSWuczhKQf6Evvl7PFGkTt4RfP4bhyUtUyv6znovpybhAScQDdrFr9Jh280nG39x9AWMY8j477PHL1A==", "dependencies": { "prop-types": "^15.5.7" }, "peerDependencies": { - "react": "0.14.x || 15.x || 16.x || 17.x", - "react-dom": "0.14.x || 15.x || 16.x || 17.x" + "react": "16.x || 17.x || 18.x", + "react-dom": "16.x || 17.x || 18.x" } }, "node_modules/react-select": { @@ -29014,7 +29016,6 @@ }, "node_modules/slate-hyperscript": { "version": "0.77.0", - "dev": true, "license": "MIT", "dependencies": { "is-plain-object": "^5.0.0" @@ -33428,7 +33429,7 @@ "ajv": "8.12.0", "ajv-errors": "^3.0.0", "ajv-keywords": "^5.0.0", - "clean-stack": "^4.1.0", + "clean-stack": "^5.2.0", "copy-text-to-clipboard": "^3.0.0", "dayjs": "^1.11.10", "deepmerge": "^4.2.2", @@ -33454,7 +33455,7 @@ "react-polyglot": "^0.7.0", "react-redux": "^7.2.0", "react-router-dom": "^5.2.0", - "react-scroll-sync": "^0.9.0", + "react-scroll-sync": "^0.11.2", "react-split-pane": "^0.1.85", "react-toastify": "^9.1.1", "react-topbar-progress-indicator": "^4.0.0", @@ -33768,6 +33769,7 @@ "slate": "^0.91.1", "slate-base64-serializer": "^0.2.107", "slate-history": "^0.93.0", + "slate-hyperscript": "^0.77.0", "slate-plain-serializer": "^0.7.1", "slate-react": "^0.91.2", "slate-soft-break": "^0.9.0", @@ -33777,8 +33779,7 @@ }, "devDependencies": { "commonmark": "^0.30.0", - "commonmark-spec": "^0.30.0", - "slate-hyperscript": "^0.77.0" + "commonmark-spec": "^0.30.0" }, "peerDependencies": { "@emotion/react": "^11.11.1", From 026fbd61b92ce0ff0088eeea656cf5eefc53ffaa Mon Sep 17 00:00:00 2001 From: Felix Gnass Date: Thu, 6 Feb 2025 11:04:44 +0100 Subject: [PATCH 5/5] fix: workaround for jest add mapping since jest doesn't understand import maps --- jest.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/jest.config.js b/jest.config.js index 74e19e1458c6..d88bc657f2a3 100644 --- a/jest.config.js +++ b/jest.config.js @@ -8,6 +8,7 @@ module.exports = { 'decap-cms-lib-widgets': '/packages/decap-cms-lib-widgets/src/index.ts', 'decap-cms-widget-object': '/packages/decap-cms-widget-object/src/index.js', '\\.(css|less)$': '/__mocks__/styleMock.js', + '^#home-directory$': 'clean-stack/home-directory.js', }, snapshotSerializers: ['@emotion/jest/serializer'], transformIgnorePatterns: [