From 2cc1addcb3ef290678d46ded5abd3e7e66e0e57c Mon Sep 17 00:00:00 2001 From: Simon Sturmer Date: Tue, 15 Mar 2016 10:41:31 +0800 Subject: [PATCH] import Draft css from js-land --- package.json | 1 + assets/css/draft.css => src/Draft.global.css | 0 src/RichTextEditor.js | 2 ++ webpack.config.js | 7 +++---- 4 files changed, 6 insertions(+), 4 deletions(-) rename assets/css/draft.css => src/Draft.global.css (100%) diff --git a/package.json b/package.json index 0a1a9952..46a7e61b 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "expect": "^1.14.0", "flow-bin": "0.20.1", "mocha": "^2.4.5", + "raw-loader": "^0.5.1", "react-addons-test-utils": "^0.14.7", "rimraf": "^2.5.2", "style-loader": "^0.13.0", diff --git a/assets/css/draft.css b/src/Draft.global.css similarity index 100% rename from assets/css/draft.css rename to src/Draft.global.css diff --git a/src/RichTextEditor.js b/src/RichTextEditor.js index 9d5a8b71..ec0ffaee 100644 --- a/src/RichTextEditor.js +++ b/src/RichTextEditor.js @@ -15,6 +15,8 @@ import autobind from 'class-autobind'; import {EventEmitter} from 'events'; import {BLOCK_TYPE} from 'draft-js-tools'; +// $FlowIssue - Flow doesn't understand CSS Modules +import './Draft.global.css'; // $FlowIssue - Flow doesn't understand CSS Modules import styles from './RichTextEditor.css'; diff --git a/webpack.config.js b/webpack.config.js index f4b7b727..79e7ee90 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -12,17 +12,16 @@ module.exports = { }, module: { loaders: [ - { - test: /\.js$/, - loader: 'babel', - }, + {test: /\.js$/, loader: 'babel'}, { test: /\.css$/, + exclude: /\.global\.css$/, loaders: [ 'style?sourceMap', 'css?modules&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]', ], }, + {test: /\.global\.css$/, loader: 'style!raw'}, ], }, };