Change CSS dependencies to not hardcoded paths

Add add direct dependencies on the packages they come from, because
referring to them by path like this doesn't work in a frash
checkout / npm install because of how npm lays out the packages.
pull/6674/head
David Baker 2018-04-25 17:33:18 +01:00
parent 083dd4eeec
commit 981bd94615
2 changed files with 8 additions and 4 deletions

View File

@ -58,8 +58,12 @@
"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",
"draft-js": "^0.10.5",
"extract-text-webpack-plugin": "^0.9.1", "extract-text-webpack-plugin": "^0.9.1",
"favico.js": "^0.3.10", "favico.js": "^0.3.10",
"gemini-scrollbar": "^1.5.3",
"gfm.css": "^1.1.2",
"highlight.js": "^9.12.0",
"matrix-js-sdk": "0.10.2-rc.1", "matrix-js-sdk": "0.10.2-rc.1",
"matrix-react-sdk": "0.12.3-rc.2", "matrix-react-sdk": "0.12.3-rc.2",
"modernizr": "^3.1.0", "modernizr": "^3.1.0",

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('matrix-react-sdk/node_modules/gemini-scrollbar/gemini-scrollbar.css'); require('gemini-scrollbar/gemini-scrollbar.css');
require('matrix-react-sdk/node_modules/gfm.css/gfm.css'); require('gfm.css/gfm.css');
require('matrix-react-sdk/node_modules/highlight.js/styles/github.css'); require('highlight.js/styles/github.css');
require('matrix-react-sdk/node_modules/draft-js/dist/Draft.css'); require('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(() => {