[Angular] remove the server wrapper from angular sample app

samples/angular/angular.json

@@ -105,7 +105,7 @@
           "builder": "@angular-devkit/build-angular:server",
           "options": {
             "outputPath": "dist/server",
-            "main": "src/main.server.ts",
+            "main": "server.bundle.ts",
             "tsConfig": "src/tsconfig.server.json"
           },
           "configurations": {

samples/angular/package.json

@@ -26,14 +26,13 @@
     "jss": "jss",
     "start": "npm-run-all --serial bootstrap:disconnected --parallel start:angular start:proxy start:watch-components",
     "start:connected": "scjss-verify-setup && npm-run-all --serial bootstrap:connected start:angular start:watch-components",
-    "build": "npm-run-all --serial bootstrap:connected --serial build:client build:server --serial build:server-wrapper",
+    "build": "npm-run-all --serial bootstrap:connected --serial build:client build:server",
     "scaffold": "ng generate @sitecore-jss/sitecore-jss-angular-schematics:jss-component",
     "start:angular": "ng serve -o --base-href=/ --source-map=false",
     "start:proxy": "ts-node --project src/tsconfig.webpack-server.json scripts/disconnected-mode-proxy.ts",
     "start:watch-components": "ts-node --project src/tsconfig.webpack-server.json scripts/generate-component-factory.ts --watch",
     "build:client": "cross-env-shell ng build --prod --deploy-url $npm_package_config_sitecoreDistPath/browser/ --output-path=$npm_package_config_buildArtifactsPath/browser/",
     "build:server": "cross-env-shell ng run JssAngularWeb:server:production --output-path=$npm_package_config_buildArtifactsPath/server --output-hashing=none --bundleDependencies true",
-    "build:server-wrapper": "cross-env-shell webpack --config webpack.server.config.js --progress --colors --output-path $npm_package_config_buildArtifactsPath",
     "bootstrap:connected": "ts-node --project src/tsconfig.webpack-server.json scripts/bootstrap.ts",
     "bootstrap:disconnected": "ts-node --project src/tsconfig.webpack-server.json scripts/bootstrap.ts --disconnected",
     "graphql:update": "ts-node --project src/tsconfig.webpack-server.json ./scripts/update-graphql-fragment-data.ts"
@@ -128,7 +127,6 @@
     "ts-loader": "~6.2.0",
     "ts-node": "~8.4.1",
     "typescript": "~3.9.7",
-    "webpack-cli": "~3.3.9",
     "yaml-lint": "^1.2.4"
   }
-}
+}

samples/angular/server.bundle.ts

@@ -1,29 +1,28 @@
 // These are important and needed before anything else
-import 'zone.js/dist/zone-node';
-import 'reflect-metadata';
-import { join } from 'path';
 import { readFileSync } from 'fs';
+import { join } from 'path';
+import 'reflect-metadata';
+import 'zone.js/dist/zone-node';
 import { JssRouteBuilderService } from './src/app/routing/jss-route-builder.service';
 import { environment } from './src/environments/environment';
+import { AppServerModule, renderModule } from './src/main.server';
+
+export * from './src/main.server';
 
 const http = require('http');
 const https = require('https');
 
 // Our index.html we'll use as our template
 const template = readFileSync(join(__dirname, 'browser', 'index.html')).toString();
 
-// * NOTE :: leave this as require() since this file is built Dynamically from webpack
-const { AppServerModule, renderModule } = require('./dist/server/main');
-
-
 // Setup Http/Https agents for keep-alive. Used in headless-proxy
 const setUpDefaultAgents = (httpAgent, httpsAgent) => {
   http.globalAgent = httpAgent;
   https.globalAgent = httpsAgent;
 };
 
 // this is the function expected by the JSS View Engine for "integrated mode"
-function renderView (callback, path, data, viewBag) {
+function renderView(callback, path, data, viewBag) {
   try {
     /*
       Data from server is double-encoded since MS JSS does not allow control
@@ -68,8 +67,8 @@ function renderView (callback, path, data, viewBag) {
         { provide: 'JSS_SERVER_VIEWBAG', useValue: state.viewBag },
       ]
     })
-    .then(html => callback(null, { html }))
-    .catch(err => callback(err, null))
+      .then(html => callback(null, { html }))
+      .catch(err => callback(err, null))
   } catch (err) {
     // need to ensure the callback is always invoked no matter what
     // or else SSR will hang

samples/angular/src/tsconfig.server.json

@@ -11,6 +11,10 @@
   "lib": [
     "esnext.asynciterable"
   ],
+  "files": [
+    "main.server.ts",
+    "../server.bundle.ts"
+  ],
   "exclude": [
     "test.ts",
     "**/*.spec.ts",
@@ -22,4 +26,4 @@
   "angularCompilerOptions": {
     "entryModule": "app/app.server.module#AppServerModule"
   }
-}
+}