use patch-package bin directly in tests

Author: ds300

integration-tests/adding-and-deleting-files/adding-and-deleting-files.sh

@@ -3,6 +3,7 @@ set -e
 
 echo "add patch-package"
 yarn add $1
+alias patch-package=./node_modules/.bin/patch-package
 
 echo "add a file"
 echo "this is a new file" > node_modules/lodash/newFile.md
@@ -11,14 +12,14 @@ echo "remove a file"
 rm node_modules/lodash/fp/__.js
 
 echo "generate patch file"
-npx patch-package lodash
+patch-package lodash
 
 echo "remove node_modules"
 rm -rf node_modules
 
 echo "resintall and patch node_modules"
 yarn
-npx patch-package
+patch-package
 
 echo "check that the file was added"
 ls node_modules/lodash/newFile.md

integration-tests/broken-patch-file/broken-patch-file.sh

@@ -3,9 +3,10 @@ set -e
 
 echo "add patch-package"
 yarn add $1
+alias patch-package=./node_modules/.bin/patch-package
 
 (>&2 echo "SNAPSHOT: patch-package fails when patch file is invalid")
-if npx patch-package
+if patch-package
 then
   exit 1
 fi

integration-tests/custom-patch-dir/custom-patch-dir.sh

@@ -3,14 +3,15 @@ set -e
 
 echo "add patch-package"
 yarn add $1
+alias patch-package=./node_modules/.bin/patch-package
 
 echo "modify left-pad"
 npx replace pad patch-package node_modules/left-pad/index.js
 
 mkdir my
 
 echo "make patch file"
-npx patch-package left-pad --patch-dir my/patches
+patch-package left-pad --patch-dir my/patches
 
 ls my/patches/left-pad*
 
@@ -19,6 +20,6 @@ rimraf node_modules
 yarn
 
 echo "run patch-package"
-npx patch-package --patch-dir my/patches
+patch-package --patch-dir my/patches
 
 grep patch-package node_modules/left-pad/index.js

integration-tests/custom-resolutions/custom-resolutions.sh

@@ -3,9 +3,10 @@ set -e
 
 echo "add patch-package"
 yarn add $1
+alias patch-package=./node_modules/.bin/patch-package
 
 echo "make changes to dependency/index.js"
 echo '// hello i am patch-package' > node_modules/dependency/index.js
 
 echo "doesn't fail when making a patch"
-npx patch-package dependency
+patch-package dependency

integration-tests/delete-old-patch-files/delete-old-patch-files.sh

@@ -3,9 +3,10 @@ set -e
 
 echo "add patch-package"
 yarn add $1
+alias patch-package=./node_modules/.bin/patch-package
 
 echo "apply patch-package"
-npx patch-package
+patch-package
 
 echo "make sure the changes were applied"
 grep patch-package node_modules/@types/lodash/index.d.ts
@@ -16,7 +17,7 @@ ls patches/lodash:4.17.11.patch
 ls patches/@types/lodash:4.14.120.patch
 
 echo "make patch files again"
-npx patch-package lodash @types/lodash
+patch-package lodash @types/lodash
 
 echo "make sure the changes were still applied"
 grep patch-package node_modules/@types/lodash/index.d.ts

integration-tests/delete-scripts/delete-scripts.sh

@@ -2,6 +2,7 @@ set -e
 
 echo 'install without error because package.json is sanitized'
 yarn add $1
+alias patch-package=./node_modules/.bin/patch-package
 
 echo 'unsnitize package.json'
 npx replace '<<PREINSTALL>>' preinstall package.json
@@ -14,7 +15,7 @@ fi
 npx replace leftPad patchPackage node_modules/left-pad/index.js
 
 echo 'but patch-package still works because it ignores scripts'
-npx patch-package left-pad
+patch-package left-pad
 
 echo "SNAPSHOT: a patch file got produced"
 cat patches/left-pad*.patch

integration-tests/fails-when-no-package/__snapshots__/fails-when-no-package.test.ts.snap

@@ -3,6 +3,5 @@
 exports[`Test fails-when-no-package: no package present failure 1`] = `
 "SNAPSHOT: no package present failure
 Error: Patch file found for package left-pad which is not present at node_modules/left-pad
-error Command failed with exit code 1.
 END SNAPSHOT"
 `;

integration-tests/fails-when-no-package/fails-when-no-package.sh

@@ -3,9 +3,10 @@ set -e
 
 echo "add patch-package"
 yarn add $1
+alias patch-package=./node_modules/.bin/patch-package
 
 (>&2 echo "SNAPSHOT: no package present failure")
-if yarn patch-package; then
+if patch-package; then
   exit 1
 fi
 (>&2 echo "END SNAPSHOT")

integration-tests/file-mode-changes/file-mode-changes.sh

@@ -3,6 +3,7 @@ set -e
 
 echo "add patch-package"
 yarn add $1
+alias patch-package=./node_modules/.bin/patch-package
 
 echo "check file permissions 1"
 ./assert-executable.js node_modules/prettier/bin-prettier.js
@@ -17,7 +18,7 @@ echo "check file permissions 2"
 ./assert-not-executable.js node_modules/prettier/bin-prettier.js
 
 echo "patch prettier"
-npx patch-package prettier
+patch-package prettier
 
 echo "SNAPSHOT: the patch file"
 cat patches/prettier*
@@ -32,7 +33,7 @@ echo "check file permissions 3"
 ./assert-not-executable.js node_modules/prettier/index.js
 
 echo "run patch-package"
-npx patch-package
+patch-package
 
 echo "check file permissions 4"
 ./assert-executable.js node_modules/prettier/index.js

integration-tests/happy-path-npm/happy-path-npm.sh

@@ -5,6 +5,7 @@ npm i
 
 echo "add patch-package"
 npm i $1
+alias patch-package=./node_modules/.bin/patch-package
 
 echo "Add left-pad"
 npm i [email protected]
@@ -13,7 +14,7 @@ echo "replace pad with yarn in left-pad/index.js"
 npx replace pad npm node_modules/left-pad/index.js
 
 echo "SNAPSHOT: making patch"
-npx patch-package left-pad
+patch-package left-pad
 echo "END SNAPSHOT"
 
 echo "SNAPSHOT: the patch looks like this"

integration-tests/happy-path-yarn/happy-path-yarn.sh

@@ -3,6 +3,7 @@ set -e
 
 echo "add patch-package"
 yarn add $1
+alias patch-package=./node_modules/.bin/patch-package
 
 echo "Add left-pad"
 yarn add [email protected]
@@ -11,7 +12,7 @@ echo "replace pad with yarn in left-pad/index.js"
 npx replace pad yarn node_modules/left-pad/index.js
 
 echo "SNAPSHOT: making patch"
-npx patch-package left-pad
+patch-package left-pad
 echo "END SNAPSHOT"
 
 echo "SNAPSHOT: the patch looks like this"

integration-tests/ignore-whitespace/ignore-whitespace.sh

@@ -3,13 +3,14 @@ set -e
 
 echo "add patch-package"
 yarn add $1
+alias patch-package=./node_modules/.bin/patch-package
 
 echo "add random bits of whitespace"
 node add-whitespace.js
 
 echo "try to make patch file (should be empty)"
 (>&2 echo "SNAPSHOT: empty changeset when adding whitespace")
-if npx patch-package alphabet
+if patch-package alphabet
 then
   exit 1
 fi
@@ -21,7 +22,7 @@ npx replace 'a' 'patch-package' node_modules/alphabet/index.js
 node add-whitespace.js 2
 
 echo "make patch file for line a"
-npx patch-package alphabet
+patch-package alphabet
 
 echo "SNAPSHOT: line a changed"
 cat patches/alphabet*.patch
@@ -30,19 +31,19 @@ echo "END SNAPSHOT"
 echo "make sure the patch can be applied to clean files"
 rm -rf node_modules
 yarn
-npx patch-package
+patch-package
 grep patch-package node_modules/alphabet/index.js
 
 echo "make sure the patch can be applied to dirty files"
 rm -rf node_modules
 yarn
 node add-whitespace.js
-npx patch-package
+patch-package
 grep patch-package node_modules/alphabet/index.js
 
 echo "make sure the patch can be applied to dirty files with different whitespace"
 rm -rf node_modules
 yarn
 node add-whitespace.js 1
-npx patch-package
+patch-package
 grep patch-package node_modules/alphabet/index.js

integration-tests/ignores-scripts-when-making-patch/ignores-scripts-when-making-patch.sh

@@ -3,12 +3,13 @@ set -e
 
 echo "add patch-package"
 yarn add $1
+alias patch-package=./node_modules/.bin/patch-package
 
 npx replace postinstall lol node_modules/naughty-package/postinstall.sh
 
 echo "SNAPSHOT: the patch creation output should look normal"
 (>&2 echo "SNAPSHOT: there should be no stderr")
-npx patch-package naughty-package
+patch-package naughty-package
 echo "END SNAPSHOT"
 (>&2 echo "END SNAPSHOT")
 

integration-tests/include-exclude-paths/include-exclude-paths.sh

@@ -3,6 +3,7 @@ set -e
 
 echo "add patch-package"
 yarn add $1
+alias patch-package=./node_modules/.bin/patch-package
 
 echo "edit some files"
 npx replace exports patchPackage node_modules/lodash/_baseClamp.js
@@ -16,44 +17,44 @@ echo "remove a file"
 rm node_modules/lodash/fp/__.js
 
 echo "run patch-package with only __.js included"
-npx patch-package lodash --include __
+patch-package lodash --include __
 
 echo "SNAPSHOT: only __.js being deleted"
 cat patches/lodash*
 echo "END SNAPSHOT"
 
 echo "run patch-package excluding the base files"
-npx patch-package lodash --exclude base
+patch-package lodash --exclude base
 
 echo "SNAPSHOT: no base files"
 cat patches/lodash*
 echo "END SNAPSHOT"
 
 echo "run patch-package including base and excluding clone"
-npx patch-package lodash --include base --exclude clone
+patch-package lodash --include base --exclude clone
 
 echo "SNAPSHOT: only base files, no clone files"
 cat patches/lodash*
 echo "END SNAPSHOT"
 
 echo "run patch package excluding all but flip"
-npx patch-package lodash --exclude '^(?!.*flip)'
+patch-package lodash --exclude '^(?!.*flip)'
 
 echo "SNAPSHOT: exclude all but flip"
 cat patches/lodash*
 echo "END SNAPSHOT"
 
 echo "run patch package including newfile (case insensitive)"
-npx patch-package lodash --include newfile
+patch-package lodash --include newfile
 
 echo "run patch package including newfile (case sensitive)"
-if npx patch-package lodash --include newfile --case-sensitive-path-filtering
+if patch-package lodash --include newfile --case-sensitive-path-filtering
 then
   exit 1
 fi
 
 echo "run patch package including newFile (case insensitive)"
-npx patch-package lodash --include newFile --case-sensitive-path-filtering
+patch-package lodash --include newFile --case-sensitive-path-filtering
 
 echo "revert to the beginning"
 npx rimraf node_modules
@@ -63,13 +64,13 @@ echo "edit lodash's package.json"
 npx replace description patchPackageRulezLol node_modules/lodash/package.json
 
 echo "check that the edit was ignored by default"
-if npx patch-package lodash
+if patch-package lodash
 then
   exit 1
 fi
 
 echo "un-ingore the edit by specifying the empty string as regexp"
-npx patch-package lodash --exclude '^$'
+patch-package lodash --exclude '^$'
 
 echo "SNAPSHOT: modified package.json"
 cat patches/lodash*

integration-tests/include-exclude-regex-relativity/include-exclude-regex-relativity.sh

@@ -3,38 +3,39 @@ set -e
 
 echo "add patch-package"
 yarn add $1
+alias patch-package=./node_modules/.bin/patch-package
 
 echo "mutate words.js"
 npx replace words patch-packages node_modules/lodash/words.js
 
 echo "patch-package includes words.js in a patch by default"
-npx patch-package lodash
+patch-package lodash
 
 echo "patch-package doesn't include words.js if excluded with relative path"
-if npx patch-package lodash --exclude '^words' ; then
+if patch-package lodash --exclude '^words' ; then
   exit 1
 fi
 
 echo "patch-package includes words.js if included with relative path"
-npx patch-package lodash --include '^words'
+patch-package lodash --include '^words'
 
 echo "patch-package doesn't exclude words.js if excluded with node_modules path"
-npx patch-package lodash --exclude node_modules/lodash/words.js
+patch-package lodash --exclude node_modules/lodash/words.js
 
 echo "patch-package doesn't include words.js if included with node_modules path"
-if npx patch-package lodash --include node_modules/lodash/words.js ; then
+if patch-package lodash --include node_modules/lodash/words.js ; then
   exit 1
 fi
 
 echo "patch-package doesn't exclude words.js if excluded with lodash path"
-npx patch-package lodash --exclude lodash/words.js
+patch-package lodash --exclude lodash/words.js
 
 echo "patch-package doesn't include words.js if included with lodash path"
-if npx patch-package lodash --include lodash/words.js ; then
+if patch-package lodash --include lodash/words.js ; then
   exit 1
 fi
 
 echo "patch-package does exclude words.js if excluded without prefix"
-if npx patch-package lodash --exclude words.js ; then
+if patch-package lodash --exclude words.js ; then
   exit 1
 fi