ctl - npm Package Compare versions

Comparing version 2.0.2 to 2.0.3

package.json

@@ -7,3 +7,3 @@ {
   "name": "ctl",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "dependencies": {
@@ -10,0 +10,0 @@ "app-module-path": "^2.2.0",

src/plugins/config.js

@@ -13,5 +13,7 @@ const path = require('path');
     config.set(await settings(ctl));
+    ctl.stage(config.stage);
     log.info(`Config "${path.relative(process.cwd(), f)}" executed.`);
   } else if (settings) {
     config.set(settings);
+    ctl.stage(config.stage);
     log.info(`Config "${path.relative(process.cwd(), f)}" loaded.`);
@@ -22,6 +24,4 @@ }
 module.exports = async (ctl) => {
-  const { ENV = 'local', CONFIG = '', PORT = 8080 } = process.env;
-  const env = ENV.toLowerCase();
+  const { CONFIG = '', PORT = 8080 } = process.env;
   const log = ctl.log('config');
-  ctl.env = env;
   let overrides;
@@ -34,3 +34,3 @@ try {
   config.set({
-    env,
+    stage: ctl.stage(),
     server: {
@@ -46,11 +46,11 @@ port: PORT,
   await load(ctl, `${ctl.dirs.root}/defaults.js`);
-  await load(ctl, `${ctl.dirs.src}/library/defaults-${env}`);
-  await load(ctl, `${ctl.dirs.root}/defaults-${env}.json`);
-  await load(ctl, `${ctl.dirs.root}/defaults-${env}.js`);
+  await load(ctl, `${ctl.dirs.src}/library/defaults-${ctl.stage()}`);
+  await load(ctl, `${ctl.dirs.root}/defaults-${ctl.stage()}.json`);
+  await load(ctl, `${ctl.dirs.root}/defaults-${ctl.stage()}.js`);
   await load(ctl, `${ctl.dirs.src}/library/config`);
   await load(ctl, `${ctl.dirs.root}/config.json`);
   await load(ctl, `${ctl.dirs.root}/config.js`);
-  await load(ctl, `${ctl.dirs.src}/library/config-${env}`);
-  await load(ctl, `${ctl.dirs.root}/config-${env}.json`);
-  await load(ctl, `${ctl.dirs.root}/config-${env}.js`);
+  await load(ctl, `${ctl.dirs.src}/library/config-${ctl.stage()}`);
+  await load(ctl, `${ctl.dirs.root}/config-${ctl.stage()}.json`);
+  await load(ctl, `${ctl.dirs.root}/config-${ctl.stage()}.js`);
   if (overrides) {
@@ -60,3 +60,4 @@ config.set(overrides);
   }
+  log.info(`Loaded config for "${ctl.stage()}".`);
   return () => config;
 }

src/service.js

@@ -10,2 +10,3 @@ const mods = require('app-module-path');
   plugins: {
+    stage: require('./plugins/stage'),
     log: require('./plugins/log'),
@@ -12,0 +13,0 @@ config: require('./plugins/config'),

src/services/express.js

@@ -21,3 +21,3 @@ const http = require('http');
     express: app,
-    noCache: (config.env !== 'production'),
+    noCache: (ctl.stage !== 'production'),
   });
@@ -24,0 +24,0 @@

No alert changes

Improved metrics

Total package byte prevSize

68614

increased by0.54%

Number of package files

11

increased by10%

Lines of code

237

increased by4.87%

No dependency changes