Skip to content

Commit

Permalink
Merge master to develop
Browse files Browse the repository at this point in the history
  • Loading branch information
bpmn-io-bot committed Dec 20, 2023
2 parents 0cb0cd5 + c59b08a commit a5a2bc7
Show file tree
Hide file tree
Showing 32 changed files with 103 additions and 103 deletions.
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"version": "1.6.0",
"version": "1.6.1",
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
}
48 changes: 24 additions & 24 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/form-js-carbon-styles/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bpmn-io/form-js-carbon-styles",
"version": "1.6.0",
"version": "1.6.1",
"description": "Custom carbon styles for form-js",
"scripts": {
"all": "run-s test",
Expand All @@ -18,7 +18,7 @@
"url": "https://github.com/bpmn-io"
},
"devDependencies": {
"@bpmn-io/form-js-viewer": "^1.6.0",
"@bpmn-io/form-js-viewer": "^1.6.1",
"@carbon/elements": "^11.33.1",
"styled-components": "^6.1.1"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ describe('Carbon styles', function() {
it('should have no violations', async function() {

// given
this.timeout(5000);
this.timeout(10000);

const data = {};

Expand Down
4 changes: 2 additions & 2 deletions packages/form-js-editor/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bpmn-io/form-js-editor",
"version": "1.6.0",
"version": "1.6.1",
"description": "Edit forms - powered by bpmn.io",
"exports": {
".": {
Expand Down Expand Up @@ -47,7 +47,7 @@
},
"dependencies": {
"@bpmn-io/draggle": "^4.0.0",
"@bpmn-io/form-js-viewer": "^1.6.0",
"@bpmn-io/form-js-viewer": "^1.6.1",
"@bpmn-io/properties-panel": "^3.13.0",
"array-move": "^3.0.1",
"big.js": "^6.2.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/form-js-editor/test/spec/FormEditor.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -1557,7 +1557,7 @@ describe('FormEditor', function() {
it('should have no violations', async function() {

// given
this.timeout(5000);
this.timeout(10000);

await bootstrapFormEditor({
schema,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ describe('palette', function() {
it('should have no violations', async function() {

// given
this.timeout(5000);
this.timeout(10000);

const result = createPalette({ container });

Expand All @@ -257,7 +257,7 @@ describe('palette', function() {
it('should have no violations - searched', async function() {

// given
this.timeout(5000);
this.timeout(10000);

const result = createPalette({ container });

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ describe('Text', function() {
it('should have no violations - default', async function() {

// given
this.timeout(5000);
this.timeout(10000);

const { container } = createEditorText();

Expand All @@ -162,7 +162,7 @@ describe('Text', function() {
it('should have no violations - placeholder', async function() {

// given
this.timeout(5000);
this.timeout(10000);

const { container } = createEditorText({
field: {
Expand Down
4 changes: 2 additions & 2 deletions packages/form-js-integration/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bpmn-io/form-js-integration",
"version": "1.6.0",
"version": "1.6.1",
"description": "A set of form-js integration testing resources",
"private": true,
"scripts": {
Expand All @@ -17,6 +17,6 @@
"url": "https://github.com/bpmn-io"
},
"dependencies": {
"@bpmn-io/form-js": "^1.6.0"
"@bpmn-io/form-js": "^1.6.1"
}
}
6 changes: 3 additions & 3 deletions packages/form-js-playground/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bpmn-io/form-js-playground",
"version": "1.6.0",
"version": "1.6.1",
"description": "A form-js playground",
"files": [
"dist"
Expand Down Expand Up @@ -44,8 +44,8 @@
"url": "https://github.com/bpmn-io"
},
"dependencies": {
"@bpmn-io/form-js-editor": "^1.6.0",
"@bpmn-io/form-js-viewer": "^1.6.0",
"@bpmn-io/form-js-editor": "^1.6.1",
"@bpmn-io/form-js-viewer": "^1.6.1",
"@codemirror/autocomplete": "^6.3.4",
"@codemirror/commands": "^6.1.2",
"@codemirror/lang-json": "^6.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/form-js-playground/test/spec/Playground.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ describe('playground', function() {
(singleStartBasic ? it.only : it)('should render', async function() {

// given
this.timeout(5000);
this.timeout(10000);

const data = {
logo: "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='160px' viewBox='0 0 58 23'%3E%3Cpath fill='currentColor' d='M7.75 3.8v.58c0 1.7-.52 2.78-1.67 3.32C7.46 8.24 8 9.5 8 11.24v1.34c0 2.54-1.35 3.9-3.93 3.9H0V0h3.91c2.68 0 3.84 1.25 3.84 3.8zM2.59 2.35V6.7H3.6c.97 0 1.56-.42 1.56-1.74v-.92c0-1.18-.4-1.7-1.32-1.7zm0 6.7v5.07h1.48c.87 0 1.34-.4 1.34-1.63v-1.43c0-1.53-.5-2-1.67-2H2.6zm14.65-4.98v2.14c0 2.64-1.27 4.08-3.87 4.08h-1.22v6.2H9.56V0h3.82c2.59 0 3.86 1.44 3.86 4.07zm-5.09-1.71v5.57h1.22c.83 0 1.28-.37 1.28-1.55V3.91c0-1.18-.45-1.56-1.28-1.56h-1.22zm11.89 9.34L25.81 0h3.6v16.48h-2.44V4.66l-1.8 11.82h-2.45L20.8 4.83v11.65h-2.26V0h3.6zm9.56-7.15v11.93h-2.33V0h3.25l2.66 9.87V0h2.31v16.48h-2.66zm10.25 9.44v2.5h-2.5v-2.5zM50 4.16C50 1.52 51.38.02 53.93.02c2.54 0 3.93 1.5 3.93 4.14v8.37c0 2.64-1.4 4.14-3.93 4.14-2.55 0-3.93-1.5-3.93-4.14zm2.58 8.53c0 1.18.52 1.63 1.35 1.63.82 0 1.34-.45 1.34-1.63V4c0-1.17-.52-1.62-1.34-1.62-.83 0-1.35.45-1.35 1.62zM0 18.7h57.86V23H0zM45.73 0h2.6v2.58h-2.6zm2.59 16.48V4.16h-2.59v12.32z'%3E%3C/path%3E%3C/svg%3E",
Expand Down Expand Up @@ -837,7 +837,7 @@ describe('playground', function() {
it('should have no violations', async function() {

// given
this.timeout(5000);
this.timeout(10000);

const main = document.createElement('main');
container.appendChild(main);
Expand Down
2 changes: 1 addition & 1 deletion packages/form-js-viewer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bpmn-io/form-js-viewer",
"version": "1.6.0",
"version": "1.6.1",
"description": "View forms - powered by bpmn.io",
"exports": {
".": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ describe('Description', function() {
it('should have no violations', async function() {

// given
this.timeout(5000);
this.timeout(10000);

// @Note(pinussilvestrus): we need to render a bit more here as
// Firefox + Ubuntu has problems with the description element on its own
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ describe('Label', function() {
it('should have no violations', async function() {

// given
this.timeout(5000);
this.timeout(10000);

const { container } = createLabel({
id: 'foo',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ describe('Button', function() {
it('should have no violations - submit', async function() {

// given
this.timeout(5000);
this.timeout(10000);

const { container } = createButton({
field: {
Expand All @@ -126,7 +126,7 @@ describe('Button', function() {
it('should have no violations - reset', async function() {

// given
this.timeout(5000);
this.timeout(10000);

const { container } = createButton({
field: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ describe('Checkbox', function() {
it('should have no violations', async function() {

// given
this.timeout(5000);
this.timeout(10000);

const { container } = createCheckbox({
value: true
Expand All @@ -221,7 +221,7 @@ describe('Checkbox', function() {
it('should have no violations for readonly', async function() {

// given
this.timeout(5000);
this.timeout(10000);

const { container } = createCheckbox({
value: true,
Expand All @@ -236,7 +236,7 @@ describe('Checkbox', function() {
it('should have no violations for errors', async function() {

// given
this.timeout(5000);
this.timeout(10000);

const { container } = createCheckbox({
value: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ describe('Checklist', function() {
it('should have no violations', async function() {

// given
this.timeout(5000);
this.timeout(10000);

const { container } = createChecklist({
value: [ 'approver' ]
Expand All @@ -340,7 +340,7 @@ describe('Checklist', function() {
it('should have no violations for readonly', async function() {

// given
this.timeout(5000);
this.timeout(10000);

const { container } = createChecklist({
value: [ 'approver' ],
Expand All @@ -355,7 +355,7 @@ describe('Checklist', function() {
it('should have no violations for errors', async function() {

// given
this.timeout(5000);
this.timeout(10000);

const { container } = createChecklist({
value: [ 'approver' ],
Expand Down
Loading

0 comments on commit a5a2bc7

Please sign in to comment.