fix: further consolidate built in modules

Author: patrickmichalina

src/commands/serve.ts

@@ -23,9 +23,9 @@ import { appEnvironmentVariables } from '../utilities/environment-variables'
 import { renderSassDir } from '../utilities/sass'
 import { exec, execSync } from 'child_process'
 import { NgSwPlugin } from '../fusebox/ng.sw.plugin'
+import { copy } from 'fs-extra'
 import clearTerminal from '../utilities/clear'
 import readConfig_ from '../utilities/read-config'
-import { copy } from 'fs-extra'
 
 command(
   'serve [port][prod][aot][sw]',
@@ -70,6 +70,11 @@ function serve(isProdBuild = false, isServiceWorkerEnabled = false) {
       const browserOutput = resolve(config.fusebox.browser.outputDir)
       const modulesFolder = resolve(process.cwd(), 'node_modules')
       const watchDir = resolve(`${homeDir}/src/**`)
+      const appName =
+        (config.favicon &&
+          config.favicon.config &&
+          config.favicon.config.appName) ||
+        'FUSING ANGULAR'
       const browserModule = isAotBuild
         ? config.fusebox.browser.aotBrowserModule
         : config.fusebox.browser.browserModule
@@ -96,7 +101,7 @@ function serve(isProdBuild = false, isServiceWorkerEnabled = false) {
             template: resolve('src/app/index.pug'),
             engine: 'pug',
             locals: {
-              pageTitle: 'FUSING ANGULAR',
+              pageTitle: appName,
               isLocalDev,
               faviconMeta: (config.generatedMetaTags || []).join('\n')
             }

src/modules/fusing-angular/browser.ts

@@ -4,10 +4,16 @@ import { CookiesBrowserModule } from '../cookies/browser'
 import { EnvironmentBrowserModule } from '../environment'
 import { ResponseBrowserModule } from '../response/browser'
 import { ServiceWorkerModule } from '@angular/service-worker'
+import {
+  BrowserTransferStateModule,
+  BrowserModule
+} from '@angular/platform-browser'
 
 // tslint:disable-next-line:no-class
 @NgModule({
   imports: [
+    BrowserModule.withServerTransition({ appId: 'app-root' }),
+    BrowserTransferStateModule,
     ServiceWorkerModule.register('/js/ngsw-worker.js', {
       enabled: false
     }),
@@ -17,6 +23,8 @@ import { ServiceWorkerModule } from '@angular/service-worker'
     ResponseBrowserModule
   ],
   exports: [
+    BrowserModule,
+    BrowserTransferStateModule,
     ServiceWorkerModule,
     WindowBrowserModule,
     CookiesBrowserModule,

src/modules/fusing-angular/server.ts

@@ -3,20 +3,28 @@ import { WindowServerModule } from '../util/window/window-server.module'
 import { EnvironmentServerModule } from '../environment'
 import { CookiesServerModule } from '../cookies/server'
 import { ResponseServerModule } from '../response/server'
+import {
+  ServerModule,
+  ServerTransferStateModule
+} from '@angular/platform-server'
 
 // tslint:disable-next-line:no-class
 @NgModule({
   imports: [
+    ServerTransferStateModule,
     WindowServerModule.forRoot({}),
     EnvironmentServerModule,
     CookiesServerModule,
-    ResponseServerModule
+    ResponseServerModule,
+    ServerModule
   ],
   exports: [
+    ServerTransferStateModule,
     WindowServerModule,
     EnvironmentServerModule,
     CookiesServerModule,
-    ResponseServerModule
+    ResponseServerModule,
+    ServerModule
   ]
 })
 export class FusingAngularServerModule {}

src/modules/util/config-server.ts

@@ -0,0 +1,3 @@
+export function fngRawEnvironmentConfig<T>() {
+  return JSON.parse(process.env.FUSING_ANGULAR || '{}') as T
+}

src/templates/core/browser/app.browser.module.ts.txt

@@ -1,16 +1,14 @@
 import { AppModule } from '../app/app.module'
 import { NgModule } from '@angular/core'
-import { BrowserTransferStateModule, BrowserModule } from '@angular/platform-browser'
 import { AppComponent } from '../app/app.component'
 import { FusingAngularBrowserModule } from 'fusing-angular-cli/.build/modules/src/modules/fusing-angular/browser'
 
 @NgModule({
   imports: [
-    BrowserModule.withServerTransition({ appId: 'app-root' }),
-    BrowserTransferStateModule,
     FusingAngularBrowserModule,
     AppModule
   ],
+  exports: [AppModule],
   bootstrap: [AppComponent]
 })
 export class AppBrowserModule { }

src/templates/core/server/server.angular.module.ts.txt

@@ -1,17 +1,15 @@
 import { NgModule } from '@angular/core'
-import { ServerModule, ServerTransferStateModule } from '@angular/platform-server'
 import { AppModule } from '../app/app.module'
 import { AppComponent } from '../app/app.component'
 import { FusingAngularServerModule } from 'fusing-angular-cli/.build/modules/src/modules/fusing-angular/server'
 
 @NgModule({
   imports: [
-    ServerTransferStateModule,
     FusingAngularServerModule,
-    ServerModule,
     AppModule
   ],
-  bootstrap: [AppComponent],
+  exports: [AppModule],
+  bootstrap: [AppComponent]
 })
 export class AppServerModule {
 }