Skip to content

Commit 405fc45

Browse files
committed
fix: make dev server and test run again
1 parent ffe1f5e commit 405fc45

File tree

3 files changed

+17
-14
lines changed

3 files changed

+17
-14
lines changed

.babelrc

-11
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,6 @@
55
"production": {
66
"presets": ["es2015", "react", "react-optimize", "es2015-native-modules", "stage-0"]
77
},
8-
"development": {
9-
"plugins": [
10-
[
11-
"babel-plugin-webpack-loaders",
12-
{
13-
"config": "./webpack.config.babel.js",
14-
"verbose": false
15-
}
16-
]
17-
]
18-
},
198
"test": {
209
"plugins": [
2110
[

index.js

+15-1
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,25 @@
33
*/
44

55
if (process.env.NODE_ENV === 'production') {
6+
process.env.webpackAssets = JSON.stringify(require('./dist/manifest.json'));
7+
process.env.webpackChunkAssets = JSON.stringify(require('./dist/chunk-manifest.json'));
68
// In production, serve the webpacked server file.
79
require('./dist/server.bundle.js');
810
} else {
11+
process.env.webpackAssets = JSON.stringify({});
12+
process.env.webpackChunkAssets = JSON.stringify({});
913
// Babel polyfill to convert ES6 code in runtime
10-
require('babel-register');
14+
require('babel-register')({
15+
"plugins": [
16+
[
17+
"babel-plugin-webpack-loaders",
18+
{
19+
"config": "./webpack.config.babel.js",
20+
"verbose": false
21+
}
22+
]
23+
]
24+
});
1125
require('babel-polyfill');
1226

1327
// CSS modules hook to inject css-modules classes in the final html.

server/server.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ const renderFullPage = (html, initialState) => {
5858
const head = Helmet.rewind();
5959

6060
// Import Manifests
61-
const assetsManifest = process.env.NODE_ENV === 'production' ? require('../dist/manifest.json') : {}; // eslint-disable-line
62-
const chunkManifest = process.env.NODE_ENV === 'production' ? require('../dist/chunk-manifest.json') : {}; // eslint-disable-line
61+
const assetsManifest = JSON.parse(process.env.webpackAssets);
62+
const chunkManifest = JSON.parse(process.env.webpackChunkAssets);
6363

6464
return `
6565
<!doctype html>

0 commit comments

Comments
 (0)