Skip to content

Commit 5ad206b

Browse files
committed
Migrate to webpack 2
1 parent a9c6f50 commit 5ad206b

File tree

4 files changed

+22
-12
lines changed

4 files changed

+22
-12
lines changed

.babelrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/App.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react'
22
import ReactDOM from 'react-dom'
33
import { Router, Route, IndexRoute, hashHistory } from 'react-router'
44
import 'bulma/css/bulma.css'
5-
import 'font-awesome-webpack'
5+
import 'style-loader!css-loader!less-loader!font-awesome-webpack/font-awesome-styles.loader!font-awesome-webpack/font-awesome.config.js';
66

77
import iClientComponent from 'components/IClient/IClient'
88
import HomeComponent from 'components/Home/Home'

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"react-test-renderer": "^15.3.2",
3434
"style-loader": "^0.13.1",
3535
"url-loader": "^0.5.7",
36-
"webpack": "^1.13.2"
36+
"webpack": "^2.1.0-beta.27"
3737
},
3838
"scripts": {
3939
"test": "jest",
@@ -47,8 +47,8 @@
4747
"app"
4848
],
4949
"collectCoverage": true,
50-
"globals" : {
51-
"HOST" : "http://localhost:3000"
50+
"globals": {
51+
"HOST": "http://localhost:3000"
5252
},
5353
"moduleNameMapper": {
5454
"\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/tests/__mocks__/fileMock.js",

webpack.config.js

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,27 @@ var fontAwesomeLoader = {
1414

1515
var fontAwesomeWoffLoader = {
1616
test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
17-
loader: "url-loader?limit=10000&minetype=application/font-woff"
17+
loader: "url-loader",
18+
query: {
19+
limit: '10000',
20+
minetype: 'application/font-woff'
21+
}
1822
};
1923

2024
var jsxLoader = {
2125
test: /\.js$/,
2226
exclude: /node_modules/,
23-
loader: 'babel',
27+
loader: 'babel-loader',
2428
query: {
25-
presets: ['react', 'es2015']
29+
presets: ['react', ['es2015', {'modules' : false}]]
2630
}
2731
};
2832

33+
var loaderOptionsPlugin = new webpack.LoaderOptionsPlugin({
34+
minimize: true,
35+
debug: false
36+
});
37+
2938
var uglifyJsPlugin = new webpack.optimize.UglifyJsPlugin({
3039
compress: { warnings: false }
3140
});
@@ -38,9 +47,10 @@ var definePlugin = new webpack.DefinePlugin({
3847
});
3948

4049
var resolve = {
41-
extensions: ['', '.js', '.jsx'],
42-
root: [
43-
path.resolve('./app')
50+
extensions: ['*', '.js', '.jsx'],
51+
modules: [
52+
path.resolve('./app'),
53+
'node_modules'
4454
]
4555
};
4656

@@ -52,14 +62,15 @@ module.exports = {
5262
filename: "bundle.min.js",
5363
},
5464
module: {
55-
loaders: [
65+
rules: [
5666
bulmaLoader,
5767
fontAwesomeWoffLoader,
5868
fontAwesomeLoader,
5969
jsxLoader
6070
]
6171
},
6272
plugins: [
73+
loaderOptionsPlugin,
6374
uglifyJsPlugin,
6475
definePlugin
6576
],

0 commit comments

Comments
 (0)