Skip to content

Commit 7e58962

Browse files
committed
Improve webpack server config
1 parent 718ffec commit 7e58962

File tree

2 files changed

+8
-16
lines changed

2 files changed

+8
-16
lines changed

lessons/13-server-rendering/README.md

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,14 @@ module.exports = {
3030
entry: path.resolve(__dirname, 'server.js'),
3131

3232
output: {
33-
filename: 'server.bundle.js'
33+
filename: 'server.bundle.js',
34+
libraryTarget: 'commonjs2'
3435
},
3536

3637
target: 'node',
3738

3839
// keep node_module paths out of the bundle
39-
externals: fs.readdirSync(path.resolve(__dirname, 'node_modules')).concat([
40-
'react-dom/server', 'react/addons',
41-
]).reduce(function (ext, mod) {
42-
ext[mod] = 'commonjs ' + mod
43-
return ext
44-
}, {}),
40+
externals: /^[^.\/]/,
4541

4642
node: {
4743
__filename: true,
@@ -50,7 +46,7 @@ module.exports = {
5046

5147
module: {
5248
loaders: [
53-
{ test: /\.js$/, exclude: /node_modules/, loader: 'babel-loader?presets[]=es2015&presets[]=react' }
49+
{ test: /\.js$/, loader: 'babel-loader?presets[]=es2015&presets[]=react' }
5450
]
5551
}
5652

lessons/14-whats-next/webpack.server.config.js

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,14 @@ module.exports = {
66
entry: path.resolve(__dirname, 'server.js'),
77

88
output: {
9-
filename: 'server.bundle.js'
9+
filename: 'server.bundle.js',
10+
libraryTarget: 'commonjs2'
1011
},
1112

1213
target: 'node',
1314

1415
// keep node_module paths out of the bundle
15-
externals: fs.readdirSync(path.resolve(__dirname, 'node_modules')).concat([
16-
'react-dom/server'
17-
]).reduce(function (ext, mod) {
18-
ext[mod] = 'commonjs ' + mod
19-
return ext
20-
}, {}),
16+
externals: /^[^.\/]/,
2117

2218
node: {
2319
__filename: false,
@@ -26,7 +22,7 @@ module.exports = {
2622

2723
module: {
2824
loaders: [
29-
{ test: /\.js$/, exclude: /node_modules/, loader: 'babel-loader?presets[]=es2015&presets[]=react' }
25+
{ test: /\.js$/, loader: 'babel-loader?presets[]=es2015&presets[]=react' }
3026
]
3127
}
3228

0 commit comments

Comments
 (0)