Skip to content

Commit b887b5f

Browse files
committed
Revert "test: check if process import is result of using default server.ts"
This reverts commit 8a7a7cb.
1 parent ce65227 commit b887b5f

File tree

2 files changed

+61
-81
lines changed

2 files changed

+61
-81
lines changed

tests/fixtures/angular-19-common-engine/src/server.original.ts

Lines changed: 0 additions & 67 deletions
This file was deleted.
Lines changed: 61 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,65 @@
1-
import { CommonEngine } from '@angular/ssr/node'
1+
import { APP_BASE_HREF } from '@angular/common';
2+
import { CommonEngine, isMainModule } from '@angular/ssr/node';
3+
import express from 'express';
4+
import { dirname, join, resolve } from 'node:path';
5+
import { fileURLToPath } from 'node:url';
6+
import bootstrap from './main.server';
27

3-
const commonEngine = new CommonEngine()
8+
const serverDistFolder = dirname(fileURLToPath(import.meta.url));
9+
const browserDistFolder = resolve(serverDistFolder, '../browser');
10+
const indexHtml = join(serverDistFolder, 'index.server.html');
411

5-
export default async function HttpHandler(
6-
request: Request,
7-
context: any,
8-
commonEngineRenderArgs: any,
9-
): Promise<Response> {
10-
// customize if you want to
12+
const app = express();
13+
const commonEngine = new CommonEngine();
1114

12-
return new Response(
13-
await commonEngine.render(commonEngineRenderArgs),
14-
{
15-
headers: { 'content-type': 'text/html' }
16-
}
17-
)
15+
/**
16+
* Example Express Rest API endpoints can be defined here.
17+
* Uncomment and define endpoints as necessary.
18+
*
19+
* Example:
20+
* ```ts
21+
* app.get('/api/**', (req, res) => {
22+
* // Handle API request
23+
* });
24+
* ```
25+
*/
26+
27+
/**
28+
* Serve static files from /browser
29+
*/
30+
app.get(
31+
'**',
32+
express.static(browserDistFolder, {
33+
maxAge: '1y',
34+
index: 'index.html'
35+
}),
36+
);
37+
38+
/**
39+
* Handle all other requests by rendering the Angular application.
40+
*/
41+
app.get('**', (req, res, next) => {
42+
const { protocol, originalUrl, baseUrl, headers } = req;
43+
44+
commonEngine
45+
.render({
46+
bootstrap,
47+
documentFilePath: indexHtml,
48+
url: `${protocol}://${headers.host}${originalUrl}`,
49+
publicPath: browserDistFolder,
50+
providers: [{ provide: APP_BASE_HREF, useValue: baseUrl }],
51+
})
52+
.then((html) => res.send(html))
53+
.catch((err) => next(err));
54+
});
55+
56+
/**
57+
* Start the server if this module is the main entry point.
58+
* The server listens on the port defined by the `PORT` environment variable, or defaults to 4000.
59+
*/
60+
if (isMainModule(import.meta.url)) {
61+
const port = process.env['PORT'] || 4000;
62+
app.listen(port, () => {
63+
console.log(`Node Express server listening on http://localhost:${port}`);
64+
});
1865
}

0 commit comments

Comments
 (0)