feat: added react-router

Signed-off-by: Simon Bailey <simon@newtriks.com>
This commit is contained in:
Simon Bailey
2014-09-26 14:23:08 +01:00
parent 3b27c1802a
commit 967706e942
10 changed files with 85 additions and 41 deletions
+10 -14
View File
@@ -8,6 +8,7 @@
'use strict';
module.exports = {
output: {
filename: 'main.js',
publicPath: '/assets/'
@@ -24,7 +25,7 @@ module.exports = {
},
resolve: {
extensions: ['','.js','.jsx']
extensions: ['', '.js', '.jsx']
},
module: {
@@ -35,20 +36,15 @@ module.exports = {
}],
loaders: [{
test: /\.css$/,
loader: 'style!css'
}, {
test: /\.gif/,
loader: 'url-loader?limit=10000&mimetype=image/gif'
}, {
test: /\.jpg/,
loader: 'url-loader?limit=10000&mimetype=image/jpg'
}, {
test: /\.png/,
loader: 'url-loader?limit=10000&mimetype=image/png'
}, {
test: /\.jsx$/,
loader: 'jsx-loader'
loader: 'jsx-loader?harmony'
}, {
test: /\.css$/,
loader: 'style-loader!css-loader'
}, {
test: /\.(png|jpg)$/,
loader: 'url-loader?limit=8192'
}]
}
};
+12 -19
View File
@@ -9,6 +9,7 @@
var webpack = require('webpack');
module.exports = {
output: {
publicPath: '/assets/',
path: 'dist/assets/',
@@ -32,7 +33,7 @@ module.exports = {
],
resolve: {
extensions: ['','.js','.jsx']
extensions: ['', '.js', '.jsx']
},
module: {
@@ -42,23 +43,15 @@ module.exports = {
loader: 'jshint'
}],
loaders: [
{
test: /\.css$/,
loader: 'style!css'
}, {
test: /\.gif/,
loader: 'url-loader?limit=10000&mimetype=image/gif'
}, {
test: /\.jpg/,
loader: 'url-loader?limit=10000&mimetype=image/jpg'
}, {
test: /\.png/,
loader: 'url-loader?limit=10000&mimetype=image/png'
}, {
test: /\.jsx$/,
loader: 'jsx-loader'
}
]
loaders: [{
test: /\.jsx$/,
loader: 'jsx-loader?harmony'
}, {
test: /\.css$/,
loader: 'style-loader!css-loader'
}, {
test: /\.(png|jpg)$/,
loader: 'url-loader?limit=8192'
}]
}
};