Skip to content
This repository has been archived by the owner on Jul 11, 2019. It is now read-only.

use electron-prebuilt@^0.36.4, node >= 4 #153

Merged
merged 3 commits into from
Jan 21, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ See [our site](http://moose-team.github.io/friends/) or the `gh-pages` branch.

### Prerequisites

You'll need the newest [io.js](https://iojs.org) and npm (`>= 1.8.1`, `>= 2.8.3`)
You'll need the newest [node.js](https://nodejs.org) (`>= 4`) and npm (`>= 2.8.3`).

### Build

Expand Down Expand Up @@ -52,7 +52,7 @@ If you are not on 64-bit architecture, you will have to modify the command in
package.json:

```
"rebuild-leveldb": "cd node_modules/leveldown && set HOME=~/.electron-gyp && node-gyp rebuild --target=0.34.2 --arch=x64 --dist-url=https://atom.io/download/atom-shell"
"rebuild-leveldb": "cd node_modules/leveldown && set HOME=~/.electron-gyp && node-gyp rebuild --target=$(../../version.js) --arch=x64 --dist-url=https://atom.io/download/atom-shell"
```

to use `--arch=ia32`.
Expand Down
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ function appReady () {
height: 600,
title: APP_NAME
})
mainWindow.loadUrl(INDEX)
mainWindow.loadURL(INDEX)

mainWindow.on('closed', function () {
mainWindow = null
Expand Down
38 changes: 21 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@
"github-current-user": false,
"leveldown": "level-js"
},
"browserify": {
"transforms": [
"brfs"
]
},
"bugs": {
"url": "https://github.com/moose-team/friends/issues"
},
Expand Down Expand Up @@ -49,7 +54,7 @@
"beefy": "^2.1.5",
"brfs": "^1.4.1",
"electron-packager": "^5.0.2",
"electron-prebuilt": "^0.34.2",
"electron-prebuilt": "^0.36.4",
"mkdirp": "^0.5.0",
"nib": "^1.1.0",
"node-gyp": "^2.0.2",
Expand All @@ -59,42 +64,41 @@
"stylus": "^0.52.0",
"watchify": "^3.2.1"
},
"engines": {
"node": ">=4",
"npm": ">=2.8.3"
},
"homepage": "https://github.com/moose-team/friends",
"keywords": [
"peer-to-peer",
"mad science",
"chat",
"friends",
"p2p",
"discussion",
"communication",
"team chat",
"replication",
"crypto",
"webrtc",
"discussion",
"friends",
"irc",
"slack"
"mad science",
"p2p",
"peer-to-peer",
"replication",
"slack",
"team chat",
"webrtc"
],
"license": "MIT",
"main": "index.js",
"repository": {
"type": "git",
"url": "https://github.com/moose-team/friends.git"
},
"browserify": {
"transforms": [
"brfs"
]
},
"scripts": {
"build-css": "mkdirp dist && stylus -u nib css/app.styl -o dist/ -c",
"package": "node pkg.js",
"package-all": "node pkg.js --all",
"rebuild-leveldb": "cd node_modules/leveldown && set HOME=~/.electron-gyp && node-gyp rebuild --target=$(../../version.js) --arch=x64 --dist-url=https://atom.io/download/atom-shell",
"start": "npm run build-css && electron index.js 2>&1 | silence-chromium",
"test": "standard",
"watch": "npm run build-css && (npm run watch-css & electron index.js 2>&1 | silence-chromium)",
"watch-css": "mkdirp dist && stylus -u nib css/app.styl -o dist/ -w",
"web": "beefy web.js:bundle.js",
"rebuild-leveldb": "cd node_modules/leveldown && set HOME=~/.electron-gyp && node-gyp rebuild --target=0.34.2 --arch=x64 --dist-url=https://atom.io/download/atom-shell"
"web": "beefy web.js:bundle.js"
}
}
2 changes: 1 addition & 1 deletion pkg.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ var os = require('os')
var pkgjson = require('./package.json')
var path = require('path')
var sh = require('shelljs')
var electronVersion = require('./version')

var appVersion = pkgjson.version
var appName = pkgjson.name
var electronPackager = './node_modules/.bin/electron-packager'
var electronVersion = '0.26.0'
var icon = 'static/Icon.icns'

if (process.argv[2] === '--all') {
Expand Down
8 changes: 8 additions & 0 deletions version.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/usr/bin/env node

var pkg = require('./package.json')
var version = pkg.devDependencies['electron-prebuilt'].replace('^', '')

if (require.main === module) console.log(version)

module.exports = version