Feat/config path from package.json (#405)

feathersjs-ecosystem · Dec 29, 2018 · 5aed867 · 5aed867
1 parent edd8204
commit 5aed867
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/generators/app/configs/package.json.js b/generators/app/configs/package.json.js
@@ -2,6 +2,8 @@ const semver = require('semver');
 
 module.exports = function(generator) {
   const major = semver.major(process.version);
+  const envConfigDir = process.env['NODE_CONFIG_DIR'];
+  const configDirectory = envConfigDir ? p.join(envConfigDir) : 'config/';
   const { props } = generator;
   const lib = props.src;
   const [ packager, version ] = props.packager.split('@');
@@ -22,7 +24,8 @@ module.exports = function(generator) {
     bugs: {},
     directories: {
       lib,
-      test: 'test/'
+      test: 'test/',
+      config: configDirectory
     },
     engines: {
       node: `^${major}.0.0`,

diff --git a/generators/app/index.js b/generators/app/index.js
@@ -160,12 +160,12 @@ module.exports = class AppGenerator extends Generator {
     );
 
     this.fs.writeJSON(
-      this.destinationPath('config', 'default.json'),
+      this.destinationPath(this.configDirectory, 'default.json'),
       makeConfig.configDefault(this)
     );
 
     this.fs.writeJSON(
-      this.destinationPath('config', 'production.json'),
+      this.destinationPath(this.configDirectory, 'production.json'),
       makeConfig.configProduction(this)
     );
   }

diff --git a/generators/authentication/index.js b/generators/authentication/index.js
@@ -135,7 +135,7 @@ module.exports = class AuthGenerator extends Generator {
 
     this.conflicter.force = true;
     this.fs.writeJSON(
-      this.destinationPath('config', 'default.json'),
+      this.destinationPath(this.configDirectory, 'default.json'),
       config
     );
   }
@@ -167,7 +167,7 @@ module.exports = class AuthGenerator extends Generator {
         dependencies.push(`@feathersjs/authentication-${strategy}`);
       }
     });
-    
+
     if(!this.fs.exists(this.destinationPath(this.libDirectory, 'services', context.kebabEntity, `${context.kebabEntity}.service.js`))) {
       // Create the users service
       this.composeWith(require.resolve('../service'), {

diff --git a/generators/connection/index.js b/generators/connection/index.js
@@ -139,7 +139,7 @@ module.exports = class ConnectionGenerator extends Generator {
 
       this.conflicter.force = true;
       this.fs.writeJSON(
-        this.destinationPath('config', 'default.json'),
+        this.destinationPath(this.configDirectory, 'default.json'),
         config
       );
     }

diff --git a/lib/generator.js b/lib/generator.js
@@ -7,11 +7,9 @@ module.exports = class BaseGenerator extends Generator {
   constructor(args, opts) {
     super(args, opts);
 
-    const defaultConfig = this.destinationPath('config', 'default.json');
-
     this.generatorPkg = this.fs.readJSON(path.join(__dirname, '..', 'package.json'));
     this.pkg = this.fs.readJSON(this.destinationPath('package.json'), {});
-    this.defaultConfig = this.fs.readJSON(defaultConfig, {});
+    this.defaultConfig = this.fs.readJSON(this.destinationPath(this.configDirectory, 'default.json'), {});
     this.props = opts.props || {};
 
     if (!semver.satisfies(process.version, '>= 6.0.0')) {
@@ -52,9 +50,13 @@ module.exports = class BaseGenerator extends Generator {
   get testDirectory() {
     return (this.pkg.directories && this.pkg.directories.test) || 'test';
   }
+
+  get configDirectory () {
+    return (this.pkg.directories && this.pkg.directories.config) || 'config';
+  }
 
   _packagerInstall(deps, options) {
-    const packager = this.pkg.engines && this.pkg.engines.yarn ? 
+    const packager = this.pkg.engines && this.pkg.engines.yarn ?
       'yarn' : 'npm';
     const method = `${packager}Install`;
     const isDev = options.saveDev;