Skip to content

Commit

Permalink
Update universal for demo
Browse files Browse the repository at this point in the history
  • Loading branch information
MurhafSousli committed Jun 25, 2023
1 parent fa14c30 commit 891b654
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 32 deletions.
8 changes: 4 additions & 4 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -151,14 +151,15 @@
"outputPath": "dist/ngx-highlightjs-demo/server",
"main": "projects/ngx-highlightjs-demo/server.ts",
"tsConfig": "projects/ngx-highlightjs-demo/tsconfig.server.json",
"buildOptimizer": false,
"optimization": false,
"sourceMap": true,
"extractLicenses": false,
"vendorChunk": true,
"buildOptimizer": false
"vendorChunk": true
},
"configurations": {
"production": {
"buildOptimizer": true,
"outputHashing": "media",
"fileReplacements": [
{
Expand All @@ -169,8 +170,7 @@
"optimization": true,
"sourceMap": false,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true
"vendorChunk": false
}
},
"defaultConfiguration": "production"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,4 @@
"ng-packagr": "^16.1.0",
"typescript": "~5.0.4"
}
}
}
11 changes: 5 additions & 6 deletions projects/ngx-highlightjs-demo/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ import 'zone.js/node';
import { APP_BASE_HREF } from '@angular/common';
import { ngExpressEngine } from '@nguniversal/express-engine';
import * as express from 'express';
import { existsSync } from 'fs';
import { join } from 'path';

import { AppServerModule } from './src/main.server';
import { existsSync } from 'node:fs';
import { join } 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 {
Expand All @@ -16,7 +15,7 @@ export function app(): express.Express {

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

server.set('view engine', 'html');
Expand Down Expand Up @@ -57,4 +56,4 @@ if (moduleFilename === __filename || moduleFilename.includes('iisnode')) {
run();
}

export * from './src/main.server';
export default bootstrap;
14 changes: 14 additions & 0 deletions projects/ngx-highlightjs-demo/src/app/app.config.server.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { mergeApplicationConfig, ApplicationConfig, importProvidersFrom } from '@angular/core';
import { provideServerRendering } from '@angular/platform-server';
import { provideHttpClient } from '@angular/common/http';
import { FlexLayoutServerModule } from '@angular/flex-layout/server';

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

export const config = mergeApplicationConfig(serverConfig);
15 changes: 0 additions & 15 deletions projects/ngx-highlightjs-demo/src/app/app.server.module.ts

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { Component, ChangeDetectionStrategy } from '@angular/core';
import { FlexModule } from '@angular/flex-layout/flex';
import { FlexLayoutModule } from '@angular/flex-layout';

@Component({
selector: 'app-header',
templateUrl: './header.component.html',
styleUrls: ['./header.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
standalone: true,
imports: [FlexModule]
imports: [FlexLayoutModule]
})
export class HeaderComponent {
}
7 changes: 6 additions & 1 deletion projects/ngx-highlightjs-demo/src/main.server.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
import { bootstrapApplication } from '@angular/platform-browser';
import { AppComponent } from './app/app.component';
import { config } from './app/app.config.server';

export { AppServerModule } from './app/app.server.module';
const bootstrap = () => bootstrapApplication(AppComponent, config);

export default bootstrap;
5 changes: 2 additions & 3 deletions projects/ngx-highlightjs-demo/src/main.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { enableProdMode, importProvidersFrom } from '@angular/core';
import { enableProdMode } from '@angular/core';
import { provideHttpClient } from '@angular/common/http';
import { provideAnimations } from '@angular/platform-browser/animations';
import { BrowserModule, bootstrapApplication } from '@angular/platform-browser';
import { bootstrapApplication } from '@angular/platform-browser';
import { GIST_OPTIONS } from 'ngx-highlightjs/plus';
import { HIGHLIGHT_OPTIONS } from 'ngx-highlightjs';
import { environment } from './environments/environment';
Expand All @@ -14,7 +14,6 @@ if (environment.production) {
function bootstrap() {
bootstrapApplication(AppComponent, {
providers: [
importProvidersFrom(BrowserModule.withServerTransition({ appId: 'serverApp' })),
provideHttpClient(),
{
provide: HIGHLIGHT_OPTIONS,
Expand Down

0 comments on commit 891b654

Please sign in to comment.