Skip to content

Commit 44656de

Browse files
authored
Merge pull request #615 from zeromq/deps
fix: update dependencies with minor changes
2 parents eaf6c45 + 8fd6653 commit 44656de

26 files changed

+6136
-3884
lines changed

.clang-format

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ BreakBeforeBraces: Attach
2323
BreakBeforeTernaryOperators: true
2424
BreakConstructorInitializersBeforeComma: false
2525
ColumnLimit: 90
26-
CommentPragmas: '^ IWYU pragma:'
26+
CommentPragmas: "^ IWYU pragma:"
2727
ConstructorInitializerAllOnOneLineOrOnePerLine: false
2828
ConstructorInitializerIndentWidth: 4
2929
ContinuationIndentWidth: 4
@@ -32,13 +32,13 @@ DerivePointerAlignment: false
3232
DisableFormat: false
3333
ExperimentalAutoDetectBinPacking: false
3434
FixNamespaceComments: false
35-
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
35+
ForEachMacros: [foreach, Q_FOREACH, BOOST_FOREACH]
3636
IndentCaseLabels: false
3737
IndentWidth: 4
3838
IndentWrappedFunctionNames: false
3939
KeepEmptyLinesAtTheStartOfBlocks: false
40-
MacroBlockBegin: ''
41-
MacroBlockEnd: ''
40+
MacroBlockBegin: ""
41+
MacroBlockEnd: ""
4242
MaxEmptyLinesToKeep: 1
4343
NamespaceIndentation: None
4444
ObjCBlockIndentWidth: 2
@@ -64,5 +64,5 @@ SpacesInSquareBrackets: false
6464
Standard: Auto
6565
TabWidth: 4
6666
UseTab: Never
67-
...
67+
---
6868

.eslintrc

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
{
2-
"plugins": [
3-
"prettier"
4-
],
5-
"extends": [
6-
"plugin:prettier/recommended",
7-
"eslint-config-atomic"
8-
],
2+
"plugins": ["prettier"],
3+
"extends": ["plugin:prettier/recommended", "eslint-config-atomic"],
94
"rules": {
10-
"@typescript-eslint/quotes": [
11-
"error",
12-
"double"
13-
],
5+
"@typescript-eslint/quotes": ["error", "double"],
146
"require-await": "off"
157
},
168
"ignorePatterns": [

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
---
22
name: Bug report
33
about: Create a report to help us improve
4-
title: ''
4+
title: ""
55
labels: bug
6-
assignees: ''
7-
6+
assignees: ""
87
---
98

10-
**Describe the bug**
11-
A clear and concise description of what the bug is.
9+
**Describe the bug** A clear and concise description of what the bug is.
1210

13-
**Reproducing**
14-
If possible, provide a list of commands or a code sample that reproduces the bug that you are observing. Otherwise please describe as much as possible in which circumstances the bug can be observed.
11+
**Reproducing** If possible, provide a list of commands or a code sample that
12+
reproduces the bug that you are observing. Otherwise please describe as much as
13+
possible in which circumstances the bug can be observed.
1514

16-
**Expected behavior**
17-
A clear and concise description of what you expected to happen.
15+
**Expected behavior** A clear and concise description of what you expected to
16+
happen.
1817

1918
**Tested on**
20-
- OS: [e.g. Ubuntu 18.04, Windows 10]
21-
- ZeroMQ.js version: [e.g. 5.1.0, 6.0.0-beta.2]
19+
20+
- OS: [e.g. Ubuntu 18.04, Windows 10]
21+
- ZeroMQ.js version: [e.g. 5.1.0, 6.0.0-beta.2]
Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
---
22
name: Feature request
33
about: Suggest an idea for this project
4-
title: ''
4+
title: ""
55
labels: enhancement
6-
assignees: ''
7-
6+
assignees: ""
87
---
98

10-
**Is your feature request related to a problem? Please describe.**
11-
A clear and concise description of what the problem is.
9+
**Is your feature request related to a problem? Please describe.** A clear and
10+
concise description of what the problem is.
1211

13-
**Describe the solution you'd like**
14-
A clear and concise description of what you want to happen.
12+
**Describe the solution you'd like** A clear and concise description of what you
13+
want to happen.
1514

16-
**Describe alternatives you've considered**
17-
A clear and concise description of any alternative solutions or features you've considered.
15+
**Describe alternatives you've considered** A clear and concise description of
16+
any alternative solutions or features you've considered.
1817

19-
**Additional context**
20-
Add any other context or screenshots about the feature request here.
18+
**Additional context** Add any other context or screenshots about the feature
19+
request here.

.github/workflows/CI.yml

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
Build:
10-
if: "!contains(github.event.head_commit.message, '[skip ci]')"
10+
if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
1111
runs-on: ${{ matrix.os }}
1212
strategy:
1313
fail-fast: false
@@ -17,7 +17,7 @@ jobs:
1717
- ubuntu-20.04
1818
- windows-2022
1919
node_version:
20-
- 20
20+
- 18
2121
node_arch:
2222
- x64
2323
cpp_arch:
@@ -33,38 +33,40 @@ jobs:
3333

3434
include:
3535
- os: windows-2022
36-
node_version: 20
36+
node_version: 18
3737
node_arch: x86
3838
ARCH: x86
3939
cpp_arch: amd64_x86
4040
zmq_draft: false
4141

4242
# - os: windows-2022
43-
# node_version: 20
43+
# node_version: 18
4444
# node_arch: x64
4545
# ARCH: arm64
4646
# cpp_arch: amd64_arm64
4747
# zmq_draft: false
4848

4949
- os: macos-13
50-
node_version: 20
50+
node_version: 18
5151
node_arch: x64
5252
ARCH: x86_64
5353
cpp_arch: x64
5454
zmq_draft: false
5555

5656
- os: macos-13
57-
node_version: 20
57+
node_version: 18
5858
node_arch: x64
5959
ARCH: arm64
6060
cpp_arch: amd64_arm64
6161
zmq_draft: false
6262

6363
# Alpine
6464
- os: ubuntu-22.04
65-
docker: node:20-alpine
66-
docker_cmd: apk add --no-cache pkgconfig curl tar python3 make gcc g++ cmake musl-dev && npm i -g pnpm && pnpm install && pnpm run prebuild
67-
node_version: 20
65+
docker: node:18-alpine
66+
docker_cmd:
67+
apk add --no-cache pkgconfig curl tar python3 make gcc g++ cmake
68+
musl-dev && npm i -g pnpm && pnpm install && pnpm run prebuild
69+
node_version: 18
6870
node_arch: x64
6971
ARCH: x64
7072
cpp_arch: x64
@@ -75,15 +77,18 @@ jobs:
7577
ZMQ_SHARED: false
7678
ARCH: ${{ matrix.ARCH }}
7779
steps:
78-
- uses: actions/checkout@v3
80+
- uses: actions/checkout@v4
7981

8082
- name: Cache
81-
uses: actions/cache@v3
83+
uses: actions/cache@v4
8284
with:
8385
path: |
8486
./node_modules/
8587
./build/
86-
key: "cache-OS:${{ matrix.os }}-arch:${{ matrix.node_arch }}-ZMQ_DRAFT:${{ matrix.zmq_draft }}-Node:${{ matrix.node_version }}-${{ hashFiles('./package.json') }}"
88+
key:
89+
"cache-OS:${{ matrix.os }}-arch:${{ matrix.node_arch
90+
}}-ZMQ_DRAFT:${{ matrix.zmq_draft }}-Node:${{ matrix.node_version
91+
}}-${{ hashFiles('./package.json') }}"
8792
restore-keys: |
8893
"cache-OS:${{ matrix.os }}-arch:${{ matrix.node_arch }}-ZMQ_DRAFT:${{ matrix.zmq_draft }}-Node:${{ matrix.node_version }}-"
8994
@@ -96,14 +101,14 @@ jobs:
96101
python: true
97102
architecture: ${{ matrix.cpp_arch }}
98103

99-
- uses: pnpm/action-setup@v2.2.4
104+
- uses: pnpm/action-setup@v4
100105
if: ${{ !matrix.docker }}
101106
with:
102-
version: 8
107+
version: 9
103108

104109
- name: Install Node
105110
if: ${{ !matrix.docker }}
106-
uses: actions/setup-node@v3
111+
uses: actions/setup-node@v4
107112
with:
108113
node-version: ${{ matrix.node_version }}
109114
architecture: ${{ matrix.node_arch }}
@@ -149,18 +154,19 @@ jobs:
149154

150155
- name: Test (Debug)
151156
if: ${{ !matrix.docker }}
152-
uses: nick-fields/retry@v2
157+
uses: nick-fields/retry@v3
153158
with:
154159
timeout_minutes: 5
155160
max_attempts: 1
156161
command: |
157162
pnpm run clean
158163
pnpm run test.skip_gc_tests
159-
continue-on-error: "${{ contains(matrix.os, 'ubuntu') && !matrix.docker }}"
164+
continue-on-error:
165+
"${{ contains(matrix.os, 'ubuntu') && !matrix.docker }}"
160166

161167
- name: Test Electron (Main)
162168
if: "${{ contains(matrix.os, 'ubuntu') && !matrix.docker }}"
163-
uses: nick-fields/retry@v2
169+
uses: nick-fields/retry@v3
164170
with:
165171
timeout_minutes: 5
166172
max_attempts: 1
@@ -173,7 +179,7 @@ jobs:
173179

174180
- name: Tests + GC Tests (Release)
175181
if: ${{ !matrix.docker }}
176-
uses: nick-fields/retry@v2
182+
uses: nick-fields/retry@v3
177183
with:
178184
timeout_minutes: 5
179185
max_attempts: 1

.github/workflows/docs.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ on:
66

77
jobs:
88
Docs:
9-
if: "startsWith(github.ref, 'refs/tags/') && !contains(github.event.head_commit.message, '[skip ci]')"
9+
if:
10+
"startsWith(github.ref, 'refs/tags/') &&
11+
!contains(github.event.head_commit.message, '[skip ci]')"
1012
runs-on: ubuntu-22.04
1113
strategy:
1214
fail-fast: false
@@ -37,7 +39,10 @@ jobs:
3739
path: |
3840
./node_modules/
3941
./build/
40-
key: "cache-OS:${{ matrix.os }}-arch:${{ matrix.node_arch }}-ZMQ_DRAFT:${{ matrix.zmq_draft }}-Node:${{ matrix.node_version }}-${{ hashFiles('./package.json') }}"
42+
key:
43+
"cache-OS:${{ matrix.os }}-arch:${{ matrix.node_arch
44+
}}-ZMQ_DRAFT:${{ matrix.zmq_draft }}-Node:${{ matrix.node_version
45+
}}-${{ hashFiles('./package.json') }}"
4146
restore-keys: |
4247
"cache-OS:${{ matrix.os }}-arch:${{ matrix.node_arch }}-ZMQ_DRAFT:${{ matrix.zmq_draft }}-Node:${{ matrix.node_version }}-"
4348

.mocharc.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
'use strict'
1+
"use strict"
22

33
module.exports = {
4-
require: ['ts-node/register', 'rocha'],
5-
spec: ['test/unit/*-test.ts', 'test/unit/compat/*-test.{ts,js}'],
4+
require: ["ts-node/register", "rocha"],
5+
spec: ["test/unit/*-test.ts", "test/unit/compat/*-test.{ts,js}"],
66
"expose-gc": true,
77
"experimental-worker": true,
88
recursive: true,

.prettierignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/docs/
2+
/docs-raw
3+
/lib
4+
/prebuilds
5+
/node_modules
6+
pnpm-lock.yaml

0 commit comments

Comments
 (0)