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

Commit

Permalink
fix(express-engine): export Express app from server.ts (#1247)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
vikerman authored Sep 21, 2019
1 parent a24ba01 commit b3e1461
Show file tree
Hide file tree
Showing 3 changed files with 75 additions and 72 deletions.
49 changes: 25 additions & 24 deletions integration/express-engine-ivy/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,34 @@ import { join } from 'path';

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

// The Express app is exported so that it can be used by serverless Functions.
export const app = express();
const distFolder = join(process.cwd(), 'dist/express-engine-ivy/browser');

// Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
app.engine('html', ngExpressEngine({
bootstrap: AppServerModule,
}));

app.set('view engine', 'html');
app.set('views', distFolder);

// Example Express Rest API endpoints
// app.get('/api/**', (req, res) => { });
// Serve static files from /browser
app.get('*.*', express.static(distFolder, {
maxAge: '1y'
}));

// All regular routes use the Universal engine
app.get('*', (req, res) => {
res.render('index', { req });
});

// Express server
function run() {
const app = express();
const port: string | number = process.env.PORT || 4000;
const distFolder = join(process.cwd(), 'dist/express-engine-ivy/browser');

// Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
app.engine('html', ngExpressEngine({
bootstrap: AppServerModule,
}));

app.set('view engine', 'html');
app.set('views', distFolder);

// Example Express Rest API endpoints
// app.get('/api/**', (req, res) => { });
// Serve static files from /browser
app.get('*.*', express.static(distFolder, {
maxAge: '1y'
}));

// All regular routes use the Universal engine
app.get('*', (req, res) => {
res.render('index', { req });
});

// Start up the Node server
const port: string | number = process.env.PORT || 4000;
app.listen(port, () => {
console.log(`Node Express server listening on http://localhost:${port}`);
});
Expand Down
49 changes: 25 additions & 24 deletions integration/express-engine-ve/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,34 @@ import { join } from 'path';

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

// The Express app is exported so that it can be used by serverless Functions.
export const app = express();
const distFolder = join(process.cwd(), 'dist/express-engine-ve/browser');

// Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
app.engine('html', ngExpressEngine({
bootstrap: AppServerModuleNgFactory,
}));

app.set('view engine', 'html');
app.set('views', distFolder);

// Example Express Rest API endpoints
// app.get('/api/**', (req, res) => { });
// Serve static files from /browser
app.get('*.*', express.static(distFolder, {
maxAge: '1y'
}));

// All regular routes use the Universal engine
app.get('*', (req, res) => {
res.render('index', { req });
});

// Express server
function run() {
const app = express();
const port: string | number = process.env.PORT || 4000;
const distFolder = join(process.cwd(), 'dist/express-engine-ve/browser');

// Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
app.engine('html', ngExpressEngine({
bootstrap: AppServerModuleNgFactory,
}));

app.set('view engine', 'html');
app.set('views', distFolder);

// Example Express Rest API endpoints
// app.get('/api/**', (req, res) => { });
// Serve static files from /browser
app.get('*.*', express.static(distFolder, {
maxAge: '1y'
}));

// All regular routes use the Universal engine
app.get('*', (req, res) => {
res.render('index', { req });
});

// Start up the Node server
const port: string | number = process.env.PORT || 4000;
app.listen(port, () => {
console.log(`Node Express server listening on http://localhost:${port}`);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,34 @@ import { join } from 'path';

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

// The Express app is exported so that it can be used by serverless Functions.
export const app = express();
const distFolder = join(process.cwd(), '<%= browserDistDirectory %>');

// Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
app.engine('html', ngExpressEngine({
bootstrap: AppServerModule,
}));

app.set('view engine', 'html');
app.set('views', distFolder);

// Example Express Rest API endpoints
// app.get('/api/**', (req, res) => { });
// Serve static files from /browser
app.get('*.*', express.static(distFolder, {
maxAge: '1y'
}));

// All regular routes use the Universal engine
app.get('*', (req, res) => {
res.render('index', { req });
});

// Express server
function run() {
const app = express();
const port: string | number = process.env.PORT || <%= serverPort %>;
const distFolder = join(process.cwd(), '<%= browserDistDirectory %>');

// Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
app.engine('html', ngExpressEngine({
bootstrap: AppServerModule,
}));

app.set('view engine', 'html');
app.set('views', distFolder);

// Example Express Rest API endpoints
// app.get('/api/**', (req, res) => { });
// Serve static files from /browser
app.get('*.*', express.static(distFolder, {
maxAge: '1y'
}));

// All regular routes use the Universal engine
app.get('*', (req, res) => {
res.render('index', { req });
});

// Start up the Node server
const port: string | number = process.env.PORT || <%= serverPort %>;
app.listen(port, () => {
console.log(`Node Express server listening on http://localhost:${port}`);
});
Expand Down

0 comments on commit b3e1461

Please sign in to comment.