giMerge branch 'develop'

holochain · Dec 9, 2021 · febc1fe · febc1fe
2 parents b5eb9e7 + 944648f
commit febc1fe
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -58,7 +58,7 @@ To reset the launcher, you can execute a factory reset in the `Holochain Admin`
 
 ### Logs
 
-Logs can be found at `$DATA_DIR/holochain/logs/launcher.log`. When reporting issues, please attach the contents of this file.
+Logs can be found at `$DATA_DIR/holochain-launcher/launcher.log`. When reporting issues, please attach the contents of this file.
 
 ## Developer Setup
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -22,6 +22,7 @@
     "@material/mwc-textfield": "^0.25.1",
     "@msgpack/msgpack": "^2.7.1",
     "@tauri-apps/api": "1.0.0-beta.8",
+    "array-flat-polyfill": "^1.0.1",
     "blob-polyfill": "^5.0.20210201",
     "core-js": "^3.6.5",
     "js-base64": "^3.7.2",

diff --git a/src/main.ts b/src/main.ts
@@ -1,3 +1,5 @@
+import "array-flat-polyfill";
+import "blob-polyfill";
 import { createApp } from "vue";
 import "@material/mwc-textfield";
 import "@material/mwc-textarea";
@@ -9,7 +11,6 @@ import "@material/mwc-snackbar";
 import { AdminWebsocket, AppWebsocket } from "@holochain/conductor-api";
 import HcAdminPlugin from "@holochain/admin-ui";
 import { invoke } from "@tauri-apps/api/tauri";
-import "blob-polyfill";
 
 import App from "./App.vue";
 import createStore from "./store";