diff --git a/README.md b/README.md index 053c004a86..fabaf55e07 100644 --- a/README.md +++ b/README.md @@ -946,25 +946,8 @@ A way to mitigate this in Chrome, is to run your IPFS node inside a Service Work Yes you can and in many ways. Read https://github.com/ipfs/notes/issues/256 for the multiple options. -If your [electron-rebuild step is failing](https://github.com/ipfs/js-ipfs/issues/843), all you need to do is: - -```bash -# Electron's version. -export npm_config_target=2.0.0 -# The architecture of Electron, can be ia32 or x64. -export npm_config_arch=x64 -export npm_config_target_arch=x64 -# Download headers for Electron. -export npm_config_disturl=https://atom.io/download/electron -# Tell node-pre-gyp that we are building for Electron. -export npm_config_runtime=electron -# Tell node-pre-gyp to build module from source code. -export npm_config_build_from_source=true -# Install all dependencies, and store cache to ~/.electron-gyp. -HOME=~/.electron-gyp npm install -``` - -If you find any other issue, please check the [`Electron Support` issue](https://github.com/ipfs/js-ipfs/issues/843). +We now support Electron v5.0.0 without the need to rebuilt native modules. +Still if you run into problems with native modules follow these instructions [here](https://electronjs.org/docs/tutorial/using-native-node-modules). #### Have more questions? diff --git a/examples/run-in-electron/package.json b/examples/run-in-electron/package.json index 761cc7026f..69b6ba2c36 100644 --- a/examples/run-in-electron/package.json +++ b/examples/run-in-electron/package.json @@ -4,8 +4,7 @@ "description": "A minimal Electron application with js-ipfs", "main": "main.js", "scripts": { - "start": "electron .", - "postinstall": "./rebuild.sh" + "start": "electron ." }, "keywords": [ "Electron", @@ -15,7 +14,7 @@ "author": "David Dias ", "license": "MIT", "devDependencies": { - "electron": "^4.2.0", + "electron": "^5.0.2", "electron-rebuild": "^1.8.4", "ipfs": "ipfs/js-ipfs" }, diff --git a/examples/run-in-electron/rebuild.sh b/examples/run-in-electron/rebuild.sh deleted file mode 100755 index b19f7e9d19..0000000000 --- a/examples/run-in-electron/rebuild.sh +++ /dev/null @@ -1,13 +0,0 @@ -# Electron's version. -export npm_config_target=4.2.0 -# The architecture of Electron, can be ia32 or x64. -export npm_config_arch=x64 -export npm_config_target_arch=x64 -# Download headers for Electron. -export npm_config_disturl=https://atom.io/download/electron -# Tell node-pre-gyp that we are building for Electron. -export npm_config_runtime=electron -# Tell node-pre-gyp to build module from source code. -export npm_config_build_from_source=true -# Install all dependencies, and store cache to ~/.electron-gyp. -HOME=~/.electron-gyp npm rebuild