Skip to content
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: ipfs/aegir
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2945fadd470deb584503a1f0a7695cedd0cc2341
Choose a base ref
...
head repository: ipfs/aegir
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 585b0040f8a5e092e50f49c4a67b34938ad0a87c
Choose a head ref
Loading
Showing with 34,441 additions and 35,823 deletions.
  1. +1 −78 .github/dependabot.yml
  2. +50 −0 .github/workflows/automerge.yml
  3. +152 −0 .github/workflows/js-test-and-release.yml
  4. +0 −43 .github/workflows/main.yml
  5. +2 −1 .gitignore
  6. +202 −3 CHANGELOG.md
  7. +3 −20 LICENSE
  8. +5 −0 LICENSE-APACHE
  9. +19 −0 LICENSE-MIT
  10. +1 −1 actions/bundle-size/action.yml
  11. +33,206 −35,368 actions/bundle-size/dist/index.js
  12. +1 −1 actions/bundle-size/utils.js
  13. +38 −0 actions/cache-node-modules/action.yml
  14. +17 −0 actions/docker-login/action.yml
  15. +11 −0 actions/install-browser-deps/action.yml
  16. +0 −68 cli.js
  17. +27 −0 md/esm.md
  18. +158 −87 package.json
  19. +34 −3 src/build/index.js
  20. +12 −0 src/cmds/build.js
  21. +1 −1 src/cmds/lint.js
  22. +22 −3 src/cmds/test-dependant.js
  23. +2 −2 src/cmds/test.js
  24. +3 −3 src/cmds/ts.js
  25. +3 −3 src/cmds/z-dependency-check.js
  26. +1 −0 src/config/tsconfig.aegir.json
  27. +5 −2 src/config/user.js
  28. +1 −1 src/dependency-check.js
  29. +67 −32 src/docs/index.js
  30. +64 −5 src/index.js
  31. +1 −1 src/release/commit.js
  32. +1 −1 src/release/contributors.js
  33. +15 −9 src/release/publish.js
  34. +1 −1 src/release/push.js
  35. +1 −1 src/release/tag.js
  36. +31 −39 src/test-dependant/index.js
  37. +2 −2 src/test/browser.js
  38. +1 −1 src/test/electron.js
  39. +3 −2 src/test/node.js
  40. +3 −3 src/test/react-native.js
  41. +3 −1 src/ts/typedoc-plugin.js
  42. +15 −0 src/types.d.ts
  43. +37 −0 test/build.js
  44. +39 −1 test/dependants.js
  45. +12 −0 test/fixtures/esm/an-esm-project/node_modules/a-cjs-dep/package.json
  46. +2 −0 test/fixtures/esm/an-esm-project/node_modules/a-cjs-dep/src/index.d.ts
  47. +4 −0 test/fixtures/esm/an-esm-project/node_modules/a-cjs-dep/src/index.js
  48. +18 −0 test/fixtures/esm/an-esm-project/node_modules/an-esm-dep/package.json
  49. +4 −0 test/fixtures/esm/an-esm-project/node_modules/an-esm-dep/src/index.cjs
  50. +2 −0 test/fixtures/esm/an-esm-project/node_modules/an-esm-dep/src/index.d.ts
  51. +4 −0 test/fixtures/esm/an-esm-project/node_modules/an-esm-dep/src/index.js
  52. +18 −0 test/fixtures/esm/an-esm-project/package.json
  53. +10 −0 test/fixtures/esm/an-esm-project/src/index.js
  54. +9 −0 test/fixtures/esm/an-esm-project/test/esm-test.spec.js
  55. +2 −1 test/fixtures/test-dependant/monorepo/packages/submodule/package.json
  56. +2 −1 test/fixtures/test-dependant/project/package.json
  57. +1 −1 test/lint.js
  58. +2 −0 test/node.js
  59. +28 −0 test/test.js
  60. +0 −1 tsconfig.json
  61. +3 −3 utils/chai.js
  62. +2 −29 utils/fixtures.js
  63. +57 −0 utils/resolve.js
79 changes: 1 addition & 78 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -4,82 +4,5 @@ updates:
directory: "/"
schedule:
interval: daily
time: "11:00"
time: "10:00"
open-pull-requests-limit: 10
reviewers:
- hugomrdias
labels:
- topic/dependencies
ignore:
- dependency-name: "@types/node"
versions:
- 15.0.0
- dependency-name: esbuild
versions:
- 0.10.0
- 0.10.1
- 0.11.0
- 0.11.10
- 0.11.11
- 0.11.12
- 0.11.13
- 0.11.15
- 0.11.2
- 0.11.3
- 0.11.5
- 0.11.6
- 0.11.9
- 0.9.0
- 0.9.1
- 0.9.3
- 0.9.4
- 0.9.6
- dependency-name: electron
versions:
- 12.0.0
- 12.0.1
- 12.0.2
- dependency-name: typescript
versions:
- 4.2.2
- 4.2.3
- dependency-name: sinon
versions:
- 10.0.0
- dependency-name: "@commitlint/load"
versions:
- 12.0.0
- dependency-name: "@commitlint/config-conventional"
versions:
- 12.0.0
- dependency-name: "@commitlint/travis-cli"
versions:
- 12.0.0
- dependency-name: "@commitlint/cli"
versions:
- 12.0.0
- dependency-name: "@commitlint/lint"
versions:
- 12.0.0
- dependency-name: "@commitlint/read"
versions:
- 12.0.0
- dependency-name: eslint-config-ipfs
versions:
- 2.0.0
- dependency-name: webpack-cli
versions:
- 4.4.0
- 4.5.0
- dependency-name: "@types/yargs"
versions:
- 16.0.0
- dependency-name: terser-webpack-plugin
versions:
- 4.2.3
- dependency-name: webpack-bundle-analyzer
versions:
- 4.4.0
- dependency-name: webpack-merge
versions:
- 5.7.3
50 changes: 50 additions & 0 deletions .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# Automatically merge pull requests opened by web3-bot, as soon as (and only if) all tests pass.
# This reduces the friction associated with updating with our workflows.

on: [ pull_request ]
name: Automerge

jobs:
automerge-check:
if: github.event.pull_request.user.login == 'web3-bot'
runs-on: ubuntu-latest
outputs:
status: ${{ steps.should-automerge.outputs.status }}
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Check if we should automerge
id: should-automerge
run: |
for commit in $(git rev-list --first-parent origin/${{ github.event.pull_request.base.ref }}..${{ github.event.pull_request.head.sha }}); do
committer=$(git show --format=$'%ce' -s $commit)
echo "Committer: $committer"
if [[ "$committer" != "web3-bot@users.noreply.github.com" ]]; then
echo "Commit $commit wasn't committed by web3-bot, but by $committer."
echo "::set-output name=status::false"
exit
fi
done
echo "::set-output name=status::true"
automerge:
needs: automerge-check
runs-on: ubuntu-latest
# The check for the user is redundant here, as this job depends on the automerge-check job,
# but it prevents this job from spinning up, just to be skipped shortly after.
if: github.event.pull_request.user.login == 'web3-bot' && needs.automerge-check.outputs.status == 'true'
steps:
- name: Wait on tests
uses: lewagon/wait-on-check-action@bafe56a6863672c681c3cf671f5e10b20abf2eaa # v0.2
with:
ref: ${{ github.event.pull_request.head.sha }}
repo-token: ${{ secrets.GITHUB_TOKEN }}
wait-interval: 10
running-workflow-name: 'automerge' # the name of this job
- name: Merge PR
uses: pascalgn/automerge-action@741c311a47881be9625932b0a0de1b0937aab1ae # v0.13.1
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
MERGE_LABELS: ""
MERGE_METHOD: "squash"
MERGE_DELETE_BRANCH: true
152 changes: 152 additions & 0 deletions .github/workflows/js-test-and-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
name: test & maybe release
on:
push:
branches:
- master # with #262 - ${{{ github.default_branch }}}
pull_request:
branches:
- master # with #262 - ${{{ github.default_branch }}}

jobs:

check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npm run --if-present lint
- run: npm run --if-present dep-check

test-node:
needs: check
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-latest, ubuntu-latest, macos-latest]
node: [16]
fail-fast: true
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node }}
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npm run --if-present test:node
- uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0
with:
directory: ./.nyc_output
flags: node

test-chrome:
needs: check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npm run --if-present test:chrome
- uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0
with:
directory: ./.nyc_output
flags: chrome

test-chrome-webworker:
needs: check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npm run --if-present test:chrome-webworker
- uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0
with:
directory: ./.nyc_output
flags: chrome-webworker

test-firefox:
needs: check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npm run --if-present test:firefox
- uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0
with:
directory: ./.nyc_output
flags: firefox

test-firefox-webworker:
needs: check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npm run --if-present test:firefox-webworker
- uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0
with:
directory: ./.nyc_output
flags: firefox-webworker

test-electron-main:
needs: check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npx xvfb-maybe npm run --if-present test:electron-main
- uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0
with:
directory: ./.nyc_output
flags: electron-main

test-electron-renderer:
needs: check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npx xvfb-maybe npm run --if-present test:electron-renderer
- uses: codecov/codecov-action@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0
with:
directory: ./.nyc_output
flags: electron-renderer

release:
needs: [test-node, test-chrome, test-chrome-webworker, test-firefox, test-firefox-webworker, test-electron-main, test-electron-renderer]
runs-on: ubuntu-latest
if: github.event_name == 'push' && github.ref == 'refs/heads/master' # with #262 - 'refs/heads/${{{ github.default_branch }}}'
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: actions/setup-node@v2
with:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- uses: ipfs/aegir/actions/docker-login@master
with:
docker-token: ${{ secrets.DOCKER_TOKEN }}
docker-username: ${{ secrets.DOCKER_USERNAME }}
- run: npm run --if-present release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
43 changes: 0 additions & 43 deletions .github/workflows/main.yml

This file was deleted.

3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package-lock.json
yarn.lock
node_modules
/node_modules
/actions/bundle-size/node_modules
/coverage
/dist
/docs
Loading