Skip to content
This repository has been archived by the owner on Feb 12, 2024. It is now read-only.

chore: update-deps #3367

Merged
merged 7 commits into from
Nov 9, 2020
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
2 changes: 1 addition & 1 deletion examples/custom-ipfs-repo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": {
"datastore-fs": "^2.0.0",
"ipfs": "^0.51.0",
"ipfs-repo": "^6.0.3",
"ipfs-repo": "^7.0.0",
"it-all": "^1.0.4"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/traverse-ipld-graphs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"dependencies": {
"cids": "^1.0.0",
"ipfs": "^0.51.0",
"ipld-block": "^0.10.1",
"ipld-block": "^0.11.0",
"ipld-dag-pb": "^0.20.0",
"ipld-git": "^0.6.1",
"ipld-ethereum": "^5.0.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/interface-ipfs-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"ipfs-unixfs": "^2.0.3",
"ipfs-unixfs-importer": "^3.0.4",
"ipfs-utils": "^4.0.0",
"ipld-block": "^0.10.1",
"ipld-block": "^0.11.0",
"ipld-dag-cbor": "^0.17.0",
"ipld-dag-pb": "^0.20.0",
"ipns": "^0.8.0",
Expand All @@ -52,7 +52,7 @@
"it-drain": "^1.0.3",
"it-last": "^1.0.4",
"it-map": "^1.0.4",
"it-pushable": "^1.3.1",
"it-pushable": "^1.4.0",
"libp2p-crypto": "^0.18.0",
"multiaddr": "^8.0.0",
"multibase": "^3.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/ipfs-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@
"ipfs-http-client": "^48.0.0",
"ipfs-http-gateway": "^0.1.0",
"ipfs-http-server": "^0.1.0",
"ipfs-repo": "^6.0.3",
"ipfs-repo": "^7.0.0",
"ipfs-utils": "^4.0.0",
"ipld-dag-cbor": "^0.17.0",
"ipld-dag-pb": "^0.20.0",
"it-all": "^1.0.4",
"it-concat": "^1.0.1",
"it-first": "^1.0.4",
"it-glob": "0.0.8",
"it-glob": "0.0.10",
"it-pipe": "^1.1.0",
"jsondiffpatch": "^0.4.1",
"just-safe-set": "^2.1.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/ipfs-core-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@
},
"license": "MIT",
"dependencies": {
"blob-to-it": "0.0.2",
"browser-readablestream-to-it": "0.0.2",
"blob-to-it": "^1.0.1",
"browser-readablestream-to-it": "^1.0.1",
"cids": "^1.0.0",
"err-code": "^2.0.3",
"ipfs-utils": "^4.0.0",
"it-all": "^1.0.4",
"it-map": "^1.0.4",
"it-peekable": "0.0.1",
"it-peekable": "^1.0.1",
"uint8arrays": "^1.1.0"
},
"devDependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@ async function toBlob (input) {

// (Async)Iterator<?>
if (input[Symbol.iterator] || input[Symbol.asyncIterator]) {
/** @type {any} peekable */
const peekable = itPeekable(input)

/** @type {any} value **/
const { value, done } = await peekable.peek()

if (done) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,15 @@ async function * toAsyncIterable (input) {

// (Async)Iterator<?>
if (input[Symbol.iterator] || input[Symbol.asyncIterator]) {
/** @type {any} peekable */
const peekable = itPeekable(input)

/** @type {any} value */
const { value, done } = await peekable.peek()

if (done) {
// make sure empty iterators result in empty files
yield * peekable
yield * []
return
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,15 @@ module.exports = async function * normaliseInput (input, normaliseContent) {

// Iterable<?>
if (input[Symbol.iterator] || input[Symbol.asyncIterator]) {
/** @type {any} peekable */
const peekable = itPeekable(input)

/** @type {any} value **/
const { value, done } = await peekable.peek()

if (done) {
// make sure empty iterators result in empty files
yield * peekable
yield * []
return
}

Expand Down Expand Up @@ -102,8 +105,8 @@ module.exports = async function * normaliseInput (input, normaliseContent) {
async function toFileObject (input, normaliseContent) {
// @ts-ignore - Those properties don't exist on most input types
const { path, mode, mtime, content } = input

const file = { path: path || '', mode, mtime }

if (content) {
file.content = await normaliseContent(content)
} else if (!path) { // Not already a file object with path or content prop
Expand Down
2 changes: 1 addition & 1 deletion packages/ipfs-core/.aegir.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ let sigServerB
let ipfsdServer

module.exports = {
bundlesize: { maxSize: '520kB' },
bundlesize: { maxSize: '523kB' },
karma: {
files: [{
pattern: 'node_modules/interface-ipfs-core/test/fixtures/**/*',
Expand Down
10 changes: 5 additions & 5 deletions packages/ipfs-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,16 @@
"hamt-sharding": "^1.0.0",
"hashlru": "^2.3.0",
"interface-datastore": "^2.0.0",
"ipfs-bitswap": "^3.0.0",
"ipfs-bitswap": "^4.0.0",
"ipfs-block-service": "^0.18.0",
"ipfs-core-utils": "^0.5.0",
"ipfs-repo": "^6.0.3",
"ipfs-repo": "^7.0.0",
"ipfs-unixfs": "^2.0.3",
"ipfs-unixfs-exporter": "^3.0.4",
"ipfs-unixfs-importer": "^3.0.4",
"ipfs-utils": "^4.0.0",
"ipld": "^0.27.2",
"ipld-block": "^0.10.1",
"ipld": "^0.28.0",
"ipld-block": "^0.11.0",
"ipld-dag-cbor": "^0.17.0",
"ipld-dag-pb": "^0.20.0",
"ipld-raw": "^6.0.0",
Expand Down Expand Up @@ -127,7 +127,7 @@
"ipfsd-ctl": "^7.0.2",
"ipld-git": "^0.6.1",
"iso-random-stream": "^1.1.1",
"iso-url": "^0.4.7",
"iso-url": "^1.0.0",
"nanoid": "^3.1.12",
"p-event": "^4.2.0",
"p-map": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/ipfs-core/src/components/files/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ function createMfs (options) {
/**
* @param {Object} context
* @param {import('..').IPLD} context.ipld
* @param {import('..').IPLDBlock} context.block
* @param {import('..').Block} context.block
* @param {import('..').IPFSBlockService} context.blockService
* @param {import('..').IPFSRepo} context.repo
* @param {import('..').Preload} context.preload
Expand Down
3 changes: 2 additions & 1 deletion packages/ipfs-core/src/components/init.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ const log = require('debug')('ipfs:components:init')
const PeerId = require('peer-id')
const uint8ArrayFromString = require('uint8arrays/from-string')
const uint8ArrayToString = require('uint8arrays/to-string')

const mergeOptions = require('merge-options')
const getDefaultConfig = require('../runtime/config-nodejs.js')
const createRepo = require('../runtime/repo-nodejs')
Expand Down Expand Up @@ -209,6 +208,7 @@ async function initNewRepo (repo, { privateKey, emptyRepo, algorithm, bits, prof
emptyRepo = emptyRepo || false
bits = bits == null ? 2048 : Number(bits)

// @ts-ignore https://github.com/schnittstabil/merge-options/pull/26
config = mergeOptions(applyProfiles(profiles, getDefaultConfig()), config)

// Verify repo does not exist yet
Expand Down Expand Up @@ -271,6 +271,7 @@ async function initExistingRepo (repo, { config: newConfig, profiles, pass }) {
config = applyProfiles(profiles, config)
}
if (newConfig) {
// @ts-ignore https://github.com/schnittstabil/merge-options/pull/26
config = mergeOptions(config, newConfig)
}
await repo.config.set(config)
Expand Down
3 changes: 1 addition & 2 deletions packages/ipfs-core/src/components/name/resolve.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

const debug = require('debug')
const errcode = require('err-code')
/** @type {typeof Object.assign} */
const mergeOptions = require('merge-options')
const CID = require('cids')
const isDomain = require('is-domain-name')
Expand Down Expand Up @@ -61,7 +60,7 @@ module.exports = ({ dns, ipns, peerId, isOnline, options: constructorOptions })
const { offline } = constructorOptions

// TODO: params related logic should be in the core implementation
if (offline && options.nocache) {
if (offline && options && options.nocache) {
throw errcode(new Error('cannot specify both offline and nocache'), 'ERR_NOCACHE_AND_OFFLINE')
}

Expand Down
1 change: 1 addition & 0 deletions packages/ipfs-core/src/runtime/ipld.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
'use strict'

const mergeOptions = require('merge-options')
const multicodec = require('multicodec')

Expand Down
2 changes: 1 addition & 1 deletion packages/ipfs-http-client/.aegir.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const server = createServer({
let echoServer = new EchoServer()

module.exports = {
bundlesize: { maxSize: '81kB' },
bundlesize: { maxSize: '83kB' },
karma: {
files: [{
pattern: 'node_modules/interface-ipfs-core/test/fixtures/**/*',
Expand Down
4 changes: 2 additions & 2 deletions packages/ipfs-http-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@
"form-data": "^3.0.0",
"ipfs-core-utils": "^0.5.0",
"ipfs-utils": "^4.0.0",
"ipld-block": "^0.10.1",
"ipld-block": "^0.11.0",
"ipld-dag-cbor": "^0.17.0",
"ipld-dag-pb": "^0.20.0",
"ipld-raw": "^6.0.0",
"iso-url": "^0.4.7",
"iso-url": "^1.0.0",
"it-last": "^1.0.4",
"it-map": "^1.0.4",
"it-tar": "^1.2.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/ipfs-http-gateway/src/resources/gateway.js
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ module.exports = {

afterHandler (request, h) {
const { response } = request
// Add headers to successfult responses (regular or range)
// Add headers to successful responses (regular or range)
if (response.statusCode === 200 || response.statusCode === 206) {
const path = request.path
response.header('X-Ipfs-Path', path)
Expand Down
2 changes: 1 addition & 1 deletion packages/ipfs-message-port-client/.aegir.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const EchoServer = require('aegir/utils/echo-server')
const echoServer = new EchoServer()

module.exports = {
bundlesize: { maxSize: '12kB' },
bundlesize: { maxSize: '13kB' },
karma: {
files: [
{
Expand Down
2 changes: 1 addition & 1 deletion packages/ipfs-message-port-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"dep-check": "aegir dep-check"
},
"dependencies": {
"browser-readablestream-to-it": "0.0.2",
"browser-readablestream-to-it": "^1.0.1",
"cids": "^1.0.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/ipfs-message-port-protocol/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
},
"dependencies": {
"cids": "^1.0.0",
"ipld-block": "^0.10.1"
"ipld-block": "^0.11.0"
},
"devDependencies": {
"aegir": "^28.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/ipfs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"debug": "^4.1.1",
"ipfs-cli": "^0.1.0",
"ipfs-core": "^0.1.0",
"ipfs-repo": "^6.0.3",
"ipfs-repo": "^7.0.0",
"semver": "^7.3.2",
"update-notifier": "^5.0.0"
},
Expand All @@ -57,7 +57,7 @@
"ipfs-utils": "^4.0.0",
"ipfsd-ctl": "^7.0.2",
"iso-random-stream": "^1.1.1",
"iso-url": "^0.4.7",
"iso-url": "^1.0.0",
"it-to-buffer": "^1.0.2",
"merge-options": "^2.0.0",
"nanoid": "^3.1.12",
Expand Down