simplify patch creation

Author: ds300

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

@@ -11,14 +11,14 @@ echo "remove a file"
 rm node_modules/lodash/fp/__.js
 
 echo "generate patch file"
-patch-package lodash
+npx patch-package lodash
 
 echo "remove node_modules"
 rm -rf node_modules
 
 echo "resintall and patch node_modules"
 yarn
-yarn patch-package
+npx patch-package
 
 echo "check that the file was added"
 ls node_modules/lodash/newFile.md

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

@@ -14,7 +14,7 @@ fi
 replace leftPad patchPackage node_modules/left-pad/index.js
 
 echo 'but patch-package still works because it ignores scripts'
-patch-package left-pad
+npx patch-package left-pad
 
 echo "SNAPSHOT: a patch file got produced"
 cat patches/left-pad*.patch

integration-tests/happy-path-npm/__snapshots__/happy-path-npm.test.ts.snap

@@ -2,9 +2,10 @@
 
 exports[`Test happy-path-npm: making patch 1`] = `
 "SNAPSHOT: making patch
-☑ Creating temporary folder
-☑ Building clean node_modules with npm
-☑ Diffing your files with clean files
+✔ Creating temporary folder
+✔ Making tmp package.json
+✔ Installing [email protected] with npm
+✔ Diffing your files with clean files
 ✔ Created file patches/left-pad+1.1.3.patch
 END SNAPSHOT"
 `;

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

@@ -13,7 +13,7 @@ echo "replace pad with yarn in left-pad/index.js"
 replace pad npm node_modules/left-pad/index.js
 
 echo "SNAPSHOT: making patch"
-patch-package left-pad
+npx patch-package left-pad
 echo "END SNAPSHOT"
 
 echo "SNAPSHOT: the patch looks like this"

integration-tests/happy-path-yarn/__snapshots__/happy-path-yarn.test.ts.snap

@@ -2,9 +2,10 @@
 
 exports[`Test happy-path-yarn: making patch 1`] = `
 "SNAPSHOT: making patch
-☑ Creating temporary folder
-☑ Building clean node_modules with yarn
-☑ Diffing your files with clean files
+✔ Creating temporary folder
+✔ Making tmp package.json
+✔ Installing [email protected] with yarn
+✔ Diffing your files with clean files
 ✔ Created file patches/left-pad+1.1.3.patch
 END SNAPSHOT"
 `;

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

@@ -11,7 +11,7 @@ echo "replace pad with yarn in left-pad/index.js"
 replace pad yarn node_modules/left-pad/index.js
 
 echo "SNAPSHOT: making patch"
-patch-package left-pad
+npx patch-package left-pad
 echo "END SNAPSHOT"
 
 echo "SNAPSHOT: the patch looks like this"

integration-tests/ignore-whitespace/add-whitespace.js

@@ -13,6 +13,6 @@ const withWhitespace = lines
   )
   .join("\n")
 
-const buf = new Buffer(withWhitespace)
+const buf = Buffer.from(withWhitespace)
 
 fs.writeFileSync(file, buf)

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

@@ -21,7 +21,7 @@ replace 'a' 'patch-package' node_modules/alphabet/index.js
 node add-whitespace.js 2
 
 echo "make patch file for line a"
-patch-package alphabet
+npx patch-package alphabet
 
 echo "SNAPSHOT: line a changed"
 cat patches/alphabet*.patch
@@ -30,19 +30,19 @@ echo "END SNAPSHOT"
 echo "make sure the patch can be applied to clean files"
 rm -rf node_modules
 yarn
-patch-package
+npx 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
-patch-package
+npx 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
-patch-package
+npx patch-package
 grep patch-package node_modules/alphabet/index.js

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

@@ -16,44 +16,44 @@ echo "remove a file"
 rm node_modules/lodash/fp/__.js
 
 echo "run patch-package with only __.js included"
-patch-package lodash --include __
+npx patch-package lodash --include __
 
 echo "SNAPSHOT: only __.js being deleted"
 cat patches/lodash*
 echo "END SNAPSHOT"
 
 echo "run patch-package excluding the base files"
-patch-package lodash --exclude base
+npx 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"
-patch-package lodash --include base --exclude clone
+npx 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"
-patch-package lodash --exclude '^(?!.*flip)'
+npx 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)"
-patch-package lodash --include newfile
+npx patch-package lodash --include newfile
 
 echo "run patch package including newfile (case sensitive)"
-if patch-package lodash --include newfile --case-sensitive-path-filtering
+if npx patch-package lodash --include newfile --case-sensitive-path-filtering
 then
   exit 1
 fi
 
 echo "run patch package including newFile (case insensitive)"
-patch-package lodash --include newFile --case-sensitive-path-filtering
+npx patch-package lodash --include newFile --case-sensitive-path-filtering
 
 echo "revet to the beginning"
 rimraf node_modules
@@ -63,13 +63,13 @@ echo "edit lodash's package.json"
 replace description patchPackageRulezLol node_modules/lodash/package.json
 
 echo "check that the edit was ignored by default"
-if patch-package lodash
+if npx patch-package lodash
 then
   exit 1
 fi
 
 echo "un-ingore the edit by specifying the empty string as regexp"
-patch-package lodash --exclude '^$'
+npx patch-package lodash --exclude '^$'
 
 echo "SNAPSHOT: modified package.json"
 cat patches/lodash*

integration-tests/resolve-relative-paths/__snapshots__/resolve-relative-paths.test.ts.snap

@@ -14,7 +14,7 @@ echo "remove a file"
 rm node_modules/lodash/fp/__.js
 
 echo "make the patch file"
-yarn patch-package lodash
+npx patch-package lodash
 
 echo "reinstall node modules"
 rm -rf node_modules
@@ -32,7 +32,7 @@ fi
 ls node_modules/lodash/fp/__.js
 
 echo "apply the patch"
-yarn patch-package
+npx patch-package
 
 echo "make sure the patch is applied"
 ls node_modules/lodash/newFile.md
@@ -43,7 +43,7 @@ fi
 grep patchPackage node_modules/lodash/_baseClamp.js
 
 echo "apply the patch again to make sure it's an idempotent operation"
-yarn patch-package
+npx patch-package
 
 echo "make sure the patch is still applied"
 ls node_modules/lodash/newFile.md
@@ -55,7 +55,7 @@ grep patchPackage node_modules/lodash/_baseClamp.js
 
 
 echo "unapply the patch"
-yarn patch-package --reverse
+npx patch-package --reverse
 
 echo "make sure the patch is unapplied"
 if ls node_modules/lodash/newFile.md
@@ -69,7 +69,7 @@ fi
 ls node_modules/lodash/fp/__.js
 
 echo "unapply the patch again to make sure it's an idempotent operation"
-yarn patch-package --reverse
+npx patch-package --reverse
 
 echo "make sure the patch is still unapplied"
 if ls node_modules/lodash/newFile.md

integration-tests/resolve-relative-paths/local-package/index.js

@@ -12,7 +12,7 @@ echo "modify add.d.t.s"
 replace add patch-package node_modules/@types/lodash/add.d.ts
 
 echo "patch-package can make patches for scoped packages"
-patch-package @types/lodash
+npx patch-package @types/lodash
 
 echo "remove node_modules"
 rimraf node_modules