Skip to content

Commit 9dc4a45

Browse files
committed
Merge branch 'test' into typescript
2 parents e8b14be + c4e2a24 commit 9dc4a45

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

src/components/left-sidebar/ComponentTab/ImportComponent.vue

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313
import { computed } from "vue";
1414
import { useStore } from "../../../store/main.js";
1515
import { useCreateComponent } from "../../composables/useCreateComponent.js";
16-
import * as fs from "fs";
16+
// import * as fs from "fs";
1717
import { Component, HtmlElement, HtmlElementMap } from "../../../../types";
18-
const { ipcRenderer } = window.require("electron");
18+
// @ts-ignore
19+
const { fs, ipcRenderer } = window;
1920
const store = useStore();
2021
2122
const props = defineProps(["title"]);
@@ -140,6 +141,7 @@ const parsingStringToState = (str: string) => {
140141
};
141142
142143
//the bulk of the work for this component
144+
// @ts-ignore
143145
const openVueFile = (data) => {
144146
if (data === undefined) return;
145147

src/components/nav-buttons/ExportMenu.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ Description:
3434
import { computed } from "vue";
3535
import { useStore } from "../../store/main";
3636
import { useExportComponent } from "../composables/useExportComponent";
37-
import * as fs from "fs";
38-
import path from "path";
37+
// import * as fs from "fs";
38+
// import path from "path";
3939
import {
4040
Component,
4141
HtmlElement,
@@ -45,7 +45,7 @@ import {
4545
4646
const store = useStore();
4747
// @ts-ignore
48-
const { ipcRenderer } = window;
48+
const { fs, ipcRenderer } = window;
4949
5050
const componentMap = computed(() => store.componentMap);
5151
const imagePath = computed(() => store.imagePath);

src/components/nav-buttons/ImportMenu.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ Description:
3131
import { useStore } from "../../store/main";
3232
import ImportComponent from "../left-sidebar/ComponentTab/ImportComponent.vue";
3333
import { Component } from "../../../types";
34-
import * as fs from "fs";
34+
// import * as fs from "fs";
3535
const Mousetrap = require("mousetrap");
3636
// @ts-ignore
37-
const { ipcRenderer } = window;
37+
const { fs, ipcRenderer } = window;
3838
3939
const store = useStore();
4040

src/components/nav-buttons/SaveProject.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import localforage from "localforage";
2121
import { useStore } from "../../store/main";
2222
import { computed } from "vue";
2323
import { HtmlElement } from "app/types";
24-
import * as fs from "fs";
24+
// import * as fs from "fs";
2525
const Mousetrap = require("mousetrap");
2626
// @ts-ignore
27-
const { ipcRenderer } = window;
27+
const { fs, ipcRenderer } = window;
2828
2929
const store = useStore();
3030

tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,6 @@
4040
"dist",
4141
".quasar",
4242
"node_modules",
43+
"src",
4344
]
4445
}

0 commit comments

Comments
 (0)