Fixing UI and frontend compilation

This commit is contained in:
Tom Gallacher 2017-01-18 12:39:28 +00:00
parent 116f806d8f
commit abd113d009
3 changed files with 10 additions and 8 deletions

View File

@ -50,7 +50,7 @@ module.exports = {
], ],
loaders: [ loaders: [
'babel-loader' 'babel-loader'
] ],
}, { }, {
test: /\.json?$/, test: /\.json?$/,
exclude: /node_modules/, exclude: /node_modules/,
@ -60,7 +60,7 @@ module.exports = {
], ],
loaders: [ loaders: [
'json-loader' 'json-loader'
] ],
}, { }, {
test: /\.png/, test: /\.png/,
exclude: /node_modules/, exclude: /node_modules/,
@ -68,18 +68,19 @@ module.exports = {
FRONTEND, FRONTEND,
UI UI
], ],
loader: [ loaders: [
'url-loader' 'url-loader'
] ],
}, },
{ {
test: /\.(eot|svg|ttf|woff|woff2)$/, test: /\.(eot|svg|ttf|woff|woff2)$/,
exclude: /node_modules/,
loader: 'file-loader',
include: [ include: [
FRONTEND, FRONTEND,
UI UI
] ],
loaders: [
'file-loader'
],
}] }]
} }
}; };

View File

@ -3,7 +3,7 @@ const base = require('./base');
module.exports = Object.assign(base, { module.exports = Object.assign(base, {
devtool: 'hidden-source-map', devtool: 'eval-source-map',
entry: [ entry: [
base.entry base.entry
], ],

View File

@ -41,6 +41,7 @@ install-production: compile clean
.PHONY: compile .PHONY: compile
compile: install compile: install
cp -R src/ dist/.
$(bindir)/babel src --out-dir dist --source-maps inline $(bindir)/babel src --out-dir dist --source-maps inline
.PHONY: build .PHONY: build