Commit f93f8d4fc67466bd1d3c82874870ebb132e8286a
Merge branch 'onboarding' into pre-release
mixmix committed on 7/16/2019, 6:27:35 AMParent: 8e4e9c4e33e4475499a439dc81219dc9da8b19a2
Parent: aa1beaf1cd116f8a379c4be490b5fde4dda8ad4e
Files changed
index.js | changed |
package-lock.json | changed |
package.json | changed |
index.js | ||
---|---|---|
@@ -1,16 +1,17 @@ | ||
1 | 1 … | const ahoy = require('ssb-ahoy') |
2 | 2 … | const StartMenus = require('./menu') |
3 | 3 … | |
4 | 4 … | const plugins = [ |
5 | - 'ssb-server/plugins/master', | |
6 | - 'ssb-server/plugins/unix-socket', | |
7 | - 'ssb-server/plugins/no-auth', | |
8 | - 'ssb-server/plugins/onion', | |
9 | - 'ssb-server/plugins/local', | |
10 | - 'ssb-server/plugins/logging', | |
5 … | + 'ssb-master', | |
6 … | + 'ssb-unix-socket', | |
7 … | + 'ssb-no-auth', | |
8 … | + 'ssb-onion', | |
9 … | + 'ssb-local', | |
10 … | + 'ssb-logging', | |
11 | 11 … | |
12 | 12 … | 'ssb-legacy-conn', |
13 … | + // 'ssb-conn', // TODO requires secret-stack@^6.2.0 , but ssb-server shrinkwrapped @6.1.2 | |
13 | 14 … | 'ssb-replicate', |
14 | 15 … | 'ssb-friends', |
15 | 16 … | |
16 | 17 … | 'ssb-blobs', |
@@ -39,9 +40,9 @@ | ||
39 | 40 … | ahoy( |
40 | 41 … | { |
41 | 42 … | title: 'Patchbay', |
42 | 43 … | plugins, |
43 | - // appDir: '../patchbay', // only used when ssb-ahoy is symlinked in! | |
44 … | + appDir: '../patchbay', // only used when ssb-ahoy is symlinked in! // TODO recomment before publish | |
44 | 45 … | uiPath: './ui.js' |
45 | 46 … | }, |
46 | 47 … | (state) => { |
47 | 48 … | StartMenus(state) |
package-lock.json | ||
---|---|---|
The diff is too large to show. Use a local git client to view these changes. Old file size: 799402 bytes New file size: 827451 bytes |
package.json | ||
---|---|---|
@@ -6,9 +6,9 @@ | ||
6 | 6 … | "scripts": { |
7 | 7 … | "postinstall": "npm run rebuild", |
8 | 8 … | "rebuild": "electron-builder install-app-deps", |
9 | 9 … | "start": "electron index.js -- --title patchbay", |
10 | - "start-frameless": "FRAME=false npm start", | |
10 … | + "frameless": "ELECTRON_FRAME=false npm start", | |
11 | 11 … | "lite": "echo 'run your own sbot!' && electro lite.js -- --title patchbay --icon ./node_module/ssb-ahoy/electron/assets/icon.png", |
12 | 12 … | "dist": "electron-builder", |
13 | 13 … | "test": "standard", |
14 | 14 … | "lint": "standard --fix", |
@@ -104,29 +104,37 @@ | ||
104 | 104 … | "ssb-blobs": "^1.1.12", |
105 | 105 … | "ssb-chess-db": "^1.0.6", |
106 | 106 … | "ssb-chess-mithril": "1.0.10", |
107 | 107 … | "ssb-config": "^3.3.0", |
108 … | + "ssb-conn": "^0.1.0", | |
108 | 109 … | "ssb-device-address": "^1.1.6", |
109 | 110 … | "ssb-ebt": "^5.6.6", |
110 | 111 … | "ssb-friend-pub": "^1.0.7", |
111 | 112 … | "ssb-friends": "^4.1.4", |
112 | 113 … | "ssb-identities": "^2.1.0", |
113 | 114 … | "ssb-invite": "~2.0.4", |
114 | 115 … | "ssb-legacy-conn": "^1.0.25", |
116 … | + "ssb-local": "^1.0.0", | |
117 … | + "ssb-logging": "^1.0.0", | |
118 … | + "ssb-master": "^1.0.3", | |
115 | 119 … | "ssb-meme": "^1.0.4", |
116 | 120 … | "ssb-mentions": "^0.5.0", |
117 | 121 … | "ssb-mutual": "^0.1.0", |
122 … | + "ssb-no-auth": "^1.0.0", | |
123 … | + "ssb-onion": "^1.0.0", | |
118 | 124 … | "ssb-ooo": "^1.1.1", |
119 | 125 … | "ssb-peer-invites": "^2.0.0", |
126 … | + "ssb-plugins": "^1.0.2", | |
120 | 127 … | "ssb-private": "^0.2.3", |
121 | 128 … | "ssb-query": "^2.1.0", |
122 | 129 … | "ssb-ref": "^2.13.6", |
123 | 130 … | "ssb-replicate": "^1.3.0", |
124 | 131 … | "ssb-search": "^1.1.2", |
125 | - "ssb-server": "^14.1.12", | |
132 … | + "ssb-server": "^15.0.2", | |
126 | 133 … | "ssb-sort": "^1.1.0", |
127 | 134 … | "ssb-suggest": "^1.0.4", |
128 | 135 … | "ssb-tangle": "^1.0.1", |
136 … | + "ssb-unix-socket": "^1.0.0", | |
129 | 137 … | "ssb-unread": "^1.0.8", |
130 | 138 … | "ssb-uri": "^1.0.1", |
131 | 139 … | "ssb-ws": "~6.0.0", |
132 | 140 … | "suggest-box": "^2.2.3", |
Built with git-ssb-web