Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/v2' into bdo/number-edgetypes
Browse files Browse the repository at this point in the history
  • Loading branch information
thebriando committed Aug 5, 2021
2 parents 65bd2df + 8fc248f commit 8657593
Show file tree
Hide file tree
Showing 788 changed files with 24,648 additions and 11,455 deletions.
2 changes: 1 addition & 1 deletion .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ untyped-import
untyped-type-import

[version]
0.151.0
0.153.0
6 changes: 4 additions & 2 deletions .github/workflows/nightly-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,14 @@ jobs:
name: ${{ matrix.target }}
runs-on: ubuntu-latest
container:
image: docker.pkg.github.com/napi-rs/napi-rs/rust-nodejs-alpine:lts
image: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
credentials:
username: ${{ github.actor }}
password: ${{ secrets.GHCR_TOKEN }}
steps:
- uses: actions/checkout@v1
- name: Install build tools
run: apk add --no-cache python3 make gcc g++ musl-dev curl
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
Expand All @@ -140,7 +142,7 @@ jobs:
- name: Install cross compile toolchains
if: ${{ matrix.target == 'aarch64-unknown-linux-musl' }}
run: |
curl -O https://musl.cc/aarch64-linux-musl-cross.tgz
curl -O http://musl.cc/aarch64-linux-musl-cross.tgz
tar xzf aarch64-linux-musl-cross.tgz
cp -R aarch64-linux-musl-cross/* /usr
- uses: bahmutov/[email protected]
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/tag-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,14 @@ jobs:
name: ${{ matrix.target }}
runs-on: ubuntu-latest
container:
image: docker.pkg.github.com/napi-rs/napi-rs/rust-nodejs-alpine:lts
image: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
credentials:
username: ${{ github.actor }}
password: ${{ secrets.GHCR_TOKEN }}
steps:
- uses: actions/checkout@v1
- name: Install build tools
run: apk add --no-cache python3 make gcc g++ musl-dev curl
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
Expand All @@ -139,7 +141,7 @@ jobs:
- name: Install cross compile toolchains
if: ${{ matrix.target == 'aarch64-unknown-linux-musl' }}
run: |
curl -O https://musl.cc/aarch64-linux-musl-cross.tgz
curl -O http://musl.cc/aarch64-linux-musl-cross.tgz
tar xzf aarch64-linux-musl-cross.tgz
cp -R aarch64-linux-musl-cross/* /usr
- uses: bahmutov/[email protected]
Expand Down
4 changes: 1 addition & 3 deletions .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
"overrides": [
{
"files": [
"packages/packagers/js/src/prelude.js",
"packages/packagers/swc/src/dev-prelude.js",
"packages/shared/scope-hoisting/src/helpers.js"
"packages/packagers/js/src/dev-prelude.js"
],
"options": {
"trailingComma": "es5"
Expand Down
Loading

0 comments on commit 8657593

Please sign in to comment.