diff --git a/angular.json b/angular.json index 0a4c062..24b95c4 100644 --- a/angular.json +++ b/angular.json @@ -59,11 +59,6 @@ "styles": [ "src/styles.scss" ], - "server": "src/main.server.ts", - "outputMode": "static", - "ssr": { - "entry": "src/server.ts" - }, "stylePreprocessorOptions": { "includePaths": [ "node_modules" diff --git a/package.json b/package.json index 1f518e0..b0d20e7 100644 --- a/package.json +++ b/package.json @@ -23,12 +23,10 @@ "build:fin": "ng build finance-grid", "build:hr": "ng build hr-portal", "build:sales": "ng build sales-grid", - "ssr": "node dist/grid-demos/server/server.mjs", "ssr:erp": "node dist/erp-hgrid/server/server.mjs", "ssr:fin": "node dist/finance-grid/server/server.mjs", "ssr:hr": "node dist/hr-portal/server/server.mjs", - "ssr:sales": "node dist/sales-grid/server/server.mjs", - "ssr:fleet": "node dist/fleet-management/server/server.mjs" + "ssr:sales": "node dist/sales-grid/server/server.mjs" }, "private": true, "dependencies": { diff --git a/src/app/app.config.server.ts b/src/app/app.config.server.ts deleted file mode 100644 index b17c54c..0000000 --- a/src/app/app.config.server.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { mergeApplicationConfig, ApplicationConfig } from '@angular/core'; -import { provideServerRendering } from '@angular/platform-server'; -import { appConfig } from './app.config'; -import { serverRoutes } from './app.routes.server'; -import { provideServerRoutesConfig } from '@angular/ssr'; - -const serverConfig: ApplicationConfig = { - providers: [ - provideServerRendering(), - provideServerRoutesConfig(serverRoutes) - ] -}; - -export const config = mergeApplicationConfig(appConfig, serverConfig); diff --git a/src/app/app.config.ts b/src/app/app.config.ts index e922bdc..e58e6df 100644 --- a/src/app/app.config.ts +++ b/src/app/app.config.ts @@ -2,15 +2,15 @@ import { ApplicationConfig, provideZoneChangeDetection } from '@angular/core'; import { provideRouter } from '@angular/router'; import { routes } from './app.routes'; -import { provideClientHydration, withEventReplay } from '@angular/platform-browser'; import { provideAnimations } from "@angular/platform-browser/animations"; -import { provideHttpClient } from '@angular/common/http'; +import { provideHttpClient, withInterceptors } from '@angular/common/http'; +import { cacheInterceptor } from './cache.interceptor'; + export const appConfig: ApplicationConfig = { providers: [ - provideHttpClient(), + provideHttpClient(withInterceptors([cacheInterceptor]),), provideZoneChangeDetection({ eventCoalescing: true, runCoalescing: true }), provideRouter(routes), - provideClientHydration(withEventReplay()), provideAnimations()] }; diff --git a/src/app/app.routes.server.ts b/src/app/app.routes.server.ts deleted file mode 100644 index 80414d0..0000000 --- a/src/app/app.routes.server.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { RenderMode, ServerRoute } from '@angular/ssr'; -export const serverRoutes: ServerRoute[] = [ - { - path: '', - renderMode: RenderMode.Prerender, - }, - { - path: 'inventory', - renderMode: RenderMode.Prerender, - }, - { - path: 'hr-portal', - renderMode: RenderMode.Prerender, - }, - { - path: 'finance', - renderMode: RenderMode.Prerender, - }, - { - path: 'fleet', - renderMode: RenderMode.Prerender, - }, - { - path: 'sales', - renderMode: RenderMode.Prerender, - }, -]; diff --git a/src/app/cache.interceptor.ts b/src/app/cache.interceptor.ts new file mode 100644 index 0000000..736e3bf --- /dev/null +++ b/src/app/cache.interceptor.ts @@ -0,0 +1,9 @@ +import { HttpInterceptorFn } from "@angular/common/http"; + +export const cacheInterceptor: HttpInterceptorFn = (req, next) => { + req = req.clone({ + headers: req.headers.set('Cache-Control', 'no-store, no-cache, must-revalidate'), + }); + + return next(req) +} diff --git a/src/index.html b/src/index.html index 057d68e..f0a17e9 100644 --- a/src/index.html +++ b/src/index.html @@ -4,6 +4,9 @@ GridDemos + + + diff --git a/src/main.server.ts b/src/main.server.ts deleted file mode 100644 index 4b9d4d1..0000000 --- a/src/main.server.ts +++ /dev/null @@ -1,7 +0,0 @@ -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; diff --git a/tsconfig.app.json b/tsconfig.app.json index 9ab8527..0d4f377 100644 --- a/tsconfig.app.json +++ b/tsconfig.app.json @@ -5,13 +5,10 @@ "compilerOptions": { "outDir": "./out-tsc/app", "types": [ - "node" ] }, "files": [ - "src/main.ts", - "src/main.server.ts", - "src/server.ts" + "src/main.ts" ], "include": [ "src/**/*.d.ts" diff --git a/web.config b/web.config index 59d7ef2..b7617e5 100644 --- a/web.config +++ b/web.config @@ -1,8 +1,19 @@ + - - - - - - + + + + + + + + + + + + + + + +