Merge branch 'bpmn-io:develop' into develop

bpmn-io · Jun 18, 2024 · 8f337a7 · 8f337a7
2 parents 6520e02 + 12e3071
commit 8f337a7
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 12 deletions.
diff --git a/.github/workflows/TASKLIST_CARBONISATION.yml b/.github/workflows/TASKLIST_CARBONISATION.yml
@@ -15,11 +15,11 @@ jobs:
       options: --user 1001:1000
     steps:
       - name: Checkout form-js
-        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
         with:
           path: form-js
       - name: Checkout Tasklist
-        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
         with:
           repository: camunda/zeebe
           token: ${{ secrets.ADD_TO_HTO_PROJECT_PAT }}

diff --git a/e2e/visual/carbon-styles.spec.js-snapshots/carbon-styles-1-chromium-linux.png b/e2e/visual/carbon-styles.spec.js-snapshots/carbon-styles-1-chromium-linux.png
diff --git a/e2e/visual/carbon-styles.spec.js-snapshots/carbon-styles-1-firefox-linux.png b/e2e/visual/carbon-styles.spec.js-snapshots/carbon-styles-1-firefox-linux.png
diff --git a/e2e/visual/carbon-styles.spec.js-snapshots/carbon-styles-1-webkit-linux.png b/e2e/visual/carbon-styles.spec.js-snapshots/carbon-styles-1-webkit-linux.png
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
     "test:visual": "playwright test visual",
     "build:e2e": "vite build",
     "start:visual-preview": "vite preview --port 8080 --logLevel silent &",
-    "start:container": "docker run --rm --network host -v $(pwd):/work/ -w /work/ -it mcr.microsoft.com/playwright:v1.43.1 /bin/bash"
+    "start:container": "docker run --rm --network host -v $(pwd):/work/ -w /work/ -it mcr.microsoft.com/playwright:v1.44.1 /bin/bash"
   },
   "repository": {
     "type": "git",

diff --git a/packages/form-js-viewer/assets/form-js-base.css b/packages/form-js-viewer/assets/form-js-base.css
@@ -49,6 +49,7 @@
   --color-background-active: var(--cds-background-active, var(--color-grey-225-10-75));
   --color-layer: var(--cds-layer, var(--cds-layer-01, var(--color-white)));
   --color-layer-accent: var(--cds-layer-accent, var(--color-grey-0-0-88));
+  --color-background-pre: var(--cds-layer, var(--cds-layer-01, var(--color-white)));
 
   --color-icon-base: var(--cds-icon-primary, var(--color-black));
   --color-icon-inverted: var(--cds-icon-inverse, var(--color-black));
@@ -66,6 +67,7 @@
   --color-borders-adornment: var(--cds-border-subtle, var(--cds-border-subtle-01, var(--color-grey-225-10-85)));
   --color-borders-readonly: var(--cds-border-subtle, var(--color-grey-225-10-75));
   --color-borders-inverted: var(--cds-border-inverse, var(--color-grey-225-10-90));
+  --color-borders-pre: var(--cds-border-subtle, var(--color-grey-225-10-85));
 
   --color-warning: var(--cds-text-error, var(--color-red-360-100-45));
   --color-warning-light: var(--cds-text-error, var(--color-red-360-100-92));
@@ -833,6 +835,13 @@
   white-space: nowrap;
 }
 
+.fjs-container .fjs-form-field-html pre,
+.fjs-container .fjs-form-field-text pre {
+  border: 1px solid var(--color-borders-pre);
+  background: var(--color-background-pre);
+  padding: 4px;
+}
+
 .fjs-container .fjs-taglist-anchor,
 .fjs-container .fjs-select-anchor,
 .fjs-container .fjs-timepicker-anchor {

diff --git a/packages/form-js-viewer/package.json b/packages/form-js-viewer/package.json
@@ -55,7 +55,7 @@
     "flatpickr": "^4.6.13",
     "ids": "^1.0.5",
     "lodash": "^4.17.21",
-    "marked": "^12.0.2",
+    "marked": "^13.0.0",
     "min-dash": "^4.2.1",
     "preact": "^10.5.14"
   },