fix: update new project imported modules

Author: patrickmichalina

package-lock.json

@@ -43,7 +43,7 @@
     "@types/node-sass": "^3.10.32",
     "@types/npm": "^2.0.29",
     "@types/ua-parser-js": "^0.7.32",
-    "@types/yargs": "^11.1.0",
+    "@types/yargs": "^11.1.1",
     "chokidar-cli": "^1.2.0",
     "condition-circle": "^2.0.1",
     "fuse-test-runner": "^1.0.16",

package.json

@@ -222,5 +222,10 @@ function serve(isProdBuild = false, isServiceWorkerEnabled = false) {
         .then(() => {
           fuseBrowser.run({ chokidar: { ignored: /^(.*\.scss$)*$/gim } })
         })
+        .catch(() => {
+          fuseSw.run().then(() => {
+            fuseBrowser.run({ chokidar: { ignored: /^(.*\.scss$)*$/gim } })
+          })
+        })
     })
 }

src/commands/serve.ts

@@ -2,17 +2,13 @@ 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 { EnvironmentBrowserModule } from 'fusing-angular-cli/.build/modules/src/modules/environment'
-import { WindowBrowserModule } from 'fusing-angular-cli/.build/modules/src/modules'
-import { CookiesBrowserModule } from 'fusing-angular-cli/.build/modules/src/modules/cookies'
+import { FusingAngularBrowserModule } from 'fusing-angular-cli/.build/modules/src/modules/fusing-angular/browser'
 
 @NgModule({
   imports: [
     BrowserModule.withServerTransition({ appId: 'app-root' }),
     BrowserTransferStateModule,
-    WindowBrowserModule.forRoot(),
-    CookiesBrowserModule,
-    EnvironmentBrowserModule,
+    FusingAngularBrowserModule,
     AppModule
   ],
   bootstrap: [AppComponent]

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

@@ -2,16 +2,12 @@ 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 { WindowServerModule } from 'fusing-angular-cli/.build/modules/src/modules'
-import { EnvironmentServerModule } from 'fusing-angular-cli/.build/modules/src/modules/environment'
-import { CookiesServerModule } from 'fusing-angular-cli/.build/modules/src/modules/cookies'
+import { FusingAngularServerModule } from 'fusing-angular-cli/.build/modules/src/modules/fusing-angular/server'
 
 @NgModule({
   imports: [
     ServerTransferStateModule,
-    WindowServerModule.forRoot({}),
-    CookiesServerModule,
-    EnvironmentServerModule,
+    FusingAngularServerModule,
     ServerModule,
     AppModule
   ],

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

@@ -41,8 +41,6 @@ expressApp.engine('html', ngExpressEngine({
   ]
 }))
 
-expressApp.use('/favicon.ico', (req, res) => res.sendStatus(204)) // TODO: FAVICONS
-
 function returnBrEncoding(availableEncodings: string[]) {
   return availableEncodings.some(a => a === 'br')
 }
@@ -74,7 +72,13 @@ function checkReturnJsFile(filePath: string, res: express.Response, encoding: st
   })
 }
 
-expressApp.get('/js**', (req, res) => {
+expressApp.use('/robots.txt', express.static(`${publicDir}/assets/robots.txt`))
+expressApp.use('/assets', express.static(`${publicDir}/assets`))
+expressApp.use('/favicon.ico', express.static(`${publicDir}/assets/favicons/favicon.ico`))
+expressApp.use('/manifest.json', express.static(`${publicDir}/assets/favicons/manifest.json`))
+expressApp.use('/js/ngsw.json', express.static(`${publicDir}/ngsw.json`))
+
+expressApp.get('/js/**', (req, res) => {
   const encodings = (req.get('Accept-Encoding') || '').split(',').map(a => a.trim())
   const filePath = resolve(`${publicDir}${req.path}`)
 
@@ -96,35 +100,4 @@ expressApp.get('**', (req, res) => {
   })
 })
 
-// app.use('/ngsw.json', express.static(`${dir}/ngsw.json`, staticOptions))
-// app.use(
-//   '/ngsw-worker.js',
-//   express.static(`${dir}/ngsw-worker.js`, staticOptions)
-// )
-// app.use(
-//   '/assets',
-//   express.static(`${dir}/assets`, { ...staticOptions, fallthrough: false })
-// )
-// app.use(
-//   '/manifest.json',
-//   express.static(`${dir}/assets`, { ...staticOptions, fallthrough: false })
-// )
-
-// app.use('/robots.txt', express.static(`${dir}/web/robots.txt`, staticOptions))
-// app.use('/ping.html', express.static(`${dir}/web/ping.html`, staticOptions))
-// app.use(
-//   '/favicon.ico',
-//   express.static(`${dir}/assets/favicons/favicon-16x16.png`, {
-//     ...staticOptions,
-//     fallthrough: false
-//   })
-// )
-// app.use(
-//   '/assets/favicons/favicon.ico',
-//   express.static(`${dir}/assets/favicons/favicon-16x16.png`, {
-//     ...staticOptions,
-//     fallthrough: false
-//   })
-// )
-
 export { expressApp }