From 268e2fe5a12e4897f702179f218f6b9a8499862c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 22:02:55 +0000 Subject: [PATCH 1/5] chore: update dependency diagram-js to v14 --- package-lock.json | 53 +++++++++++++++++++++-------------------------- package.json | 2 +- 2 files changed, 25 insertions(+), 30 deletions(-) diff --git a/package-lock.json b/package-lock.json index 25ee5af9f..94eea98d2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -41,7 +41,7 @@ "cross-env": "^7.0.3", "css-loader": "^6.7.3", "del-cli": "^5.0.0", - "diagram-js": "^13.4.0", + "diagram-js": "^14.0.0", "didi": "^10.0.1", "eslint": "^8.53.0", "eslint-plugin-bpmn-io": "^1.0.0", @@ -9889,15 +9889,14 @@ "license": "MIT" }, "node_modules/diagram-js": { - "version": "13.4.0", - "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-13.4.0.tgz", - "integrity": "sha512-JI6UI74J3TgRcgBhuZZJso//bUdh22rcVu9XSf1EBVisKPt9c+woKzOrr/79OutXvft+1NOLNEiBg58kZ8p7+Q==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-14.0.0.tgz", + "integrity": "sha512-6XNQbBCJ7mA35O7HLU78NBdwGqK1uzK6C/x/Pb61QXWNNIOzg9ewI4257W3CdlJSE2jP+pTM7a7TpGG2BNcc3g==", "dev": true, "dependencies": { "@bpmn-io/diagram-js-ui": "^0.2.2", "clsx": "^2.0.0", "didi": "^10.0.1", - "hammerjs": "^2.0.1", "inherits-browser": "^0.1.0", "min-dash": "^4.1.0", "min-dom": "^4.1.0", @@ -9911,18 +9910,21 @@ }, "node_modules/diagram-js/node_modules/component-event": { "version": "0.2.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/component-event/-/component-event-0.2.1.tgz", + "integrity": "sha512-wGA++isMqiDq1jPYeyv2as/Bt/u+3iLW0rEa+8NQ82jAv3TgqMiCM+B2SaBdn2DfLilLjjq736YcezihRYhfxw==", + "dev": true }, "node_modules/diagram-js/node_modules/min-dash": { - "version": "4.1.0", - "dev": true, - "license": "MIT" + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/min-dash/-/min-dash-4.2.1.tgz", + "integrity": "sha512-to+unsToePnm7cUeR9TrMzFlETHd/UXmU+ELTRfWZj5XGT41KF6X3L233o3E/GdEs3sk2Tbw/lOLD1avmWkg8A==", + "dev": true }, "node_modules/diagram-js/node_modules/min-dom": { "version": "4.1.0", + "resolved": "https://registry.npmjs.org/min-dom/-/min-dom-4.1.0.tgz", + "integrity": "sha512-1lj1EyoSwY/UmTeT/hhPiZTsq+vK9D+8FAJ/53iK5jT1otkG9rJTixSKdjmTieEvdfES+sKbbTptzaQJhnacjA==", "dev": true, - "license": "MIT", "dependencies": { "component-event": "^0.2.1", "domify": "^1.4.1", @@ -11939,14 +11941,6 @@ "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", "dev": true }, - "node_modules/hammerjs": { - "version": "2.0.8", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.8.0" - } - }, "node_modules/handlebars": { "version": "4.7.7", "dev": true, @@ -22040,7 +22034,7 @@ }, "packages/form-json-schema": { "name": "@bpmn-io/form-json-schema", - "version": "1.7.0-alpha.0", + "version": "1.7.0", "license": "SEE LICENSE IN LICENSE" } }, @@ -29025,15 +29019,14 @@ "dev": true }, "diagram-js": { - "version": "13.4.0", - "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-13.4.0.tgz", - "integrity": "sha512-JI6UI74J3TgRcgBhuZZJso//bUdh22rcVu9XSf1EBVisKPt9c+woKzOrr/79OutXvft+1NOLNEiBg58kZ8p7+Q==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-14.0.0.tgz", + "integrity": "sha512-6XNQbBCJ7mA35O7HLU78NBdwGqK1uzK6C/x/Pb61QXWNNIOzg9ewI4257W3CdlJSE2jP+pTM7a7TpGG2BNcc3g==", "dev": true, "requires": { "@bpmn-io/diagram-js-ui": "^0.2.2", "clsx": "^2.0.0", "didi": "^10.0.1", - "hammerjs": "^2.0.1", "inherits-browser": "^0.1.0", "min-dash": "^4.1.0", "min-dom": "^4.1.0", @@ -29044,14 +29037,20 @@ "dependencies": { "component-event": { "version": "0.2.1", + "resolved": "https://registry.npmjs.org/component-event/-/component-event-0.2.1.tgz", + "integrity": "sha512-wGA++isMqiDq1jPYeyv2as/Bt/u+3iLW0rEa+8NQ82jAv3TgqMiCM+B2SaBdn2DfLilLjjq736YcezihRYhfxw==", "dev": true }, "min-dash": { - "version": "4.1.0", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/min-dash/-/min-dash-4.2.1.tgz", + "integrity": "sha512-to+unsToePnm7cUeR9TrMzFlETHd/UXmU+ELTRfWZj5XGT41KF6X3L233o3E/GdEs3sk2Tbw/lOLD1avmWkg8A==", "dev": true }, "min-dom": { "version": "4.1.0", + "resolved": "https://registry.npmjs.org/min-dom/-/min-dom-4.1.0.tgz", + "integrity": "sha512-1lj1EyoSwY/UmTeT/hhPiZTsq+vK9D+8FAJ/53iK5jT1otkG9rJTixSKdjmTieEvdfES+sKbbTptzaQJhnacjA==", "dev": true, "requires": { "component-event": "^0.2.1", @@ -30477,10 +30476,6 @@ "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", "dev": true }, - "hammerjs": { - "version": "2.0.8", - "dev": true - }, "handlebars": { "version": "4.7.7", "dev": true, diff --git a/package.json b/package.json index a3d61806d..dcb4d1738 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "cross-env": "^7.0.3", "css-loader": "^6.7.3", "del-cli": "^5.0.0", - "diagram-js": "^13.4.0", + "diagram-js": "^14.0.0", "didi": "^10.0.1", "eslint": "^8.53.0", "eslint-plugin-bpmn-io": "^1.0.0", From cfb5f8b5f4f5521ca2752d1bfd22c0837ffef5cf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 22:22:45 +0000 Subject: [PATCH 2/5] chore: update actions/upload-artifact digest to 4c0ff1c --- .github/workflows/TASKLIST_CARBONISATION.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/TASKLIST_CARBONISATION.yml b/.github/workflows/TASKLIST_CARBONISATION.yml index 50ec60d36..62d3a593e 100644 --- a/.github/workflows/TASKLIST_CARBONISATION.yml +++ b/.github/workflows/TASKLIST_CARBONISATION.yml @@ -67,7 +67,7 @@ jobs: - name: Run Playwright tests working-directory: ./tasklist/client run: yarn playwright form-js-integration - - uses: actions/upload-artifact@3a8048248f2f288c271830f8ecf2a1c5d8eb0e9a + - uses: actions/upload-artifact@4c0ff1c489dca52fedb26375d7d8fe7bd9233f19 if: always() with: name: playwright-report From 5b46e5e4696533af7155be00334faca011a62154 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 31 Jan 2024 23:04:32 +0000 Subject: [PATCH 3/5] chore: update codecov/codecov-action action to v4 --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index ebfdfd266..36a901997 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -40,5 +40,5 @@ jobs: TEST_BROWSERS: ChromeHeadless run: npm run all - name: Upload coverage - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 if: runner.os == 'Linux' From 734b8503d2261afec52f0c18d9b8ec06f7d50b58 Mon Sep 17 00:00:00 2001 From: Vinicius Goulart Date: Wed, 14 Feb 2024 11:32:52 +0100 Subject: [PATCH 4/5] fix: Fix HTML component link --- .../src/features/properties-panel/entries/HtmlEntry.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/form-js-editor/src/features/properties-panel/entries/HtmlEntry.js b/packages/form-js-editor/src/features/properties-panel/entries/HtmlEntry.js index 3972dbd4c..713ff7343 100644 --- a/packages/form-js-editor/src/features/properties-panel/entries/HtmlEntry.js +++ b/packages/form-js-editor/src/features/properties-panel/entries/HtmlEntry.js @@ -63,7 +63,7 @@ function Content(props) { // helpers ////////// -const description = <>Supports HTML, styling, and templating. Styles are automatically scoped to the HTML component. Learn more; +const description = <>Supports HTML, styling, and templating. Styles are automatically scoped to the HTML component. Learn more; /** * @param {string|void} value From 4226bd2daf9e5d4faaaf4164d0b62ea8d11d00c8 Mon Sep 17 00:00:00 2001 From: Valentin Serra Date: Tue, 13 Feb 2024 05:21:36 +0100 Subject: [PATCH 5/5] fix: validate instead of automatically resetting height entries Closes #956 --- .../src/features/properties-panel/entries/HeightEntry.js | 7 +++---- .../features/properties-panel/entries/IFrameHeightEntry.js | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/form-js-editor/src/features/properties-panel/entries/HeightEntry.js b/packages/form-js-editor/src/features/properties-panel/entries/HeightEntry.js index 0d1a1179d..94ac27946 100644 --- a/packages/form-js-editor/src/features/properties-panel/entries/HeightEntry.js +++ b/packages/form-js-editor/src/features/properties-panel/entries/HeightEntry.js @@ -41,13 +41,12 @@ function Height(props) { description, editField, field, - id, - defaultValue = 60 // default value for spacer + id } = props; const debounce = useService('debounce'); - const getValue = (e) => get(field, [ 'height' ], defaultValue); + const getValue = (e) => get(field, [ 'height' ], null); const setValue = (value, error) => { if (error) { @@ -77,7 +76,7 @@ function Height(props) { */ const validate = (value) => { if (typeof value !== 'number') { - return null; + return 'A number is required.'; } if (!Number.isInteger(value)) { diff --git a/packages/form-js-editor/src/features/properties-panel/entries/IFrameHeightEntry.js b/packages/form-js-editor/src/features/properties-panel/entries/IFrameHeightEntry.js index f1a69a1d1..8a4961b60 100644 --- a/packages/form-js-editor/src/features/properties-panel/entries/IFrameHeightEntry.js +++ b/packages/form-js-editor/src/features/properties-panel/entries/IFrameHeightEntry.js @@ -4,7 +4,6 @@ export function IFrameHeightEntry(props) { return [ ...HeightEntry({ ...props, - defaultValue: 300, description: 'Height of the container in pixels.', isDefaultVisible: (field) => field.type === 'iframe' })