diff --git a/src/run-script.js b/src/run-script.js index 9cf4de1f..43769ba1 100755 --- a/src/run-script.js +++ b/src/run-script.js @@ -47,7 +47,7 @@ function getEnv() { return envCopy }, { - [`SCRIPTS_${script.toUpperCase()}`]: true, + [`SCRIPTS_${script.toUpperCase().replace(/-/g, '_')}`]: true, }, ) } diff --git a/src/scripts/__tests__/__snapshots__/test.js.snap b/src/scripts/__tests__/__snapshots__/test.js.snap index ce378b88..bf955799 100644 --- a/src/scripts/__tests__/__snapshots__/test.js.snap +++ b/src/scripts/__tests__/__snapshots__/test.js.snap @@ -6,7 +6,7 @@ exports[`test does not watch --updateSnapshot 1`] = `--config {"builtInConfig":t exports[`test does not watch on CI 1`] = `--config {"builtInConfig":true}`; -exports[`test does not watch on SCRIPTS_PRE-COMMIT 1`] = `--config {"builtInConfig":true}`; +exports[`test does not watch on SCRIPTS_PRE_COMMIT 1`] = `--config {"builtInConfig":true}`; exports[`test does not watch with --coverage 1`] = `--config {"builtInConfig":true} --coverage`; diff --git a/src/scripts/__tests__/test.js b/src/scripts/__tests__/test.js index 3069a317..8f763795 100644 --- a/src/scripts/__tests__/test.js +++ b/src/scripts/__tests__/test.js @@ -24,9 +24,9 @@ cases( const {run: jestRunMock} = require('jest') const originalArgv = process.argv const prevCI = mockIsCI - const prevPreCommit = process.env['SCRIPTS_PRE-COMMIT'] + const prevPreCommit = process.env.SCRIPTS_PRE_COMMIT mockIsCI = ci - process.env['SCRIPTS_PRE-COMMIT'] = preCommit + process.env.SCRIPTS_PRE_COMMIT = preCommit Object.assign(utils, { hasPkgProp: () => pkgHasJestProp, hasFile: () => hasJestConfigFile, @@ -50,7 +50,7 @@ cases( // afterEach process.argv = originalArgv mockIsCI = prevCI - process.env['SCRIPTS_PRE-COMMIT'] = prevPreCommit + process.env.SCRIPTS_PRE_COMMIT = prevPreCommit jest.resetModules() } }, @@ -59,7 +59,7 @@ cases( 'does not watch on CI': { ci: true, }, - 'does not watch on SCRIPTS_PRE-COMMIT': { + 'does not watch on SCRIPTS_PRE_COMMIT': { preCommit: 'true', }, 'does not watch with --no-watch': { diff --git a/src/scripts/__tests__/validate.js b/src/scripts/__tests__/validate.js index b0eed6ed..6a6b4909 100644 --- a/src/scripts/__tests__/validate.js +++ b/src/scripts/__tests__/validate.js @@ -10,7 +10,7 @@ cases( const {sync: crossSpawnSyncMock} = require('cross-spawn') const originalExit = process.exit process.exit = jest.fn() - process.env['SCRIPTS_PRE-COMMIT'] = 'false' + process.env.SCRIPTS_PRE_COMMIT = 'false' const teardown = setup() try { @@ -50,10 +50,10 @@ cases( }, [`doesn't use test or lint if it's in pre-commit`]: { setup: withDefaultSetup(() => { - const previousVal = process.env['SCRIPTS_PRE-COMMIT'] - process.env['SCRIPTS_PRE-COMMIT'] = 'true' + const previousVal = process.env.SCRIPTS_PRE_COMMIT + process.env.SCRIPTS_PRE_COMMIT = 'true' return function teardown() { - process.env['SCRIPTS_PRE-COMMIT'] = previousVal + process.env.SCRIPTS_PRE_COMMIT = previousVal } }), }, diff --git a/src/scripts/test.js b/src/scripts/test.js index 106a2d09..e3204843 100644 --- a/src/scripts/test.js +++ b/src/scripts/test.js @@ -8,7 +8,7 @@ const args = process.argv.slice(2) const watch = !isCI && - !parseEnv('SCRIPTS_PRE-COMMIT', false) && + !parseEnv('SCRIPTS_PRE_COMMIT', false) && !args.includes('--no-watch') && !args.includes('--coverage') && !args.includes('--updateSnapshot') diff --git a/src/scripts/validate.js b/src/scripts/validate.js index 7d67c285..7e784fc4 100644 --- a/src/scripts/validate.js +++ b/src/scripts/validate.js @@ -9,7 +9,7 @@ const { // pre-commit runs linting and tests on the relevant files // so those scripts don't need to be run if we're running // this in the context of a pre-commit hook. -const preCommit = parseEnv('SCRIPTS_PRE-COMMIT', false) +const preCommit = parseEnv('SCRIPTS_PRE_COMMIT', false) const validateScripts = process.argv[2]