fix: correct favicon generation

patrickmichalina · patrickmichalina · commit 4b61d47089ac · 2018-07-21T13:14:12.000-05:00
diff --git a/src/commands/create.ts b/src/commands/create.ts
@@ -46,6 +46,7 @@ import {
   FirebaseConfig
 } from './create-common'
 import { Q_INCLUDE_FIREBASE, Q_FIREBASE } from './create-firebase'
+import { favicon_ } from './favicon'
 
 command(
   'create [overwrite]',
@@ -330,33 +331,42 @@ function create(overwriteExisting = false) {
               storageBucket: im.config.firebaseStorageBucket
             }
           : undefined
-        return forkJoin([
-          genNpmPackageJson(im.config.fullname, true, overwriteExisting).pipe(
-            flatMap(test(im.config.fullname))
+        return generateFngConfig(path, overwriteExisting, faviOverrides).pipe(
+          flatMap(() =>
+            forkJoin([
+              generateCoreAngular(im.config.fullname),
+              generateGitIgnore(path, overwriteExisting),
+              generateTsLint(path, overwriteExisting),
+              generateDotEnv(
+                path,
+                overwriteExisting,
+                firebaseConfig,
+                im.config.googleAnalyticsTrackingId,
+                im.config.googleSiteVerificationCode
+              ),
+              generateTsConfig(path, overwriteExisting),
+              generateTsDeclartionFile(path, overwriteExisting),
+              genNpmPackageJson(im.config.fullname, true, overwriteExisting),
+              im.config.ide
+                ? generateIdeStubs(im.config.ide, path, overwriteExisting)
+                : of(undefined)
+            ])
           ),
-          generateCoreAngular(im.config.fullname),
-          generateGitIgnore(path, overwriteExisting),
-          generateTsLint(path, overwriteExisting),
-          generateDotEnv(
-            path,
-            overwriteExisting,
-            firebaseConfig,
-            im.config.googleAnalyticsTrackingId,
-            im.config.googleSiteVerificationCode
-          ),
-          generateFngConfig(path, overwriteExisting, faviOverrides),
-          generateTsConfig(path, overwriteExisting),
-          generateTsDeclartionFile(path, overwriteExisting),
-          im.config.ide
-            ? generateIdeStubs(im.config.ide, path, overwriteExisting)
-            : of(undefined)
-        ])
+          flatMap(() => favicon_(path)),
+          flatMap(test(im.config.fullname))
+        )
       }, im => im),
       take(1)
     )
-    .subscribe(res => {
-      // noop
-    }, process.exit)
+    .subscribe(
+      res => {
+        // noop
+      },
+      err => {
+        console.error(err)
+        process.exit(1)
+      }
+    )
 
   // prompt([
   //   // {
diff --git a/src/commands/favicon.ts b/src/commands/favicon.ts
@@ -1,8 +1,13 @@
 import { command } from 'yargs'
 import { logInfoWithBackground, logError } from '../utilities/log'
-import { flatMap, map, first, filter, tap } from 'rxjs/operators'
+import { flatMap, map, filter, tap, take, first } from 'rxjs/operators'
 import { rxFavicons } from '../utilities/rx-favicon'
-import { writeFile_, mkDirDeep_, writeJsonFile_ } from '../utilities/rx-fs'
+import {
+  writeFile_,
+  mkDirDeep_,
+  writeJsonFile_,
+  mkDirAndContinueIfExists_
+} from '../utilities/rx-fs'
 import { resolve } from 'path'
 import { forkJoin } from 'rxjs'
 import readConfig_, {
@@ -18,7 +23,12 @@ command(
     return args
   },
   args => {
-    favicon()
+    favicon_('.')
+      .pipe(
+        first(),
+        take(1)
+      )
+      .subscribe(logFaviconComplete, logError)
   }
 )
 
@@ -51,54 +61,55 @@ interface configModel {
   readonly result: FavIconResponse
 }
 
-function mapResponsesToWriteableObservables(response: configModel) {
-  return readConfig_().pipe(
-    flatMap(config => {
-      const _confg = {
-        ...config,
-        generatedMetaTags: response.result.html
-      }
-      return writeJsonFile_(resolve('fusing-angular.json'), _confg, true)
-    }),
-    flatMap(() => {
-      return forkJoin(
-        ...response.result.files.map(file =>
-          writeFile_(
-            resolve(`${response.config.output}/${file.name}`),
-            file.contents
+function mapResponsesToWriteableObservables(baseDir = '') {
+  return function(response: configModel) {
+    return readConfig_(baseDir).pipe(
+      map(config => {
+        return {
+          ...config,
+          generatedMetaTags: response.result.html
+        }
+      }),
+      flatMap(config =>
+        writeJsonFile_(resolve(baseDir, 'fusing-angular.json'), config, true)
+      ),
+      flatMap(() =>
+        mkDirAndContinueIfExists_(resolve(baseDir, `${response.config.output}`))
+      ),
+      flatMap(() => {
+        return forkJoin([
+          ...response.result.files.map(file =>
+            writeFile_(
+              resolve(baseDir, `${response.config.output}/${file.name}`),
+              file.contents
+            )
+          ),
+          ...response.result.images.map(file =>
+            writeFile_(
+              resolve(baseDir, `${response.config.output}/${file.name}`),
+              file.contents
+            )
           )
-        )
-      )
-    }),
-    map(() => {
-      return response.result.images.map(file =>
-        writeFile_(
-          resolve(`${response.config.output}/${file.name}`),
-          file.contents
-        )
-      )
-    })
-  )
+        ])
+      })
+    )
+  }
 }
 
-function favicon() {
-  readConfig_()
-    .pipe(
-      tap(logFaviconStart),
-      filter(requireFaviconConfig),
-      map(mapFaviconConfig),
-      flatMap(rxFavicons, (config: FaviconConfig, result) => ({
-        config,
-        result
-      })),
-      tap(logDirectoryCheck),
-      flatMap(
-        response => mkDirDeep_(response.config.output),
-        response => ({ ...response })
-      ),
-      map(mapResponsesToWriteableObservables),
-      flatMap(fileWriteObs => forkJoin(fileWriteObs)),
-      first()
-    )
-    .subscribe(logFaviconComplete, logError)
+export function favicon_(path?: string) {
+  return readConfig_(path).pipe(
+    tap(logFaviconStart),
+    filter(requireFaviconConfig),
+    map(mapFaviconConfig),
+    flatMap(rxFavicons(path), (config: FaviconConfig, result) => ({
+      config,
+      result
+    })),
+    tap(logDirectoryCheck),
+    // flatMap(
+    //   response => mkDirDeep_(resolve(path || '', response.config.output)),
+    //   response => ({ ...response })
+    // ),
+    flatMap(mapResponsesToWriteableObservables(path))
+  )
 }
diff --git a/src/generators/angular-core.gen.ts b/src/generators/angular-core.gen.ts
@@ -5,7 +5,8 @@ import {
   appSharedModuleTemplate,
   appComponentCssTemplate,
   appComponentHtmlTemplate,
-  appIndex
+  appIndex,
+  favicon
 } from '../templates/core/app'
 import { writeFile_, mkDirAndContinueIfExists_ } from '../utilities/rx-fs'
 import { forkJoin } from 'rxjs'
@@ -21,12 +22,14 @@ import {
   serverModuleTemplate,
   serverAppTemplate
 } from '../templates/core/server'
+import { robots } from '../templates/core/assets'
 
 export function generateCoreAngular(projectDir: string) {
   return forkJoin([
     generateCoreAngularApp(projectDir),
     generateCoreAngularBrowser(projectDir),
-    generateCoreAngularServer(projectDir)
+    generateCoreAngularServer(projectDir),
+    generateCoreAngularAssets(projectDir)
   ])
 }
 
@@ -59,21 +62,22 @@ export function generateCoreAngularApp(projectDir: string, universal = true) {
         writeFile_(`${baseDir}/app.component.ts`, appComponentTemplate),
         writeFile_(`${baseDir}/app.component.scss`, appComponentCssTemplate), // TODO: write component generator function instead
         writeFile_(`${baseDir}/app.component.html`, appComponentHtmlTemplate),
-        writeFile_(`${baseDir}/index.pug`, appIndex)
+        writeFile_(`${baseDir}/index.pug`, appIndex),
+        writeFile_(`${baseDir}/favicon.svg`, favicon)
       ])
-    ),
-    flatMap(() =>
-      mkDirAndContinueIfExists_(resolve(baseDir, 'home')).pipe(
-        flatMap(() =>
-          forkJoin([
-            // writeFile_(
-            //   `${baseDir}/home/home.component.ts`,
-            //   homeComponentTemplate
-            // )
-          ])
-        )
-      )
     )
+    // flatMap(() =>
+    //   mkDirAndContinueIfExists_(resolve(baseDir, 'home')).pipe(
+    //     flatMap(() =>
+    //       forkJoin([
+    //         // writeFile_(
+    //         //   `${baseDir}/home/home.component.ts`,
+    //         //   homeComponentTemplate
+    //         // )
+    //       ])
+    //     )
+    //   )
+    // )
   )
 }
 
@@ -112,3 +116,12 @@ export function generateCoreAngularServer(projectDir: string) {
     )
   )
 }
+
+export function generateCoreAngularAssets(projectDir: string) {
+  const root = resolve(`${projectDir}/src`)
+  const baseDir = resolve(root, 'assets')
+  return mkDirAndContinueIfExists_(root).pipe(
+    flatMap(() => mkDirAndContinueIfExists_(baseDir)),
+    flatMap(() => forkJoin([writeFile_(`${baseDir}/robots.txt`, robots)]))
+  )
+}
diff --git a/src/templates/core/app/favicon.svg.txt b/src/templates/core/app/favicon.svg.txt
@@ -0,0 +1,5 @@
+<svg width="2353" height="2500" viewBox="0 0 256 272" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid">
+  <path d="M.1 45.522L125.908.697l129.196 44.028-20.919 166.45-108.277 59.966-106.583-59.169L.1 45.522z" fill="#E23237"/>
+  <path d="M255.104 44.725L125.908.697v270.444l108.277-59.866 20.919-166.55z" fill="#B52E31"/>
+  <path d="M126.107 32.274L47.714 206.693l29.285-.498 15.739-39.347h70.325l17.233 39.845 27.99.498-82.179-174.917zm.2 55.882l26.496 55.383h-49.806l23.31-55.383z" fill="#FFF"/>
+</svg>
diff --git a/src/templates/core/app/index.ts b/src/templates/core/app/index.ts
@@ -6,6 +6,7 @@ import * as appComponentCssTemplate from './app.component.scss.txt'
 import * as appComponentHtmlTemplate from './app.component.html.txt'
 import * as homeComponentTemplate from './home.component.ts.txt'
 import * as appIndex from './index.pug.txt'
+import * as favicon from './favicon.svg.txt'
 
 export {
   appModuleTemplate,
@@ -15,5 +16,6 @@ export {
   homeComponentTemplate,
   appComponentCssTemplate,
   appComponentHtmlTemplate,
-  appIndex
+  appIndex,
+  favicon
 }
diff --git a/src/templates/core/assets/index.ts b/src/templates/core/assets/index.ts
@@ -0,0 +1,3 @@
+import * as robots from './robots.txt'
+
+export { robots }
diff --git a/src/templates/core/assets/robots.txt b/src/templates/core/assets/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow:
diff --git a/src/utilities/read-config.ts b/src/utilities/read-config.ts
@@ -1,6 +1,7 @@
-import { map, catchError } from 'rxjs/operators'
+import { map, catchError, tap } from 'rxjs/operators'
 import { readFile_ } from './rx-fs'
 import * as favs from 'favicons'
+import { resolve } from 'path'
 
 const configPath = 'fusing-angular.json'
 
@@ -45,8 +46,8 @@ export interface FusingAngularConfig {
   readonly generatedMetaTags?: ReadonlyArray<string>
 }
 
-export default function readConfig_() {
-  return readFile_(configPath).pipe(
+export default function readConfig_(basePath = '') {
+  return readFile_(resolve(basePath, configPath)).pipe(
     map<Buffer, any>(file => JSON.parse(file.toString())),
     map<any, FusingAngularConfig>(obj => obj), // TODO: add validation handler here
     catchError(err => {
diff --git a/src/utilities/rx-favicon.ts b/src/utilities/rx-favicon.ts
@@ -13,18 +13,20 @@ function callback(config: FaviconConfig) {
   }
 }
 
-export function rxFavicons(config?: FaviconConfig) {
-  const _config = {
-    source:
-      (config && resolve(config.source)) || resolve('src/app/favicon.svg'),
-    configuration: {
-      path: '/assets/favicons',
-      ...(config && config.config)
-    }
-  } as any
-
-  return bindCallback(favs as any, callback(_config))(
-    _config.source,
-    _config.configuration
-  ) as Observable<favs.FavIconResponse>
+export function rxFavicons(baseDir = '.') {
+  return function(config?: FaviconConfig) {
+    const _config = {
+      source:
+        (config && resolve(baseDir, config.source)) ||
+        resolve(baseDir, 'src/app/favicon.svg'),
+      configuration: {
+        path: '/assets/favicons',
+        ...(config && config.config)
+      }
+    } as any
+    return bindCallback(favs as any, callback(_config))(
+      _config.source,
+      _config.configuration
+    ) as Observable<favs.FavIconResponse>
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import * as robots from './robots.txt'`
	`2`	`+`
	`3`	`+export { robots }`