create-react-app-ssr
Advanced tools
Comparing version 0.0.27 to 0.0.28
@@ -24,5 +24,8 @@ 'use strict'; | ||
var _require2 = require('../ssr-version'), | ||
ssrVersion = _require2.ssrVersion; | ||
var _require2 = require('react-loadable/webpack'), | ||
getBundles = _require2.getBundles; | ||
var _require3 = require('../ssr-version'), | ||
ssrVersion = _require3.ssrVersion; | ||
var readFile = function readFile(filePath) { | ||
@@ -58,2 +61,3 @@ var encoding = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'utf8'; | ||
state = _ref.state, | ||
bundles = _ref.bundles, | ||
ssrDisableJs = _ref.ssrDisableJs, | ||
@@ -73,2 +77,7 @@ ssrUseWebpackJs = _ref.ssrUseWebpackJs, | ||
// react-loadable -- inject chunks | ||
if (ssrDisableJs !== 'yes') { | ||
data = data.replace('<div id="root"></div>', '<div id="root"></div>' + bundles.join('')); | ||
} | ||
data = data.replace('<div id="root"></div>', '<div id="root">' + body + '</div>'); | ||
@@ -105,4 +114,3 @@ | ||
var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(req, res, next) { | ||
var filePath, htmlTemplate, initialState, prerender, helmet, _require3, getBundles, bundleStats, bundles; | ||
var filePath, htmlTemplate, initialState, prerender, helmet, bundleStats, bundles; | ||
return _regenerator2.default.wrap(function _callee$(_context) { | ||
@@ -190,5 +198,4 @@ while (1) { | ||
// get bundles | ||
// react-loadable -- get rendered chunks | ||
_require3 = require('react-loadable/webpack'), getBundles = _require3.getBundles; | ||
bundleStats = require(path.join(settings.ssrBuild, 'react-loadable.json')); | ||
@@ -202,4 +209,2 @@ bundles = getBundles(bundleStats, prerender.modules).filter(function (bundle) { | ||
console.log(bundles); | ||
// handle simple redirect | ||
@@ -209,3 +214,3 @@ // @TODO: implement status | ||
if (!(prerender.context.action === 'REPLACE')) { | ||
_context.next = 32; | ||
_context.next = 30; | ||
break; | ||
@@ -217,3 +222,3 @@ } | ||
case 32: | ||
case 30: | ||
@@ -225,9 +230,9 @@ res.send(prepHTML(htmlTemplate, (0, _extends3.default)({}, settings, { | ||
state: prerender.initialState, | ||
modules: prerender.modules | ||
bundles: bundles | ||
}))); | ||
_context.next = 38; | ||
_context.next = 36; | ||
break; | ||
case 35: | ||
_context.prev = 35; | ||
case 33: | ||
_context.prev = 33; | ||
_context.t1 = _context['catch'](0); | ||
@@ -237,3 +242,3 @@ | ||
case 38: | ||
case 36: | ||
case 'end': | ||
@@ -243,3 +248,3 @@ return _context.stop(); | ||
} | ||
}, _callee, undefined, [[0, 35], [3, 13]]); | ||
}, _callee, undefined, [[0, 33], [3, 13]]); | ||
})); | ||
@@ -246,0 +251,0 @@ |
{ | ||
"name": "create-react-app-ssr", | ||
"version": "0.0.27", | ||
"version": "0.0.28", | ||
"description": "Server Side Rendering for Create React App (with redux, router, code splitting, ...)", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
@@ -5,2 +5,3 @@ const path = require('path') | ||
const { Helmet } = require('react-helmet') | ||
const { getBundles } = require('react-loadable/webpack') | ||
const { ssrVersion } = require('../ssr-version') | ||
@@ -35,2 +36,3 @@ | ||
state, | ||
bundles, | ||
ssrDisableJs, | ||
@@ -50,2 +52,8 @@ ssrUseWebpackJs, | ||
// react-loadable -- inject chunks | ||
if (ssrDisableJs !== 'yes') { | ||
data = data.replace('<div id="root"></div>', `<div id="root"></div>${bundles.join('')}`) | ||
} | ||
data = data.replace('<div id="root"></div>', `<div id="root">${body}</div>`) | ||
@@ -119,4 +127,3 @@ | ||
// get bundles | ||
const { getBundles } = require('react-loadable/webpack') | ||
// react-loadable -- get rendered chunks | ||
const bundleStats = require(path.join(settings.ssrBuild, 'react-loadable.json')) | ||
@@ -126,3 +133,2 @@ const bundles = getBundles(bundleStats, prerender.modules) | ||
.map(bundle => `<script type="text/javascript" src="${bundle.publicPath}"></script>`) | ||
console.log(bundles) | ||
@@ -147,3 +153,3 @@ | ||
state: prerender.initialState, | ||
modules: prerender.modules, | ||
bundles, | ||
})) | ||
@@ -150,0 +156,0 @@ } catch (err) { |
97534
785