Skip to content

Commit b5ed7e4

Browse files
author
Anthony Gore
committed
Remove .babelrc
Need to include modified webpack
1 parent a8bef1d commit b5ed7e4

File tree

3 files changed

+47
-33
lines changed

3 files changed

+47
-33
lines changed

.babelrc

-6
This file was deleted.

package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,14 @@
4242
"sass-loader": "^4.1.1",
4343
"style-loader": "^0.13.1",
4444
"vue": "^2.1.0",
45-
"vuex": "^2.1.1",
4645
"vue-loader": "^10.0.0",
4746
"vue-style-loader": "^1.0.0",
4847
"vue-template-compiler": "^2.1.0",
48+
"vuex": "^2.1.1",
4949
"webpack": "^2.2.0-rc.3",
5050
"webpack-dev-middleware": "^1.9.0",
5151
"webpack-hot-middleware": "^2.14.0",
52-
"webpack-merge": "^2.3.1"
52+
"webpack-merge": "^2.3.1",
53+
"webpack-module-hot-accept": "^1.0.4"
5354
}
5455
}

webpack.config.js

+44-25
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,15 @@ var baseConfig = {
1212
},
1313
module: {
1414
rules: [
15-
{
16-
test: /\.vue$/,
17-
loader: 'vue-loader',
18-
options: {
19-
loaders: {
20-
'scss': 'vue-style-loader!css-loader!sass-loader',
21-
}
22-
}
23-
},
2415
{
2516
test: /\.js$/,
26-
loader: 'babel-loader',
17+
use: [{
18+
loader: 'babel-loader',
19+
options: {
20+
"presets": [ [ "es2015" ] ],
21+
"plugins": [ "transform-es2015-destructuring", "transform-object-rest-spread", "transform-runtime" ]
22+
}
23+
}],
2724
exclude: /node_modules/
2825
},
2926
{
@@ -37,6 +34,15 @@ var baseConfig = {
3734
name: '[name].[ext]?[hash]',
3835
publicPath: process.env.CDN_URL && process.env.NODE_ENV === 'production' ? `${process.env.CDN_URL}/dist/` : false
3936
}
37+
},
38+
{
39+
test: /\.vue$/,
40+
loader: 'vue-loader',
41+
options: {
42+
loaders: {
43+
'scss': 'vue-style-loader!css-loader!sass-loader',
44+
}
45+
}
4046
}
4147
]
4248
},
@@ -54,41 +60,54 @@ var baseConfig = {
5460
}
5561
};
5662

63+
if (process.env.NODE_ENV === 'development') {
64+
65+
}
66+
5767
let targets = [ 'web', 'node' ].map((target) => {
58-
return webpackMerge(baseConfig, {
68+
let obj = webpackMerge(baseConfig, {
5969
target: target,
6070
entry: {
6171
app: target === 'web'
6272
? process.env.NODE_ENV === 'development'
63-
? [ `./src/${target}.entry.js`, 'webpack-hot-middleware/client?path=/__webpack_hmr&timeout=20000' ]
64-
: [ `./src/${target}.entry.js` ]
73+
? [ `./src/${target}.entry.js`, 'webpack-hot-middleware/client?path=/__webpack_hmr&timeout=20000' ]
74+
: [ `./src/${target}.entry.js` ]
6575
: [ `./src/${target}.entry.js` ]
6676
,
6777
},
6878
output: {
6979
filename: `${target}.bundle.js`,
7080
libraryTarget: target === 'web' ? 'var' : 'commonjs2'
7181
},
82+
module: {
83+
rules: [
84+
85+
]
86+
},
7287
plugins: target === 'web'
7388
? process.env.NODE_ENV === 'development'
74-
? [
75-
new webpack.HotModuleReplacementPlugin(),
76-
new ExtractTextPlugin("style.css")
77-
]
78-
: [
79-
new webpack.DefinePlugin({ 'process.env': { NODE_ENV: '"production"' } }),
80-
new webpack.optimize.UglifyJsPlugin({ sourceMap: true, compress: { warnings: false } }),
81-
new webpack.LoaderOptionsPlugin({ minimize: true }),
82-
new ExtractTextPlugin("style.css")
83-
]
89+
? [
90+
new webpack.HotModuleReplacementPlugin(),
91+
new ExtractTextPlugin("style.css")
92+
]
93+
: [
94+
new webpack.DefinePlugin({ 'process.env': { NODE_ENV: '"production"' } }),
95+
new webpack.optimize.UglifyJsPlugin({ sourceMap: true, compress: { warnings: false } }),
96+
new webpack.LoaderOptionsPlugin({ minimize: true }),
97+
new ExtractTextPlugin("style.css")
98+
]
8499
: []
85100
,
86101
devtool: target === 'web'
87102
? process.env.NODE_ENV === 'development'
88-
? '#eval-source-map'
89-
: '#source-map'
103+
? '#eval-source-map'
104+
: '#source-map'
90105
: false
91106
});
107+
if (process.env.NODE_ENV === 'development' && target === 'web') {
108+
module.exports.module.rules[0].use.push({ loader: 'webpack-module-hot-accept' });
109+
}
110+
return obj;
92111
});
93112

94113
module.exports = targets;

0 commit comments

Comments
 (0)