Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(ssr): migrated demo to ssr #2007

Merged
merged 6 commits into from
Jan 6, 2025
Merged
Show file tree
Hide file tree
Changes from all 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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions apps/ng2-charts-demo/playwright.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ const baseURL = process.env['BASE_URL'] || 'http://localhost:4200';
*/
export default defineConfig({
...nxE2EPreset(__filename, { testDir: './e2e' }),
expect: {
toHaveScreenshot: { maxDiffPixels: 100 },
},
projects: [
{
name: 'chromium',
Expand Down
71 changes: 71 additions & 0 deletions apps/ng2-charts-demo/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@
"loader": {
".html": "text",
".ts": "text"
},
"server": "apps/ng2-charts-demo/src/main.server.ts",
"prerender": true,
"ssr": {
"entry": "apps/ng2-charts-demo/server.ts"
}
},
"configurations": {
Expand Down Expand Up @@ -102,6 +107,72 @@
"updateSnapshots": true
}
}
},

"server": {
"executor": "@angular-devkit/build-angular:server",
"options": {
"outputPath": "dist/ng2-charts-demo/server",
"main": "apps/ng2-charts-demo/server.ts",
"tsConfig": "apps/ng2-charts-demo/tsconfig.server.json"
},
"configurations": {
"production": {
"buildOptimizer": true,
"outputHashing": "media",
"fileReplacements": [
{
"replace": "apps/ng2-charts-demo/src/environments/environment.ts",
"with": "apps/ng2-charts-demo/src/environments/environment.prod.ts"
}
],
"optimization": true,
"sourceMap": false,
"extractLicenses": true,
"vendorChunk": false
},
"development": {
"buildOptimizer": false,
"optimization": false,
"sourceMap": true,
"extractLicenses": false,
"vendorChunk": true
}
},
"defaultConfiguration": "production"
},

"serve-ssr": {
"executor": "@angular-devkit/build-angular:ssr-dev-server",
"configurations": {
"development": {
"browserTarget": "ng2-charts-demo:build:development",
"serverTarget": "ng2-charts-demo:server:development"
},
"production": {
"browserTarget": "ng2-charts-demo:build:production",
"serverTarget": "ng2-charts-demo:server:production"
}
},
"defaultConfiguration": "development"
},

"prerender": {
"executor": "@angular-devkit/build-angular:prerender",
"options": {
"routes": ["/"]
},
"configurations": {
"production": {
"browserTarget": "ng2-charts-demo:build:production",
"serverTarget": "ng2-charts-demo:server:production"
},
"development": {
"browserTarget": "ng2-charts-demo:build:development",
"serverTarget": "ng2-charts-demo:server:development"
}
},
"defaultConfiguration": "production"
}
},
"implicitDependencies": ["ng2-charts"]
Expand Down
60 changes: 60 additions & 0 deletions apps/ng2-charts-demo/server.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
import { APP_BASE_HREF } from '@angular/common';
import { CommonEngine } from '@angular/ssr/node';
import express from 'express';
import { fileURLToPath } from 'node:url';
import { dirname, join, resolve } from 'node:path';
import bootstrap from './src/main.server';

// The Express app is exported so that it can be used by serverless Functions.
export function app(): express.Express {
const server = express();
const serverDistFolder = dirname(fileURLToPath(import.meta.url));
const browserDistFolder = resolve(serverDistFolder, '../browser');
const indexHtml = join(serverDistFolder, 'index.server.html');

const commonEngine = new CommonEngine();

server.set('view engine', 'html');
server.set('views', browserDistFolder);

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

// All regular routes use the Angular engine
server.get('**', (req, res, next) => {
const { protocol, originalUrl, baseUrl, headers } = req;

commonEngine
.render({
bootstrap,
documentFilePath: indexHtml,
url: `${protocol}://${headers.host}${originalUrl}`,
publicPath: browserDistFolder,
providers: [{ provide: APP_BASE_HREF, useValue: baseUrl }],
})
.then((html: any) => res.send(html))
.catch((err: any) => next(err));
});

return server;
}

function run(): void {
const port = process.env['PORT'] || 4000;

// Start up the Node server
const server = app();
server.listen(port, () => {
console.log(`Node Express server listening on http://localhost:${port}`);
});
}

run();
9 changes: 9 additions & 0 deletions apps/ng2-charts-demo/src/app/app.config.server.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { mergeApplicationConfig, ApplicationConfig } from '@angular/core';
import { provideServerRendering } from '@angular/platform-server';
import { appConfig } from './app.config';

const serverConfig: ApplicationConfig = {
providers: [provideServerRendering()],
};

export const config = mergeApplicationConfig(appConfig, serverConfig);
2 changes: 2 additions & 0 deletions apps/ng2-charts-demo/src/app/app.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import { ScatterChartComponent } from './scatter-chart/scatter-chart.component';
import { DynamicChartComponent } from './dynamic-chart/dynamic-chart.component';
import { FinancialChartComponent } from './financial-chart/financial-chart.component';
import { LandingComponent } from './landing/landing.component';
import { provideClientHydration } from '@angular/platform-browser';

const routes: Route[] = [
{
Expand Down Expand Up @@ -114,5 +115,6 @@ export const appConfig: ApplicationConfig = {
provideHttpClient(withInterceptorsFromDi()),
provideAnimations(),
provideRouter(routes),
provideClientHydration(),
],
};
7 changes: 7 additions & 0 deletions apps/ng2-charts-demo/src/main.server.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { bootstrapApplication } from '@angular/platform-browser';
import { AppComponent } from './app/app.component';
import { config } from './app/app.config.server';

const bootstrap = () => bootstrapApplication(AppComponent, config);

export default bootstrap;
2 changes: 1 addition & 1 deletion apps/ng2-charts-demo/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"outDir": "../../dist/out-tsc",
"types": ["node"]
},
"files": ["src/main.ts"],
"files": ["src/main.ts", "src/main.server.ts", "server.ts"],
"include": ["src/**/*.d.ts"],
"exclude": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts"]
}
9 changes: 9 additions & 0 deletions apps/ng2-charts-demo/tsconfig.server.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "./tsconfig.app.json",
"compilerOptions": {
"outDir": "../../out-tsc/server",
"types": ["node"]
},
"files": ["src/main.server.ts", "server.ts"]
}
8 changes: 4 additions & 4 deletions libs/ng2-charts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"name": "ng2-charts",
"description": "Reactive, responsive, beautiful charts for Angular based on Chart.js",
"peerDependencies": {
"@angular/platform-browser": ">=18.0.0",
"@angular/common": ">=18.0.0",
"@angular/core": ">=18.0.0",
"@angular/cdk": ">=18.0.0",
"@angular/platform-browser": ">=19.0.0",
"@angular/common": ">=19.0.0",
"@angular/core": ">=19.0.0",
"@angular/cdk": ">=19.0.0",
"chart.js": "^3.4.0 || ^4.0.0",
"rxjs": "^6.5.3 || ^7.4.0"
},
Expand Down
Loading
Loading