Skip to content

Commit b041b1f

Browse files
aminyaaminya
committed
fix: update dependencies with minor changes
1 parent eaf6c45 commit b041b1f

File tree

26 files changed

+6118
-3867
lines changed

26 files changed

+6118
-3867
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]

‎.github/ISSUE_TEMPLATE/feature_request.md

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: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@ jobs:
6363
# Alpine
6464
- os: ubuntu-22.04
6565
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
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
6769
node_version: 20
6870
node_arch: x64
6971
ARCH: x64
@@ -83,7 +85,10 @@ jobs:
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
@@ -156,7 +161,8 @@ jobs:
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 }}"

‎.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

‎.travis.yml

Lines changed: 99 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -6,104 +6,110 @@ python:
66

77
jobs:
88
include:
9-
10-
## TEST STAGE
11-
12-
- os: linux
13-
node_js: "14"
14-
env: ZMQ_DRAFT=true
15-
16-
- os: linux
17-
node_js: "14"
18-
env: ZMQ_DRAFT=true INCLUDE_COMPAT_TESTS=true
19-
20-
- os: linux
21-
env: ALPINE_CHROOT=3.10 ZMQ_DRAFT=true INCLUDE_COMPAT_TESTS=true
22-
sudo: required
23-
node_js: "14"
24-
25-
- os: osx
26-
osx_image: xcode10
27-
env: ZMQ_DRAFT=true
28-
node_js: "14"
29-
30-
- os: windows
31-
node_js: "14"
32-
# https://travis-ci.community/t/build-doesnt-finish-after-completing-tests/288
33-
env: ZMQ_DRAFT=true YARN_GPG=no
34-
35-
- os: windows
36-
node_js: "14/x86"
37-
# https://travis-ci.community/t/build-doesnt-finish-after-completing-tests/288
38-
env: ZMQ_DRAFT=true YARN_GPG=no
39-
40-
# Test shared libraries on Linux and macOS.
41-
- os: linux
42-
node_js: "14"
43-
env: ZMQ_SHARED=true
44-
addons: {apt: {packages: libzmq3-dev}}
45-
46-
- os: osx
47-
osx_image: xcode10
48-
node_js: "14"
49-
env: ZMQ_SHARED=true
50-
addons: {homebrew: {packages: zeromq, update: true}}
51-
52-
# Test older versions of ZMQ.
53-
- os: linux
54-
node_js: "14"
55-
env: ZMQ_VERSION=4.2.4
56-
57-
# Test recent Node versions.
58-
- os: linux
59-
node_js: "14"
60-
# Skip GC tests due to https://github.com/node-ffi-napi/weak-napi/issues/16
61-
env: ZMQ_DRAFT=true SKIP_GC_TESTS=true INCLUDE_COMPAT_TESTS=true
62-
63-
- os: linux
64-
node_js: "13"
65-
# Skip GC tests due to https://github.com/node-ffi-napi/weak-napi/issues/16
66-
env: ZMQ_DRAFT=true SKIP_GC_TESTS=true
67-
68-
## ADDITIONAL TESTS
69-
70-
# This test ensures the delayed resolution of read/write promises is correct
71-
# by disabling immediate resolution (which happens 99% of the time) entirely.
72-
- os: linux
73-
node_js: "14"
74-
env: ZMQ_NO_SYNC_RESOLVE=true ZMQ_DRAFT=true INCLUDE_COMPAT_TESTS=true NODE_NO_WARNINGS=1
75-
76-
## PREBUILD STAGE
77-
78-
- stage: prebuild
79-
os: linux
80-
env: ALPINE_CHROOT=3.10 ARCHIVE_SUFFIX=-x64-musl
81-
sudo: required
82-
script: npm run prebuild
83-
84-
- stage: prebuild
85-
os: linux
86-
node_js: "14"
87-
env: ARCH=arm TRIPLE=arm-linux-gnueabihf GCC=8 ARCHIVE_SUFFIX=-armv7
88-
addons: {apt: {packages: [gcc-8-arm-linux-gnueabihf, g++-8-arm-linux-gnueabihf]}}
89-
script: npm run prebuild
90-
91-
- stage: prebuild
92-
os: linux
93-
node_js: "14"
94-
env: ARCH=arm64 TRIPLE=aarch64-linux-gnu GCC=8 ARCHIVE_SUFFIX=-armv8
95-
addons: {apt: {packages: [gcc-8-aarch64-linux-gnu, g++-8-aarch64-linux-gnu]}}
96-
script: npm run prebuild
9+
## TEST STAGE
10+
11+
- os: linux
12+
node_js: "14"
13+
env: ZMQ_DRAFT=true
14+
15+
- os: linux
16+
node_js: "14"
17+
env: ZMQ_DRAFT=true INCLUDE_COMPAT_TESTS=true
18+
19+
- os: linux
20+
env: ALPINE_CHROOT=3.10 ZMQ_DRAFT=true INCLUDE_COMPAT_TESTS=true
21+
sudo: required
22+
node_js: "14"
23+
24+
- os: osx
25+
osx_image: xcode10
26+
env: ZMQ_DRAFT=true
27+
node_js: "14"
28+
29+
- os: windows
30+
node_js: "14"
31+
# https://travis-ci.community/t/build-doesnt-finish-after-completing-tests/288
32+
env: ZMQ_DRAFT=true YARN_GPG=no
33+
34+
- os: windows
35+
node_js: "14/x86"
36+
# https://travis-ci.community/t/build-doesnt-finish-after-completing-tests/288
37+
env: ZMQ_DRAFT=true YARN_GPG=no
38+
39+
# Test shared libraries on Linux and macOS.
40+
- os: linux
41+
node_js: "14"
42+
env: ZMQ_SHARED=true
43+
addons: {apt: {packages: libzmq3-dev}}
44+
45+
- os: osx
46+
osx_image: xcode10
47+
node_js: "14"
48+
env: ZMQ_SHARED=true
49+
addons: {homebrew: {packages: zeromq, update: true}}
50+
51+
# Test older versions of ZMQ.
52+
- os: linux
53+
node_js: "14"
54+
env: ZMQ_VERSION=4.2.4
55+
56+
# Test recent Node versions.
57+
- os: linux
58+
node_js: "14"
59+
# Skip GC tests due to https://github.com/node-ffi-napi/weak-napi/issues/16
60+
env: ZMQ_DRAFT=true SKIP_GC_TESTS=true INCLUDE_COMPAT_TESTS=true
61+
62+
- os: linux
63+
node_js: "13"
64+
# Skip GC tests due to https://github.com/node-ffi-napi/weak-napi/issues/16
65+
env: ZMQ_DRAFT=true SKIP_GC_TESTS=true
66+
67+
## ADDITIONAL TESTS
68+
69+
# This test ensures the delayed resolution of read/write promises is correct
70+
# by disabling immediate resolution (which happens 99% of the time) entirely.
71+
- os: linux
72+
node_js: "14"
73+
env:
74+
ZMQ_NO_SYNC_RESOLVE=true ZMQ_DRAFT=true INCLUDE_COMPAT_TESTS=true
75+
NODE_NO_WARNINGS=1
76+
77+
## PREBUILD STAGE
78+
79+
- stage: prebuild
80+
os: linux
81+
env: ALPINE_CHROOT=3.10 ARCHIVE_SUFFIX=-x64-musl
82+
sudo: required
83+
script: npm run prebuild
84+
85+
- stage: prebuild
86+
os: linux
87+
node_js: "14"
88+
env: ARCH=arm TRIPLE=arm-linux-gnueabihf GCC=8 ARCHIVE_SUFFIX=-armv7
89+
addons:
90+
{
91+
apt:
92+
{packages: [gcc-8-arm-linux-gnueabihf, g++-8-arm-linux-gnueabihf]},
93+
}
94+
script: npm run prebuild
95+
96+
- stage: prebuild
97+
os: linux
98+
node_js: "14"
99+
env: ARCH=arm64 TRIPLE=aarch64-linux-gnu GCC=8 ARCHIVE_SUFFIX=-armv8
100+
addons:
101+
{apt: {packages: [gcc-8-aarch64-linux-gnu, g++-8-aarch64-linux-gnu]}}
102+
script: npm run prebuild
97103

98104
fast_finish: true
99105

100106
stages:
101-
- name: test
102-
- name: prebuild
103-
if: tag IS present
107+
- name: test
108+
- name: prebuild
109+
if: tag IS present
104110

105111
install:
106-
- travis_retry script/ci/install.sh
112+
- travis_retry script/ci/install.sh
107113

108114
script:
109-
- travis_retry script/ci/test.sh
115+
- travis_retry script/ci/test.sh

0 commit comments

Comments
 (0)