From 981bd94615dbd49075af7bd87baab42ba97eca7d Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 25 Apr 2018 17:33:18 +0100 Subject: [PATCH] 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. --- package.json | 4 ++++ src/vector/index.js | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index e718f745b2..f59f78785e 100644 --- a/package.json +++ b/package.json @@ -58,8 +58,12 @@ "babel-runtime": "^6.11.6", "bluebird": "^3.5.0", "browser-request": "^0.3.3", + "draft-js": "^0.10.5", "extract-text-webpack-plugin": "^0.9.1", "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-react-sdk": "0.12.3-rc.2", "modernizr": "^3.1.0", diff --git a/src/vector/index.js b/src/vector/index.js index 63affadde9..183e0b50eb 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('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'); +require('gemini-scrollbar/gemini-scrollbar.css'); +require('gfm.css/gfm.css'); +require('highlight.js/styles/github.css'); +require('draft-js/dist/Draft.css'); const rageshake = require("matrix-react-sdk/lib/rageshake/rageshake"); rageshake.init().then(() => {