@leverege/build-tools 2.95.0 → 2.96.0-quinn.2

package/lib/web/unleash.js

@@ -0,0 +1,50 @@
+#!/usr/bin/env node
+"use strict";
+
+var _execa = _interopRequireDefault(require("execa"));
+var _simpleGit = _interopRequireDefault(require("simple-git"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const git = new _simpleGit.default();
+const getCurrentBranchName = async () => {
+  const branchInfo = await git.branch();
+
+  // first check to see if there are no branches - new repo?
+  if (Object.keys(branchInfo.branches).length === 0) {
+    return '';
+  }
+  return Object.entries(branchInfo.branches).find(([name, info]) => info.current)[0];
+};
+const isProtected = async () => {
+  const theBranch = await getCurrentBranchName();
+  const protectedBranches = ['main', 'master', 'development'];
+  const additionalProtectedBranches = [...process.argv.slice(2)];
+
+  // Check if the current branch starts with any of the additional
+  // protected branch name
+  let matchesAdditionalBranch = false;
+  for (let i = 0; i < additionalProtectedBranches.length; i++) {
+    matchesAdditionalBranch = matchesAdditionalBranch || theBranch.startsWith(additionalProtectedBranches[i]);
+  }
+  return protectedBranches.includes(theBranch) || matchesAdditionalBranch;
+};
+const npmRunner = async script => {
+  try {
+    const results = await (0, _execa.default)('npm', ['run', script], {
+      stdio: 'inherit'
+    });
+    return results;
+  } catch (err) {
+    process.exit(1);
+  }
+  return undefined;
+};
+(async () => {
+  if (await isProtected()) {
+    const script = ['test', 'lint'];
+    for (let i = 0; i < script.length; i++) {
+      await npmRunner(script[i]); // eslint-disable-line no-await-in-loop
+    }
+  } else {
+    process.exit(0);
+  }
+})();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.95.0",
+  "version": "2.96.0-quinn.2",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {

package/src/Utils.mjs

@@ -585,7 +585,7 @@ export const getRepositoryDescr = async () => {
   const helmChart = await parseHelmChart()
   const rootPackageJson = await parseJsonFile( `${gitRoot}/package.json` )
   const rootPyProjectToml = await parsePyProjectToml( `${gitRoot}/pyproject.toml` )
-  const isYarnProject = fs.existsSync( path.join( gitRoot, 'yarn.lock' ) ) || fs.existsSync( path.join( gitRoot, '.yarn' ) ) /* eslint-disable-line security/detect-non-literal-fs-filename */
+  const isYarnProject = getIsYarnProject( gitRoot )
 
   return {
     currentDir : process.cwd(),
@@ -730,3 +730,30 @@ export const analyzeRepository = async ( giveGuidance ) => {
     isYarnProject
   }
 }
+
+export function isDir( path ) {
+  // eslint-disable-next-line security/detect-non-literal-fs-filename
+  const exists = fs.existsSync( path )
+
+  // eslint-disable-next-line security/detect-non-literal-fs-filename
+  return exists && fs.statSync( path ).isDirectory()
+}
+
+export function getSecretsDir() {
+  let secretsDir
+  
+  if ( process.env.SECRETS_DIR ) {
+    secretsDir = process.env.SECRETS_DIR
+  } else if ( isDir( path.join( process.cwd(), 'env' ) ) ) {
+    secretsDir = 'env'
+  } else {
+    secretsDir = 'secrets'
+  }
+
+  return secretsDir
+}
+
+export function getIsYarnProject( gitRoot ) {
+  // eslint-disable-next-line security/detect-non-literal-fs-filename
+  return fs.existsSync( path.join( gitRoot, 'yarn.lock' ) ) || isDir( path.join( gitRoot, '.yarn' ) )
+}

package/src/firebaseDeploy.mjs

@@ -4,6 +4,8 @@
 import pkg from 'enquirer'
 import { $, fs, argv, path, chalk } from 'zx'
 
+import { getGitRootDirectory, getIsYarnProject, getSecretsDir } from './Utils.mjs'
+
 const { prompt } = pkg
 
 // This will preserve coloration from spawned child processes
@@ -34,8 +36,9 @@ const INTERACTIVE_MODE = !TARGET
 
 let exited = false
 
-const SECRETS_DIR = 'secrets'
+const SECRETS_DIR = await getSecretsDir()
 const EXIT_EVENTS = [ 'SIGINT', 'exit', 'uncaughException', 'unhandledRejection' ]
+const isYarnProject = getIsYarnProject( await getGitRootDirectory() )
 
 const [
   firebaserc,
@@ -211,7 +214,10 @@ try {
   const deployType = CHANNEL ? `hosting:channel:deploy ${CHANNEL.name} ${CHANNEL.expiration ? `--expires ${CHANNEL.expiration}` : ''}`.split( ' ' ) : 'deploy'
   const hostingPrefix = CHANNEL ? '' : 'hosting:'
 
-  await $( { ac } )`npm run clean && DOTENV_CONFIG_PATH=${path.join( process.cwd(), '.env.temp' )} DEPLOYMENT_TARGET=${TARGET.siteId} npm run build && firebase use ${TARGET.projectId} && firebase ${deployType} --only ${hostingPrefix}${TARGET.siteId}`
+  const cleanCommand = isYarnProject ? 'yarn clean' : 'npm run clean'
+  const buildCommand = isYarnProject ? 'yarn build' : 'npm run build'
+
+  await $( { ac } )`${cleanCommand} && DOTENV_CONFIG_PATH=${path.join( process.cwd(), '.env.temp' )} DEPLOYMENT_TARGET=${TARGET.siteId} ${buildCommand} && firebase use ${TARGET.projectId} && firebase ${deployType} --only ${hostingPrefix}${TARGET.siteId}`
 } catch ( err ) {
   console.error( err )
 }

package/src/firebaseServe.mjs

@@ -4,6 +4,8 @@
 import pkg from 'enquirer'
 import { $, fs, argv, path, chalk } from 'zx'
 
+import { getGitRootDirectory, getIsYarnProject, getSecretsDir } from './Utils.mjs'
+
 const { prompt } = pkg
 
 // This will preserve coloration from spawned child processes
@@ -13,9 +15,12 @@ process.env.FORCE_COLOR = '1'
 let TARGET = argv._[0]
 let exited = false
 
-const SECRETS_DIR = 'secrets'
 const EXIT_EVENTS = [ 'SIGINT', 'exit', 'uncaughtException', 'unhandledRejection' ]
 
+const SECRETS_DIR = await getSecretsDir()
+
+const isYarnProject = getIsYarnProject( await getGitRootDirectory() )
+
 const [
   firebaserc,
   firebaseJson,
@@ -142,7 +147,8 @@ EXIT_EVENTS
 await fs.writeFile( path.join( process.cwd(), '.env.temp' ), envFileContent )
 
 try {
-  await $( { ac } )`DOTENV_CONFIG_PATH=${path.join( process.cwd(), '.env.temp' )} DEPLOYMENT_TARGET=${TARGET.siteId} npm run serve --colors`
+  const serveCommand = isYarnProject ? 'yarn serve' : 'npm run serve'
+  await $( { ac } )`DOTENV_CONFIG_PATH=${path.join( process.cwd(), '.env.temp' )} DEPLOYMENT_TARGET=${TARGET.siteId} yarn serve --colors`
 } catch ( err ) {
   console.error( err )
 }