@leverege/build-tools 2.91.0 → 2.92.0

package/package.json

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

package/src/prepack.mjs

@@ -8,13 +8,14 @@ import { $, fs, minimist, chalk } from 'zx'
 
 process.env.FORCE_COLOR = '1'
 
-const { compile, 'manual-tag' : manualTag, 'force-tag' : forceTag } = minimist( process.argv.slice( 2 ), {
+const { compile, 'manual-tag' : manualTag, 'force-tag' : forceTag, 'push-tag' : pushTag } = minimist( process.argv.slice( 2 ), {
   default : {
     compile : true,
     'force-tag' : false,
-    'manual-tag' : false
+    'manual-tag' : false,
+    'push-tag' : true
   },
-  boolean : [ 'compile', 'manual-tag', 'forceTag' ]
+  boolean : [ 'compile', 'manual-tag', 'force-tag', 'push-tag' ]
 } )
 
 try {
@@ -60,6 +61,18 @@ if ( !isPrerelease || forceTag ) {
     process.stderr.write( error.text() )
     process.exit( error.exitCode )
   }
+
+  if ( pushTag ) {
+    try {
+      await $( {
+        quiet : true
+      } )`git push --tags`
+    } catch ( error ) {
+      process.stderr.write( chalk.redBright( 'Failed to push git tag with error:\n' ) )
+      process.stderr.write( error.text() )
+      process.exit( error.exitCode )
+    }
+  }
 }
 
 function compileCmd( { isYarn } ) {

package/src/refresh-npm-token.mjs

@@ -25,9 +25,13 @@ import commandLineArgs from 'command-line-args'
 import commandLineUsage from 'command-line-usage'
 import ms from 'ms'
 import { lt as semverLt } from 'semver'
+import YAML from 'js-yaml'
 
 import { debug, log, shellCmd } from './Utils.mjs'
 
+const AUTH_TOKEN_REGEX = /_authToken=(.+)/
+const YARNRC_FILE_NAME = `${os.homedir()}/.yarnrc.yml`
+
 const refreshTokenOptions = [ // Use refreshTokenOptions to tie into the Usage statements
   {
     name : 'project',
@@ -59,6 +63,12 @@ const refreshTokenOptions = [ // Use refreshTokenOptions to tie into the Usage s
     default : false,
     description : '{green display this help screen}',
   },
+  {
+    name : 'update-yarnrc',
+    type : Boolean,
+    defaultValue : true,
+    description : '{green updates the npmAuthToken variable of your .yarnrc.yml file (in addition to .npmrc/.npmrc.ro)}'
+  }
 ]
 
 const sections = [
@@ -195,11 +205,14 @@ const getGcpSecretCommand = ( secretName ) => {
 
 // fetch the contents of the npmrc secret file stored on the specified project
 let npmrcFile
+let npmAuthToken
 try {
   const npmTokenFetcher = getGcpSecretCommand( 'REFRESH_NPM_NPMRC' )
   debug( { npmTokenFetcher }, '<==Secret Fetcher' )
 
   npmrcFile = await shellCmd( npmTokenFetcher )
+  npmAuthToken = npmrcFile.match( AUTH_TOKEN_REGEX )?.[1]
+  debug( { npmAuthToken }, '<==npmAuthToken' )
   debug( { npmrcFile }, '<==shellCmd Output npmrc file' )// debug
 } catch ( err ) {
   log( chalk.yellow( `\nFailed Command => [${err.escapedCommand}]\n\n` ), chalk.red( err.stderr ) )
@@ -234,6 +247,18 @@ try {
       fs.copyFileSync( filename, `${filename}-BAK` ) // make a backup for safety
     }
     fs.writeFileSync( filename, npmrcFile )
+
+    if ( args.updateYarnrc && npmAuthToken ) {
+      let yarnRcContent = { nodeLinker : 'node-modules' }
+      if ( fs.existsSync( YARNRC_FILE_NAME ) ) {
+        fs.copyFileSync( YARNRC_FILE_NAME, `${YARNRC_FILE_NAME}-BAK` )
+        yarnRcContent = YAML.load( fs.readFileSync( YARNRC_FILE_NAME, 'utf-8' ) )
+        debug( { yarnRcContent }, '<==yarnrc content' )
+        yarnRcContent.npmAuthToken = npmAuthToken
+      }
+
+      fs.writeFileSync( YARNRC_FILE_NAME, YAML.dump( yarnRcContent ) )
+    }
   }
 } catch ( fileErr ) {
   log( fileErr, 'fs failed' )