mirror/lowdefy
2
0
Fork 0
mirror of https://github.com/lowdefy/lowdefy.git synced 2025-03-31 15:20:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(servers): Append html when serving index from url root

Browse Source
This commit is contained in:
SamTolmay 2021-05-27 10:40:15 +02:00
parent fe250ad406
commit 12cb782946
3 changed files with 73 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
packages/cli/src/commands/dev/getExpress.js
View File

@ -21,27 +21,52 @@ import { readFile } from '@lowdefy/node-utils';
import findOpenPort from '../../utils/findOpenPort';
async function getExpress({ context, gqlServer, options }) {
let indexHtml = null;
const serveIndex = async (req, res) => {
if (!indexHtml) {
indexHtml = await readFile(path.resolve(__dirname, 'shell/index.html'));
let appConfig = await readFile(path.resolve(context.outputDirectory, 'app.json'));
appConfig = JSON.parse(appConfig);
indexHtml = indexHtml.replace(
'<!-- __LOWDEFY_APP_HEAD_HTML__ -->',
appConfig.html.appendHead
);
indexHtml = indexHtml.replace(
'<!-- __LOWDEFY_APP_BODY_HTML__ -->',
appConfig.html.appendBody
);
}
res.send(indexHtml);
};
const app = express();
app.set('port', parseInt(options.port));
gqlServer.applyMiddleware({ app, path: '/api/graphql' });
const reloadPort = await findOpenPort();
const reloadReturned = await reload(app, { route: '/api/dev/reload.js', port: reloadPort });
// serve index.html with appended html
// else static server serves without appended html
app.get('/', serveIndex);
// serve public files
app.use('/public', express.static(path.resolve(process.cwd(), 'public')));
// serve webpack files
app.use(express.static(path.resolve(__dirname, 'shell')));
// serve version for renderer module federation
app.use('/api/dev/version', (req, res) => {
res.json(context.lowdefyVersion);
});
app.use(async (req, res) => {
let indexHtml = await readFile(path.resolve(__dirname, 'shell/index.html'));
let appConfig = await readFile(path.resolve(context.outputDirectory, 'app.json'));
appConfig = JSON.parse(appConfig);
indexHtml = indexHtml.replace('<!-- __LOWDEFY_APP_HEAD_HTML__ -->', appConfig.html.appendHead);
indexHtml = indexHtml.replace('<!-- __LOWDEFY_APP_BODY_HTML__ -->', appConfig.html.appendBody);
res.send(indexHtml);
});
// Redirect all 404 to index.html with status 200
// This should always be the last route
app.use(serveIndex);
return { expressApp: app, reloadFn: reloadReturned.reload };
}

29
packages/servers/serverDev/src/server.js
View File

@ -35,22 +35,33 @@ const server = new ApolloServer({
resolvers,
context,
});
let indexHtml = null;
const serveIndex = async (req, res) => {
if (!indexHtml) {
indexHtml = await readFile(path.resolve(process.cwd(), 'dist/shell/index.html'));
let appConfig = await readFile(path.resolve(config.CONFIGURATION_BASE_PATH, 'app.json'));
appConfig = JSON.parse(appConfig);
indexHtml = indexHtml.replace('<!-- __LOWDEFY_APP_HEAD_HTML__ -->', appConfig.html.appendHead);
indexHtml = indexHtml.replace('<!-- __LOWDEFY_APP_BODY_HTML__ -->', appConfig.html.appendBody);
}
res.send(indexHtml);
};
const app = express();
server.applyMiddleware({ app, path: '/api/graphql' });
// Serve Webpack shell files from './shell/dist'
// serve index.html with appended html
// else static server serves without appended html
app.get('/', serveIndex);
// Serve webpack and public files from './dist/shell'
app.use(express.static('dist/shell'));
// Redirect all 404 to index.html with status 200
// This should always be the last route
app.use(async (req, res) => {
let indexHtml = await readFile(path.resolve(process.cwd(), 'dist/shell/index.html'));
let appConfig = await readFile(path.resolve(config.CONFIGURATION_BASE_PATH, 'app.json'));
appConfig = JSON.parse(appConfig);
indexHtml = indexHtml.replace('<!-- __LOWDEFY_APP_HEAD_HTML__ -->', appConfig.html.appendHead);
indexHtml = indexHtml.replace('<!-- __LOWDEFY_APP_BODY_HTML__ -->', appConfig.html.appendBody);
res.send(indexHtml);
});
app.use(serveIndex);
app.listen({ port: 3000 }, () => console.log(`🚀 Server ready at http://localhost:3000`));

28
packages/servers/serverDocker/src/server.js
View File

@ -32,22 +32,34 @@ const server = new ApolloServer({
resolvers,
context,
});
let indexHtml = null;
const serveIndex = async (req, res) => {
if (!indexHtml) {
indexHtml = await readFile(path.resolve(process.cwd(), 'dist/shell/index.html'));
let appConfig = await readFile(path.resolve(config.CONFIGURATION_BASE_PATH, 'app.json'));
appConfig = JSON.parse(appConfig);
indexHtml = indexHtml.replace('<!-- __LOWDEFY_APP_HEAD_HTML__ -->', appConfig.html.appendHead);
indexHtml = indexHtml.replace('<!-- __LOWDEFY_APP_BODY_HTML__ -->', appConfig.html.appendBody);
}
res.send(indexHtml);
};
const app = express();
server.applyMiddleware({ app, path: '/api/graphql' });
// serve index.html with appended html
// else static server serves without appended html
app.get('/', serveIndex);
// Serve Webpack shell files from './shell/dist'
app.use(express.static('dist/shell'));
// Redirect all 404 to index.html with status 200
// This should always be the last route
app.use(async (req, res) => {
let indexHtml = await readFile(path.resolve(process.cwd(), 'dist/shell/index.html'));
let appConfig = await readFile(path.resolve(config.CONFIGURATION_BASE_PATH, 'app.json'));
appConfig = JSON.parse(appConfig);
indexHtml = indexHtml.replace('<!-- __LOWDEFY_APP_HEAD_HTML__ -->', appConfig.html.appendHead);
indexHtml = indexHtml.replace('<!-- __LOWDEFY_APP_BODY_HTML__ -->', appConfig.html.appendBody);
res.send(indexHtml);
});
app.use(serveIndex);
// TODO: option to modify port here? port 443 by default?
app.listen({ port: 3000 }, () => console.log(`Server started at port 3000`));