fix(traverseapp): looks in the different places for tsconfig.app.json (#282)

closes 279

Author: SanderElias

scully/routerPlugins/traverseAppRoutesPlugin.ts

@@ -1,7 +1,7 @@
 import {parseAngularRoutes} from 'guess-parser';
 import {join} from 'path';
 import * as yargs from 'yargs';
-import {scullyConfig, loadConfig} from '../utils/config';
+import {scullyConfig} from '../utils/config';
 import {existFolder} from '../utils/fsFolder';
 import {green, logError, logWarn, yellow} from '../utils/log';
 
@@ -18,7 +18,13 @@ export const traverseAppRoutes = async (appRootFolder = scullyConfig.projectRoot
       ? scullyConfig.guessParserOptions.excludedFiles
       : [];
   try {
-    const file = join(appRootFolder, 'tsconfig.app.json');
+    let file = join(appRootFolder, 'tsconfig.app.json');
+    if (!existFolder(file)) {
+      file = join(appRootFolder, '../tsconfig.app.json');
+    }
+    if (!existFolder(file)) {
+      file = join(appRootFolder, '../../tsconfig.app.json');
+    }
     if (!existFolder(file)) {
       logWarn(
         `We could not find "${yellow(

scully/scully.ts

@@ -5,7 +5,6 @@
  */
 import {readFileSync} from 'fs-extra';
 import {join} from 'path';
-import * as yargs from 'yargs';
 import './pluginManagement/systemPlugins';
 import {startBackgroundServer} from './startBackgroundServer';
 import {loadConfig} from './utils/config';
@@ -16,28 +15,11 @@ import {logError, logWarn, yellow} from './utils/log';
 import {startScully} from './utils/startup';
 import {waitForServerToBeAvailable} from './utils/waitForServerToBeAvailable';
 import {bootServe, isBuildThere, watchMode} from './watchMode';
+import {watch, removeStaticDist} from './utils/cli-options';
 
 /** the default of 10 is too shallow for generating pages. */
 require('events').defaultMaxListeners = 100;
 
-const {argv: options} = yargs.option('port', {
-  alias: 'p',
-  type: 'number',
-  description: 'The port to run on',
-});
-
-const {watch} = yargs
-  .boolean('wm')
-  .default('wm', false)
-  .alias('wm', 'watch')
-  .describe('wm', 'Use this flag for use the watch mode into scully').argv;
-
-const {removeStaticDist} = yargs
-  .boolean('RSD')
-  .default('RSD', false)
-  .alias('RSD', 'removeStaticDist')
-  .describe('RSD', 'Use this flag to remove the Scully outfolder before starting').argv;
-
 if (process.argv.includes('version')) {
   const {version} = JSON.parse(readFileSync(join(__dirname, './package.json')).toString());
   console.log('version:', version);

scully/utils/cli-options.ts

@@ -0,0 +1,19 @@
+import * as yargs from 'yargs';
+
+export const {watch} = yargs
+  .boolean('wm')
+  .default('wm', false)
+  .alias('wm', 'watch')
+  .describe('wm', 'Use this flag for use the watch mode into scully').argv;
+
+export const {removeStaticDist} = yargs
+  .boolean('RSD')
+  .default('RSD', false)
+  .alias('RSD', 'removeStaticDist')
+  .describe('RSD', 'Use this flag to remove the Scully outfolder before starting').argv;
+
+export const {argv: options} = yargs.option('port', {
+  alias: 'p',
+  type: 'number',
+  description: 'The port to run on',
+});

scully/utils/startup.ts

@@ -2,6 +2,8 @@ import {performance, PerformanceObserver, PerformanceObserverCallback} from 'per
 import {generateAll} from './defaultAction';
 import {log, yellow} from './log';
 import {performanceIds} from './performanceIds';
+import {watch} from './cli-options';
+import {scullyConfig} from './config';
 
 /**
  * Starts the entire process
@@ -49,6 +51,11 @@ Generating took ${yellow(Math.floor(seconds * 100) / 100)} seconds for ${yellow(
   Pulling in route-data took ${logSeconds(durations.Discovery)}
   Rendering the pages took ${logSeconds(durations.Render)}
 
+${
+  watch
+    ? `The server is available on "${yellow(`http://${scullyConfig.hostName}:${scullyConfig.staticport}/`)}"`
+    : ''
+}
 `);
   });
 };

scully/utils/staticServer.ts

@@ -30,7 +30,11 @@ export async function staticServer(port?: number) {
     scullyServer.get('/', (req, res) => res.sendFile(join(distFolder, '/index.html')));
 
     scullyServerInstance = scullyServer.listen(port, scullyConfig.hostName, x => {
-      log(`Scully static server started on "${yellow(`http://${scullyConfig.hostName}:${port}/`)}" `);
+      log(
+        `Scully static server started on "${yellow(
+          `http://${scullyConfig.hostName}:${scullyConfig.staticport}/`
+        )}"`
+      );
     });
 
     const angularDistServer = express();