From 5a7d04ed64dae0821b7e62690bcc53b861684175 Mon Sep 17 00:00:00 2001
From: Spotandjake <spotandjake@hotmail.com>
Date: Fri, 28 Mar 2025 15:57:52 -0400
Subject: [PATCH 1/2] feat!: Require `node >= 22` for jsoo `6`
---
.github/workflows/esy.yml | 2 +-
.github/workflows/js.yml | 2 +-
.github/workflows/opam.yml | 7 ++
.github/workflows/release.yml | 2 +-
esy.lock/index.json | 70 +++++++++----------
esy.lock/opam/base.v0.17.1/opam | 2 +-
.../opam | 14 ++--
.../opam/ocaml_intrinsics_kernel.v0.17.1/opam | 2 +-
esy.lock/opam/sexplib0.v0.17.0/opam | 2 +-
esy.lock/opam/stdio.v0.17.0/opam | 2 +-
libbinaryen.opam | 2 +-
package.json | 2 +-
12 files changed, 58 insertions(+), 51 deletions(-)
rename esy.lock/opam/{js_of_ocaml-compiler.5.9.1 => js_of_ocaml-compiler.6.0.1}/opam (72%)
diff --git a/.github/workflows/esy.yml b/.github/workflows/esy.yml
index 1120f9a..c7ee222 100644
--- a/.github/workflows/esy.yml
+++ b/.github/workflows/esy.yml
@@ -17,7 +17,7 @@ jobs:
- name: Setup node.js
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
with:
- node-version: "16"
+ node-version: "22"
check-latest: true
# Install `esy` to build the project
diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml
index 569929b..189d7e9 100644
--- a/.github/workflows/js.yml
+++ b/.github/workflows/js.yml
@@ -13,7 +13,7 @@ jobs:
- name: Setup node.js
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
with:
- node-version: "16"
+ node-version: "22"
check-latest: true
- name: "Set up emsdk"
diff --git a/.github/workflows/opam.yml b/.github/workflows/opam.yml
index 3b0baf9..96e1ca2 100644
--- a/.github/workflows/opam.yml
+++ b/.github/workflows/opam.yml
@@ -15,6 +15,13 @@ jobs:
ocaml-compiler: [4.13.1, 4.14.1, 5.3.0]
steps:
+ # Js_of_ocaml fails below node 22: https://github.com/ocsigen/js_of_ocaml/issues/1845
+ - name: Setup node.js
+ uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
+ with:
+ node-version: "22"
+ check-latest: true
+
- name: Checkout project
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index df52996..4314be3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -102,7 +102,7 @@ jobs:
- name: Setup NodeJS
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
with:
- node-version: "16"
+ node-version: "22"
registry-url: "https://registry.npmjs.org"
- name: Publish to npm
diff --git a/esy.lock/index.json b/esy.lock/index.json
index a026379..0534751 100644
--- a/esy.lock/index.json
+++ b/esy.lock/index.json
@@ -1,5 +1,5 @@
{
- "checksum": "8096f1a43ac441e386d8e73c0addbe20",
+ "checksum": "0788e0bc808e13adda49a6a958abdf76",
"root": "@grain/libbinaryen@link-dev:./package.json",
"node": {
"ocaml@5.2.0@d41d8cd9": {
@@ -240,8 +240,8 @@
],
"available": "true"
},
- "@opam/stdio@opam:v0.17.0@29b17754": {
- "id": "@opam/stdio@opam:v0.17.0@29b17754",
+ "@opam/stdio@opam:v0.17.0@def6a62f": {
+ "id": "@opam/stdio@opam:v0.17.0@def6a62f",
"name": "@opam/stdio",
"version": "opam:v0.17.0",
"source": {
@@ -259,14 +259,14 @@
"overrides": [],
"dependencies": [
"ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86",
- "@opam/base@opam:v0.17.1@699decbd",
+ "@opam/base@opam:v0.17.1@6229f0ef",
"@esy-ocaml/substs@0.0.1@d41d8cd9"
],
"devDependencies": [
"ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86",
- "@opam/base@opam:v0.17.1@699decbd"
+ "@opam/base@opam:v0.17.1@6229f0ef"
],
- "available": "arch != \"arm32\" & arch != \"x86_32\""
+ "available": "arch != \"x86_32\""
},
"@opam/spawn@opam:v0.17.0@d0f69739": {
"id": "@opam/spawn@opam:v0.17.0@d0f69739",
@@ -294,8 +294,8 @@
],
"available": "os != \"freebsd\""
},
- "@opam/sexplib0@opam:v0.17.0@21847769": {
- "id": "@opam/sexplib0@opam:v0.17.0@21847769",
+ "@opam/sexplib0@opam:v0.17.0@75dcb697": {
+ "id": "@opam/sexplib0@opam:v0.17.0@75dcb697",
"name": "@opam/sexplib0",
"version": "opam:v0.17.0",
"source": {
@@ -318,7 +318,7 @@
"devDependencies": [
"ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86"
],
- "available": "arch != \"arm32\" & arch != \"x86_32\""
+ "available": "arch != \"x86_32\""
},
"@opam/seq@opam:base@5ed5af70": {
"id": "@opam/seq@opam:base@5ed5af70",
@@ -426,14 +426,14 @@
"overrides": [],
"dependencies": [
"ocaml@5.2.0@d41d8cd9", "@opam/stdlib-shims@opam:0.3.0@72c7bc98",
- "@opam/sexplib0@opam:v0.17.0@21847769",
+ "@opam/sexplib0@opam:v0.17.0@75dcb697",
"@opam/ppx_derivers@opam:1.2.1@d78727cd",
"@opam/ocaml-compiler-libs@opam:v0.17.0@6bdcfede",
"@opam/dune@opam:3.17.2@31dc7e86", "@esy-ocaml/substs@0.0.1@d41d8cd9"
],
"devDependencies": [
"ocaml@5.2.0@d41d8cd9", "@opam/stdlib-shims@opam:0.3.0@72c7bc98",
- "@opam/sexplib0@opam:v0.17.0@21847769",
+ "@opam/sexplib0@opam:v0.17.0@75dcb697",
"@opam/ppx_derivers@opam:1.2.1@d78727cd",
"@opam/ocaml-compiler-libs@opam:v0.17.0@6bdcfede",
"@opam/dune@opam:3.17.2@31dc7e86"
@@ -624,7 +624,7 @@
"dependencies": [
"ocaml@5.2.0@d41d8cd9", "@opam/uutf@opam:1.0.4@ba7fbef7",
"@opam/uuseg@opam:16.0.0@bd0df457",
- "@opam/stdio@opam:v0.17.0@29b17754",
+ "@opam/stdio@opam:v0.17.0@def6a62f",
"@opam/ocp-indent@opam:1.7.0@3e255333",
"@opam/ocaml-version@opam:4.0.0@db2acb74",
"@opam/menhirSdk@opam:20240715@9d924351",
@@ -637,14 +637,14 @@
"@opam/dune@opam:3.17.2@31dc7e86", "@opam/csexp@opam:1.5.2@46614bf4",
"@opam/cmdliner@opam:1.3.0@8e6dd99f",
"@opam/camlp-streams@opam:5.0.1@8e96208c",
- "@opam/base@opam:v0.17.1@699decbd",
+ "@opam/base@opam:v0.17.1@6229f0ef",
"@opam/astring@opam:0.8.5@9975798d",
"@esy-ocaml/substs@0.0.1@d41d8cd9"
],
"devDependencies": [
"ocaml@5.2.0@d41d8cd9", "@opam/uutf@opam:1.0.4@ba7fbef7",
"@opam/uuseg@opam:16.0.0@bd0df457",
- "@opam/stdio@opam:v0.17.0@29b17754",
+ "@opam/stdio@opam:v0.17.0@def6a62f",
"@opam/ocp-indent@opam:1.7.0@3e255333",
"@opam/ocaml-version@opam:4.0.0@db2acb74",
"@opam/menhirSdk@opam:20240715@9d924351",
@@ -657,7 +657,7 @@
"@opam/dune@opam:3.17.2@31dc7e86", "@opam/csexp@opam:1.5.2@46614bf4",
"@opam/cmdliner@opam:1.3.0@8e6dd99f",
"@opam/camlp-streams@opam:5.0.1@8e96208c",
- "@opam/base@opam:v0.17.1@699decbd",
+ "@opam/base@opam:v0.17.1@6229f0ef",
"@opam/astring@opam:0.8.5@9975798d"
],
"available": "true"
@@ -771,8 +771,8 @@
"devDependencies": [ "ocaml@5.2.0@d41d8cd9" ],
"available": "true"
},
- "@opam/ocaml_intrinsics_kernel@opam:v0.17.1@ea7fa575": {
- "id": "@opam/ocaml_intrinsics_kernel@opam:v0.17.1@ea7fa575",
+ "@opam/ocaml_intrinsics_kernel@opam:v0.17.1@122c1c73": {
+ "id": "@opam/ocaml_intrinsics_kernel@opam:v0.17.1@122c1c73",
"name": "@opam/ocaml_intrinsics_kernel",
"version": "opam:v0.17.1",
"source": {
@@ -795,7 +795,7 @@
"devDependencies": [
"ocaml@5.2.0@d41d8cd9", "@opam/dune@opam:3.17.2@31dc7e86"
],
- "available": "arch != \"arm32\" & arch != \"x86_32\""
+ "available": "arch != \"x86_32\""
},
"@opam/ocaml-version@opam:4.0.0@db2acb74": {
"id": "@opam/ocaml-version@opam:4.0.0@db2acb74",
@@ -859,7 +859,7 @@
"@opam/dune@opam:3.17.2@31dc7e86", "@opam/csexp@opam:1.5.2@46614bf4",
"@opam/chrome-trace@opam:3.17.2@ece6ea1d",
"@opam/camlp-streams@opam:5.0.1@8e96208c",
- "@opam/base@opam:v0.17.1@699decbd",
+ "@opam/base@opam:v0.17.1@6229f0ef",
"@opam/astring@opam:0.8.5@9975798d",
"@esy-ocaml/substs@0.0.1@d41d8cd9"
],
@@ -882,7 +882,7 @@
"@opam/dune@opam:3.17.2@31dc7e86", "@opam/csexp@opam:1.5.2@46614bf4",
"@opam/chrome-trace@opam:3.17.2@ece6ea1d",
"@opam/camlp-streams@opam:5.0.1@8e96208c",
- "@opam/base@opam:v0.17.1@699decbd",
+ "@opam/base@opam:v0.17.1@6229f0ef",
"@opam/astring@opam:0.8.5@9975798d"
],
"available": "true"
@@ -1108,20 +1108,20 @@
],
"available": "true"
},
- "@opam/js_of_ocaml-compiler@opam:5.9.1@e8650b39": {
- "id": "@opam/js_of_ocaml-compiler@opam:5.9.1@e8650b39",
+ "@opam/js_of_ocaml-compiler@opam:6.0.1@ac2ae2e8": {
+ "id": "@opam/js_of_ocaml-compiler@opam:6.0.1@ac2ae2e8",
"name": "@opam/js_of_ocaml-compiler",
- "version": "opam:5.9.1",
+ "version": "opam:6.0.1",
"source": {
"type": "install",
"source": [
- "archive:https://opam.ocaml.org/cache/sha256/68/68c95c60871d8e9c9a54c82f35e2ed50413bcb440f220d0b3516b2a1ee1c7307#sha256:68c95c60871d8e9c9a54c82f35e2ed50413bcb440f220d0b3516b2a1ee1c7307",
- "archive:https://github.com/ocsigen/js_of_ocaml/releases/download/5.9.1/js_of_ocaml-5.9.1.tbz#sha256:68c95c60871d8e9c9a54c82f35e2ed50413bcb440f220d0b3516b2a1ee1c7307"
+ "archive:https://opam.ocaml.org/cache/sha256/81/813dbee2b62e1541049ea23a20e405cf244e27ebfa9859785cfa53e286d2c614#sha256:813dbee2b62e1541049ea23a20e405cf244e27ebfa9859785cfa53e286d2c614",
+ "archive:https://github.com/ocsigen/js_of_ocaml/releases/download/6.0.1/js_of_ocaml-6.0.1.tbz#sha256:813dbee2b62e1541049ea23a20e405cf244e27ebfa9859785cfa53e286d2c614"
],
"opam": {
"name": "js_of_ocaml-compiler",
- "version": "5.9.1",
- "path": "esy.lock/opam/js_of_ocaml-compiler.5.9.1"
+ "version": "6.0.1",
+ "path": "esy.lock/opam/js_of_ocaml-compiler.6.0.1"
}
},
"overrides": [],
@@ -1605,8 +1605,8 @@
],
"available": "true"
},
- "@opam/base@opam:v0.17.1@699decbd": {
- "id": "@opam/base@opam:v0.17.1@699decbd",
+ "@opam/base@opam:v0.17.1@6229f0ef": {
+ "id": "@opam/base@opam:v0.17.1@6229f0ef",
"name": "@opam/base",
"version": "opam:v0.17.1",
"source": {
@@ -1623,18 +1623,18 @@
},
"overrides": [],
"dependencies": [
- "ocaml@5.2.0@d41d8cd9", "@opam/sexplib0@opam:v0.17.0@21847769",
- "@opam/ocaml_intrinsics_kernel@opam:v0.17.1@ea7fa575",
+ "ocaml@5.2.0@d41d8cd9", "@opam/sexplib0@opam:v0.17.0@75dcb697",
+ "@opam/ocaml_intrinsics_kernel@opam:v0.17.1@122c1c73",
"@opam/dune-configurator@opam:3.17.2@6a903a8c",
"@opam/dune@opam:3.17.2@31dc7e86", "@esy-ocaml/substs@0.0.1@d41d8cd9"
],
"devDependencies": [
- "ocaml@5.2.0@d41d8cd9", "@opam/sexplib0@opam:v0.17.0@21847769",
- "@opam/ocaml_intrinsics_kernel@opam:v0.17.1@ea7fa575",
+ "ocaml@5.2.0@d41d8cd9", "@opam/sexplib0@opam:v0.17.0@75dcb697",
+ "@opam/ocaml_intrinsics_kernel@opam:v0.17.1@122c1c73",
"@opam/dune-configurator@opam:3.17.2@6a903a8c",
"@opam/dune@opam:3.17.2@31dc7e86"
],
- "available": "arch != \"arm32\" & arch != \"x86_32\""
+ "available": "arch != \"x86_32\""
},
"@opam/astring@opam:0.8.5@9975798d": {
"id": "@opam/astring@opam:0.8.5@9975798d",
@@ -1681,7 +1681,7 @@
"devDependencies": [
"@opam/ocamlformat@opam:0.27.0@6c2dc1c8",
"@opam/ocaml-lsp-server@opam:1.21.0@3b310a8b",
- "@opam/js_of_ocaml-compiler@opam:5.9.1@e8650b39"
+ "@opam/js_of_ocaml-compiler@opam:6.0.1@ac2ae2e8"
]
},
"@esy-ocaml/substs@0.0.1@d41d8cd9": {
diff --git a/esy.lock/opam/base.v0.17.1/opam b/esy.lock/opam/base.v0.17.1/opam
index faba069..40b59f0 100644
--- a/esy.lock/opam/base.v0.17.1/opam
+++ b/esy.lock/opam/base.v0.17.1/opam
@@ -16,7 +16,7 @@ depends: [
"dune" {>= "3.11.0"}
"dune-configurator"
]
-available: arch != "arm32" & arch != "x86_32"
+available: arch != "x86_32"
synopsis: "Full standard library replacement for OCaml"
description: "
Full standard library replacement for OCaml
diff --git a/esy.lock/opam/js_of_ocaml-compiler.5.9.1/opam b/esy.lock/opam/js_of_ocaml-compiler.6.0.1/opam
similarity index 72%
rename from esy.lock/opam/js_of_ocaml-compiler.5.9.1/opam
rename to esy.lock/opam/js_of_ocaml-compiler.6.0.1/opam
index 89af4b1..ed835fe 100644
--- a/esy.lock/opam/js_of_ocaml-compiler.5.9.1/opam
+++ b/esy.lock/opam/js_of_ocaml-compiler.6.0.1/opam
@@ -11,10 +11,10 @@ homepage: "https://ocsigen.org/js_of_ocaml/latest/manual/overview"
doc: "https://ocsigen.org/js_of_ocaml/latest/manual/overview"
bug-reports: "https://github.com/ocsigen/js_of_ocaml/issues"
depends: [
- "dune" {>= "3.15"}
+ "dune" {>= "3.17"}
"ocaml" {>= "4.08" & < "5.4"}
"num" {with-test}
- "ppx_expect" {>= "v0.14.2" & with-test}
+ "ppx_expect" {>= "v0.16.1" & with-test}
"ppxlib" {>= "0.15.0" & < "0.36.0"}
"re" {with-test}
"cmdliner" {>= "1.1.0"}
@@ -23,7 +23,7 @@ depends: [
"menhir"
"menhirLib"
"menhirSdk"
- "yojson" {>= "1.6"}
+ "yojson" {>= "2.1"}
"odoc" {with-doc}
]
depopts: ["ocamlfind"]
@@ -47,10 +47,10 @@ build: [
]
url {
src:
- "https://github.com/ocsigen/js_of_ocaml/releases/download/5.9.1/js_of_ocaml-5.9.1.tbz"
+ "https://github.com/ocsigen/js_of_ocaml/releases/download/6.0.1/js_of_ocaml-6.0.1.tbz"
checksum: [
- "sha256=68c95c60871d8e9c9a54c82f35e2ed50413bcb440f220d0b3516b2a1ee1c7307"
- "sha512=288d68ea7a45e92375cf51c34bb1071dd26d0d8de54883f3422639561e1494ff43aa45c3d7466627fd7b5a9bb29a0c75e5744a3e7147f5d544bf2c5414083778"
+ "sha256=813dbee2b62e1541049ea23a20e405cf244e27ebfa9859785cfa53e286d2c614"
+ "sha512=194ae5d1122171fa8253b6a41438a2fc330caf4ab6dd008fcce1253fd51fbe4b1149813da6075c5deb52ea136143def57c83c3f4e32421803d7699648fdc563b"
]
}
-x-commit-hash: "a02342914f3221a298730d61537cc0d939ccb6e0"
+x-commit-hash: "b6d60e4f8ff35e7c7b3bb52b97ffedc3eb8e3d08"
diff --git a/esy.lock/opam/ocaml_intrinsics_kernel.v0.17.1/opam b/esy.lock/opam/ocaml_intrinsics_kernel.v0.17.1/opam
index e4cd8e9..44be913 100644
--- a/esy.lock/opam/ocaml_intrinsics_kernel.v0.17.1/opam
+++ b/esy.lock/opam/ocaml_intrinsics_kernel.v0.17.1/opam
@@ -13,7 +13,7 @@ depends: [
"ocaml" {>= "5.1.0"}
"dune" {>= "3.11.0"}
]
-available: arch != "arm32" & arch != "x86_32"
+available: arch != "x86_32"
synopsis: "Intrinsics"
description: "
Provides functions to invoke amd64 instructions (such as cmov, min/maxsd, popcnt)
diff --git a/esy.lock/opam/sexplib0.v0.17.0/opam b/esy.lock/opam/sexplib0.v0.17.0/opam
index 4a8cdc5..7cd4cf8 100644
--- a/esy.lock/opam/sexplib0.v0.17.0/opam
+++ b/esy.lock/opam/sexplib0.v0.17.0/opam
@@ -13,7 +13,7 @@ depends: [
"ocaml" {>= "4.14.0"}
"dune" {>= "3.11.0"}
]
-available: arch != "arm32" & arch != "x86_32"
+available: arch != "x86_32"
synopsis: "Library containing the definition of S-expressions and some base converters"
description: "
Part of Jane Street's Core library
diff --git a/esy.lock/opam/stdio.v0.17.0/opam b/esy.lock/opam/stdio.v0.17.0/opam
index daecaa2..6939fc7 100644
--- a/esy.lock/opam/stdio.v0.17.0/opam
+++ b/esy.lock/opam/stdio.v0.17.0/opam
@@ -14,7 +14,7 @@ depends: [
"base" {>= "v0.17" & < "v0.18"}
"dune" {>= "3.11.0"}
]
-available: arch != "arm32" & arch != "x86_32"
+available: arch != "x86_32"
synopsis: "Standard IO library for OCaml"
description: "
Stdio implements simple input/output functionalities for OCaml.
diff --git a/libbinaryen.opam b/libbinaryen.opam
index c67bba8..d98e04b 100644
--- a/libbinaryen.opam
+++ b/libbinaryen.opam
@@ -15,7 +15,7 @@ depends: [
"conf-cmake" {build}
"dune" {>= "3.0.0"}
"dune-configurator" {>= "3.0.0"}
- "js_of_ocaml-compiler" {with-test & >= "4.1.0" < "6.0.0"}
+ "js_of_ocaml-compiler" {with-test & >= "4.1.0" < "7.0.0"}
"ocaml" {>= "4.13"}
]
depexts: [
diff --git a/package.json b/package.json
index 4c9ba95..3a5309b 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
"@opam/dune-configurator": ">= 3.0.0"
},
"devDependencies": {
- "@opam/js_of_ocaml-compiler": ">= 4.1.0 < 6.0.0",
+ "@opam/js_of_ocaml-compiler": ">= 4.1.0 < 7.0.0",
"@opam/ocamlformat": "0.27.0",
"@opam/ocaml-lsp-server": "> 1.9.1 < 2.0.0"
},
From a5dda97bfb3566573c1295181011d675ad2a9988 Mon Sep 17 00:00:00 2001
From: Oscar Spencer <oscar.spen@gmail.com>
Date: Sat, 29 Mar 2025 23:45:56 -0500
Subject: [PATCH 2/2] Update .github/workflows/opam.yml
---
.github/workflows/opam.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.github/workflows/opam.yml b/.github/workflows/opam.yml
index 96e1ca2..0eb8d8a 100644
--- a/.github/workflows/opam.yml
+++ b/.github/workflows/opam.yml
@@ -15,7 +15,6 @@ jobs:
ocaml-compiler: [4.13.1, 4.14.1, 5.3.0]
steps:
- # Js_of_ocaml fails below node 22: https://github.com/ocsigen/js_of_ocaml/issues/1845
- name: Setup node.js
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
with: