From c03bcc59b447ec5f2cd43fe4964562040ce04271 Mon Sep 17 00:00:00 2001 From: roykho Date: Thu, 2 Dec 2021 11:09:46 -0800 Subject: [PATCH 1/4] Prevent the use of npm to install packages --- packages/js/api-core-tests/package.json | 1 + packages/js/api/package.json | 1 + packages/js/e2e-core-tests/package.json | 1 + packages/js/e2e-environment/package.json | 1 + packages/js/e2e-utils/package.json | 1 + 5 files changed, 5 insertions(+) diff --git a/packages/js/api-core-tests/package.json b/packages/js/api-core-tests/package.json index 64406839e25..a7ae4d39bce 100644 --- a/packages/js/api-core-tests/package.json +++ b/packages/js/api-core-tests/package.json @@ -4,6 +4,7 @@ "description": "API tests for WooCommerce", "main": "index.js", "scripts": { + "preinstall": "npx only-allow pnpm", "test": "jest", "test:api": "jest --group=api", "test:hello": "jest --group=hello", diff --git a/packages/js/api/package.json b/packages/js/api/package.json index 56388920230..eded9fafdd6 100644 --- a/packages/js/api/package.json +++ b/packages/js/api/package.json @@ -26,6 +26,7 @@ ], "sideEffects": false, "scripts": { + "preinstall": "npx only-allow pnpm", "clean": "rm -rf ./dist ./tsconfig.tsbuildinfo", "compile": "tsc -b", "build": "pnpm run clean && npm run compile", diff --git a/packages/js/e2e-core-tests/package.json b/packages/js/e2e-core-tests/package.json index 6081cfb045b..9ba215ddc21 100644 --- a/packages/js/e2e-core-tests/package.json +++ b/packages/js/e2e-core-tests/package.json @@ -23,6 +23,7 @@ "access": "public" }, "scripts": { + "preinstall": "npx only-allow pnpm", "build": "./bin/build.sh", "prepare": "pnpm run build" } diff --git a/packages/js/e2e-environment/package.json b/packages/js/e2e-environment/package.json index 33e576f5420..7cf0a5dbcec 100644 --- a/packages/js/e2e-environment/package.json +++ b/packages/js/e2e-environment/package.json @@ -49,6 +49,7 @@ "access": "public" }, "scripts": { + "preinstall": "npx only-allow pnpm", "clean": "rm -rf ./build ./build-module", "compile": "node ./../bin/build.js", "build": "pnpm run clean && pnpm run compile", diff --git a/packages/js/e2e-utils/package.json b/packages/js/e2e-utils/package.json index 43b2d77d749..149bbcdb93f 100644 --- a/packages/js/e2e-utils/package.json +++ b/packages/js/e2e-utils/package.json @@ -30,6 +30,7 @@ "access": "public" }, "scripts": { + "preinstall": "npx only-allow pnpm", "clean": "rm -rf ./build ./build-module", "compile": "node ./../bin/build.js", "build": "pnpm run clean && pnpm run compile", From 286928bb6d2975acc34c8feba568b8052c19fc73 Mon Sep 17 00:00:00 2001 From: roykho Date: Thu, 2 Dec 2021 11:12:27 -0800 Subject: [PATCH 2/4] Ignore package-lock.json --- packages/js/api-core-tests/.gitignore | 2 ++ packages/js/api/.gitignore | 2 ++ packages/js/e2e-core-tests/.gitignore | 2 ++ packages/js/e2e-environment/.gitignore | 1 + packages/js/e2e-utils/.gitignore | 1 + plugins/woocommerce/.gitignore | 2 ++ 6 files changed, 10 insertions(+) create mode 100644 packages/js/e2e-environment/.gitignore create mode 100644 packages/js/e2e-utils/.gitignore diff --git a/packages/js/api-core-tests/.gitignore b/packages/js/api-core-tests/.gitignore index 5a5072cb91d..d0961824d84 100644 --- a/packages/js/api-core-tests/.gitignore +++ b/packages/js/api-core-tests/.gitignore @@ -1,2 +1,4 @@ # Collection output collection.json + +package-lock.json diff --git a/packages/js/api/.gitignore b/packages/js/api/.gitignore index e22a3150198..9d5ef1986ac 100644 --- a/packages/js/api/.gitignore +++ b/packages/js/api/.gitignore @@ -1,2 +1,4 @@ # Editors /nbproject/private/ + +package-lock.json diff --git a/packages/js/e2e-core-tests/.gitignore b/packages/js/e2e-core-tests/.gitignore index 5585f5a8863..b698ab70fe7 100644 --- a/packages/js/e2e-core-tests/.gitignore +++ b/packages/js/e2e-core-tests/.gitignore @@ -1 +1,3 @@ /test-data/sample_products.csv + +package-lock.json diff --git a/packages/js/e2e-environment/.gitignore b/packages/js/e2e-environment/.gitignore new file mode 100644 index 00000000000..d8b83df9cdb --- /dev/null +++ b/packages/js/e2e-environment/.gitignore @@ -0,0 +1 @@ +package-lock.json diff --git a/packages/js/e2e-utils/.gitignore b/packages/js/e2e-utils/.gitignore new file mode 100644 index 00000000000..d8b83df9cdb --- /dev/null +++ b/packages/js/e2e-utils/.gitignore @@ -0,0 +1 @@ +package-lock.json diff --git a/plugins/woocommerce/.gitignore b/plugins/woocommerce/.gitignore index 65ccaf64123..b4bcbc85e23 100644 --- a/plugins/woocommerce/.gitignore +++ b/plugins/woocommerce/.gitignore @@ -54,3 +54,5 @@ yarn.lock # Language files i18n/languages/woocommerce.pot + +package-lock.json From f5b4c86e8e7d0d4633b58c72eddfaabca44f10c4 Mon Sep 17 00:00:00 2001 From: roykho Date: Thu, 9 Dec 2021 06:21:01 -0800 Subject: [PATCH 3/4] Move ignore file to root level --- .gitignore | 3 +++ packages/js/api-core-tests/.gitignore | 2 -- packages/js/api/.gitignore | 2 -- packages/js/e2e-core-tests/.gitignore | 2 -- packages/js/e2e-environment/.gitignore | 1 - packages/js/e2e-utils/.gitignore | 1 - 6 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 packages/js/e2e-environment/.gitignore delete mode 100644 packages/js/e2e-utils/.gitignore diff --git a/.gitignore b/.gitignore index 130ad00fe7e..e99fc6a5d4d 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,9 @@ vendor/ # TypeScript files tsconfig.tsbuildinfo +# Node Package Dependencies +package-lock.json + # wp-env config .wp-env.override.json diff --git a/packages/js/api-core-tests/.gitignore b/packages/js/api-core-tests/.gitignore index d0961824d84..5a5072cb91d 100644 --- a/packages/js/api-core-tests/.gitignore +++ b/packages/js/api-core-tests/.gitignore @@ -1,4 +1,2 @@ # Collection output collection.json - -package-lock.json diff --git a/packages/js/api/.gitignore b/packages/js/api/.gitignore index 9d5ef1986ac..e22a3150198 100644 --- a/packages/js/api/.gitignore +++ b/packages/js/api/.gitignore @@ -1,4 +1,2 @@ # Editors /nbproject/private/ - -package-lock.json diff --git a/packages/js/e2e-core-tests/.gitignore b/packages/js/e2e-core-tests/.gitignore index b698ab70fe7..5585f5a8863 100644 --- a/packages/js/e2e-core-tests/.gitignore +++ b/packages/js/e2e-core-tests/.gitignore @@ -1,3 +1 @@ /test-data/sample_products.csv - -package-lock.json diff --git a/packages/js/e2e-environment/.gitignore b/packages/js/e2e-environment/.gitignore deleted file mode 100644 index d8b83df9cdb..00000000000 --- a/packages/js/e2e-environment/.gitignore +++ /dev/null @@ -1 +0,0 @@ -package-lock.json diff --git a/packages/js/e2e-utils/.gitignore b/packages/js/e2e-utils/.gitignore deleted file mode 100644 index d8b83df9cdb..00000000000 --- a/packages/js/e2e-utils/.gitignore +++ /dev/null @@ -1 +0,0 @@ -package-lock.json From 56ebc906745a9cd5b7903eed3048da3b52d8457b Mon Sep 17 00:00:00 2001 From: roykho Date: Fri, 10 Dec 2021 11:18:21 -0800 Subject: [PATCH 4/4] Remove remaining gitignore item --- plugins/woocommerce/.gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/woocommerce/.gitignore b/plugins/woocommerce/.gitignore index b4bcbc85e23..65ccaf64123 100644 --- a/plugins/woocommerce/.gitignore +++ b/plugins/woocommerce/.gitignore @@ -54,5 +54,3 @@ yarn.lock # Language files i18n/languages/woocommerce.pot - -package-lock.json