Skip to content
This repository was archived by the owner on Nov 22, 2024. It is now read-only.

Commit b3e1461

Browse files
authored
fix(express-engine): export Express app from server.ts (#1247)
Change the schematics to export the Express app object itself from server.ts. This can be used from a serverless function to call into the Express app directly. Example - https://github.com/angular/angularfire2/blob/master/docs/universal/cloud-functions.md
1 parent a24ba01 commit b3e1461

File tree

3 files changed

+75
-72
lines changed

3 files changed

+75
-72
lines changed

integration/express-engine-ivy/server.ts

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,34 @@ import { join } from 'path';
66

77
import { AppServerModule } from './src/main.server';
88

9+
// The Express app is exported so that it can be used by serverless Functions.
10+
export const app = express();
11+
const distFolder = join(process.cwd(), 'dist/express-engine-ivy/browser');
12+
13+
// Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
14+
app.engine('html', ngExpressEngine({
15+
bootstrap: AppServerModule,
16+
}));
17+
18+
app.set('view engine', 'html');
19+
app.set('views', distFolder);
20+
21+
// Example Express Rest API endpoints
22+
// app.get('/api/**', (req, res) => { });
23+
// Serve static files from /browser
24+
app.get('*.*', express.static(distFolder, {
25+
maxAge: '1y'
26+
}));
27+
28+
// All regular routes use the Universal engine
29+
app.get('*', (req, res) => {
30+
res.render('index', { req });
31+
});
32+
933
// Express server
1034
function run() {
11-
const app = express();
12-
const port: string | number = process.env.PORT || 4000;
13-
const distFolder = join(process.cwd(), 'dist/express-engine-ivy/browser');
14-
15-
// Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
16-
app.engine('html', ngExpressEngine({
17-
bootstrap: AppServerModule,
18-
}));
19-
20-
app.set('view engine', 'html');
21-
app.set('views', distFolder);
22-
23-
// Example Express Rest API endpoints
24-
// app.get('/api/**', (req, res) => { });
25-
// Serve static files from /browser
26-
app.get('*.*', express.static(distFolder, {
27-
maxAge: '1y'
28-
}));
29-
30-
// All regular routes use the Universal engine
31-
app.get('*', (req, res) => {
32-
res.render('index', { req });
33-
});
34-
3535
// Start up the Node server
36+
const port: string | number = process.env.PORT || 4000;
3637
app.listen(port, () => {
3738
console.log(`Node Express server listening on http://localhost:${port}`);
3839
});

integration/express-engine-ve/server.ts

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,34 @@ import { join } from 'path';
66

77
import { AppServerModuleNgFactory } from './src/main.server';
88

9+
// The Express app is exported so that it can be used by serverless Functions.
10+
export const app = express();
11+
const distFolder = join(process.cwd(), 'dist/express-engine-ve/browser');
12+
13+
// Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
14+
app.engine('html', ngExpressEngine({
15+
bootstrap: AppServerModuleNgFactory,
16+
}));
17+
18+
app.set('view engine', 'html');
19+
app.set('views', distFolder);
20+
21+
// Example Express Rest API endpoints
22+
// app.get('/api/**', (req, res) => { });
23+
// Serve static files from /browser
24+
app.get('*.*', express.static(distFolder, {
25+
maxAge: '1y'
26+
}));
27+
28+
// All regular routes use the Universal engine
29+
app.get('*', (req, res) => {
30+
res.render('index', { req });
31+
});
32+
933
// Express server
1034
function run() {
11-
const app = express();
12-
const port: string | number = process.env.PORT || 4000;
13-
const distFolder = join(process.cwd(), 'dist/express-engine-ve/browser');
14-
15-
// Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
16-
app.engine('html', ngExpressEngine({
17-
bootstrap: AppServerModuleNgFactory,
18-
}));
19-
20-
app.set('view engine', 'html');
21-
app.set('views', distFolder);
22-
23-
// Example Express Rest API endpoints
24-
// app.get('/api/**', (req, res) => { });
25-
// Serve static files from /browser
26-
app.get('*.*', express.static(distFolder, {
27-
maxAge: '1y'
28-
}));
29-
30-
// All regular routes use the Universal engine
31-
app.get('*', (req, res) => {
32-
res.render('index', { req });
33-
});
34-
3535
// Start up the Node server
36+
const port: string | number = process.env.PORT || 4000;
3637
app.listen(port, () => {
3738
console.log(`Node Express server listening on http://localhost:${port}`);
3839
});

modules/express-engine/schematics/install/files/__serverFileName@stripTsExtension__.ts

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,34 @@ import { join } from 'path';
66

77
import { AppServerModule } from './src/<%= stripTsExtension(main) %>';
88

9+
// The Express app is exported so that it can be used by serverless Functions.
10+
export const app = express();
11+
const distFolder = join(process.cwd(), '<%= browserDistDirectory %>');
12+
13+
// Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
14+
app.engine('html', ngExpressEngine({
15+
bootstrap: AppServerModule,
16+
}));
17+
18+
app.set('view engine', 'html');
19+
app.set('views', distFolder);
20+
21+
// Example Express Rest API endpoints
22+
// app.get('/api/**', (req, res) => { });
23+
// Serve static files from /browser
24+
app.get('*.*', express.static(distFolder, {
25+
maxAge: '1y'
26+
}));
27+
28+
// All regular routes use the Universal engine
29+
app.get('*', (req, res) => {
30+
res.render('index', { req });
31+
});
32+
933
// Express server
1034
function run() {
11-
const app = express();
12-
const port: string | number = process.env.PORT || <%= serverPort %>;
13-
const distFolder = join(process.cwd(), '<%= browserDistDirectory %>');
14-
15-
// Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
16-
app.engine('html', ngExpressEngine({
17-
bootstrap: AppServerModule,
18-
}));
19-
20-
app.set('view engine', 'html');
21-
app.set('views', distFolder);
22-
23-
// Example Express Rest API endpoints
24-
// app.get('/api/**', (req, res) => { });
25-
// Serve static files from /browser
26-
app.get('*.*', express.static(distFolder, {
27-
maxAge: '1y'
28-
}));
29-
30-
// All regular routes use the Universal engine
31-
app.get('*', (req, res) => {
32-
res.render('index', { req });
33-
});
34-
3535
// Start up the Node server
36+
const port: string | number = process.env.PORT || <%= serverPort %>;
3637
app.listen(port, () => {
3738
console.log(`Node Express server listening on http://localhost:${port}`);
3839
});

0 commit comments

Comments
 (0)