Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: bump aegir from 38.1.8 to 39.0.13 #104

Merged
merged 2 commits into from
Jun 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
# Coverage directory used by tools like istanbul
.nyc_output

node_modules
build
dist
docs

# Dependency directory
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
.docs
.coverage
node_modules
# Lock files
package-lock.json
yarn.lock
.clinic
coverage
.vscode
6 changes: 1 addition & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@
"interface",
"libp2p"
],
"engines": {
"node": ">=16.0.0",
"npm": ">=7.0.0"
},
"private": true,
"scripts": {
"reset": "aegir run clean && aegir clean ./node_modules ./package-lock.json packages/*/node_modules packages/*/package-lock.json packages/*/dist",
Expand All @@ -37,7 +33,7 @@
"release": "aegir run release"
},
"dependencies": {
"aegir": "^38.0.0"
"aegir": "^39.0.13"
},
"workspaces": [
"packages/*"
Expand Down
26 changes: 1 addition & 25 deletions packages/protons-benchmark/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,8 @@
"bugs": {
"url": "https://github.com/ipfs/protons/issues"
},
"engines": {
"node": ">=16.0.0",
"npm": ">=7.0.0"
},
"type": "module",
"types": "./dist/src/index.d.ts",
"typesVersions": {
"*": {
"*": [
"*",
"dist/*",
"dist/src/*",
"dist/src/*/index"
],
"src/*": [
"*",
"dist/*",
"dist/src/*",
"dist/src/*/index"
]
}
},
"files": [
"src",
"dist",
Expand All @@ -43,10 +23,6 @@
".": {
"types": "./dist/src/index.d.ts",
"import": "./dist/src/index.js"
},
"./status": {
"types": "./dist/src/status.d.ts",
"import": "./dist/src/status.js"
}
},
"eslintConfig": {
Expand All @@ -73,7 +49,7 @@
"@protobuf-ts/plugin": "^2.8.1",
"@protobuf-ts/runtime": "^2.8.1",
"@types/benchmark": "^2.1.1",
"aegir": "^38.0.0",
"aegir": "^39.0.13",
"benchmark": "^2.1.4",
"pbjs": "^0.0.14",
"protobufjs": "^7.0.0",
Expand Down
1 change: 0 additions & 1 deletion packages/protons-benchmark/src/decode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ $ npx playwright-test dist/src/index.js --runner benchmark
*/

import Benchmark from 'benchmark'

import { decodeTest as pbjsDecodeTest } from './pbjs/bench.js'
import { Test as ProtobufjsTest } from './protobufjs/bench.js'
import { Test as ProtonsTest } from './protons/bench.js'
Expand Down
1 change: 0 additions & 1 deletion packages/protons-benchmark/src/encode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ $ npx playwright-test dist/src/index.js --runner benchmark
*/

import Benchmark from 'benchmark'

import { encodeTest as pbjsEncodeTest } from './pbjs/bench.js'
import { Test as ProtobufjsTest } from './protobufjs/bench.js'
import { Test as ProtonsTest } from './protons/bench.js'
Expand Down
2 changes: 0 additions & 2 deletions packages/protons-benchmark/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ $ npx playwright-test dist/src/index.js --runner benchmark
*/

import { expect } from 'aegir/chai'

import Benchmark from 'benchmark'

import { encodeTest as pbjsEncodeTest, decodeTest as pbjsDecodeTest } from './pbjs/bench.js'
import { Test as ProtobufTsTest } from './protobuf-ts/bench.js'
import { Test as ProtobufjsTest } from './protobufjs/bench.js'
Expand Down
4 changes: 1 addition & 3 deletions packages/protons-benchmark/src/rpc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ $ node dist/src/index.js
$ npx playwright-test dist/src/index.js --runner benchmark
*/

import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'

import Benchmark from 'benchmark'

import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
import { RPC as ProtobufjsRPC } from './protobufjs/rpc.js'
import { RPC as ProtonsRPC } from './protons/rpc.js'

Expand Down
26 changes: 1 addition & 25 deletions packages/protons-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,8 @@
"bugs": {
"url": "https://github.com/ipfs/protons/issues"
},
"engines": {
"node": ">=16.0.0",
"npm": ">=7.0.0"
},
"type": "module",
"types": "./dist/src/index.d.ts",
"typesVersions": {
"*": {
"*": [
"*",
"dist/*",
"dist/src/*",
"dist/src/*/index"
],
"src/*": [
"*",
"dist/*",
"dist/src/*",
"dist/src/*/index"
]
}
},
"files": [
"src",
"dist",
Expand All @@ -43,10 +23,6 @@
".": {
"types": "./dist/src/index.d.ts",
"import": "./dist/src/index.js"
},
"./status": {
"types": "./dist/src/status.d.ts",
"import": "./dist/src/status.js"
}
},
"eslintConfig": {
Expand Down Expand Up @@ -152,7 +128,7 @@
"uint8arraylist": "^2.4.3"
},
"devDependencies": {
"aegir": "^38.0.0"
"aegir": "^39.0.13"
},
"peerDependencies": {
"uint8arraylist": "^2.3.2"
Expand Down
3 changes: 1 addition & 2 deletions packages/protons-runtime/src/codecs/message.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { createCodec, CODEC_TYPES, EncodeOptions } from '../codec.js'
import type { Codec } from '../codec.js'
import { createCodec, CODEC_TYPES, type EncodeOptions, type Codec } from '../codec.js'
import type { Reader, Writer } from '../index.js'

export interface Factory<A, T> {
Expand Down
5 changes: 2 additions & 3 deletions packages/protons-runtime/src/decode.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import type { Uint8ArrayList } from 'uint8arraylist'

import type { Codec } from './codec.js'
import { reader } from './utils.js'
import type { Codec } from './codec.js'
import type { Uint8ArrayList } from 'uint8arraylist'

export function decodeMessage <T> (buf: Uint8Array | Uint8ArrayList, codec: Codec<T>): T {
const r = reader(buf instanceof Uint8Array ? buf : buf.subarray())
Expand Down
2 changes: 1 addition & 1 deletion packages/protons-runtime/src/encode.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Codec } from './codec.js'
import { writer } from './utils.js'
import type { Codec } from './codec.js'

export function encodeMessage <T> (message: T, codec: Codec<T>): Uint8Array {
const w = writer()
Expand Down
1 change: 0 additions & 1 deletion packages/protons-runtime/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import util from 'protobufjs/src/util/minimal.js'
import WriterClass from 'protobufjs/src/writer.js'
// @ts-expect-error no types
import WriterBufferClass from 'protobufjs/src/writer_buffer.js'

import type { Reader, Writer } from './index.js'

function configure (): void {
Expand Down
1 change: 0 additions & 1 deletion packages/protons/bin/protons.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#! /usr/bin/env node

import meow from 'meow'

import { generate } from '../src/index.js'

async function main (): Promise<void> {
Expand Down
26 changes: 1 addition & 25 deletions packages/protons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,31 +11,11 @@
"bugs": {
"url": "https://github.com/ipfs/protons/issues"
},
"engines": {
"node": ">=16.0.0",
"npm": ">=7.0.0"
},
"bin": {
"protons": "./dist/bin/protons.js"
},
"type": "module",
"types": "./dist/src/index.d.ts",
"typesVersions": {
"*": {
"*": [
"*",
"dist/*",
"dist/src/*",
"dist/src/*/index"
],
"src/*": [
"*",
"dist/*",
"dist/src/*",
"dist/src/*/index"
]
}
},
"files": [
"src",
"dist",
Expand All @@ -46,10 +26,6 @@
".": {
"types": "./dist/src/index.d.ts",
"import": "./dist/src/index.js"
},
"./status": {
"types": "./dist/src/status.d.ts",
"import": "./dist/src/status.js"
}
},
"eslintConfig": {
Expand Down Expand Up @@ -157,7 +133,7 @@
"protobufjs-cli": "^1.0.0"
},
"devDependencies": {
"aegir": "^38.0.0",
"aegir": "^39.0.13",
"long": "^5.2.0",
"pbjs": "^0.0.14",
"protobufjs": "^7.0.0",
Expand Down
1 change: 0 additions & 1 deletion packages/protons/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import fs from 'fs/promises'
import path from 'path'
import { promisify } from 'util'

import { main as pbjs } from 'protobufjs-cli/pbjs.js'

export enum CODEC_TYPES {
Expand Down
9 changes: 3 additions & 6 deletions packages/protons/test/compatibility.spec.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
/* eslint-env mocha */

import fs from 'fs'

import { expect } from 'aegir/chai'

import Long from 'long'
import pbjs from 'pbjs'
import protobufjs, { Type as PBType } from 'protobufjs'

import protobufjs, { type Type as PBType } from 'protobufjs'
import { Basic, Empty } from './fixtures/basic.js'
import { Message as Bitswap } from './fixtures/bitswap.js'
import { CircuitRelay } from './fixtures/circuit.js'
import { Optional, OptionalEnum } from './fixtures/optional.js'
import { Peer } from './fixtures/peer.js'
import { Singular, SingularEnum } from './fixtures/singular.js'
import { AllTheTypes, AnEnum } from './fixtures/test.js'
import { Message as Bitswap } from './fixtures/bitswap.js'

function longifyBigInts (obj: any): any {
const output = {
Expand Down Expand Up @@ -280,7 +277,7 @@ describe('encode', () => {
}

const root = protobufjs.loadSync('./test/fixtures/circuit.proto')
// @ts-expect-error
// @ts-expect-error root.nested is possibly undefined
const PbCircuitRelay = root.nested.CircuitRelay as PBType

const protobufJsBuf = PbCircuitRelay.encode(PbCircuitRelay.fromObject(message)).finish()
Expand Down
4 changes: 1 addition & 3 deletions packages/protons/test/maps.spec.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
/* eslint-env mocha */

import { expect } from 'aegir/chai'

import Long from 'long'
import protobufjs from 'protobufjs'

import { MapTypes, SubMessage } from './fixtures/maps.js'
import { MapTypes, type SubMessage } from './fixtures/maps.js'

function longifyBigInts (obj: any): any {
const output = {
Expand Down
1 change: 0 additions & 1 deletion packages/protons/test/unsupported.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* eslint-env mocha */

import { expect } from 'aegir/chai'

import { generate } from '../src/index.js'

describe('unsupported', () => {
Expand Down