gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

move deps to sdk for stuff now in the sdk

This commit is contained in:
Matthew Hodgson 2018-04-18 10:53:17 +01:00
parent 7ee534388b
commit df3fb83da3
2 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
package.json
View File

@ -58,30 +58,17 @@
"babel-runtime": "^6.11.6", "babel-runtime": "^6.11.6",
"bluebird": "^3.5.0", "bluebird": "^3.5.0",
"browser-request": "^0.3.3", "browser-request": "^0.3.3",
"classnames": "^2.1.2",
"draft-js": "^0.11.0-alpha",
"extract-text-webpack-plugin": "^0.9.1", "extract-text-webpack-plugin": "^0.9.1",
"favico.js": "^0.3.10", "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-js-sdk": "0.10.1",
"matrix-react-sdk": "0.12.2", "matrix-react-sdk": "0.12.2",
"modernizr": "^3.1.0", "modernizr": "^3.1.0",
"pako": "^1.0.5",
"prop-types": "^15.5.10", "prop-types": "^15.5.10",
"react": "^15.6.0", "react": "^15.6.0",
"react-beautiful-dnd": "^4.0.1",
"react-dom": "^15.6.0", "react-dom": "^15.6.0",
"react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
"sanitize-html": "^1.11.1", "sanitize-html": "^1.11.1",
"text-encoding-utf-8": "^1.0.1",
"ua-parser-js": "^0.7.10", "ua-parser-js": "^0.7.10",
"url": "^0.11.0", "url": "^0.11.0"
"velocity-vector": "vector-im/velocity#059e3b2"
}, },
"devDependencies": { "devDependencies": {
"autoprefixer": "^6.6.0", "autoprefixer": "^6.6.0",

8
src/vector/index.js
View File

@ -32,10 +32,10 @@ require('babel-polyfill');
// Require common CSS here; this will make webpack process it into bundle.css. // 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 // Our own CSS (which is themed) is imported via separate webpack entry points
// in webpack.config.js // in webpack.config.js
require('gemini-scrollbar/gemini-scrollbar.css'); require('matrix-react-sdk/node_modules/gemini-scrollbar/gemini-scrollbar.css');
require('gfm.css/gfm.css'); require('matrix-react-sdk/node_modules/gfm.css/gfm.css');
require('highlight.js/styles/github.css'); require('matrix-react-sdk/node_modules/highlight.js/styles/github.css');
require('draft-js/dist/Draft.css'); require('matrix-react-sdk/node_modules/draft-js/dist/Draft.css');
const rageshake = require("matrix-react-sdk/lib/rageshake/rageshake"); const rageshake = require("matrix-react-sdk/lib/rageshake/rageshake");
rageshake.init().then(() => { rageshake.init().then(() => {