Fix: resources path and CSS bundle

This commit is contained in:
fecaille
2016-03-31 14:26:05 +02:00
parent c43fdf9f95
commit 2115d30c32
4 changed files with 8 additions and 17 deletions

View File

@@ -8,6 +8,7 @@ import App from './app.jsx';
require('bootstrap/dist/css/bootstrap.css'); require('bootstrap/dist/css/bootstrap.css');
require('../css/comments.css');
global.renderClient = function (comments) { global.renderClient = function (comments) {
var data = comments || []; var data = comments || [];

View File

@@ -24,7 +24,7 @@
</ul> </ul>
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li> <li>
<a href="/signin" th:href="@{/signin}">Sign in</a> <a href="/signin" th:href="@{/signin}" class="glyphicon glyphicon-user">Sign in</a>
</li> </li>
</ul> </ul>
</div> </div>

View File

@@ -4,7 +4,7 @@
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<title>Comments channel</title> <title>Comments channel</title>
<link rel="stylesheet" href="/css/vendors.css" /> <link rel="stylesheet" href="/css/vendors.css" />
<link rel="stylesheet" href="/css/comments.css" /> <link rel="stylesheet" href="/css/app.css" />
</head> </head>
<body> <body>

View File

@@ -19,8 +19,7 @@ var config = {
debug: true, debug: true,
output: { output: {
path: './target/classes/static/js', path: './target/classes/static/js',
filename: '[name].bundle.js', filename: '[name].bundle.js'
}, },
plugins: [ plugins: [
new ExtractTextPlugin("../css/[name].css"), new ExtractTextPlugin("../css/[name].css"),
@@ -41,30 +40,21 @@ var config = {
test: /\.css$/, test: /\.css$/,
loader: ExtractTextPlugin.extract("style-loader", "css-loader!postcss-loader") 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+)?$/, test: /\.eot(\?v=\d+\.\d+\.\d+)?$/,
loader: "file" loader: "file?name=../css/[name].[ext]"
}, },
{ {
test: /\.(woff|woff2)$/, 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+)?$/, 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+)?$/, test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,
loader: "url?limit=10000&mimetype=image/svg+xml" loader: "url?limit=10000&mimetype=image/svg+xml&&name=../css/[name].[ext]"
},
{
test: path.join(__dirname, '.'),
exclude: /(node_modules)/,
loader: 'babel-loader'
} }
] ]
}, },