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: mergeback next -> identity-provider/2021-01-04 #216

Merged
merged 32 commits into from
Feb 17, 2021
Merged
Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
8aeb792
feat: add support for bigint in leb128 (#200)
hansl Feb 16, 2021
bb07678
chore: add more files to gitignore (#203)
hansl Feb 16, 2021
95be45b
chore: remove scripts and move closer to lerna (#202)
hansl Feb 16, 2021
c2b7ec8
Merge remote-tracking branch 'origin/next' into hansl/merge-master-in…
hansl Feb 16, 2021
4881b32
fix auth-demo missing dep
hansl Feb 16, 2021
18b58ba
use the right versions of packages
hansl Feb 16, 2021
60612d5
fix tests for apps
hansl Feb 16, 2021
4826f0e
fix linting
hansl Feb 16, 2021
3514f8d
.
hansl Feb 16, 2021
6a5be70
rm subpackage package-lock.json
gobengo Feb 16, 2021
5f4fb54
regenerate /package-lock.json without subpackage package-lock.json
gobengo Feb 16, 2021
e739e80
rm package-lock.json
gobengo Feb 16, 2021
6323ad6
try explicitly opting-in packages to lerna
gobengo Feb 16, 2021
8a27e6f
add hoist,ci to lerna.json
gobengo Feb 16, 2021
5299de3
gh nodejs-ci runs npm install
gobengo Feb 16, 2021
efcba4b
fix npm install at monorepo now that subpackage ci scripts dont try t…
gobengo Feb 16, 2021
5791c41
package.json devDeps on packages/agent-js-devtools to provide typescr…
gobengo Feb 16, 2021
85f58fc
see if lerna installs devtools as dep not devDep
gobengo Feb 16, 2021
0b7fec2
Add typescript as monorepo devDep
gobengo Feb 16, 2021
e3aa294
agent,bootstrap lint scripts dont call tslint (which isnt installed o…
gobengo Feb 16, 2021
7410a60
monorepo doesnt do its own lint, it just does lerna run lint
gobengo Feb 16, 2021
877801b
@dfinity/agent package.json includes types key
gobengo Feb 16, 2021
ff45c69
use lockfileVersion 1 since our github action for node 14 doesnt alwa…
gobengo Feb 17, 2021
883c65b
try with 'lerna bootstrap', ci=false, meaning each subpackage gets it…
gobengo Feb 17, 2021
805a4c2
only use one version of typescript-eslint/eslint-plugin, not two
gobengo Feb 17, 2021
bbfb6c4
hoist eslint and use one version
gobengo Feb 17, 2021
5f5a9fa
hoist typescript
gobengo Feb 17, 2021
64cf0b1
hoist eslint-plugin-jsdoc
gobengo Feb 17, 2021
b5b4473
hoist @typescript-eslint/parser
gobengo Feb 17, 2021
f2f334b
disable new request_id sender_delegation test (will make it pass once…
gobengo Feb 17, 2021
2af85e5
rm file dependencies from /package.json (#217)
Feb 17, 2021
e29a93b
Merge branch 'identity-provider/2021-01-04' of github.com:dfinity-lab…
gobengo Feb 17, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 6 additions & 9 deletions .github/workflows/nodejs-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,14 @@ jobs:
with:
node-version: ${{ matrix.node }}

# See if we can lint before full build/test
- run: npm ci --ignore-scripts
- run: npm run lint --if-present
- run: npx lerna bootstrap
- run: npx lerna run lint

# full install, including npm postinstall, prepare
- run: npm ci
# build monorepo incl. each subpackage
- run: npm run build --if-present
- run: npx lerna run build

# test monorepo incl. each subpackage
- run: npm test
- run: npx lerna run test
env:
CI: true

Expand Down Expand Up @@ -99,7 +96,7 @@ jobs:
&
sleep 1

- run: npm run e2e
- run: npx lerna run e2e
env:
CI: true
IC_REF_PORT: ${{ steps.ic_ref.outputs.IC_REF_PORT }}
Expand All @@ -109,7 +106,7 @@ jobs:
CI: true
IC_REF_PORT: 8888
MITM: true
run: npm run mitm
run: npx lerna run mitm

- name: clean up
run: |
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ typings/
# TypeScript cache
*.tsbuildinfo
build_info.json
.tsc-out/

# TypeScript output
.tsc-out/
Expand Down Expand Up @@ -114,3 +115,4 @@ dist
# IDE Settings
.code
.idea
.vscode
20 changes: 19 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,28 @@ This source code repository contains multiple npm packages, each under `./packag
### Getting Started

1. Clone the git repository.
2. Run `npm install`
2. Run `npx lerna bootstrap`

After that, you probably want to dive into a specific package in [./packages](./packages).

#### Lerna

We use [lerna](https://github.com/lerna/lerna) to manage this repo and its packages. A few useful
commands to keep in mind;

- To run the unit tests locally, you can use `npx lerna run test`.
- To run e2e tests, you can use `npx lerna run e2e`. **WARNING:** You need to have a running
replica locally. In our CI runs, we use the `ic-ref` which is not (at this time) available
publicly. Normally you can use a replica distributed with dfx (ie. dfx start in a project),
but there is no guarantee that the `next` branch will work with the latest published dfx.
Once you have a replica running locally, you must pass the port to the e2e tests using the
`IC_REF_PORT` environment vairable. If that variable is not set, the tests will fail.
- To run the entire ci, use `npx lerna run ci`. This will validate syntax and linting, as well
as running tests (both unit and e2e).

You can also install lerna globally and not use `npx` if you wish; run `npm install -g lerna` then
skip the `npx` part of the example commands.

### GitHub Actions

GitHub Actions for this repo are configured in [./.github/workflows](./.github/workflows).
Expand Down
13 changes: 0 additions & 13 deletions bin/e2e

This file was deleted.

13 changes: 0 additions & 13 deletions bin/mitm

This file was deleted.

16 changes: 0 additions & 16 deletions bin/npm-postinstall

This file was deleted.