chore: remove ipfs-utils from monorepo (ipfs#2931)

Splits the ipfs-utils code out as it's used in a lot of other projects.

Creates a ipfs-core-utils module to share code between ipfs and ipfs-http-client

Author: achingbrain

.travis.yml

@@ -131,14 +131,15 @@ jobs:
     - stage: test
       name: examples
       script:
-        - npm run build -- --scope={ipfs,ipfs-http-client}
+        - npm run build
         - npm run test -- $RUN_SINCE --scope=example* --concurrency=1
 
     - stage: release-rc
       # only run on changes to master
       if: branch = master AND type = push AND fork = false
       name: release rc
       script:
+        - npm run build
         - echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" > .npmrc
         - npm run release:rc -- --yes
 

examples/browser-create-react-app/package.json

@@ -6,8 +6,8 @@
     "dot-prop": "^5.0.0",
     "ipfs": "^0.41.0",
     "ipfs-css": "^0.13.1",
-    "react": "^16.8.0",
-    "react-dom": "^16.8.0",
+    "react": "^16.8.6",
+    "react-dom": "^16.8.6",
     "react-scripts": "^3.2.0",
     "tachyons": "^4.11.1"
   },

examples/browser-parceljs/package.json

@@ -22,12 +22,12 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.1.5",
-    "@babel/core": "^7.1.6",
-    "@babel/preset-env": "^7.1.6",
+    "@babel/core": "^7.2.2",
+    "@babel/preset-env": "^7.3.1",
     "babel-plugin-syntax-async-functions": "^6.13.0",
     "babel-plugin-transform-regenerator": "^6.26.0",
     "babel-polyfill": "^6.26.0",
-    "parcel-bundler": "^1.10.3",
+    "parcel-bundler": "^1.12.4",
     "standard": "^13.1.0",
     "test-ipfs-example": "^1.0.0"
   }

examples/browser-webpack/package.json

@@ -13,12 +13,12 @@
   "keywords": [],
   "devDependencies": {
     "@babel/core": "^7.2.2",
-    "@babel/preset-env": "^7.2.3",
+    "@babel/preset-env": "^7.3.1",
     "@babel/preset-react": "^7.0.0",
     "babel-loader": "^8.0.5",
     "copy-webpack-plugin": "^5.0.4",
-    "react": "^16.7.0",
-    "react-dom": "^16.7.0",
+    "react": "^16.8.6",
+    "react-dom": "^16.8.6",
     "react-hot-loader": "^4.8.8",
     "test-ipfs-example": "^1.0.0",
     "webpack": "^4.28.4",

examples/circuit-relaying/package.json

@@ -23,7 +23,7 @@
     "execa": "^3.2.0",
     "ipfs-css": "^0.13.1",
     "ipfs-http-client": "^42.0.0",
-    "parcel-bundler": "^1.6.2",
+    "parcel-bundler": "^1.12.4",
     "tachyons": "^4.9.1",
     "test-ipfs-example": "^1.0.0"
   },

examples/custom-libp2p/package.json

@@ -11,7 +11,7 @@
   "license": "MIT",
   "dependencies": {
     "ipfs": "^0.41.0",
-    "libp2p": "^0.27.0-rc.0",
+    "libp2p": "^0.27.2",
     "libp2p-bootstrap": "^0.10.3",
     "libp2p-kad-dht": "^0.18.3",
     "libp2p-mdns": "^0.13.1",

packages/interface-ipfs-core/package.json

@@ -38,7 +38,7 @@
     "dirty-chai": "^2.0.1",
     "ipfs-block": "^0.8.1",
     "ipfs-unixfs": "^1.0.0",
-    "ipfs-utils": "^0.7.2",
+    "ipfs-utils": "^1.0.0",
     "ipld-dag-cbor": "^0.15.1",
     "ipld-dag-pb": "^0.18.3",
     "is-ipfs": "^0.6.1",

packages/ipfs-utils/.aegir.js renamed to packages/ipfs-core-utils/.aegir.js

@@ -0,0 +1,37 @@
+# ipfs-core-utils <!-- omit in toc -->
+
+[![](https://img.shields.io/badge/made%20by-Protocol%20Labs-blue.svg?style=flat-square)](http://protocol.ai)
+[![](https://img.shields.io/badge/project-IPFS-blue.svg?style=flat-square)](http://ipfs.io/)
+[![](https://img.shields.io/badge/freenode-%23ipfs-blue.svg?style=flat-square)](http://webchat.freenode.net/?channels=%23ipfs)
+[![Travis CI](https://flat.badgen.net/travis/ipfs/js-ipfs-utils)](https://travis-ci.com/ipfs/js-ipfs-utils)
+[![Codecov branch](https://img.shields.io/codecov/c/github/ipfs/js-ipfs-utils/master.svg?style=flat-square)](https://codecov.io/gh/ipfs/js-ipfs-utils)
+[![Dependency Status](https://david-dm.org/ipfs/js-ipfs-utils.svg?style=flat-square)](https://david-dm.org/ipfs/js-ipfs-utils)
+[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/feross/standard)
+
+> This package serves as a repository code shared between the core `ipfs` core implementation and the `ipfs-http-client`
+
+## Lead Maintainer <!-- omit in toc -->
+
+[Alex Potsides](https://github.com/achingbrain)
+
+## Table of Contents <!-- omit in toc -->
+
+- [Install](#install)
+- [Contribute](#contribute)
+- [License](#license)
+
+## Install
+
+```bash
+$ npm install --save ipfs-core-utils
+```
+
+## Contribute
+
+Contributions welcome. Please check out [the issues](https://github.com/ipfs/js-ipfs-utils/issues).
+
+Check out our [contributing document](https://github.com/ipfs/community/blob/master/CONTRIBUTING_JS.md) for more information on how we work, and about contributing in general. Please be aware that all interactions related to this repo are subject to the IPFS [Code of Conduct](https://github.com/ipfs/community/blob/master/code-of-conduct.md).
+
+## License
+
+[MIT](LICENSE) © Protocol Labs Inc.

packages/ipfs-utils/CHANGELOG.md renamed to packages/ipfs-core-utils/CHANGELOG.md

@@ -1,12 +1,12 @@
 {
-  "name": "ipfs-utils",
-  "version": "0.7.2",
-  "description": "Package to aggregate shared logic and dependencies for the IPFS ecosystem",
+  "name": "ipfs-core-utils",
+  "version": "0.0.0",
+  "description": "Package to share code between ipfs and ipfs-http-client",
   "main": "src/index.js",
-  "author": "Hugo Dias <[email protected]>",
+  "author": "Alex Potsides <[email protected]>",
   "homepage": "https://github.com/ipfs/js-ipfs",
   "bugs": "https://github.com/ipfs/js-ipfs/issues",
-  "leadMaintainer": "Hugo Dias <[email protected]>",
+  "leadMaintainer": "Alex Potsides <[email protected]>",
   "files": [
     "src",
     "dist"
@@ -28,35 +28,16 @@
   },
   "license": "MIT",
   "dependencies": {
-    "abort-controller": "^3.0.0",
     "buffer": "^5.4.2",
     "err-code": "^2.0.0",
-    "fs-extra": "^8.1.0",
-    "is-electron": "^2.2.0",
-    "iso-url": "^0.4.7",
-    "it-glob": "0.0.7",
-    "merge-options": "^2.0.0",
-    "node-fetch": "^2.6.0",
-    "stream-to-it": "^0.2.0"
+    "ipfs-utils": "^1.0.0"
   },
   "devDependencies": {
     "aegir": "21.3.0",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "delay": "^4.3.0",
     "dirty-chai": "^2.0.1",
-    "it-all": "^1.0.1",
-    "it-drain": "^1.0.0",
-    "it-to-stream": "^0.1.1"
-  },
-  "contributors": [
-    "Alan Shaw <[email protected]>",
-    "Alex Potsides <[email protected]>",
-    "Hugo Dias <[email protected]>",
-    "Marcin Rataj <[email protected]>"
-  ],
-  "browser": {
-    "fs-extra": false,
-    "./src/text-encoder.js": "./src/text-encoder.browser.js"
+    "it-all": "^1.0.1"
   }
 }

packages/ipfs-utils/LICENSE renamed to packages/ipfs-core-utils/LICENSE

@@ -2,7 +2,7 @@
 
 const errCode = require('err-code')
 const { Buffer } = require('buffer')
-const globalThis = require('../globalthis')
+const globalThis = require('ipfs-utils/src/globalthis')
 
 /*
  * Transform one of:

packages/ipfs-core-utils/README.md

@@ -0,0 +1 @@
+'use strict'

packages/ipfs-utils/package.json renamed to packages/ipfs-core-utils/package.json

@@ -1,12 +1,9 @@
 'use strict'
 
 /* eslint-env mocha */
-const chai = require('chai')
-const dirtyChai = require('dirty-chai')
-const formatMode = require('../../src/files/format-mode')
 
-chai.use(dirtyChai)
-const expect = chai.expect
+const { expect } = require('../utils/chai')
+const formatMode = require('../../src/files/format-mode')
 
 describe('format-mode', function () {
   it('formats mode for directories', function () {

packages/ipfs-utils/src/files/format-mode.js renamed to packages/ipfs-core-utils/src/files/format-mode.js

@@ -1,12 +1,9 @@
 'use strict'
 
 /* eslint-env mocha */
-const chai = require('chai')
-const dirtyChai = require('dirty-chai')
-const formatMtime = require('../../src/files/format-mtime')
 
-chai.use(dirtyChai)
-const expect = chai.expect
+const { expect } = require('../utils/chai')
+const formatMtime = require('../../src/files/format-mtime')
 
 describe('format-mtime', function () {
   it('formats mtime', function () {

packages/ipfs-utils/src/files/format-mtime.js renamed to packages/ipfs-core-utils/src/files/format-mtime.js

@@ -1,16 +1,12 @@
 'use strict'
 
 /* eslint-env mocha */
-const chai = require('chai')
-const dirtyChai = require('dirty-chai')
+const { expect } = require('../utils/chai')
 const normalise = require('../../src/files/normalise-input')
-const { supportsFileReader } = require('../../src/supports')
+const { supportsFileReader } = require('ipfs-utils/src/supports')
 const { Buffer } = require('buffer')
 const all = require('it-all')
-const globalThis = require('../../src/globalthis')
-
-chai.use(dirtyChai)
-const expect = chai.expect
+const globalThis = require('ipfs-utils/src/globalthis')
 
 const STRING = () => 'hello world'
 const BUFFER = () => Buffer.from(STRING())
@@ -34,11 +30,7 @@ if (supportsFileReader) {
 
 async function verifyNormalisation (input) {
   expect(input.length).to.equal(1)
-
-  if (!input[0].content[Symbol.asyncIterator] && !input[0].content[Symbol.iterator]) {
-    chai.assert.fail('Content should have been an iterable or an async iterable')
-  }
-
+  expect(input[0].content[Symbol.asyncIterator] || input[0].content[Symbol.iterator]).to.be.ok('Content should have been an iterable or an async iterable')
   expect(await all(input[0].content)).to.deep.equal([BUFFER()])
   expect(input[0].path).to.equal('')
 }

packages/ipfs-utils/src/files/normalise-input.js renamed to packages/ipfs-core-utils/src/files/normalise-input.js

@@ -14,8 +14,8 @@
     "ipfs-http-client": "../.."
   },
   "devDependencies": {
-    "react": "^16.6.3",
-    "react-dom": "^16.6.3",
+    "react": "^16.8.6",
+    "react-dom": "^16.8.6",
     "parcel-bundler": "^1.12.4"
   },
   "browserslist": [

packages/ipfs-core-utils/src/index.js

@@ -46,11 +46,12 @@
     "debug": "^4.1.0",
     "form-data": "^3.0.0",
     "ipfs-block": "^0.8.1",
-    "ipfs-utils": "^0.7.2",
+    "ipfs-core-utils": "~0.0.0",
+    "ipfs-utils": "^1.0.0",
     "ipld-dag-cbor": "^0.15.1",
     "ipld-dag-pb": "^0.18.3",
     "ipld-raw": "^4.0.1",
-    "iso-url": "^0.4.6",
+    "iso-url": "^0.4.7",
     "it-tar": "^1.2.1",
     "it-to-buffer": "^1.0.0",
     "it-to-stream": "^0.1.1",

packages/ipfs-utils/test/files/format-mode.spec.js renamed to packages/ipfs-core-utils/test/files/format-mode.spec.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const normaliseInput = require('ipfs-utils/src/files/normalise-input')
+const normaliseInput = require('ipfs-core-utils/src/files/normalise-input')
 const toStream = require('./to-stream')
 const nanoid = require('nanoid')
 const modeToString = require('../lib/mode-to-string')