fix: don't attempt to run validate from precommit unless it exists

Author: jrolfs

src/scripts/__tests__/__snapshots__/precommit.js.snap

@@ -1,25 +1,49 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`pre-commit calls lint-staged CLI with default args 1`] = `lint-staged --config ./src/config/lintstagedrc.js`;
-
-exports[`pre-commit calls lint-staged CLI with default args 2`] = `npm run validate`;
-
-exports[`pre-commit does not use built-in config with .lintstagedrc file 1`] = `lint-staged`;
-
-exports[`pre-commit does not use built-in config with .lintstagedrc file 2`] = `npm run validate`;
-
-exports[`pre-commit does not use built-in config with --config 1`] = `lint-staged --config ./custom-config.js`;
-
-exports[`pre-commit does not use built-in config with --config 2`] = `npm run validate`;
-
-exports[`pre-commit does not use built-in config with lint-staged pkg prop 1`] = `lint-staged`;
-
-exports[`pre-commit does not use built-in config with lint-staged pkg prop 2`] = `npm run validate`;
-
-exports[`pre-commit does not use built-in config with lint-staged.config.js file 1`] = `lint-staged`;
-
-exports[`pre-commit does not use built-in config with lint-staged.config.js file 2`] = `npm run validate`;
-
-exports[`pre-commit forwards args 1`] = `lint-staged --config ./src/config/lintstagedrc.js --verbose`;
-
-exports[`pre-commit forwards args 2`] = `npm run validate`;
+exports[`pre-commit calls lint-staged CLI with default args 1`] = `
+Array [
+  lint-staged --config ./src/config/lintstagedrc.js,
+  npm run validate,
+]
+`;
+
+exports[`pre-commit does not run validate script if it's not defined 1`] = `
+Array [
+  lint-staged --config ./src/config/lintstagedrc.js,
+]
+`;
+
+exports[`pre-commit does not use built-in config with .lintstagedrc file 1`] = `
+Array [
+  lint-staged ,
+  npm run validate,
+]
+`;
+
+exports[`pre-commit does not use built-in config with --config 1`] = `
+Array [
+  lint-staged --config ./custom-config.js,
+  npm run validate,
+]
+`;
+
+exports[`pre-commit does not use built-in config with lint-staged pkg prop 1`] = `
+Array [
+  lint-staged ,
+  npm run validate,
+]
+`;
+
+exports[`pre-commit does not use built-in config with lint-staged.config.js file 1`] = `
+Array [
+  lint-staged ,
+  npm run validate,
+]
+`;
+
+exports[`pre-commit forwards args 1`] = `
+Array [
+  lint-staged --config ./src/config/lintstagedrc.js --verbose,
+  npm run validate,
+]
+`;

src/scripts/__tests__/precommit.js

@@ -11,6 +11,7 @@ cases(
     utils = require('../../utils'),
     hasPkgProp = () => false,
     hasFile = () => false,
+    ifScript = () => true,
   }) => {
     // beforeEach
     const {sync: crossSpawnSyncMock} = require('cross-spawn')
@@ -19,6 +20,7 @@ cases(
     Object.assign(utils, {
       hasPkgProp,
       hasFile,
+      ifScript,
       resolveBin: (modName, {executable = modName} = {}) => executable,
     })
     process.exit = jest.fn()
@@ -28,12 +30,10 @@ cases(
     try {
       // tests
       require('../pre-commit')
-      expect(crossSpawnSyncMock).toHaveBeenCalledTimes(2)
-      const [firstCall, secondCall] = crossSpawnSyncMock.mock.calls
-      const [scriptOne, calledArgsOne] = firstCall
-      expect([scriptOne, ...calledArgsOne].join(' ')).toMatchSnapshot()
-      const [scriptTwo, calledArgsTwo] = secondCall
-      expect([scriptTwo, ...calledArgsTwo].join(' ')).toMatchSnapshot()
+      const commands = crossSpawnSyncMock.mock.calls.map(
+        call => `${call[0]} ${call[1].join(' ')}`,
+      )
+      expect(commands).toMatchSnapshot()
     } catch (error) {
       throw error
     } finally {
@@ -60,5 +60,8 @@ cases(
     'forwards args': {
       args: ['--verbose'],
     },
+    [`does not run validate script if it's not defined`]: {
+      ifScript: () => false,
+    },
   },
 )

src/scripts/pre-commit.js

@@ -1,6 +1,6 @@
 const path = require('path')
 const spawn = require('cross-spawn')
-const {hasPkgProp, hasFile, resolveBin} = require('../utils')
+const {hasPkgProp, hasFile, ifScript, resolveBin} = require('../utils')
 
 const here = p => path.join(__dirname, p)
 const hereRelative = p => here(p).replace(process.cwd(), '.')
@@ -23,7 +23,7 @@ const lintStagedResult = spawn.sync(
   {stdio: 'inherit'},
 )
 
-if (lintStagedResult.status === 0) {
+if (lintStagedResult.status === 0 && ifScript('validate')) {
   const validateResult = spawn.sync('npm', ['run', 'validate'], {
     stdio: 'inherit',
   })