Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions packages/cli/lib/lib/webpack/prerender.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const { red, yellow } = require('kleur');
const { resolve } = require('path');
const { readFileSync } = require('fs');
const { readFileSync, existsSync } = require('fs');
const stackTrace = require('stack-trace');
const { SourceMapConsumer } = require('source-map');

Expand All @@ -24,10 +24,15 @@ module.exports = function(env, params) {
);
return '';
}

let preact = require('preact'),
renderToString = require('preact-render-to-string');

const { cwd } = env;
const preactPath = require.resolve(`${cwd}/node_modules/preact`);
const renderToStringPath = require.resolve(
`${cwd}/node_modules/preact-render-to-string`
);
let preact = require(preactPath),
renderToString = require(existsSync(renderToStringPath)
? renderToStringPath
: 'preact-render-to-string');
return renderToString(preact.h(app, { ...params, url }));
} catch (err) {
let stack = stackTrace.parse(err).filter(s => s.getFileName() === entry)[0];
Expand Down
3 changes: 3 additions & 0 deletions packages/cli/lib/lib/webpack/webpack-server-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ function serverConfig(env) {
chunkFilename: '[name].chunk.[chunkhash:5].js',
libraryTarget: 'commonjs2',
},
externals: {
preact: 'preact',
},
target: 'node',
resolveLoader: {
alias: {
Expand Down