diff --git a/src/main/resources/static/js/app.render.jsx b/src/main/resources/static/js/app.render.jsx index 0b76662..8da2f07 100644 --- a/src/main/resources/static/js/app.render.jsx +++ b/src/main/resources/static/js/app.render.jsx @@ -8,6 +8,7 @@ import App from './app.jsx'; require('bootstrap/dist/css/bootstrap.css'); +require('../css/comments.css'); global.renderClient = function (comments) { var data = comments || []; diff --git a/src/main/resources/templates/fragments/header.html b/src/main/resources/templates/fragments/header.html index 51aaa1c..af5b81d 100644 --- a/src/main/resources/templates/fragments/header.html +++ b/src/main/resources/templates/fragments/header.html @@ -24,7 +24,7 @@ diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index c21b778..928728d 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -4,7 +4,7 @@ Comments channel - + diff --git a/webpack.config.js b/webpack.config.js index 650de07..d1cb047 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -19,8 +19,7 @@ var config = { debug: true, output: { path: './target/classes/static/js', - filename: '[name].bundle.js', - + filename: '[name].bundle.js' }, plugins: [ new ExtractTextPlugin("../css/[name].css"), @@ -41,30 +40,21 @@ var config = { test: /\.css$/, loader: ExtractTextPlugin.extract("style-loader", "css-loader!postcss-loader") }, - { - test: /\.jpe?g$|\.gif$|\.png$|\.svg$|\.woff(2)?$|\.ttf$|\.wav$|\.mp3$/, - loader: require.resolve("file-loader") + "?name=../[path][name].[ext]" - }, { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, - loader: "file" + loader: "file?name=../css/[name].[ext]" }, { test: /\.(woff|woff2)$/, - loader:"url?prefix=font/&limit=5000" + loader:"url?prefix=font/&limit=5000&name=../css/[name].[ext]" }, { test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, - loader: "url?limit=10000&mimetype=application/octet-stream" + loader: "url?limit=10000&mimetype=application/octet-stream&&name=../css/[name].[ext]" }, { test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, - loader: "url?limit=10000&mimetype=image/svg+xml" - }, - { - test: path.join(__dirname, '.'), - exclude: /(node_modules)/, - loader: 'babel-loader' + loader: "url?limit=10000&mimetype=image/svg+xml&&name=../css/[name].[ext]" } ] },