Merge branch 'develop' into matthew/warn-unknown-devices

matrix-org · Feb 1, 2017 · 5d544c7 · 5d544c7
2 parents 34fde7d + 526fbfa
commit 5d544c7
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -9,9 +9,9 @@
     "check": "npm run buildtest && jasmine-node specbuild --verbose --junitreport --captureExceptions",
     "gendoc": "jsdoc -r lib -P package.json -R README.md -d .jsdoc",
     "start": "babel -s -w -d lib src",
-    "build": "babel -s -d lib src && rimraf dist && mkdir dist && browserify --exclude olm browser-index.js -o dist/browser-matrix.js --ignore-missing && uglifyjs -c -m -o dist/browser-matrix.min.js dist/browser-matrix.js",
+    "build": "babel -s -d lib src && rimraf dist && mkdir dist && browserify -d browser-index.js | exorcist dist/browser-matrix.js.map > dist/browser-matrix.js && uglifyjs -c -m -o dist/browser-matrix.min.js --source-map dist/browser-matrix.min.js.map --in-source-map dist/browser-matrix.js.map dist/browser-matrix.js",
     "dist": "npm run build",
-    "watch": "watchify --exclude olm browser-index.js -o dist/browser-matrix-dev.js -v",
+    "watch": "watchify -d browser-index.js -o 'exorcist dist/browser-matrix.js.map > dist/browser-matrix.js' -v",
     "lint": "eslint --max-warnings 121 src spec",
     "prepublish": "npm run build && git rev-parse HEAD > git-revision.txt"
   },
@@ -47,24 +47,36 @@
   "dependencies": {
     "another-json": "^0.2.0",
     "browser-request": "^0.3.3",
-    "browserify": "^10.2.3",
     "q": "^1.4.1",
     "request": "^2.53.0"
   },
   "devDependencies": {
     "babel-cli": "^6.18.0",
     "babel-eslint": "^7.1.1",
     "babel-preset-es2015": "^6.18.0",
+    "browserify": "^14.0.0",
+    "browserify-shim": "^3.8.13",
     "eslint": "^3.13.1",
     "eslint-config-google": "^0.7.1",
+    "exorcist": "^0.4.0",
     "istanbul": "^0.3.13",
     "jasmine-node": "^1.14.5",
     "jsdoc": "^3.4.0",
     "rimraf": "^2.5.4",
+    "sourceify": "^0.1.0",
     "uglifyjs": "^2.4.10",
     "watchify": "^3.2.1"
   },
   "optionalDependencies": {
     "olm": "https://matrix.org/packages/npm/olm/olm-2.2.1.tgz"
+  },
+  "browserify": {
+    "transform": [
+      "sourceify",
+      "browserify-shim"
+    ]
+  },
+  "browserify-shim": {
+    "olm": "global:Olm"
   }
 }
diff --git a/src/crypto/OlmDevice.js b/src/crypto/OlmDevice.js
@@ -21,6 +21,11 @@ limitations under the License.
  * @module crypto/OlmDevice
  */
 const Olm = require("olm");
+if (!Olm) {
+    // this happens if we were loaded via browserify and the Olm module was not
+    // loaded.
+    throw new Error("Olm is not defined");
+}
 const utils = require("../utils");
 
 

diff --git a/src/crypto/index.js b/src/crypto/index.js
@@ -833,10 +833,6 @@ Crypto.prototype.setRoomEncryption = function(roomId, config) {
         throw new Error("Unable to encrypt with " + config.algorithm);
     }
 
-    // remove spurious keys
-    config = {
-        algorithm: config.algorithm,
-    };
     this._sessionStore.storeEndToEndRoom(roomId, config);
 
     const alg = new AlgClass({