From df3fb83da314fdc26f1eec2c1adfc475a9877c46 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Wed, 18 Apr 2018 10:53:17 +0100 Subject: [PATCH] move deps to sdk for stuff now in the sdk --- package.json | 15 +-------------- src/vector/index.js | 8 ++++---- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index b012a8cae6..f4bf133521 100644 --- a/package.json +++ b/package.json @@ -58,30 +58,17 @@ "babel-runtime": "^6.11.6", "bluebird": "^3.5.0", "browser-request": "^0.3.3", - "classnames": "^2.1.2", - "draft-js": "^0.11.0-alpha", "extract-text-webpack-plugin": "^0.9.1", "favico.js": "^0.3.10", - "filesize": "3.5.6", - "flux": "2.1.1", - "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279", - "gfm.css": "^1.1.1", - "highlight.js": "^9.0.0", - "linkifyjs": "^2.1.3", "matrix-js-sdk": "0.10.1", "matrix-react-sdk": "0.12.2", "modernizr": "^3.1.0", - "pako": "^1.0.5", "prop-types": "^15.5.10", "react": "^15.6.0", - "react-beautiful-dnd": "^4.0.1", "react-dom": "^15.6.0", - "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef", "sanitize-html": "^1.11.1", - "text-encoding-utf-8": "^1.0.1", "ua-parser-js": "^0.7.10", - "url": "^0.11.0", - "velocity-vector": "vector-im/velocity#059e3b2" + "url": "^0.11.0" }, "devDependencies": { "autoprefixer": "^6.6.0", diff --git a/src/vector/index.js b/src/vector/index.js index 183e0b50eb..63affadde9 100644 --- a/src/vector/index.js +++ b/src/vector/index.js @@ -32,10 +32,10 @@ require('babel-polyfill'); // Require common CSS here; this will make webpack process it into bundle.css. // Our own CSS (which is themed) is imported via separate webpack entry points // in webpack.config.js -require('gemini-scrollbar/gemini-scrollbar.css'); -require('gfm.css/gfm.css'); -require('highlight.js/styles/github.css'); -require('draft-js/dist/Draft.css'); +require('matrix-react-sdk/node_modules/gemini-scrollbar/gemini-scrollbar.css'); +require('matrix-react-sdk/node_modules/gfm.css/gfm.css'); +require('matrix-react-sdk/node_modules/highlight.js/styles/github.css'); +require('matrix-react-sdk/node_modules/draft-js/dist/Draft.css'); const rageshake = require("matrix-react-sdk/lib/rageshake/rageshake"); rageshake.init().then(() => {