Refreshed and improved, glitchless edition

README.md

@@ -38,6 +38,11 @@ Options:
   -d, --default-config, --default      Override update-node configuration
                                        default path                    [boolean]
   -c, --clean                          Run on a clean state            [boolean]
+      --sync-lock                      Run npm install or yarn after patching
+                                       package.json (default, disable with
+                                       --no-sync-lock) [boolean] [default: true]
+  -b, --pre-commit-bump-command        Command to run before to commit (changes
+                                       will be commited)                 [array]
   -p, --pre-clean-command              Run before to clean state         [array]
   -P, --post-clean-command             Run on a clean state              [array]
   -f, --force                          Git Push with force changes

package.json

@@ -52,13 +52,13 @@
     "semver": "^7.6.3",
     "split2": "^3.2.2",
     "through2": "^4.0.2",
-    "yaml": "^2.5.1",
+    "yaml": "^2.6.0",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
     "@coorpacademy/eslint-plugin-coorpacademy": "14.0.0",
     "ava": "^5.3.1",
-    "eslint": "^8.57.0",
+    "eslint": "^8.57.1",
     "nyc": "^17.1.0"
   }
 }

scripts/integration-test.sh

@@ -4,6 +4,7 @@ set -e
 echo "> Linking update-node"
 npm link
 echo
+export NVM_DIR="$(realpath "$(dirname "$0")/../test/integration")"
 
 cd test/integration
 if [ -d .git ]; then

src/bump-dependencies.js

@@ -15,14 +15,17 @@ const {
 } = require('./updatees/package');
 const updateDockerfile = require('./updatees/dockerfile');
 const {commitFiles, currentUser} = require('./core/git');
+const {executeScript} = require('./core/script');
 const {syncGithub} = require('./core/github');
 const {findLatest} = require('./core/node');
 const {makeError, formatEventualSuffix} = require('./core/utils');
 
+const LOAD_NVM = '. ${NVM_DIR:-$HOME/.nvm}/nvm.sh && nvm use'; // eslint-disable-line no-template-curly-in-string
+
 const bumpNodeVersion = async (latestNode, config) => {
   process.stdout.write(c.bold.blue(`\n\n⬆️  About to bump node version:\n`));
   const {exact, loose} = config.node;
-  const {scope} = config.argv;
+  const {scope, preCommitBumpCommand, syncLock} = config.argv;
   const nodeVersion = _.trimCharsStart('v', latestNode.version);
   await Promise.all([
     updateServerless(nodeVersion, config.node.serverless),
@@ -32,6 +35,13 @@ const bumpNodeVersion = async (latestNode, config) => {
     updateDockerfile(nodeVersion, config.node.dockerfile),
     config.lernaMonorepo && updateLearnaPackageEngines(nodeVersion, latestNode.npm, {exact, loose})
   ]);
+  // Post commands to synchronise the package-lock.json
+  if (syncLock)
+    await executeScript([
+      LOAD_NVM,
+      config.packageManager === 'npm' ? 'npm install' : 'yarn --ignore-engines --ignore-scripts'
+    ]);
+  if (!_.isEmpty(preCommitBumpCommand)) await executeScript([LOAD_NVM, ...preCommitBumpCommand]);
 
   const messageSuffix = formatEventualSuffix(config.argv.message);
 

src/bump-version.js

@@ -98,7 +98,7 @@ const main = async config => {
   if (!config.local)
     await pushFiles('master', config.token, config.repoSlug, {
       tags: true,
-      forceFlag: config.forceFlag
+      forceFlag: '--force'
     });
   process.stdout.write(c.bold.green(`Successfully made a ${releaseType} release\n`));
   if (autoBumpConfig.publish || autoBumpConfig['publish-command']) {
@@ -119,15 +119,12 @@ const main = async config => {
   if (autoBumpConfig['merge-branch']) {
     const branch = autoBumpConfig['merge-branch'];
     await executeScript([
-      `git config remote.gh.url >/dev/null || git remote add gh https://${config.token}@github.com/${config.repoSlug}.git`
-    ]);
-    await executeScript([
-      `git fetch gh && git checkout -B ${branch} gh/${branch} && git merge master`
-    ]);
-    await executeScript([
-      `git push gh ${branch}:refs/heads/${branch} || (git remote remove gh && exit 12)`
+      `git config remote.gh.url >/dev/null || git remote add gh https://${config.token}@github.com/${config.repoSlug}.git`,
+      `git fetch gh && git checkout -B ${branch} gh/${branch} && git merge master`,
+      `git push gh ${branch}:refs/heads/${branch} || (git remote remove gh && exit 12)`,
+      'git remote remove gh'
     ]);
-    await executeScript(['git remote remove gh']);
+
     process.stdout.write(c.bold.green(`Successfully merged branch ${branch}\n`));
   }
 };

src/index.js

@@ -129,6 +129,18 @@
     boolean: true,
     alias: 'c'
   })
+  .option('sync-lock', {
+    describe:
+      'Run npm install or yarn after patching package.json (default, disable with --no-sync-lock)',
+    boolean: true,
+    default: true
+  })
+  .option('pre-commit-bump-command', {
+    describe: 'Command to run before to commit (changes will be commited)',
+    string: true,
+    alias: 'b',
+    array: true
+  })
   .option('pre-clean-command', {
     describe: 'Run before to clean state',
     string: true,
@@ -203,7 +215,7 @@
     error.exitCode = 22;
     throw error;
   }
   // FIXME perform schema validation
   const mainArg =
     commandType === 'config'
       ? config || (await getConfig(argv)) // do not recompute config if already done

src/updatees/package.js

@@ -24,7 +24,7 @@
 const getSemverPrefix = _.pipe(s => s && s.match(/^(\D*)\d+/), _.at(1));
 
 const updatePackageEngines = async (node, npm, pkg, {exact = false, loose = true}) => {
   // TODO: maybe support forcing the choice of prefix (example, to restore loose range like >=)
   if (_.isArray(pkg)) return pMap(pkg, p => updatePackageEngines(node, npm, p, {exact, loose}));
 
   if (!pkg) return;
@@ -93,7 +93,7 @@
   process.stdout.write(`+ Updating dependencies lock with ${c.bold.yellow(packageManager)} 🔐 :\n`);
 
   await executeScript([
-    packageManager === 'npm' ? 'npm install' : 'yarn --ignore-engines --ignore-scripts ',
+    packageManager === 'npm' ? 'npm install' : 'yarn --ignore-engines --ignore-scripts',
     'echo "Updated Locks"'
   ]);
 };

test/integration/nvm.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+nvm () {
+    echo nope nope
+}