Merge branch 'main' into renovate/napi-2.x

crabnebula-dev · Jan 29, 2024 · a4bf122 · a4bf122
2 parents 5daed14 + 1e8c935
commit a4bf122
Show file tree

Hide file tree

Showing 27 changed files with 376 additions and 203 deletions.
diff --git a/.changes/add-pacman-support.md b/.changes/add-pacman-support.md
diff --git a/.changes/resource-resolver-initial-release.md b/.changes/resource-resolver-initial-release.md
diff --git a/.github/workflows/covector-version-or-publish.yml b/.github/workflows/covector-version-or-publish.yml
@@ -53,7 +53,7 @@ jobs:
         if: |
           steps.covector.outputs.successfulPublish == 'true' &&
           contains(steps.covector.outputs.packagesPublished, '@crabnebula/packager')
-        uses: peter-evans/repository-dispatch@v2
+        uses: peter-evans/repository-dispatch@v3
         with:
           event-type: publish-packager-nodejs
           client-payload: >-
@@ -63,7 +63,7 @@ jobs:
         if: |
           steps.covector.outputs.successfulPublish == 'true' &&
           contains(steps.covector.outputs.packagesPublished, '@crabnebula/updater')
-        uses: peter-evans/repository-dispatch@v2
+        uses: peter-evans/repository-dispatch@v3
         with:
           event-type: publish-updater-nodejs
           client-payload: >-
@@ -73,7 +73,7 @@ jobs:
         if: |
           steps.covector.outputs.successfulPublish == 'true' &&
           contains(steps.covector.outputs.packagesPublished, '@crabnebula/packager-resource-resolver')
-        uses: peter-evans/repository-dispatch@v2
+        uses: peter-evans/repository-dispatch@v3
         with:
           event-type: publish-packager-resource-resolver-nodejs
           client-payload: >-

diff --git a/.github/workflows/publish-packager-resource-resolver-nodejs.yml b/.github/workflows/publish-packager-resource-resolver-nodejs.yml
@@ -58,7 +58,7 @@ jobs:
           - host: macos-latest
             target: aarch64-apple-darwin
             build: |
-              pnpm build --target aarch64-apple-darwin --features native-tls-vendored --cargo-flags="--no-default-features"
+              pnpm build --target aarch64-apple-darwin
               strip -x *.node
           - host: ubuntu-latest
             target: aarch64-unknown-linux-gnu
@@ -87,7 +87,7 @@ jobs:
               /aarch64-linux-musl-cross/bin/aarch64-linux-musl-strip *.node
           - host: windows-latest
             target: aarch64-pc-windows-msvc
-            build: pnpm build --target aarch64-pc-windows-msvc --features native-tls-vendored --cargo-flags="--no-default-features"
+            build: pnpm build --target aarch64-pc-windows-msvc
     name: stable - ${{ matrix.settings.target }} - node@18
     runs-on: ${{ matrix.settings.host }}
     steps:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -28,7 +28,7 @@ tracing = "0.1"
 time = "0.3"
 tar = "0.4"
 napi = { version = "2.15", default-features = false }
-napi-derive = "2.14"
+napi-derive = "2.15"
 napi-build = "2.1.0"
 
 [profile.release-size-optimized]

diff --git a/bindings/packager/nodejs/CHANGELOG.md b/bindings/packager/nodejs/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## \[0.2.0]
+
+- [`9bdb953`](https://www.github.com/crabnebula-dev/cargo-packager/commit/9bdb953f1b48c8d69d86e9e42295cd36453c1648)([#137](https://www.github.com/crabnebula-dev/cargo-packager/pull/137)) Add Arch Linux package manager, `pacman` support for cargo packager.
+- [`a29943e`](https://www.github.com/crabnebula-dev/cargo-packager/commit/a29943e8c95d70e8b77c23021ce52f6ee13314c8)([#140](https://www.github.com/crabnebula-dev/cargo-packager/pull/140)) Fix codesigning failing on macOS under certain circumstances when the order in which files were signed was not
+  deterministic and nesting required signing files nested more deeply first.
+
+### Dependencies
+
+- Upgraded to `[email protected]`
+- Upgraded to `[email protected]`
+
 ## \[0.1.5]
 
 - [`f08e4b8`](https://www.github.com/crabnebula-dev/cargo-packager/commit/f08e4b8972b072617fdb78f11e222427e49ebe8e) Fix the signing and notarization process for MacOS bundles

diff --git a/bindings/packager/nodejs/package.json b/bindings/packager/nodejs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@crabnebula/packager",
-  "version": "0.1.5",
+  "version": "0.2.0",
   "main": "build/index.js",
   "module": "build/index.js",
   "types": "build/index.d.ts",

diff --git a/bindings/packager/nodejs/packager.js b/bindings/packager/nodejs/packager.js
diff --git a/bindings/resource-resolver/nodejs/CHANGELOG.md b/bindings/resource-resolver/nodejs/CHANGELOG.md
@@ -0,0 +1,10 @@
+# Changelog
+
+## \[0.1.0]
+
+- [`cd0242b`](https://www.github.com/crabnebula-dev/cargo-packager/commit/cd0242b8a41b2f7ecb78dfbae04b3a2e1c72c931) Initial Release.
+
+### Dependencies
+
+- Upgraded to `[email protected]`
+- Upgraded to `[email protected]`
diff --git a/bindings/resource-resolver/nodejs/__test__/index.spec.mjs b/bindings/resource-resolver/nodejs/__test__/index.spec.mjs
@@ -0,0 +1,8 @@
+import test from "ava";
+
+import { resourcesDir, PackageFormat } from "../index.js";
+
+test("resolve resource directory", async (t) => {
+  const dir = resourcesDir(PackageFormat.Nsis);
+  t.is(typeof dir, "string");
+});
diff --git a/bindings/resource-resolver/nodejs/package.json b/bindings/resource-resolver/nodejs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@crabnebula/packager-resource-resolver",
-  "version": "0.0.0",
+  "version": "0.1.0",
   "main": "./index.js",
   "types": "./index.d.ts",
   "napi": {
@@ -24,12 +24,17 @@
     "postbuild": "node ./fix-types.js",
     "build:debug": "napi build --platform",
     "prepublishOnly": "napi prepublish -t npm --gh-release-id $RELEASE_ID",
+    "test": "ava --no-worker-threads --timeout 30m",
     "universal": "napi universal",
     "version": "napi version"
   },
   "devDependencies": {
     "@napi-rs/cli": "^2.16.5",
-    "@types/node": "^20.8.10"
+    "@types/node": "^20.8.10",
+    "ava": "^6.0.0"
+  },
+  "ava": {
+    "timeout": "3m"
   },
   "engines": {
     "node": ">= 10"

diff --git a/bindings/updater/nodejs/CHANGELOG.md b/bindings/updater/nodejs/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## \[0.1.2]
+
+- [`005a55f`](https://www.github.com/crabnebula-dev/cargo-packager/commit/005a55fb27b92503b3d6f936cffb088ccf346c40)([#143](https://www.github.com/crabnebula-dev/cargo-packager/pull/143)) Fix the download callback parameters to be accurate to typescript definitions
+
+### Dependencies
+
+- Upgraded to `[email protected]`
+- Upgraded to `[email protected]`
+
 ## \[0.1.1]
 
 - [`feb53a2`](https://www.github.com/crabnebula-dev/cargo-packager/commit/feb53a2f16ef2c8d93ff2d73a4eb318490f33471)([#102](https://www.github.com/crabnebula-dev/cargo-packager/pull/102)) Fix NSIS updater failing to launch when using `basicUi` mode.

diff --git a/bindings/updater/nodejs/index.d.ts b/bindings/updater/nodejs/index.d.ts
@@ -75,7 +75,7 @@ export class Update {
   date?: string
   /** Request timeout */
   timeout?: number
-  download(onChunk?: (chunkLength: number, contentLength: number | null) => void, onDownloadFinished?: () => void): Promise<Array<number>>
-  install(bytes: Array<number>): Promise<void>
+  download(onChunk?: (chunkLength: number, contentLength: number | null) => void, onDownloadFinished?: () => void): Promise<ArrayBuffer>
+  install(buffer: ArrayBuffer): Promise<void>
   downloadAndInstall(onChunk?: (chunkLength: number, contentLength?: number) => void, onDownloadFinished?: () => void): Promise<void>
 }
diff --git a/bindings/updater/nodejs/package.json b/bindings/updater/nodejs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@crabnebula/updater",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "main": "./index.js",
   "types": "./index.d.ts",
   "napi": {