Skip to content

Commit

Permalink
mk: upgrade to Go 1.22 and xo-linter 0.57
Browse files Browse the repository at this point in the history
  • Loading branch information
yoursunny committed Feb 15, 2024
1 parent 281ff49 commit 2e1dda9
Show file tree
Hide file tree
Showing 14 changed files with 68 additions and 56 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
echo meson=$(meson --version) >> $GITHUB_OUTPUT
sudo update-alternatives --install /usr/bin/go go $(command -v go) 1
- name: Cache DPDK and SPDK
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/setup-dpdk
key: ${{ steps.deps.outputs.meson }}_20231213
Expand Down Expand Up @@ -124,3 +124,4 @@ jobs:
run: |
tinygo build -o /dev/null -target=wasm ./ndn/ndntestenv/tiny
make -C sample/wasm
continue-on-error: true # https://github.com/tinygo-org/tinygo/issues/4120
6 changes: 3 additions & 3 deletions docs/INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ You can also [build a Docker container](Docker.md), which would work on other op
* Linux kernel 5.14 or newer
* Required APT packages: `clang-15 g++-12 git jq libc6-dev-i386 libelf-dev libpcap-dev libssl-dev liburcu-dev make ninja-build pkg-config`
* Optional APT packages: `clang-format-15 doxygen lcov yamllint`
* Go 1.21
* Go 1.22
* Node.js 20.x
* [Meson build system](https://mesonbuild.com/Getting-meson.html) 1.x
* [ubpf](https://github.com/iovisor/ubpf) a3e69808
* [libbpf](https://github.com/libbpf/libbpf) 1.3.0 and [libxdp](https://github.com/xdp-project/xdp-tools) 1.4.1 (optional)
* [libbpf](https://github.com/libbpf/libbpf) 1.3.0 and [libxdp](https://github.com/xdp-project/xdp-tools) 1.4.2 (optional)
* [liburing](https://github.com/axboe/liburing) 2.5
* [Data Plane Development Kit (DPDK)](https://www.dpdk.org/) 23.11
* [Storage Performance Development Kit (SPDK)](https://spdk.io/) c47b9b42
Expand All @@ -25,7 +25,7 @@ You can run the [ndndpdk-depends.sh](ndndpdk-depends.sh) script to install these
Certain hardware drivers may require extra dependencies before building DPDK or running the script; see [hardware known to work](hardware.md) for more information.

The script automatically downloads dependencies from the Internet.
If your network cannot reach certain download sites, you can specify a mirror site via `NDNDPDK_DL_*` environment variables.
If your network cannot reach certain download sites, you can specify mirror sites via `NDNDPDK_DL_*` environment variables.
See script source code for variable names and their default values.

## Build Steps
Expand Down
2 changes: 1 addition & 1 deletion docs/ndndpdk-depends.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ DFLT_NODEVER=20
DFLT_GOVER=latest
DFLT_UBPFVER=a3e69808888b0f48e3a7972dd94115e46dad1e74
DFLT_LIBBPFVER=v1.3.0
DFLT_XDPTOOLSVER=v1.4.1
DFLT_XDPTOOLSVER=v1.4.2
DFLT_URINGVER=liburing-2.5
DFLT_DPDKVER=v23.11
DFLT_DPDKPATCH=
Expand Down
14 changes: 7 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/usnistgov/ndn-dpdk

go 1.21
go 1.22

require (
github.com/EGT-Ukraine/go2gql v0.0.0-20190528134259-79533208556f
Expand Down Expand Up @@ -40,8 +40,8 @@ require (
go.fd.io/govpp/extras v0.1.0
go.uber.org/zap v1.26.0
go4.org v0.0.0-20230225012048-214862532bf5
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc
golang.org/x/sys v0.16.0
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a
golang.org/x/sys v0.17.0
)

require (
Expand All @@ -56,7 +56,7 @@ require (
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
github.com/onsi/ginkgo v1.16.5 // indirect
github.com/onsi/gomega v1.30.0 // indirect
github.com/onsi/gomega v1.31.1 // indirect
github.com/pkg/errors v0.8.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
Expand All @@ -68,8 +68,8 @@ require (
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
go.uber.org/multierr v1.10.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/crypto v0.16.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/term v0.15.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
28 changes: 14 additions & 14 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -370,8 +370,8 @@ github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
github.com/onsi/gomega v1.31.1 h1:KYppCUK+bUgAZwHOu7EXVBKyQA6ILvOESHkn/tgoqvo=
github.com/onsi/gomega v1.31.1/go.mod h1:y40C95dwAD1Nz36SsEnxvfFe8FFfNxzI5eJ0EYGyAy0=
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
github.com/pascaldekloe/name v1.0.1 h1:9lnXOHeqeHHnWLbKfH6X98+4+ETVqFqxN09UXSjcMb0=
Expand Down Expand Up @@ -514,8 +514,8 @@ golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPh
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
Expand All @@ -526,8 +526,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc h1:ao2WRsKSzW6KuUY9IWPwWahcHCgR0s52IfwutMfEbdM=
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a h1:HinSgX1tJRX3KsL//Gxynpw5CTOAIPhgL4W8PNiIpVE=
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
Expand Down Expand Up @@ -602,8 +602,8 @@ golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qx
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
Expand Down Expand Up @@ -711,13 +711,13 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
Expand All @@ -728,8 +728,8 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
Expand Down
4 changes: 2 additions & 2 deletions js/lib/gqlclient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export { gql };
export class GqlClient {
/**
* Constructor.
* @param uri NDN-DPDK GraphQL server URI.
* @param uri - NDN-DPDK GraphQL server URI.
*/
constructor(uri: string | URL) {
uri = new URL(uri, globalThis.document?.URL);
Expand All @@ -24,7 +24,7 @@ export class GqlClient {
private async reconnect(): Promise<void> {
this.client ??= await this.mutex(async () => new Promise<GraphQLWebSocketClient>((resolve, reject) => {
const ws = new WebSocket(this.uri, GraphQLWebSocketClient.PROTOCOL);
ws.addEventListener("error", (evt) => reject(evt.error));
ws.addEventListener("error", (evt) => reject(evt.error as Error));
ws.addEventListener("close", () => { this.client = undefined; });

const client = new GraphQLWebSocketClient(ws as any, {
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"type": "module",
"main": "build/js/mod.js",
"types": "js/mod.ts",
"packageManager": "pnpm@8.14.0",
"packageManager": "pnpm@8.15.3+sha256.fc4a49bd609550a41e14d20efbce802a4b892aa4cac877322de2f0924f122991",
"dependencies": {
"graphql": "^16.8.1",
"graphql-request": "^6.1.0",
Expand All @@ -21,10 +21,10 @@
},
"devDependencies": {
"@types/ws": "^8.5.10",
"@yoursunny/xo-config": "0.56.1",
"@yoursunny/xo-config": "0.57.2",
"dockerfilelint": "^1.8.0",
"json-stable-stringify": "^1.1.0",
"markdownlint-cli": "^0.38.0",
"json-stable-stringify": "^1.1.1",
"markdownlint-cli": "^0.39.0",
"ts-json-schema-generator": "^1.5.0",
"typescript": "~5.3.3"
},
Expand Down
4 changes: 2 additions & 2 deletions sample/activate/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"start": "tsx",
"typecheck": "tsc"
},
"packageManager": "pnpm@8.12.1",
"packageManager": "pnpm@8.15.3+sha256.fc4a49bd609550a41e14d20efbce802a4b892aa4cac877322de2f0924f122991",
"dependencies": {
"stdout-stream": "^2.0.0",
"tslib": "^2.6.2",
"tsx": "^4.6.2",
"tsx": "^4.7.1",
"typescript": "~5.3.3"
},
"devDependencies": {
Expand Down
18 changes: 9 additions & 9 deletions sample/benchmark/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,33 @@
"serve": "node --loader tsm main.ts serve",
"typecheck": "tsc --noEmit"
},
"packageManager": "pnpm@8.12.1",
"packageManager": "pnpm@8.15.3+sha256.fc4a49bd609550a41e14d20efbce802a4b892aa4cac877322de2f0924f122991",
"dependencies": {
"@fastify/express": "^2.3.0",
"@fastify/http-proxy": "^9.3.0",
"@fastify/static": "^6.12.0",
"@fastify/http-proxy": "^9.4.0",
"@fastify/static": "^7.0.1",
"@strattadb/environment": "^8.0.2",
"@types/minimalistic-assert": "^1.0.3",
"@types/ndjson": "^2.0.4",
"@types/stdout-stream": "^1.4.2",
"@types/yargs": "^17.0.32",
"@typescript/lib-dom": "npm:@types/[email protected].127",
"@typescript/lib-dom": "npm:@types/[email protected].139",
"@usnistgov/ndn-dpdk": "file:/usr/local/share/ndn-dpdk/ndn-dpdk.npm.tgz",
"delay": "^6.0.0",
"dotenv": "^16.3.1",
"fastify": "^4.25.0",
"dotenv": "^16.4.4",
"fastify": "^4.26.1",
"get-stdin": "^9.0.0",
"minimalistic-assert": "^1.0.1",
"ndjson": "^2.0.0",
"preact": "^10.19.3",
"preact": "^10.19.4",
"simple-statistics": "^7.8.3",
"stdout-stream": "^2.0.0",
"ts-loader": "^9.5.1",
"tslib": "^2.6.2",
"tsm": "^2.3.0",
"typescript": "~5.3.3",
"webpack": "^5.89.0",
"webpack-dev-middleware": "^6.1.1",
"webpack": "^5.90.2",
"webpack-dev-middleware": "^7.0.0",
"yargs": "^17.7.2"
},
"engines": {
Expand Down
8 changes: 4 additions & 4 deletions sample/benchmark/src/benchmark.ts
Original file line number Diff line number Diff line change
Expand Up @@ -376,15 +376,15 @@ export class Benchmark {
}

interface State {
/** TgNodeLabel => forwarder side face ID */
/** TgNodeLabel =\> forwarder side face ID */
face: Record<string, string>;
/** whether NDT duplicates are detected */
ndtDuplicate: boolean;
/** TgNodeLabel => fetcher ID */
/** TgNodeLabel =\> fetcher ID */
fetcher: Record<string, string>;
/** TgNodeLabel => fileserver versionBypassHi */
/** TgNodeLabel =\> fileserver versionBypassHi */
fileServerVersionBypassHi: Record<string, bigint>;
/** TgNodeLabel => fetcher task IDs */
/** TgNodeLabel =\> fetcher task IDs */
tasks: Record<string, string[]>;
}

Expand Down
16 changes: 8 additions & 8 deletions sample/status/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@
"scripts": {
"typecheck": "tsc --noEmit"
},
"packageManager": "pnpm@8.12.1",
"packageManager": "pnpm@8.15.3+sha256.fc4a49bd609550a41e14d20efbce802a4b892aa4cac877322de2f0924f122991",
"dependencies": {
"@fastify/express": "^2.3.0",
"@fastify/http-proxy": "^9.3.0",
"@fastify/static": "^6.12.0",
"@typescript/lib-dom": "npm:@types/[email protected].127",
"@fastify/http-proxy": "^9.4.0",
"@fastify/static": "^7.0.1",
"@typescript/lib-dom": "npm:@types/[email protected].139",
"@usnistgov/ndn-dpdk": "file:/usr/local/share/ndn-dpdk/ndn-dpdk.npm.tgz",
"delay": "^6.0.0",
"fastify": "^4.25.0",
"fastify": "^4.26.1",
"hashquery": "^1.0.0",
"numd": "^3.1.0",
"preact": "^10.19.3",
"preact": "^10.19.4",
"ts-loader": "^9.5.1",
"tslib": "^2.6.2",
"typescript": "~5.3.3",
"url-parse-lax": "^5.0.0",
"webpack": "^5.89.0",
"webpack-dev-middleware": "^6.1.1",
"webpack": "^5.90.2",
"webpack-dev-middleware": "^7.0.0",
"yargs": "^17.7.2"
},
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion sample/status/src/workers-table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export class WorkersTable extends Component<Props> {
</tr>
</thead>
<tbody>
{workerEntries.map(([role, workers]) => workers.sort((a, b) => a.nid - b.nid).map((w, i) => (
{workerEntries.map(([role, workers]) => workers.toSorted((a, b) => a.nid - b.nid).map((w, i) => (
<tr key={w.id}>
{i === 0 ? (
<td rowSpan={workers.length}>{role}</td>
Expand Down
1 change: 1 addition & 0 deletions sample/status/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"esModuleInterop": true,
"experimentalDecorators": true,
"forceConsistentCasingInFileNames": true,
"lib": ["ES2023"],
"importHelpers": true,
"jsx": "react",
"jsxFactory": "h",
Expand Down
10 changes: 10 additions & 0 deletions xo.config.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,16 @@ module.exports = {
],
...merge(js, ts),
},
{
files: [
"js/types/**/*.ts",
],
...merge(js, ts, {
rules: {
"tsdoc/syntax": "off", // `@` tags are for ts-json-schema-generator
},
}),
},
{
files: [
"sample/benchmark/**/*.tsx",
Expand Down

0 comments on commit 2e1dda9

Please sign in to comment.