Updated webpack to latest version

pull/246/head
Piero Toffanin 2017-07-18 14:14:59 -04:00
rodzic 053a8f997d
commit dc08d6a4f3
4 zmienionych plików z 22 dodań i 17 usunięć

Wyświetl plik

@ -1 +0,0 @@
*

Wyświetl plik

@ -22,7 +22,7 @@
<link href="{% static 'app/css/metisMenu.min.css' %}" rel="stylesheet">
<link href="{% static 'app/css/sb-admin-2.css' %}" rel="stylesheet">
{% block extra-headers %}{% endblock %}
<link rel="stylesheet" type="text/css" href="{% static 'app/bundles/css/main.css' %}" />
<script src="{% static 'app/js/vendor/modernizr-2.8.3.min.js' %}"></script>
<script src="{% static 'app/js/vendor/jquery-1.11.2.min.js' %}"></script>

Wyświetl plik

@ -29,7 +29,7 @@
"babel-preset-react": "^6.16.0",
"css-loader": "^0.25.0",
"d3": "^3.5.5",
"extract-text-webpack-plugin": "^1.0.1",
"extract-text-webpack-plugin": "^3.0.0",
"file-loader": "^0.9.0",
"gl-matrix": "^2.3.2",
"immutability-helper": "^2.0.0",
@ -50,7 +50,7 @@
"style-loader": "^0.13.1",
"tween.js": "^16.6.0",
"url-loader": "^0.5.7",
"webpack": "^1.15.0",
"webpack": "^3.3.0",
"webpack-bundle-tracker": "0.0.93",
"webpack-dev-server": "^1.16.5",
"webpack-livereload-plugin": "^0.9.0"

Wyświetl plik

@ -34,23 +34,29 @@ module.exports = {
],
module: {
loaders: [
rules: [
{
test: /\.jsx?$/,
exclude: /(node_modules|bower_components)/,
loader: 'babel-loader',
query: {
"plugins": [
'syntax-class-properties',
'transform-class-properties'
// 'react-hot-loader/babel'
],
presets: ['es2015', 'react']
}
use: [
{
loader: 'babel-loader',
query: {
"plugins": [
'syntax-class-properties',
'transform-class-properties'
// 'react-hot-loader/babel'
],
presets: ['es2015', 'react']
}
}
],
},
{
test: /\.s?css$/,
loader: ExtractTextPlugin.extract('css!sass')
use: ExtractTextPlugin.extract({
use: 'css-loader!sass-loader'
})
},
{
test: /\.(png|jpg|jpeg|svg)/,
@ -65,8 +71,8 @@ module.exports = {
},
resolve: {
modulesDirectories: ['node_modules', 'bower_components'],
extensions: ['', '.js', '.jsx']
modules: ['node_modules', 'bower_components'],
extensions: ['.js', '.jsx']
},
externals: {