diff --git a/client/package.json b/client/package.json index 1b12cb77..bd8f42e8 100644 --- a/client/package.json +++ b/client/package.json @@ -3,27 +3,26 @@ "homepage": "/", "private": true, "dependencies": { - "@types/react-router-dom": "^4.3.1", "blob-polyfill": "^3.0.20180112", "blueimp-canvas-to-blob": "^3.14.0", "canvg": "^1.5.3", "d3-hierarchy": "^1.1.8", - "d3-selection": "^1.3.2", + "d3-selection": "^1.4.0", "d3-selection-multi": "^1.0.1", - "d3-transition": "^1.1.3", + "d3-transition": "^1.2.0", "d3-zoom": "^1.7.3", - "element-closest": "^2.0.2", - "file-saver": "^2.0.0-rc.4", + "element-closest": "^3.0.1", + "file-saver": "^2.0.1", "fuzzysort": "^1.1.4", "json-stable-stringify": "^1.0.1", - "normalize.css": "^8.0.0", + "normalize.css": "^8.0.1", "object-path": "^0.11.4", - "object-path-immutable": "^3.0.0", - "office-ui-fabric-react": "^6.89.0", - "re-reselect": "^2.2.0", - "react": "^16.5.2", - "react-dom": "^16.5.2", - "react-redux": "^5.0.7", + "object-path-immutable": "^3.0.2", + "office-ui-fabric-react": "^6.159.1", + "re-reselect": "^3.0.0", + "react": "^16.8.5", + "react-dom": "^16.8.5", + "react-redux": "^6.0.1", "react-router-dom": "^5.0.0", "react-scripts-ts": "^3.1.0", "reduce-reducers": "^0.4.3", @@ -32,33 +31,34 @@ "redux-thunk": "^2.3.0", "reselect": "^4.0.0", "s-expression": "^3.0.3", - "svg2pdf.js": "1.2.1", - "typesafe-actions": "^2.0.4", + "svg2pdf.js": "1.3.3", + "typesafe-actions": "^3.2.1", "uuid": "^3.3.2" }, "devDependencies": { - "@types/d3-hierarchy": "^1.1.4", - "@types/d3-selection": "^1.3.2", + "@types/react-router-dom": "^4.3.1", + "@types/d3-hierarchy": "^1.1.6", + "@types/d3-selection": "^1.4.1", "@types/d3-selection-multi": "^1.0.7", - "@types/d3-zoom": "^1.7.2", - "@types/enzyme": "^3.1.14", - "@types/enzyme-adapter-react-16": "^1.0.3", - "@types/file-saver": "^1.3.1", - "@types/jest": "^23.3.5", + "@types/d3-zoom": "^1.7.4", + "@types/enzyme": "^3.9.1", + "@types/enzyme-adapter-react-16": "^1.0.5", + "@types/file-saver": "^2.0.0", + "@types/jest": "^24.0.11", "@types/json-stable-stringify": "^1.0.32", - "@types/object-path": "^0.9.29", - "@types/react": "^16.4.18", - "@types/react-dom": "^16.0.9", - "@types/react-redux": "^6.0.9", + "@types/object-path": "^0.11.0", + "@types/react": "^16.8.8", + "@types/react-dom": "^16.8.3", + "@types/react-redux": "^7.0.5", "@types/redux-localstorage": "^1.0.8", "@types/uuid": "^3.4.4", - "enzyme": "^3.7.0", - "enzyme-adapter-react-16": "^1.6.0", - "enzyme-to-json": "^3.3.4", + "enzyme": "^3.9.0", + "enzyme-adapter-react-16": "^1.11.2", + "enzyme-to-json": "^3.3.5", "mock-socket": "^8.0.5", - "redux-devtools": "^3.4.1", - "tslint": "^5.11.0", - "typescript": "^3.1.3" + "redux-devtools": "^3.5.0", + "tslint": "^5.14.0", + "typescript": "^3.3.4000" }, "scripts": { "start": "react-scripts-ts start", diff --git a/client/src/components/FeatureDiagramRouteContainer.tsx b/client/src/components/FeatureDiagramRouteContainer.tsx index 36a16d67..67f1b89e 100644 --- a/client/src/components/FeatureDiagramRouteContainer.tsx +++ b/client/src/components/FeatureDiagramRouteContainer.tsx @@ -34,7 +34,6 @@ class FeatureDiagramRoute extends React.Component { } render() { - console.log('render'); return { beforeAll(() => { FeatureModel.getSvg = jest.fn(() => ({ getBoundingClientRect: () => ({x: 0, y: 0, width: 1000, height: 1000}) - })); + })) as () => any; }); it('renders information for a feature with a description', () => { diff --git a/client/src/components/overlays/FeatureContextualMenu.test.tsx b/client/src/components/overlays/FeatureContextualMenu.test.tsx index 5614e4a1..468fe241 100644 --- a/client/src/components/overlays/FeatureContextualMenu.test.tsx +++ b/client/src/components/overlays/FeatureContextualMenu.test.tsx @@ -49,7 +49,7 @@ describe('FeatureContextualMenu', () => { beforeAll(() => { FeatureModel.getSvg = jest.fn(() => ({ getBoundingClientRect: () => ({x: 0, y: 0, width: 1000, height: 1000}) - })); + })) as () => any; }); it('renders correctly for a single feature', () => { diff --git a/client/src/helpers/Dialog.tsx b/client/src/helpers/Dialog.tsx index bac9aab3..637b6fed 100644 --- a/client/src/helpers/Dialog.tsx +++ b/client/src/helpers/Dialog.tsx @@ -130,7 +130,7 @@ export class TextFieldDialog extends React.Component