Skip to content
This repository was archived by the owner on Aug 11, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ipld/js-ipld
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8bfec1d088be0d2901fbafe9210946c353e57221
Choose a base ref
...
head repository: ipld/js-ipld
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6e2249fc62d7f2ef070d0e26cbbb1b53d13d0bd6
Choose a head ref
  • 3 commits
  • 5 files changed
  • 2 contributors

Commits on Nov 6, 2017

  1. fix: Windows interop (#104) 

    * chore: upgrade packages

Removed running tests on a pre-commit as it prevents checking in incremental changes to a branch

* fix: os-specific path

* fix(ci): run on appveyor

* chore: rename .appveyor.yml to appveyor.yml

* fix: oops

* chore: restore pre-commit-test

* chore(ci): need more time for tests #105

* chore(ci): try latest aegir without timeout

* chore: update deps

* chore: bring back TODO

* chore: upgrade packages

* test: local timeout for test
    @richardschneider @daviddias
    richardschneider authored and daviddias committed Nov 6, 2017
    Copy the full SHA
    f2d524b View commit details

  2. chore: update contributors

    @daviddias
    daviddias committed Nov 6, 2017
    Copy the full SHA
    98a052b View commit details

  3. chore: release version v0.14.0

    @daviddias
    daviddias committed Nov 6, 2017
    Copy the full SHA
    6e2249f View commit details
Showing with 51 additions and 11 deletions.
  1. +10 −0 CHANGELOG.md
  2. +23 −0 appveyor.yml
  3. +10 −9 package.json
  4. +6 −1 src/index.js
  5. +2 −1 test/ipld-eth.js
10 changes: 10 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
<a name="0.14.0"></a>
# [0.14.0](https://github.com/ipld/js-ipld-resolver/compare/v0.13.4...v0.14.0) (2017-11-06)


### Bug Fixes

* Windows interop ([#104](https://github.com/ipld/js-ipld-resolver/issues/104)) ([f2d524b](https://github.com/ipld/js-ipld-resolver/commit/f2d524b))



<a name="0.13.4"></a>
## [0.13.4](https://github.com/ipld/js-ipld-resolver/compare/v0.13.3...v0.13.4) (2017-10-11)

23 changes: 23 additions & 0 deletions appveyor.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
environment:
matrix:
- nodejs_version: "6"
- nodejs_version: "8"

# cache:
# - node_modules

platform:
- x64

install:
- ps: Install-Product node $env:nodejs_version $env:platform
- npm install

test_script:
- node --version
- npm --version
- npm test

build: off

version: "{build}"
19 changes: 10 additions & 9 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ipld-resolver",
"version": "0.13.4",
"version": "0.14.0",
"description": "IPLD Resolver Implementation in JavaScript",
"main": "src/index.js",
"pre-commit": [
@@ -32,10 +32,10 @@
"homepage": "https://github.com/ipld/js-ipld-resolver#readme",
"license": "MIT",
"devDependencies": {
"aegir": "^12.0.8",
"aegir": "^12.1.3",
"chai": "^4.1.2",
"dirty-chai": "^2.0.1",
"eth-hash-to-cid": "^0.1.0",
"eth-hash-to-cid": "~0.1.0",
"ethereumjs-block": "^1.7.0",
"lodash": "^4.17.4",
"ncp": "^2.0.0",
@@ -46,20 +46,20 @@
"dependencies": {
"async": "^2.5.0",
"cids": "~0.5.2",
"interface-datastore": "^0.3.1",
"ipfs-block": "~0.6.0",
"ipfs-block-service": "~0.12.0",
"ipfs-repo": "~0.17.0",
"interface-datastore": "~0.4.1",
"ipfs-block": "~0.6.1",
"ipfs-block-service": "~0.13.0",
"ipfs-repo": "~0.18.2",
"ipld-dag-cbor": "~0.11.1",
"ipld-dag-pb": "~0.11.2",
"ipld-ethereum": "^1.4.3",
"ipld-git": "^0.1.0",
"ipld-git": "~0.1.0",
"ipld-raw": "^1.0.6",
"is-ipfs": "~0.3.2",
"lodash.flatten": "^4.4.0",
"lodash.includes": "^4.3.0",
"memdown": "^1.4.1",
"multihashes": "~0.4.9",
"multihashes": "~0.4.12",
"pull-sort": "^1.0.1",
"pull-stream": "^3.6.1",
"pull-traverse": "^1.0.3"
@@ -70,6 +70,7 @@
"Nicola Greco <me@nicola.io>",
"Pedro Teixeira <i@pgte.me>",
"Richard Littauer <richard.littauer@gmail.com>",
"Richard Schneider <makaretu@gmail.com>",
"Victor Bjelkholm <victorbjelkholm@gmail.com>",
"greenkeeperio-bot <support@greenkeeper.io>",
"kumavis <kumavis@users.noreply.github.com>",
7 changes: 6 additions & 1 deletion src/index.js
View file
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@ const doUntil = require('async/doUntil')
const IPFSRepo = require('ipfs-repo')
const BlockService = require('ipfs-block-service')
const joinPath = require('path').join
const osPathSep = require('path').sep
const pullDeferSource = require('pull-defer').source
const pullTraverse = require('pull-traverse')
const map = require('async/map')
@@ -116,8 +117,12 @@ class IPLDResolver {

// this removes occurrences of ./, //, ../
// makes sure that path never starts with ./ or /
// path.join is OS specific. Need to convert back to POSIX format.
if (typeof path === 'string') {
path = joinPath('/', path).substr(1)
path = joinPath('/', path)
.substr(1)
.split(osPathSep)
.join('/')
}

if (path === '' || !path) {
3 changes: 2 additions & 1 deletion test/ipld-eth.js
View file
Original file line number Diff line number Diff line change
@@ -21,7 +21,8 @@ module.exports = (repo) => {

let ethObjs

before((done) => {
before(function (done) {
this.timeout(10 * 1000)
const bs = new BlockService(repo)
resolver = new IPLDResolver(bs)