Skip to content

Commit ba5af70

Browse files
committed
Merge branch 'chrisTypescript' into typescript
2 parents afab468 + bed441d commit ba5af70

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/components/Canvas.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,9 @@ import { useStore } from "../store/main.js";
516516
import { ref, computed, onMounted, watch } from "vue";
517517
import * as fs from "fs";
518518
import { ResizePayload, Component } from "../../types";
519-
const { ipcRenderer } = window;
519+
// @ts-ignore
520+
// const { ipcRenderer } = window;
521+
// ipcRenderer is not used
520522
521523
const cloneDeep = require("lodash.clonedeep");
522524

src/components/right-sidebar/Tree.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import VueTree from "@ssthouse/vue3-tree-chart";
3636
import "@ssthouse/vue3-tree-chart/dist/vue3-tree-chart.css";
3737
import { useStore } from "../../store/main.js";
3838
import { ref, computed, watch } from "vue";
39+
import { Component, RouteComponentMap } from "../../../types";
3940
4041
const store = useStore();
4142
@@ -118,7 +119,7 @@ const activateNode = (nodeToActivate: string) => {
118119
119120
const buildTree = (componentData: typeof VueTree.treeData) => {
120121
//App is always the root of the tree.
121-
const treeData = {
122+
const treeData : {value: string; children:{value: string; children: string[]}[]} = {
122123
value: "App",
123124
children: [],
124125
};
@@ -152,7 +153,7 @@ function buildTreeChildren(array: string[]) {
152153
}
153154
}
154155
}
155-
outputArray.push(outputObj);
156+
(outputArray as { value: string; children: string[]}[]).push(outputObj);
156157
});
157158
return outputArray;
158159
}

0 commit comments

Comments
 (0)