[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop

package.json

@@ -34,10 +34,22 @@
     "i18n": "matrix-gen-i18n",
     "prunei18n": "matrix-prune-i18n",
     "diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && ./scripts/gen-i18n.js && node scripts/compare-file.js src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",
+<<<<<<< HEAD
     "emoji-data-strip": "node scripts/emoji-data-strip.js",
     "reskindex": "node scripts/reskindex.js -h header",
     "reskindex:watch": "node scripts/reskindex.js -h header -w",
     "rethemendex": "res/css/rethemendex.sh",
+=======
+    "build": "yarn reskindex && yarn start:init",
+    "build:watch": "babel src -w --skip-initial-build -d lib --source-maps --copy-files",
+    "start": "yarn start:init && yarn start:all",
+    "start:all": "concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n build,reskindex \"yarn build:watch\" \"yarn reskindex:watch\"",
+    "start:init": "babel src -d lib --source-maps --copy-files",
+    "lint": "eslint src/",
+    "lintall": "eslint src/ test/",
+    "lintwithexclusions": "eslint --max-warnings 0 --ignore-path .eslintignore.errorfiles src test",
+    "stylelint": "stylelint 'res/css/**/*.scss'",
+>>>>>>> develop
     "clean": "rimraf lib",
     "build": "yarn clean && git rev-parse HEAD > git-revision.txt && yarn build:compile && yarn build:types",
     "build:compile": "yarn reskindex && babel -d lib --verbose --extensions \".ts,.js\" src",
@@ -70,7 +82,6 @@
     "file-saver": "^1.3.3",
     "filesize": "3.5.6",
     "flux": "2.1.1",
-    "focus-trap-react": "^3.0.5",
     "focus-visible": "^5.0.2",
     "fuse.js": "^2.2.0",
     "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566",
@@ -78,6 +89,8 @@
     "glob": "^5.0.14",
     "glob-to-regexp": "^0.4.1",
     "highlight.js": "^9.15.8",
+    "html-entities": "^1.2.1",
+    "humanize": "^0.0.9",
     "is-ip": "^2.0.0",
     "isomorphic-fetch": "^2.2.1",
     "linkifyjs": "^2.1.6",
@@ -95,13 +108,10 @@
     "react-addons-css-transition-group": "15.6.2",
     "react-beautiful-dnd": "^4.0.1",
     "react-dom": "^16.9.0",
+    "react-focus-lock": "^2.2.1",
     "react-gemini-scrollbar": "github:matrix-org/react-gemini-scrollbar#9cf17f63b7c0b0ec5f31df27da0f82f7238dc594",
     "resize-observer-polyfill": "^1.5.0",
     "sanitize-html": "^1.18.4",
-    "slate": "^0.41.2",
-    "slate-html-serializer": "^0.6.1",
-    "slate-md-serializer": "github:matrix-org/slate-md-serializer#f7c4ad3",
-    "slate-react": "^0.18.10",
     "text-encoding-utf-8": "^1.0.1",
     "url": "^0.11.0",
     "velocity-animate": "^1.5.2",
@@ -128,6 +138,8 @@
     "babel-eslint": "^10.0.3",
     "chokidar": "^2.1.2",
     "concurrently": "^4.0.1",
+    "enzyme": "^3.10.0",
+    "enzyme-adapter-react-16": "^1.15.1",
     "eslint": "^5.12.0",
     "eslint-config-google": "^0.7.1",
     "eslint-plugin-babel": "^5.2.1",