Merge pull request #132 from ipfs/fix/peer-id

Fix peer-id errors on browser tests
ipfs · Apr 8, 2016 · 810f35c · 810f35c
2 parents 28ac19d + ecc731a
commit 810f35c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/karma.conf.js b/karma.conf.js
@@ -1,6 +1,6 @@
 module.exports = function (config) {
   var path = require('path')
-  var nodeForgePath = path.resolve(__dirname, 'node_modules/peer-id/deps/forge.bundle.js')
+  var nodeForgePath = path.resolve(__dirname, 'node_modules/peer-id/vendor/forge.bundle.js')
 
   config.set({
     basePath: '',
@@ -31,7 +31,12 @@ module.exports = function (config) {
       module: {
         loaders: [
           { test: /\.json$/, loader: 'json' }
-        ]
+        ],
+        postLoaders: [{
+          test: /\.js$/,
+          loader: 'transform?brfs',
+          include: /node_modules\/peer-id/
+        }]
       }
     },
 

diff --git a/package.json b/package.json
@@ -90,7 +90,7 @@
     "libp2p-ipfs": "^0.2.0",
     "lodash.get": "^4.0.0",
     "lodash.set": "^4.0.0",
-    "peer-id": "^0.6.1",
+    "peer-id": "^0.6.3",
     "peer-info": "^0.6.0",
     "ronin": "^0.3.11",
     "temp": "^0.8.3"