diff --git a/angular.json b/angular.json index a6eb968..60fef1d 100644 --- a/angular.json +++ b/angular.json @@ -29,12 +29,7 @@ "styles": [ "src/styles.css" ], - "scripts": [], - "server": "src/main.server.ts", - "prerender": true, - "ssr": { - "entry": "server.ts" - } + "scripts": [] }, "configurations": { "production": { diff --git a/package-lock.json b/package-lock.json index 6943719..3473473 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,10 +15,7 @@ "@angular/forms": "^18.1.0", "@angular/platform-browser": "^18.1.0", "@angular/platform-browser-dynamic": "^18.1.0", - "@angular/platform-server": "^18.1.0", "@angular/router": "^18.1.0", - "@angular/ssr": "^18.1.0", - "express": "^4.18.2", "rxjs": "~7.8.0", "tslib": "^2.3.0", "zone.js": "~0.14.3" @@ -27,7 +24,6 @@ "@angular-devkit/build-angular": "^18.1.0", "@angular/cli": "^18.1.0", "@angular/compiler-cli": "^18.1.0", - "@types/express": "^4.17.17", "@types/jasmine": "~5.1.0", "@types/node": "^18.18.0", "jasmine-core": "~5.1.0", @@ -509,25 +505,6 @@ "@angular/platform-browser": "18.1.0" } }, - "node_modules/@angular/platform-server": { - "version": "18.1.0", - "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-18.1.0.tgz", - "integrity": "sha512-7JSkgw9HXnfiy4XcJKrIGEl4SXoqeJmoajN0KfMCZwbGcuakM/t0lkD3JwyueAcYUlTPBdZQuqgxs3SIT52v3A==", - "dependencies": { - "tslib": "^2.3.0", - "xhr2": "^0.2.0" - }, - "engines": { - "node": "^18.19.1 || ^20.11.1 || >=22.0.0" - }, - "peerDependencies": { - "@angular/animations": "18.1.0", - "@angular/common": "18.1.0", - "@angular/compiler": "18.1.0", - "@angular/core": "18.1.0", - "@angular/platform-browser": "18.1.0" - } - }, "node_modules/@angular/router": { "version": "18.1.0", "resolved": "https://registry.npmjs.org/@angular/router/-/router-18.1.0.tgz", @@ -545,19 +522,6 @@ "rxjs": "^6.5.3 || ^7.4.0" } }, - "node_modules/@angular/ssr": { - "version": "18.1.0", - "resolved": "https://registry.npmjs.org/@angular/ssr/-/ssr-18.1.0.tgz", - "integrity": "sha512-xj052pB9J0rk9oZiYCQIC7tRHFyR0KewuACZZQGS+Vdop4e/uuikP7/RY9nruHjznb/iIW+M5ZtjCAHTpGY1BA==", - "dependencies": { - "critters": "0.0.24", - "tslib": "^2.3.0" - }, - "peerDependencies": { - "@angular/common": "^18.0.0", - "@angular/core": "^18.0.0" - } - }, "node_modules/@babel/code-frame": { "version": "7.24.7", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", diff --git a/package.json b/package.json index 0ff9e55..4f9a359 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,7 @@ "start": "ng serve", "build": "ng build", "watch": "ng build --watch --configuration development", - "test": "ng test", - "serve:ssr:jedi-archive-frontend": "node dist/jedi-archive-frontend/server/server.mjs" + "test": "ng test" }, "private": true, "dependencies": { @@ -18,10 +17,7 @@ "@angular/forms": "^18.1.0", "@angular/platform-browser": "^18.1.0", "@angular/platform-browser-dynamic": "^18.1.0", - "@angular/platform-server": "^18.1.0", "@angular/router": "^18.1.0", - "@angular/ssr": "^18.1.0", - "express": "^4.18.2", "rxjs": "~7.8.0", "tslib": "^2.3.0", "zone.js": "~0.14.3" @@ -30,7 +26,6 @@ "@angular-devkit/build-angular": "^18.1.0", "@angular/cli": "^18.1.0", "@angular/compiler-cli": "^18.1.0", - "@types/express": "^4.17.17", "@types/jasmine": "~5.1.0", "@types/node": "^18.18.0", "jasmine-core": "~5.1.0", diff --git a/server.ts b/server.ts deleted file mode 100644 index 1a0df5e..0000000 --- a/server.ts +++ /dev/null @@ -1,57 +0,0 @@ -import { APP_BASE_HREF } from '@angular/common'; -import { CommonEngine } from '@angular/ssr'; -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) => res.send(html)) - .catch((err) => 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(); 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 cdc0b28..0641ab9 100644 --- a/tsconfig.app.json +++ b/tsconfig.app.json @@ -9,9 +9,7 @@ ] }, "files": [ - "src/main.ts", - "src/main.server.ts", - "server.ts" + "src/main.ts" ], "include": [ "src/**/*.d.ts"