From a727c6ba6d2e275059bf5d1a31e41f8a71757927 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Mon, 6 Jan 2025 16:17:42 +1100
Subject: [PATCH 1/4] Updates

---
 build/build.yml | 16 ++++++++--------
 config.json     |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build/build.yml b/build/build.yml
index 466fbe3..0097eb2 100644
--- a/build/build.yml
+++ b/build/build.yml
@@ -48,14 +48,14 @@ steps:
       cd zeromq.js
       git checkout $TREEISH
 
-- bash: |
-    node ../build/patch.js
-    git apply --whitespace=fix ../build/zeromq.js.patch
-    git diff
-    cp ../build/libzmq.patch .
-    cp ../build/libzmq-438d5d88.patch .
-  displayName: Patch zeromq.js
-  workingDirectory: zeromq.js
+# - bash: |
+#     node ../build/patch.js
+#     git apply --whitespace=fix ../build/zeromq.js.patch
+#     git diff
+#     cp ../build/libzmq.patch .
+#     cp ../build/libzmq-438d5d88.patch .
+#   displayName: Patch zeromq.js
+#   workingDirectory: zeromq.js
 
 - pwsh: |
     $includes = @'
diff --git a/config.json b/config.json
index d659214..437671b 100644
--- a/config.json
+++ b/config.json
@@ -1,4 +1,4 @@
 {
     "zeromqRepo": "zeromq/zeromq.js",
-    "zeromqTag": "v6.0.0-beta.19"
+    "zeromqTag": "v6.3.0"
 }

From 44d991e183043af3d5aa4fc3bc14b76be4897e7e Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Mon, 6 Jan 2025 16:25:10 +1100
Subject: [PATCH 2/4] Updates

---
 README.md       |  1 -
 build/build.yml | 12 ++++++------
 build/main.yml  |  4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index dfd96c0..0bd56d8 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,6 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope
 For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or
 contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
 
-* Use pnpm 7.33.6 when udpating the pnpm lock files
 
 ## Trademarks
 
diff --git a/build/build.yml b/build/build.yml
index 0097eb2..f4c5ac5 100644
--- a/build/build.yml
+++ b/build/build.yml
@@ -85,9 +85,9 @@ steps:
 
 - bash: |
     export PREBUILD_STRIP_BIN=$STRIP
-    npm install -g pnpm@latest-8
-    pnpm install
-    npm run prebuild
+    npm install -g pnpm@latest-9
+    npm install
+    npm run build
   displayName: Build
   condition: and(succeeded(), eq('${{ parameters.build }}', 'true'), ne('${{ parameters.ARCH }}', ''))
   workingDirectory: zeromq.js
@@ -97,9 +97,9 @@ steps:
     PREBUILD_ARCH: ${{ parameters.ARCH }}
 
 - bash: |
-    npm install -g pnpm@latest-8
-    pnpm install
-    npm run prebuild
+    npm install -g pnpm@latest-9
+    npm install
+    npm run build
   displayName: Build (no-arch)
   condition: and(succeeded(), eq('${{ parameters.build }}', 'true'), eq('${{ parameters.ARCH }}', ''))
   workingDirectory: zeromq.js
diff --git a/build/main.yml b/build/main.yml
index 51d194f..414a3fb 100644
--- a/build/main.yml
+++ b/build/main.yml
@@ -214,7 +214,7 @@ extends:
                   DOCKERCMD: >
                     addgroup -g 1000 node && adduser -u 1000 -G node -s /bin/sh -D node && HOME=/home/node &&
                     apk add --no-cache pkgconfig curl tar python3 make gcc g++ cmake musl-dev npm patch &&
-                    npm i -g pnpm@latest-8 && pnpm install && npm run prebuild
+                    npm i -g pnpm@latest-9 && npm install && npm run build
                 inputs:
                   targetType: 'inline'
                   workingDirectory: zeromq.js
@@ -257,7 +257,7 @@ extends:
                   DOCKERCMD: >
                     addgroup -g 1000 node && adduser -u 1000 -G node -s /bin/sh -D node && HOME=/home/node &&
                     apk add --no-cache pkgconfig curl tar python3 make gcc g++ cmake musl-dev npm patch &&
-                    npm i -g cross-env pnpm@latest-8 && cross-env ARCH=arm64 npm_config_arch=arm64 pnpm install && cross-env ARCH=arm64 npm_config_arch=arm64 npm run prebuild
+                    npm i -g cross-env pnpm@latest-9 && cross-env ARCH=arm64 npm_config_arch=arm64 npm install && cross-env ARCH=arm64 npm_config_arch=arm64 npm run build
                 inputs:
                   targetType: 'inline'
                   workingDirectory: zeromq.js

From 22e223b97b8de8cf7957f1f9156190700411ced5 Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Mon, 6 Jan 2025 16:31:50 +1100
Subject: [PATCH 3/4] wip

---
 build/build.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/build/build.yml b/build/build.yml
index f4c5ac5..4177269 100644
--- a/build/build.yml
+++ b/build/build.yml
@@ -87,6 +87,15 @@ steps:
     export PREBUILD_STRIP_BIN=$STRIP
     npm install -g pnpm@latest-9
     npm install
+  displayName: Build
+  condition: and(succeeded(), eq('${{ parameters.build }}', 'true'), ne('${{ parameters.ARCH }}', ''))
+  workingDirectory: zeromq.js
+  env:
+    ARCH: ${{ parameters.ARCH }}
+    npm_config_arch: ${{ parameters.npm_config_arch }}
+    PREBUILD_ARCH: ${{ parameters.ARCH }}
+
+- bash: |
     npm run build
   displayName: Build
   condition: and(succeeded(), eq('${{ parameters.build }}', 'true'), ne('${{ parameters.ARCH }}', ''))

From 02306fc4d42fbdd4a0516ce1bb21d70f4461982c Mon Sep 17 00:00:00 2001
From: Don Jayamanne <don.jayamanne@outlook.com>
Date: Mon, 6 Jan 2025 16:47:52 +1100
Subject: [PATCH 4/4] wip

---
 build/build.yml | 8 ++++----
 build/main.yml  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build/build.yml b/build/build.yml
index 4177269..e6d33be 100644
--- a/build/build.yml
+++ b/build/build.yml
@@ -86,7 +86,7 @@ steps:
 - bash: |
     export PREBUILD_STRIP_BIN=$STRIP
     npm install -g pnpm@latest-9
-    npm install
+    pnpm install
   displayName: Build
   condition: and(succeeded(), eq('${{ parameters.build }}', 'true'), ne('${{ parameters.ARCH }}', ''))
   workingDirectory: zeromq.js
@@ -96,7 +96,7 @@ steps:
     PREBUILD_ARCH: ${{ parameters.ARCH }}
 
 - bash: |
-    npm run build
+    pnpm run build
   displayName: Build
   condition: and(succeeded(), eq('${{ parameters.build }}', 'true'), ne('${{ parameters.ARCH }}', ''))
   workingDirectory: zeromq.js
@@ -107,8 +107,8 @@ steps:
 
 - bash: |
     npm install -g pnpm@latest-9
-    npm install
-    npm run build
+    pnpm install
+    pnpm run build
   displayName: Build (no-arch)
   condition: and(succeeded(), eq('${{ parameters.build }}', 'true'), eq('${{ parameters.ARCH }}', ''))
   workingDirectory: zeromq.js
diff --git a/build/main.yml b/build/main.yml
index 414a3fb..09354c9 100644
--- a/build/main.yml
+++ b/build/main.yml
@@ -214,7 +214,7 @@ extends:
                   DOCKERCMD: >
                     addgroup -g 1000 node && adduser -u 1000 -G node -s /bin/sh -D node && HOME=/home/node &&
                     apk add --no-cache pkgconfig curl tar python3 make gcc g++ cmake musl-dev npm patch &&
-                    npm i -g pnpm@latest-9 && npm install && npm run build
+                    npm i -g pnpm@latest-9 && pnpm install && pnpm run build
                 inputs:
                   targetType: 'inline'
                   workingDirectory: zeromq.js
@@ -257,7 +257,7 @@ extends:
                   DOCKERCMD: >
                     addgroup -g 1000 node && adduser -u 1000 -G node -s /bin/sh -D node && HOME=/home/node &&
                     apk add --no-cache pkgconfig curl tar python3 make gcc g++ cmake musl-dev npm patch &&
-                    npm i -g cross-env pnpm@latest-9 && cross-env ARCH=arm64 npm_config_arch=arm64 npm install && cross-env ARCH=arm64 npm_config_arch=arm64 npm run build
+                    npm i -g cross-env pnpm@latest-9 && cross-env ARCH=arm64 npm_config_arch=arm64 pnpm install && cross-env ARCH=arm64 npm_config_arch=arm64 pnpm run build
                 inputs:
                   targetType: 'inline'
                   workingDirectory: zeromq.js