@leverege/build-tools 2.36.0 → 2.36.1

package/lib/server/firebaseDeploy.js

@@ -38,7 +38,11 @@ const INTERACTIVE_MODE = !TARGET;
 let exited = false;
 const SECRETS_DIR = 'secrets';
 const EXIT_EVENTS = ['SIGINT', 'exit', 'uncaughException', 'unhandledRejection'];
-const [firebaserc, firebaseJson, git] = 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(), '.git/HEAD'))]);
+const [firebaserc, firebaseJson, gitBranch] = await Promise.all([_zx.fs.exists(_zx.path.join(process.cwd(), '.firebaserc')), _zx.fs.exists(_zx.path.join(process.cwd(), 'firebase.json')), (0, _zx.$)`git rev-parse --abbrev-ref HEAD -C ${process.cwd()}`.then(({
+  stdout
+}) => {
+  return stdout.split('\n')[0];
+})]);
 if (!firebaserc) {
   console.log(_zx.chalk.red('No .firebaserc file found. Make sure that you are executing firebaseDeploy from within a firebase project directory.'));
 }
@@ -51,18 +55,6 @@ if (!firebaserc || !firebaseJson) {
 const firebasercContent = JSON.parse(await _zx.fs.readFile(_zx.path.join(process.cwd(), '.firebaserc'), {
   encoding: 'utf-8'
 }));
-
-// If in a git repo, fetch the name of the git branch to use as a default
-// name in case a deployment channel is needed. Examining this file directly
-// is less cumbersome then running an actual git command to fetch the
-// branch name
-let gitBranch;
-if (git) {
-  const gitContent = (await _zx.fs.readFile(_zx.path.join(process.cwd(), '.git/HEAD'), {
-    encoding: 'utf-8'
-  }))?.split('/');
-  gitBranch = gitContent[gitContent?.length - 1]?.trimEnd('\n');
-}
 let maxSiteIdLength = 0;
 const targets = Object.entries(firebasercContent.targets).reduce((prev, [projectId, config]) => {
   Object.entries(config.hosting).forEach(([siteId, aliases]) => {

package/lib/web/firebaseDeploy.js

@@ -38,7 +38,11 @@ const INTERACTIVE_MODE = !TARGET;
 let exited = false;
 const SECRETS_DIR = 'secrets';
 const EXIT_EVENTS = ['SIGINT', 'exit', 'uncaughException', 'unhandledRejection'];
-const [firebaserc, firebaseJson, git] = 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(), '.git/HEAD'))]);
+const [firebaserc, firebaseJson, gitBranch] = await Promise.all([_zx.fs.exists(_zx.path.join(process.cwd(), '.firebaserc')), _zx.fs.exists(_zx.path.join(process.cwd(), 'firebase.json')), (0, _zx.$)`git rev-parse --abbrev-ref HEAD -C ${process.cwd()}`.then(({
+  stdout
+}) => {
+  return stdout.split('\n')[0];
+})]);
 if (!firebaserc) {
   console.log(_zx.chalk.red('No .firebaserc file found. Make sure that you are executing firebaseDeploy from within a firebase project directory.'));
 }
@@ -51,18 +55,6 @@ if (!firebaserc || !firebaseJson) {
 const firebasercContent = JSON.parse(await _zx.fs.readFile(_zx.path.join(process.cwd(), '.firebaserc'), {
   encoding: 'utf-8'
 }));
-
-// If in a git repo, fetch the name of the git branch to use as a default
-// name in case a deployment channel is needed. Examining this file directly
-// is less cumbersome then running an actual git command to fetch the
-// branch name
-let gitBranch;
-if (git) {
-  const gitContent = (await _zx.fs.readFile(_zx.path.join(process.cwd(), '.git/HEAD'), {
-    encoding: 'utf-8'
-  }))?.split('/');
-  gitBranch = gitContent[gitContent?.length - 1]?.trimEnd('\n');
-}
 let maxSiteIdLength = 0;
 const targets = Object.entries(firebasercContent.targets).reduce((prev, [projectId, config]) => {
   Object.entries(config.hosting).forEach(([siteId, aliases]) => {

package/package.json

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

package/src/dockreate

@@ -392,7 +392,7 @@ rm -rf ./workspace && mkdir -p ./workspace
 cp -rfp ${PKGTOP}/package*json ${PKGTOP}/dist/* ./workspace
  
 # grab the npmrc token for the image
-cp -f "$HOME/.npmrc.ro" .npmrc
+cp -f "$HOME/.npmrc" .npmrc
 
 [ "$CIRCLECI" == "true" ] && exit 0
 

package/src/firebaseDeploy.mjs

@@ -42,11 +42,14 @@ const EXIT_EVENTS = [ 'SIGINT', 'exit', 'uncaughException', 'unhandledRejection'
 const [
   firebaserc,
   firebaseJson,
-  git
+  gitBranch
 ] = await Promise.all( [
   fs.exists( path.join( process.cwd(), '.firebaserc' ) ),
   fs.exists( path.join( process.cwd(), 'firebase.json' ) ),
-  fs.exists( path.join( process.cwd(), '.git/HEAD' ) )
+  $`git rev-parse --abbrev-ref HEAD -C ${process.cwd()}`
+    .then( ( { stdout } ) => {
+      return stdout.split( '\n' )[0]
+    } )
 ] )
 
 if ( !firebaserc ) {
@@ -63,16 +66,6 @@ if ( !firebaserc || !firebaseJson ) {
 
 const firebasercContent = JSON.parse( await fs.readFile( path.join( process.cwd(), '.firebaserc' ), { encoding : 'utf-8' } ) )
 
-// If in a git repo, fetch the name of the git branch to use as a default
-// name in case a deployment channel is needed. Examining this file directly
-// is less cumbersome then running an actual git command to fetch the
-// branch name
-let gitBranch
-if ( git ) {
-  const gitContent = ( await fs.readFile( path.join( process.cwd(), '.git/HEAD' ), { encoding : 'utf-8' } ) )?.split( '/' )
-  gitBranch = gitContent[gitContent?.length - 1]?.trimEnd( '\n' )
-}
-
 let maxSiteIdLength = 0
 
 const targets = Object