From fbe7de51a973dd93fedade27d8b2aa1feaba0f6b Mon Sep 17 00:00:00 2001 From: Tyler Hall Date: Tue, 6 Aug 2024 21:35:54 +0000 Subject: [PATCH] fix(repo,ur,cu,mu,scheduler-utils,connect): remove engine to force use of npm This apparently causes error when using yarn to install the package from npm which was not the desired effect. For now, i've added `only-allow` to the root package. Eventually, we'll need another way to enforce use of npm for development --- connect/package-lock.json | 3 +-- connect/package.json | 3 +-- package-lock.json | 39 +++++++++++++++++++++++++++++++ package.json | 5 ++-- scheduler-utils/package-lock.json | 3 +-- scheduler-utils/package.json | 3 +-- servers/cu/package-lock.json | 3 +-- servers/cu/package.json | 3 +-- servers/mu/package-lock.json | 3 +-- servers/mu/package.json | 3 +-- servers/ur/package-lock.json | 3 +-- servers/ur/package.json | 3 +-- 12 files changed, 51 insertions(+), 23 deletions(-) diff --git a/connect/package-lock.json b/connect/package-lock.json index f4d4bcc6c..529ccd5cd 100644 --- a/connect/package-lock.json +++ b/connect/package-lock.json @@ -23,8 +23,7 @@ "typescript": "^5.5.4" }, "engines": { - "node": ">=18", - "yarn": "please-use-npm" + "node": ">=18" } }, "node_modules/@esbuild/aix-ppc64": { diff --git a/connect/package.json b/connect/package.json index 08baa5cfa..11dd6e1fe 100644 --- a/connect/package.json +++ b/connect/package.json @@ -60,7 +60,6 @@ "typescript": "^5.5.4" }, "engines": { - "node": ">=18", - "yarn": "please-use-npm" + "node": ">=18" } } diff --git a/package-lock.json b/package-lock.json index 7772031f3..fe12d36f9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "husky": "^9.0.11", "lint-staged": "^15.2.5", "markdown-toc-gen": "^1.0.1", + "only-allow": "^1.2.1", "sort-package-json": "^2.10.0", "standard": "^17.1.0" }, @@ -4100,6 +4101,19 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/only-allow": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/only-allow/-/only-allow-1.2.1.tgz", + "integrity": "sha512-M7CJbmv7UCopc0neRKdzfoGWaVZC+xC1925GitKH9EAqYFzX9//25Q7oX4+jw0tiCCj+t5l6VZh8UPH23NZkMA==", + "dev": true, + "license": "MIT", + "dependencies": { + "which-pm-runs": "^1.1.0" + }, + "bin": { + "only-allow": "bin.js" + } + }, "node_modules/optionator": { "version": "0.9.3", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", @@ -5279,6 +5293,16 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/which-pm-runs": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.1.0.tgz", + "integrity": "sha512-n1brCuqClxfFfq/Rb0ICg9giSZqCS+pLtccdag6C2HyufBrh3fBOiy9nb6ggRMvWOVH5GrdJskj5iGTZNxd7SA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, "node_modules/which-typed-array": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz", @@ -8415,6 +8439,15 @@ "mimic-fn": "^4.0.0" } }, + "only-allow": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/only-allow/-/only-allow-1.2.1.tgz", + "integrity": "sha512-M7CJbmv7UCopc0neRKdzfoGWaVZC+xC1925GitKH9EAqYFzX9//25Q7oX4+jw0tiCCj+t5l6VZh8UPH23NZkMA==", + "dev": true, + "requires": { + "which-pm-runs": "^1.1.0" + } + }, "optionator": { "version": "0.9.3", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", @@ -9227,6 +9260,12 @@ "is-weakset": "^2.0.1" } }, + "which-pm-runs": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.1.0.tgz", + "integrity": "sha512-n1brCuqClxfFfq/Rb0ICg9giSZqCS+pLtccdag6C2HyufBrh3fBOiy9nb6ggRMvWOVH5GrdJskj5iGTZNxd7SA==", + "dev": true + }, "which-typed-array": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz", diff --git a/package.json b/package.json index 780c1157f..a1108697c 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "workspaces": [], "scripts": { "fmt": "standard --fix", + "preinstall": "npx only-allow npm", "prepare": "husky", "staged": "lint-staged" }, @@ -13,12 +14,10 @@ "husky": "^9.0.11", "lint-staged": "^15.2.5", "markdown-toc-gen": "^1.0.1", + "only-allow": "^1.2.1", "sort-package-json": "^2.10.0", "standard": "^17.1.0" }, - "engines": { - "yarn": "please-use-npm" - }, "standard": { "ignore": [ "dist", diff --git a/scheduler-utils/package-lock.json b/scheduler-utils/package-lock.json index 8af592d77..00ea9d068 100644 --- a/scheduler-utils/package-lock.json +++ b/scheduler-utils/package-lock.json @@ -17,8 +17,7 @@ "typescript": "^5.4.5" }, "engines": { - "node": ">=18", - "yarn": "please-use-npm" + "node": ">=18" } }, "node_modules/@esbuild/aix-ppc64": { diff --git a/scheduler-utils/package.json b/scheduler-utils/package.json index 73987a6dd..563044be8 100644 --- a/scheduler-utils/package.json +++ b/scheduler-utils/package.json @@ -40,7 +40,6 @@ "typescript": "^5.4.5" }, "engines": { - "node": ">=18", - "yarn": "please-use-npm" + "node": ">=18" } } diff --git a/servers/cu/package-lock.json b/servers/cu/package-lock.json index 23eae338c..05e6364cb 100644 --- a/servers/cu/package-lock.json +++ b/servers/cu/package-lock.json @@ -42,8 +42,7 @@ "nodemon": "^3.1.4" }, "engines": { - "node": ">=18", - "yarn": "please-use-npm" + "node": ">=18" } }, "node_modules/@fastify/ajv-compiler": { diff --git a/servers/cu/package.json b/servers/cu/package.json index 62f5cdd05..cb96e0e4f 100644 --- a/servers/cu/package.json +++ b/servers/cu/package.json @@ -45,7 +45,6 @@ "nodemon": "^3.1.4" }, "engines": { - "node": ">=18", - "yarn": "please-use-npm" + "node": ">=18" } } diff --git a/servers/mu/package-lock.json b/servers/mu/package-lock.json index a0e47b6f4..e17da5a79 100644 --- a/servers/mu/package-lock.json +++ b/servers/mu/package-lock.json @@ -34,8 +34,7 @@ "nodemon": "^3.0.1" }, "engines": { - "node": "22", - "yarn": "please-use-npm" + "node": "22" } }, "node_modules/@ethersproject/abstract-provider": { diff --git a/servers/mu/package.json b/servers/mu/package.json index dc1eb09cd..b0a3ebcd6 100644 --- a/servers/mu/package.json +++ b/servers/mu/package.json @@ -44,7 +44,6 @@ "nodemon": "^3.0.1" }, "engines": { - "node": "22", - "yarn": "please-use-npm" + "node": "22" } } diff --git a/servers/ur/package-lock.json b/servers/ur/package-lock.json index 6c2a7e7c3..0187c5244 100644 --- a/servers/ur/package-lock.json +++ b/servers/ur/package-lock.json @@ -22,8 +22,7 @@ "nodemon": "^3.1.4" }, "engines": { - "node": ">=18", - "yarn": "please-use-npm" + "node": ">=18" } }, "node_modules/@ethersproject/abstract-provider": { diff --git a/servers/ur/package.json b/servers/ur/package.json index 44b8f7226..ddd3abdf4 100644 --- a/servers/ur/package.json +++ b/servers/ur/package.json @@ -24,7 +24,6 @@ "nodemon": "^3.1.4" }, "engines": { - "node": ">=18", - "yarn": "please-use-npm" + "node": ">=18" } }