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

chore: use npm 7 workspaces instead of lerna bootstrap #120

Merged
merged 4 commits into from
Feb 19, 2021
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ yarn.lock
test/repo-tests*
**/bundle.js
package-lock.json
tsconfig-types.aegir.json

# Logs
logs
Expand Down
15 changes: 13 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ stages:
- release

node_js:
- 'node'
- 'lts/*'
- 'node'

os:
- linux
Expand All @@ -26,7 +26,17 @@ os:

before_install:
# prevents windows error: npm ERR! ... git-sh-setup: file not found
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then export PATH=/c/PROGRA~1/Git/usr/bin:/c/PROGRA~1/Git/mingw64/libexec/git-core:$PATH ; fi
- if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then export PATH=/c/PROGRA~1/Git/usr/bin:/c/PROGRA~1/Git/mingw64/libexec/git-core:$PATH ; fi
# upgrading npm on travis/windows/node 14 is completely broken
- if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then export NODE_INSTALL_DIR=`npm prefix -g` ; fi
- if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then mv $NODE_INSTALL_DIR/node_modules $NODE_INSTALL_DIR/node_modules_old ; fi
- if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then mkdir $NODE_INSTALL_DIR/node_modules ; fi
- if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then rm -f $NODE_INSTALL_DIR/npm $NODE_INSTALL_DIR/npm.cmd $NODE_INSTALL_DIR/npm.ps1 $NODE_INSTALL_DIR/npx $NODE_INSTALL_DIR/npx.cmd $NODE_INSTALL_DIR/npx.ps1 ; fi
# workspaces require npm 7 or above
- if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then node $NODE_INSTALL_DIR/node_modules_old/npm/bin/npm-cli.js i -g npm@latest ; fi
- if [[ "$TRAVIS_OS_NAME" != "windows" ]]; then npm install -g npm@latest ; fi
# allow windows to run scripts with node 14 and npm 7 (may not be necessary when node 14 is no longer lts)
- if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then npm config set script-shell c:/PROGRA~1/Git/bin/bash.exe ; fi

script: npx nyc -s npm run test -- -- -- -t node --bail
after_success: npx nyc report --reporter=text-lcov > coverage.lcov && npx codecov
Expand All @@ -36,6 +46,7 @@ jobs:
- stage: check
name: linting
script:
- npm --version
- npm run lint

- stage: check
Expand Down
12 changes: 9 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
"version": "1.0.0",
"description": "JS implementation of the IPFS UnixFS",
"scripts": {
"postinstall": "lerna bootstrap",
"reset": "lerna run clean && rm -rf packages/*/node_modules node_modules",
"reset": "lerna run clean && rimraf packages/*/node_modules node_modules",
"test": "lerna run test",
"coverage": "lerna run coverage",
"prepare": "lerna run prepare",
Expand All @@ -17,6 +16,7 @@
"update-contributors": "aegir release --lint=false --test=false --bump=false --build=false --changelog=false --commit=false --tag=false --push=false --ghrelease=false --docs=false --publish=false"
},
"devDependencies": {
"aegir": "^30.3.0",
"lerna": "^3.22.1"
},
"repository": {
Expand Down Expand Up @@ -47,5 +47,11 @@
"Diogo Silva <fsdiogo@gmail.com>",
"jbenet <juan@benet.ai>",
"Bernard Mordan <bernard@tableflip.io>"
]
],
"workspaces": [
"packages/*"
],
"engines": {
"npm": ">=7.0.0"
}
}
23 changes: 12 additions & 11 deletions packages/ipfs-unixfs-exporter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
"scripts": {
"prepare": "aegir build --no-bundle",
"test": "aegir test",
"clean": "rm -rf ./dist",
"clean": "rimraf ./dist",
"lint": "aegir lint",
"coverage": "nyc -s npm run test -t node && nyc report --reporter=html",
"depcheck": "aegir dep-check -i @types/mocha -i @types/sinon -i nyc -i abort-controller"
"depcheck": "aegir dep-check -i @types/mocha -i @types/sinon -i nyc -i abort-controller -i rimraf"
},
"repository": {
"type": "git",
Expand All @@ -32,7 +32,7 @@
},
"homepage": "https://github.com/ipfs/js-ipfs-unixfs#readme",
"devDependencies": {
"@types/mocha": "^8.2.0",
"@types/mocha": "^8.2.1",
"@types/sinon": "^9.0.10",
"abort-controller": "^3.0.0",
"aegir": "^30.3.0",
Expand All @@ -41,23 +41,24 @@
"ipld": "^0.28.0",
"ipld-dag-pb": "^0.21.0",
"ipld-in-memory": "^7.0.0",
"it-all": "^1.0.1",
"it-all": "^1.0.5",
"it-buffer-stream": "^2.0.0",
"it-first": "^1.0.1",
"it-first": "^1.0.6",
"merge-options": "^3.0.4",
"multicodec": "^2.0.0",
"multicodec": "^2.1.0",
"native-abort-controller": "^1.0.3",
"nyc": "^15.0.0",
"sinon": "^9.0.10",
"uint8arrays": "^2.0.5"
"rimraf": "^3.0.2",
"sinon": "^9.2.4",
"uint8arrays": "^2.1.2"
},
"dependencies": {
"cids": "^1.1.5",
"err-code": "^3.0.0",
"err-code": "^3.0.1",
"hamt-sharding": "^2.0.0",
"ipfs-unixfs": "^3.0.0",
"it-last": "^1.0.1",
"multihashing-async": "^2.0.0"
"it-last": "^1.0.5",
"multihashing-async": "^2.1.0"
},
"types": "dist/src/index.d.ts",
"files": [
Expand Down
31 changes: 16 additions & 15 deletions packages/ipfs-unixfs-importer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
"scripts": {
"prepare": "aegir build --no-bundle",
"test": "aegir test",
"clean": "rm -rf ./dist",
"clean": "rimraf ./dist",
"lint": "aegir lint",
"coverage": "nyc -s npm run test -t node && nyc report --reporter=html",
"depcheck": "aegir dep-check -i @types/mocha -i nyc"
"depcheck": "aegir dep-check -i @types/mocha -i nyc -i rimraf"
},
"repository": {
"type": "git",
Expand All @@ -32,29 +32,30 @@
},
"homepage": "https://github.com/ipfs/js-ipfs-unixfs#readme",
"devDependencies": {
"@types/mocha": "^8.2.0",
"@types/mocha": "^8.2.1",
"aegir": "^30.3.0",
"ipld": "^0.28.0",
"ipld-in-memory": "^7.0.0",
"it-buffer-stream": "^2.0.0",
"multicodec": "^2.0.0",
"nyc": "^15.0.0"
"multicodec": "^2.1.0",
"nyc": "^15.0.0",
"rimraf": "^3.0.2"
},
"dependencies": {
"bl": "^4.0.0",
"bl": "^4.1.0",
"cids": "^1.1.5",
"err-code": "^3.0.0",
"err-code": "^3.0.1",
"hamt-sharding": "^2.0.0",
"ipfs-unixfs": "^3.0.0",
"ipld-dag-pb": "^0.21.0",
"it-all": "^1.0.1",
"it-batch": "^1.0.3",
"it-first": "^1.0.1",
"it-parallel-batch": "^1.0.3",
"merge-options": "^3.0.3",
"multihashing-async": "^2.0.0",
"rabin-wasm": "^0.1.1",
"uint8arrays": "^2.0.5"
"it-all": "^1.0.5",
"it-batch": "^1.0.8",
"it-first": "^1.0.6",
"it-parallel-batch": "^1.0.9",
"merge-options": "^3.0.4",
"multihashing-async": "^2.1.0",
"rabin-wasm": "^0.1.4",
"uint8arrays": "^2.1.2"
},
"types": "dist/src/index.d.ts",
"files": [
Expand Down
13 changes: 7 additions & 6 deletions packages/ipfs-unixfs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
"prepare:proto": "pbjs -t static-module -w commonjs --force-number --no-verify --no-delimited --no-create --no-beautify --no-defaults --lint eslint-disable -o src/unixfs.js ./src/unixfs.proto",
"prepare:proto:types": "pbts -o src/unixfs.d.ts src/unixfs.js",
"prepare:types": "aegir build --no-bundle",
"prepare:copy": "cp ./src/*.d.ts ./dist/src",
"prepare:copy": "copy ./src/*.d.ts ./dist/src",
"test": "aegir test",
"clean": "rm -rf ./dist",
"clean": "rimraf ./dist",
"lint": "aegir lint",
"coverage": "nyc -s aegir test -t node && nyc report --reporter=html",
"depcheck": "aegir dep-check -i mkdirp -i protobufjs -i @types/mocha -i nyc -i npm-run-all"
"depcheck": "aegir dep-check -i mkdirp -i @types/mocha -i nyc -i npm-run-all -i copy"
},
"repository": {
"type": "git",
Expand All @@ -36,15 +36,16 @@
},
"homepage": "https://github.com/ipfs/js-ipfs-unixfs#readme",
"devDependencies": {
"@types/mocha": "^8.2.0",
"@types/mocha": "^8.2.1",
"aegir": "^30.3.0",
"copy": "^0.3.2",
"mkdirp": "^1.0.4",
"npm-run-all": "^4.1.5",
"nyc": "^15.0.0",
"uint8arrays": "^2.0.5"
"uint8arrays": "^2.1.2"
},
"dependencies": {
"err-code": "^3.0.0",
"err-code": "^3.0.1",
"protobufjs": "^6.10.2"
},
"types": "dist/src/index.d.ts",
Expand Down