Merge pull request mgechev#894 from brian428/feature/850

Add initial code to support NPM plugin module configuration lookups; …

Author: mgechev

package.json

@@ -45,6 +45,7 @@
     "connect-history-api-fallback": "^1.2.0",
     "connect-livereload": "^0.5.3",
     "cssnano": "^3.5.2",
+    "deep-extend": "^0.4.1",
     "doiuse": "^2.3.0",
     "event-stream": "^3.3.2",
     "express": "~4.13.4",

tools/config/project.config.ts

@@ -22,5 +22,9 @@ export class ProjectConfig extends SeedConfig {
     const seedDependencies = this.NPM_DEPENDENCIES;
 
     this.NPM_DEPENDENCIES = seedDependencies.concat(additional_deps);
+
+    /* Add to or override NPM module configurations: */
+    //this.mergeObject( this.PLUGIN_CONFIGS['browser-sync'], { ghostMode: false } );
+
   }
 }

tools/config/seed.config.ts

@@ -379,27 +379,54 @@ export class SeedConfig {
   ];
 
   /**
-   * The BrowserSync configuration of the application.
-   * The default open behavior is to open the browser. To prevent the browser from opening use the `--b`  flag when
-   * running `npm start` (tested with serve.dev).
-   * Example: `npm start -- --b`
-   * @type {any}
-   */
-  BROWSER_SYNC_CONFIG: any = {
-    middleware: [require('connect-history-api-fallback')({ index: `${this.APP_BASE}index.html` })],
-    port: this.PORT,
-    startPath: this.APP_BASE,
-    open: argv['b'] ? false : true,
-    server: {
-      baseDir: `${this.DIST_DIR}/empty/`,
-      routes: {
-        [`${this.APP_BASE}${this.APP_DEST}`]: this.APP_DEST,
-        [`${this.APP_BASE}node_modules`]: 'node_modules',
-        [`${this.APP_BASE.replace(/\/$/, '')}`]: this.APP_DEST
+   * Configurations for NPM module configurations. Add to or override in project.config.ts.
+   * If you like, use the mergeObject() method to assist with this.
+   */
+  PLUGIN_CONFIGS: any = {
+    /**
+     * The BrowserSync configuration of the application.
+     * The default open behavior is to open the browser. To prevent the browser from opening use the `--b`  flag when
+     * running `npm start` (tested with serve.dev).
+     * Example: `npm start -- --b`
+     * @type {any}
+     */
+    'browser-sync': {
+      middleware: [require('connect-history-api-fallback')({ index: `${this.APP_BASE}index.html` })],
+      port: this.PORT,
+      startPath: this.APP_BASE,
+      open: argv['b'] ? false : true,
+      server: {
+        baseDir: `${this.DIST_DIR}/empty/`,
+        routes: {
+          [`${this.APP_BASE}${this.APP_DEST}`]: this.APP_DEST,
+          [`${this.APP_BASE}node_modules`]: 'node_modules',
+          [`${this.APP_BASE.replace(/\/$/, '')}`]: this.APP_DEST
+        }
       }
     }
   };
 
+  /**
+   * Recursively merge source onto target.
+   * @param {any} target The target object (to receive values from source)
+   * @param {any} source The source object (to be merged onto target)
+   */
+  mergeObject(target: any, source: any) {
+    const deepExtend = require('deep-extend');
+    deepExtend(target, source);
+  }
+
+  /**
+   * Locate a plugin configuration object by plugin key.
+   * @param {any} pluginKey The object key to look up in PLUGIN_CONFIGS.
+   */
+  getPluginConfig(pluginKey: string): any {
+    if (this.PLUGIN_CONFIGS[ pluginKey ]) {
+      return this.PLUGIN_CONFIGS[pluginKey];
+    }
+    return null;
+  }
+
 }
 
 /**

tools/tasks/seed/build.html_css.ts

@@ -5,7 +5,7 @@ import * as gulpLoadPlugins from 'gulp-load-plugins';
 import * as merge from 'merge-stream';
 import { join } from 'path';
 
-import { APP_DEST, APP_SRC, BROWSER_LIST, CSS_DEST, CSS_PROD_BUNDLE, DEPENDENCIES, ENV, TMP_DIR } from '../../config';
+import { APP_DEST, APP_SRC, BROWSER_LIST, CSS_DEST, CSS_PROD_BUNDLE, DEPENDENCIES, ENV, getPluginConfig, TMP_DIR } from '../../config';
 
 const plugins = <any>gulpLoadPlugins();
 const cleanCss = require('gulp-clean-css');
@@ -57,7 +57,7 @@ function processExternalCss() {
   return gulp.src(getExternalCss().map(r => r.src))
     .pipe(isProd ? plugins.cached('process-external-css') : plugins.util.noop())
     .pipe(plugins.postcss(processors))
-    .pipe(isProd ? plugins.concatCss(CSS_PROD_BUNDLE) : plugins.util.noop())
+    .pipe(isProd ? plugins.concatCss(CSS_PROD_BUNDLE, getPluginConfig('gulp-concat-css')) : plugins.util.noop())
     .pipe(isProd ? cleanCss() : plugins.util.noop())
     .pipe(gulp.dest(CSS_DEST));
 }

tools/utils/seed/code_change_tools.ts

@@ -1,13 +1,13 @@
 import * as browserSync from 'browser-sync';
 import * as path from 'path';
 
-import { BROWSER_SYNC_CONFIG } from '../../config';
+import { getPluginConfig } from '../../config';
 
 /**
  * Initialises BrowserSync with the configuration defined in seed.config.ts (or if overriden: project.config.ts).
  */
 let runServer = () => {
-  browserSync.init(BROWSER_SYNC_CONFIG);
+  browserSync.init(getPluginConfig('browser-sync'));
 };
 
 /**