diff --git a/examples/workflow-server/package.json b/examples/workflow-server/package.json index 0952a37..93effb8 100644 --- a/examples/workflow-server/package.json +++ b/examples/workflow-server/package.json @@ -44,8 +44,7 @@ "node.d.ts", "browser.d.ts", "browser.js", - "bundle/wf-glsp-server-node.js", - "bundle/wf-glsp-server-webworker.js" + "bundle/wf-glsp-server-node.js" ], "scripts": { "build": "tsc -b && yarn bundle", @@ -55,7 +54,6 @@ "lint": "eslint --ext .ts,.tsx ./src", "lint:ci": "yarn lint -o eslint.xml -f checkstyle", "prepare": "yarn clean && yarn build", - "prepublish": "yarn bundle && yarn bundle:browser", "start": "node --enable-source-maps bundle/wf-glsp-server-node.js --port 5007", "start:websocket": "node --enable-source-maps bundle/wf-glsp-server-node.js -w --port 8081", "watch": "tsc -w" diff --git a/package.json b/package.json index 12fcb4f..5d2a724 100644 --- a/package.json +++ b/package.json @@ -16,9 +16,8 @@ "lint": "lerna run lint", "lint:ci": "lerna run lint:ci", "prepare": "lerna run prepare", - "prepublish": "lerna run prepublish", - "publish:latest": "yarn prepublish && lerna publish from-git --no-git-reset --no-git-tag-version --no-verify-access --no-push", - "publish:next": "yarn prepublish && SHA=$(git rev-parse --short HEAD) && lerna publish preminor --exact --canary --preid next.${SHA} --dist-tag next --no-git-reset --no-git-tag-version --no-push --ignore-scripts --yes --no-verify-access", + "publish:latest": "lerna publish from-git --no-git-reset --no-git-tag-version --no-verify-access --no-push", + "publish:next": "SHA=$(git rev-parse --short HEAD) && lerna publish preminor --exact --canary --preid next.${SHA} --dist-tag next --no-git-reset --no-git-tag-version --no-push --ignore-scripts --yes --no-verify-access", "publish:prepare": "lerna version --ignore-scripts --yes --no-push", "start": "yarn --cwd examples/workflow-server start", "start:websocket": "yarn --cwd examples/workflow-server start:websocket", diff --git a/packages/layout-elk/src/di.config.spec.ts b/packages/layout-elk/src/di.config.spec.ts index af6a1be..259c288 100644 --- a/packages/layout-elk/src/di.config.spec.ts +++ b/packages/layout-elk/src/di.config.spec.ts @@ -13,8 +13,16 @@ * * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 ********************************************************************************/ -import { DefaultModelState, GGraph, GModelElementConstructor, ModelState } from '@eclipse-glsp/server'; -import { StubDiagramConfiguration } from '@eclipse-glsp/server/lib/common/test/mock-util'; +import { + DefaultModelState, + DiagramConfiguration, + EdgeTypeHint, + GGraph, + GModelElementConstructor, + ModelState, + ServerLayoutKind, + ShapeTypeHint +} from '@eclipse-glsp/server'; import { expect } from 'chai'; import { Container, ContainerModule, injectable } from 'inversify'; import * as sinon from 'sinon'; @@ -28,6 +36,20 @@ class CustomLayoutConfigurator extends AbstractLayoutConfigurator {} @injectable() class CustomElementFilter extends DefaultElementFilter {} +class StubDiagramConfiguration implements DiagramConfiguration { + typeMapping = new Map(); + + shapeTypeHints: ShapeTypeHint[] = []; + + edgeTypeHints: EdgeTypeHint[] = []; + + layoutKind = ServerLayoutKind.NONE; + + needsClientLayout = true; + + animatedUpdate = true; +} + describe('test configureELKLayoutModule', () => { const sandbox = sinon.createSandbox(); const mockDiagramConfiguration = new StubDiagramConfiguration();