From 7c23b6e030a0d460ed9a91c394be58bc5cd5fe9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Ch=C3=A1varri?= Date: Thu, 10 Aug 2023 14:46:06 +0000 Subject: [PATCH 1/7] [new release] opam-check-npm-deps (1.0.0) CHANGES: - Initial version - Read `depexts` field from all the opam files of the installed packages in the switch - Check the depexts that include filters using the `npm-version` variable against the installed npm packages in `node_modules` --- .../opam-check-npm-deps.1.0.0/opam | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam diff --git a/packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam b/packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam new file mode 100644 index 00000000000..3573205c2b5 --- /dev/null +++ b/packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam @@ -0,0 +1,52 @@ +opam-version: "2.0" +synopsis: + "An opam plugin to check for npm depexts inside the node_modules folder" +description: + "Provides the `opam check-npm-deps` command, which given an opam switch, gathers all the depexts belonging to the npm platform and their version constraints, and checks the `node_modules` folder to see if the constraints are satisfied." +maintainer: ["Javier Chávarri"] +authors: ["Javier Chávarri"] +license: "MIT" +homepage: "https://github.com/jchavarri/opam-check-npm-deps" +bug-reports: "https://github.com/jchavarri/opam-check-npm-deps/issues" +depends: [ + "ocaml" {>= "4.14.0"} + "reason" {>= "3.8.1" & < "4.0.0"} + "dune" {>= "3.8"} + "opam-client" {>= "2.1.2" & < "2.2.0"} + "angstrom" + "bos" + "lwt_ppx" + "ppx_deriving_yojson" + "ppx_expect" + "ppx_inline_test" + "ppx_let" + "ppx_sexp_conv" + "ocaml-lsp-server" {dev} + "ocamlformat" {dev} + "odoc" {with-doc} +] +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +dev-repo: "git+https://github.com/jchavarri/opam-check-npm-deps.git" +flags: plugin +url { + src: + "https://github.com/jchavarri/opam-check-npm-deps/releases/download/1.0.0/opam-check-npm-deps-1.0.0.tbz" + checksum: [ + "sha256=dce793b588d997b299e371847c9a4c85c3e446a55f6c6e56f99d71cfaf31c967" + "sha512=4cef4b1456d9da7a2539d43344c81aed6f19332125cfc08e183a18b3085bf421eee20e93fcaee4ff6cb7f4add295e343d2def877eb9680fe62a5d9fe23b88bbb" + ] +} +x-commit-hash: "1978cca0ea36d79f5f05a5c3b80f930f4922921e" From c14788a350f8dc135e1776f642e188fba41d6e7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Ch=C3=A1varri?= Date: Thu, 10 Aug 2023 16:15:58 +0000 Subject: [PATCH 2/7] remove tests from `build` field --- packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam b/packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam index 3573205c2b5..22022fe8339 100644 --- a/packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam +++ b/packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam @@ -35,7 +35,6 @@ build: [ "-j" jobs "@install" - "@runtest" {with-test} "@doc" {with-doc} ] ] From 66ca48d8a9cf96cb14f3d85113263fe0ce0e1075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Ch=C3=A1varri?= Date: Fri, 11 Aug 2023 11:43:48 +0000 Subject: [PATCH 3/7] set lower boundary for mccs --- packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam b/packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam index 22022fe8339..5f403b8dbad 100644 --- a/packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam +++ b/packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam @@ -13,6 +13,7 @@ depends: [ "reason" {>= "3.8.1" & < "4.0.0"} "dune" {>= "3.8"} "opam-client" {>= "2.1.2" & < "2.2.0"} + "mccs" {>= "1.11+14"} "angstrom" "bos" "lwt_ppx" From 294ec31fe22098cc75736fd7fd9d00baef38be8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Ch=C3=A1varri?= Date: Mon, 14 Aug 2023 16:45:56 +0000 Subject: [PATCH 4/7] fix mccs version --- packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam b/packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam index 5f403b8dbad..79c904fe2f5 100644 --- a/packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam +++ b/packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam @@ -13,7 +13,7 @@ depends: [ "reason" {>= "3.8.1" & < "4.0.0"} "dune" {>= "3.8"} "opam-client" {>= "2.1.2" & < "2.2.0"} - "mccs" {>= "1.11+14"} + "mccs" {>= "1.1+14"} "angstrom" "bos" "lwt_ppx" From 9e8032690f0ae50d92975b7dfe76d14c565eafb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Ch=C3=A1varri?= Date: Tue, 15 Aug 2023 10:47:13 +0000 Subject: [PATCH 5/7] add lower bound to angstrom --- packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam b/packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam index 79c904fe2f5..b4d5f1cb70f 100644 --- a/packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam +++ b/packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam @@ -14,7 +14,7 @@ depends: [ "dune" {>= "3.8"} "opam-client" {>= "2.1.2" & < "2.2.0"} "mccs" {>= "1.1+14"} - "angstrom" + "angstrom" {>= "0.15.0"} "bos" "lwt_ppx" "ppx_deriving_yojson" From 232c0e8ebf5ad7d9aeb134a5c6665e3ab1739462 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Ch=C3=A1varri?= Date: Tue, 15 Aug 2023 11:08:39 +0000 Subject: [PATCH 6/7] add lower bound on fmt --- packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam b/packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam index b4d5f1cb70f..6d5db439ac5 100644 --- a/packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam +++ b/packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam @@ -15,6 +15,7 @@ depends: [ "opam-client" {>= "2.1.2" & < "2.2.0"} "mccs" {>= "1.1+14"} "angstrom" {>= "0.15.0"} + "fmt" {>= "0.9.0"} "bos" "lwt_ppx" "ppx_deriving_yojson" From 9c76899d6c742dc6bd465499c3ca43d09f4c9775 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Ch=C3=A1varri?= Date: Thu, 17 Aug 2023 12:27:45 +0100 Subject: [PATCH 7/7] apply suggestions from code review Co-authored-by: Kate --- packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam b/packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam index 6d5db439ac5..612640442ac 100644 --- a/packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam +++ b/packages/opam-check-npm-deps/opam-check-npm-deps.1.0.0/opam @@ -12,7 +12,7 @@ depends: [ "ocaml" {>= "4.14.0"} "reason" {>= "3.8.1" & < "4.0.0"} "dune" {>= "3.8"} - "opam-client" {>= "2.1.2" & < "2.2.0"} + "opam-client" {>= "2.1.3" & < "2.2"} "mccs" {>= "1.1+14"} "angstrom" {>= "0.15.0"} "fmt" {>= "0.9.0"} @@ -23,10 +23,9 @@ depends: [ "ppx_inline_test" "ppx_let" "ppx_sexp_conv" - "ocaml-lsp-server" {dev} - "ocamlformat" {dev} "odoc" {with-doc} ] +available: opam-version >= "2.1" & opam-version < "2.2" build: [ ["dune" "subst"] {dev} [