fix: use electron-store

.gitignore

@@ -5,4 +5,5 @@ app/out
 _gsdata_/
 
 /.idea/workspace.xml
+/.idea/shelf/
 /out/

package.json

@@ -43,7 +43,7 @@
     }
   },
   "dependencies": {
-    "configstore": "^5.0.0",
+    "electron-store": "^4.0.0",
     "electron-debug": "^3.0.0",
     "electron-is-dev": "^1.1.0",
     "electron-log": "^3.0.6",
@@ -53,7 +53,7 @@
   "devDependencies": {
     "@types/debug": "^4.1.4",
     "electron": "5.0.6",
-    "electron-builder": "^21.0.3",
+    "electron-builder": "^21.0.14",
     "rimraf": "^2.6.3",
     "typescript": "^3.5.2"
   }

src/StateManager.ts

@@ -1,7 +1,4 @@
-import * as os from "os"
-import * as path from "path"
-import ConfigStore = require("configstore")
-import { isDev } from "./util"
+import * as ConfigStore from "electron-store"
 
 export const DEFAULT_URL = "https://cad.onshape.com/"
 
@@ -12,47 +9,31 @@ function defaultWindows() {
 }
 
 export class StateManager {
-  private store = new ConfigStore("onshape-unofficial", {windows: defaultWindows()})
+  private store = new ConfigStore()
 
-  private data: Config
-
-  constructor() {
-    if (os.platform() == "darwin") {
-      this.store.path = path.join(os.homedir(), "Library", "Preferences", "org.develar.onshape" + (isDev() ? "-dev" : "") + ".json")
-    }
-  }
+  private windows: Array<WindowItem> = defaultWindows()
 
   restoreWindows(): void {
-    let data = this.getOrLoadData()
-    data.windows = defaultWindows()
-    this.store.all = data
-  }
-
-  private getOrLoadData(): Config {
-    let data = this.data
-    if (data == null) {
-      data = this.store.all
-      this.data = data
-    }
-    return data
+    this.store.delete("windows")
+    this.windows = defaultWindows()
   }
 
   getWindows(): Array<WindowItem> {
-    return this.getOrLoadData().windows
+    const result = this.store.get("windows")
+    if (result == null || !Array.isArray(result)) {
+      this.windows = defaultWindows()
+    }
+    else {
+      this.windows = result
+    }
+    return this.windows
   }
 
   save(): void {
-    const data = this.data
-    if (data != null) {
-      this.store.all = data
-    }
+    this.store.set("windows", this.windows)
   }
 }
 
-interface Config {
-  windows: Array<WindowItem>
-}
-
 export interface WindowItem {
   url: string
   width?: number

tsconfig.json

@@ -6,21 +6,12 @@
     "removeComments": true,
     "outDir": "out",
     "newLine": "LF",
-    "noResolve": true,
     "noEmitOnError": true,
     "inlineSources": true,
     "sourceMap": true,
-    "noUnusedLocals": true,
-    "skipLibCheck": true
+    "noUnusedLocals": true
   },
   "include": [
-    "node_modules/@types/*/*.d.ts",
-    "node_modules/electron/electron.d.ts",
-    "node_modules/electron-updater/out/*.d.ts",
-    "node_modules/electron-builder-http/out/*.d.ts",
-    "src/*.ts",
-    "typings/**/*.d.ts"
-  ],
-  "exclude": [
+    "src/*.ts"
   ]
 }