@leverege/build-tools 2.21.7 → 2.21.8

package/lib/server/build-tools.js

@@ -2,22 +2,17 @@
 "use strict";
 
 const chalk = require('chalk');
-
 const cliArgs = require('command-line-args');
-
 const cliHelp = require('command-line-usage');
-
 const fs = require('fs');
-
 const npmRegistryFetch = require('npm-registry-fetch');
-
 const path = require('path');
-
 const semverLt = require('semver/functions/lt');
-/* eslint-disable no-console */
 
+/* eslint-disable no-console */
 
-const optionList = [// Use optionList to tie into the Usage statements
+const optionList = [
+// Use optionList to tie into the Usage statements
 {
   name: 'root',
   type: Boolean,
@@ -63,46 +58,36 @@ const args = cliArgs(optionList, {
 });
 const help = cliHelp(sections);
 const repoRoot = path.dirname(__dirname);
-
 const thisPackage = require(`${repoRoot}/package.json`);
-
 const thisVersion = thisPackage.version;
-
 if (args.root) {
   console.log(repoRoot);
   process.exit(0);
 }
-
 if (args.bashfun) {
   console.log(`${repoRoot}/src/bash-funcs`);
   process.exit(0);
 }
-
 const checkForLatest = async (pkg = '@leverege/build-tools') => {
   const getToken = () => {
     const tokenFile = `${process.env.HOME}/.npmrc`;
-
     if (!fs.existsSync(tokenFile)) {
       console.error(`Cannot find token file ${tokenFile}`);
       process.exit(1);
     }
-
     try {
       const tokenLine = fs.readFileSync(tokenFile).toString();
       const tokenRegX = new RegExp('.*registry.npmjs.org\\/:\\w+=+(.*)');
       const tokenStr = tokenLine.match(tokenRegX);
-
       if (!tokenStr) {
         console.error(`\n***ERROR: malformed npm token in ${tokenFile}\n`);
         process.exit(1);
       }
-
       return tokenLine.match(tokenRegX)[1];
     } catch (err) {
       console.error(err);
     }
   };
-
   try {
     const list = await npmRegistryFetch.json(pkg, {
       '//registry.npmjs.org/:_authToken': getToken()
@@ -112,7 +97,6 @@ const checkForLatest = async (pkg = '@leverege/build-tools') => {
     console.log(err);
   }
 };
-
 const checkAndAnnounce = () => {
   checkForLatest().then(latestVersion => {
     if (semverLt(thisVersion, latestVersion)) {
@@ -126,23 +110,19 @@ const checkAndAnnounce = () => {
     }
   }).catch(err => {});
 };
-
 if (args.latest) {
   checkAndAnnounce();
 }
-
 if (args.version) {
   console.log(`build-tools version ${thisVersion}`);
   checkAndAnnounce();
 }
-
 if (args.help) {
   console.log(help);
   process.exit(0);
 }
-/* eslint-disable no-underscore-dangle */
-
 
+/* eslint-disable no-underscore-dangle */
 if (args._unknown) {
   console.log(`\nUnrecognized argument [${args._unknown}] try --help\n`);
   process.exit(1);

package/lib/server/firebaseDeploy.js

@@ -1,19 +1,16 @@
 #!/usr/bin/env node
 // https://github.com/google/zx
-
 /* eslint-disable max-len */
 "use strict";
 
 var _enquirer = _interopRequireDefault(require("enquirer"));
-
 var _zx = require("zx");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const {
   prompt
-} = _enquirer.default; // This will preserve coloration from spawned child processes
+} = _enquirer.default;
 
+// This will preserve coloration from spawned child processes
 process.env.FORCE_COLORS = 3;
 process.env.FORCE_COLOR = '1';
 let TARGET = _zx.argv._[0];
@@ -21,19 +18,15 @@ let exited = false;
 const SECRETS_DIR = 'secrets';
 const EXIT_EVENTS = ['SIGINT', 'exit', 'uncaughException', 'unhandledRejection'];
 const [firebaserc, firebaseJson] = await Promise.all([_zx.fs.exists(_zx.path.join(process.cwd(), '.firebaserc')), _zx.fs.exists(_zx.path.join(process.cwd(), 'firebase.json'))]);
-
 if (!firebaserc) {
   console.log(_zx.chalk.red('No .firebaserc file found. Make sure that you are executing firebaseDeploy from within a firebase project directory.'));
 }
-
 if (!firebaseJson) {
   console.log(_zx.chalk.red('No firebase.json file found. Make sure that you are executing firebaseDeploy from within a firebase project directory.'));
 }
-
 if (!firebaserc || !firebaseJson) {
   process.exit();
 }
-
 const firebasercContent = JSON.parse(await _zx.fs.readFile(_zx.path.join(process.cwd(), '.firebaserc'), {
   encoding: 'utf-8'
 }));
@@ -49,7 +42,6 @@ const targets = Object.entries(firebasercContent.targets).reduce((prev, [project
   });
   return prev;
 }, {});
-
 if (!TARGET) {
   const {
     targetEnv
@@ -66,27 +58,21 @@ if (!TARGET) {
 } else {
   TARGET = targets[TARGET];
 }
-
 if (!TARGET) {
   console.log(_zx.chalk.red('No such target exists in .firebaserc config.'));
   process.exit();
 }
-
 const [aliasFileExists, siteIdFileExists, sharedFileExists] = await Promise.all([_zx.fs.exists(_zx.path.join(process.cwd(), SECRETS_DIR, `${TARGET.alias}.env`)), _zx.fs.exists(_zx.path.join(process.cwd(), SECRETS_DIR, `${TARGET.siteId}.env`)), _zx.fs.exists(_zx.path.join(process.cwd(), SECRETS_DIR, 'shared.env'))]);
-
 if (!aliasFileExists && !siteIdFileExists) {
   console.log(_zx.chalk.red(`No env file for ${TARGET.alias} exists. Check your secrets directory and try again`));
   process.exit();
 }
-
 const exec = [];
-
 if (sharedFileExists) {
   exec.push(_zx.fs.readFile(_zx.path.join(process.cwd(), SECRETS_DIR, 'shared.env'), {
     encoding: 'utf-8'
   }));
 }
-
 if (aliasFileExists) {
   exec.push(_zx.fs.readFile(_zx.path.join(process.cwd(), SECRETS_DIR, `${TARGET.alias}.env`), {
     encoding: 'utf-8'
@@ -96,19 +82,16 @@ if (aliasFileExists) {
     encoding: 'utf-8'
   }));
 }
-
 const envFileContent = (await Promise.all(exec)).join('\n');
 EXIT_EVENTS.forEach(event => {
   process.on(event, () => {
     if (!exited) {
       exited = true;
-
       _zx.fs.removeSync(_zx.path.join(process.cwd(), '.env.temp'));
     }
   });
 });
 await _zx.fs.writeFile(_zx.path.join(process.cwd(), '.env.temp'), envFileContent);
-
 try {
   await (0, _zx.$)`npm run clean && DOTENV_CONFIG_PATH=${_zx.path.join(process.cwd(), '.env.temp')} npm run build && firebase use ${TARGET.projectId} && firebase deploy --only hosting:${TARGET.siteId}`;
 } catch (err) {

package/lib/server/firebaseServe.js

@@ -1,19 +1,16 @@
 #!/usr/bin/env node
 // https://github.com/google/zx
-
 /* eslint-disable max-len */
 "use strict";
 
 var _enquirer = _interopRequireDefault(require("enquirer"));
-
 var _zx = require("zx");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const {
   prompt
-} = _enquirer.default; // This will preserve coloration from spawned child processes
+} = _enquirer.default;
 
+// This will preserve coloration from spawned child processes
 process.env.FORCE_COLORS = 3;
 process.env.FORCE_COLOR = '1';
 let TARGET = _zx.argv._[0];
@@ -21,35 +18,29 @@ let exited = false;
 const SECRETS_DIR = 'secrets';
 const EXIT_EVENTS = ['SIGINT', 'exit', 'uncaughtException', 'unhandledRejection'];
 const [firebaserc, firebaseJson, hasLocalConfig] = await Promise.all([_zx.fs.exists(_zx.path.join(process.cwd(), '.firebaserc')), _zx.fs.exists(_zx.path.join(process.cwd(), 'firebase.json')), _zx.fs.exists(_zx.path.join(process.cwd(), SECRETS_DIR, 'local.env'))]);
-
 if (!hasLocalConfig) {
   if (!firebaserc) {
     console.log(_zx.chalk.red('No .firebaserc file found. Make sure that you are executing firebaseDeploy from within a firebase project directory.'));
   }
-
   if (!firebaseJson) {
     console.log(_zx.chalk.red('No firebase.json file found. Make sure that you are executing firebaseDeploy from within a firebase project directory.'));
   }
-
   if (!firebaserc || !firebaseJson) {
     process.exit();
   }
 }
-
 const firebasercContent = firebaserc ? JSON.parse(await _zx.fs.readFile(_zx.path.join(process.cwd(), '.firebaserc'), {
   encoding: 'utf-8'
 })) : {
   targets: {}
 };
 const defaultTargets = {};
-
 if (hasLocalConfig) {
   defaultTargets.local = {
     siteId: 'local',
     alias: 'local'
   };
 }
-
 const targets = Object.entries(firebasercContent.targets).reduce((prev, [projectId, config]) => {
   Object.entries(config.hosting).forEach(([siteId, aliases]) => {
     aliases.forEach(alias => {
@@ -62,14 +53,12 @@ const targets = Object.entries(firebasercContent.targets).reduce((prev, [project
   });
   return prev;
 }, defaultTargets);
-
 if (!TARGET) {
   const choices = Object.keys(targets).map(t => ({
     name: t,
     value: t
   }));
   let targetEnv;
-
   if (choices.length > 1) {
     const res = await prompt({
       type: 'autocomplete',
@@ -81,32 +70,25 @@ if (!TARGET) {
   } else {
     targetEnv = choices[0].value;
   }
-
   TARGET = targets[targetEnv];
 } else {
   TARGET = targets[TARGET];
 }
-
 if (!TARGET) {
   console.log(_zx.chalk.red('No such target exists in .firebaserc config.'));
   process.exit();
 }
-
 const [aliasFileExists, siteIdFileExists, sharedFileExists] = await Promise.all([_zx.fs.exists(_zx.path.join(process.cwd(), SECRETS_DIR, `${TARGET.alias}.env`)), _zx.fs.exists(_zx.path.join(process.cwd(), SECRETS_DIR, `${TARGET.siteId}.env`)), _zx.fs.exists(_zx.path.join(process.cwd(), SECRETS_DIR, 'shared.env'))]);
-
 if (!aliasFileExists && !siteIdFileExists) {
   console.log(_zx.chalk.red(`No env file for ${TARGET.alias} exists. Check your secrets directory and try again`));
   process.exit();
 }
-
 const exec = [];
-
 if (sharedFileExists) {
   exec.push(_zx.fs.readFile(_zx.path.join(process.cwd(), SECRETS_DIR, 'shared.env'), {
     encoding: 'utf-8'
   }));
 }
-
 if (aliasFileExists) {
   exec.push(_zx.fs.readFile(_zx.path.join(process.cwd(), SECRETS_DIR, `${TARGET.alias}.env`), {
     encoding: 'utf-8'
@@ -116,19 +98,16 @@ if (aliasFileExists) {
     encoding: 'utf-8'
   }));
 }
-
 const envFileContent = (await Promise.all(exec)).join('\n');
 EXIT_EVENTS.forEach(event => {
   process.on(event, () => {
     if (!exited) {
       exited = true;
-
       _zx.fs.removeSync(_zx.path.join(process.cwd(), '.env.temp'));
     }
   });
 });
 await _zx.fs.writeFile(_zx.path.join(process.cwd(), '.env.temp'), envFileContent);
-
 try {
   await (0, _zx.$)`DOTENV_CONFIG_PATH=${_zx.path.join(process.cwd(), '.env.temp')} npm run serve --colors`;
 } catch (err) {

package/lib/server/getfbcfg.js

@@ -6,8 +6,8 @@
 "use strict";
 
 const stdbuf = [];
-/* eslint-disable no-console */
 
+/* eslint-disable no-console */
 process.stdin.on('data', d => {
   stdbuf.push(d);
 }).on('end', () => {
@@ -15,11 +15,9 @@ process.stdin.on('data', d => {
   const keyVals = rawCfg.match(/\{(.*)\}/)[1].split(',');
   const lastLine = keyVals.length - 1;
   console.log('{');
-
   for (let i = 0; i <= lastLine; i++) {
     const kv = keyVals[i].trim().split(' ');
     console.log(`  "${kv[0].replace(/:/, '')}": "${kv[1]}"${i < lastLine ? ',' : ''}`);
   }
-
   console.log('}');
 }).setEncoding('utf8');

package/lib/server/getjson.js

@@ -21,14 +21,12 @@
 "use strict";
 
 const fs = require('fs');
-
 const cliArgs = require('command-line-args');
-
 const cliHelp = require('command-line-usage');
-/* eslint-disable no-console */
-
 
-const optionList = [// Use optionList to tie into the Usage statements
+/* eslint-disable no-console */
+const optionList = [
+// Use optionList to tie into the Usage statements
 {
   name: 'file',
   type: String,
@@ -57,13 +55,11 @@ const args = cliArgs(optionList, {
   partial: true
 });
 const help = cliHelp(sections);
-
 if (!args.file) {
   console.error('\n***ERROR: Missing a --file param\n');
   console.log(help);
   process.exit(1);
 }
-
 try {
   const json = JSON.parse(fs.readFileSync(args.file, 'utf8'));
   const value = json[args.key];

package/lib/server/npm-scripts/postinstall.js

@@ -2,9 +2,7 @@
 "use strict";
 
 const execa = require('execa');
-
 const fs = require('fs');
-
 const untarConfigTarball = async (subdir, tarball) => {
   if (fs.existsSync(subdir)) {
     process.chdir(subdir);
@@ -12,9 +10,7 @@ const untarConfigTarball = async (subdir, tarball) => {
     await execa('tar', ['xf', tarball]);
   }
 };
-
 const awaiter = async (subdir, tarball) => {
   await untarConfigTarball(subdir, tarball);
 };
-
 awaiter('lib/server/repo-init', 'config.tgz');