Skip to content

Commit

Permalink
Merge remote-tracking branch 'github/main' into nocheck
Browse files Browse the repository at this point in the history
  • Loading branch information
drewatk committed Sep 18, 2024
2 parents 9f50388 + da733d3 commit c22f597
Show file tree
Hide file tree
Showing 793 changed files with 49,356 additions and 18,960 deletions.
3 changes: 2 additions & 1 deletion .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ format.bracket_spacing=false

[lints]
untyped-type-import=error
deprecated-type-predicate=off

[strict]
deprecated-type
Expand All @@ -40,4 +41,4 @@ untyped-import
untyped-type-import

[version]
^0.241.0
^0.246.0
23 changes: 12 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.72.0
toolchain: 1.76.0
override: true
- name: "Run tests"
run: cargo test --manifest-path=compiler/Cargo.toml --locked ${{ matrix.target.features && '--features' }} ${{ matrix.target.features }}
Expand All @@ -118,7 +118,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.72.0
toolchain: 1.76.0
override: true
- name: "Update fixture tests"
run: ./scripts/update-fixtures.sh
Expand All @@ -136,11 +136,12 @@ jobs:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2023-11-11
# Should stay in sync with tools/third-party/rustfmt/.rustfmt-version
toolchain: nightly-2024-07-28
override: true
components: rustfmt
- name: "rustfmt"
run: grep -r --include "*.rs" --files-without-match "@generated" crates | xargs rustfmt --check --config="skip_children=true"
run: grep -r --include "*.rs" --files-without-match $'\x40generated' crates | xargs rustfmt --check --config="skip_children=true"
working-directory: ./compiler/

build-compiler:
Expand Down Expand Up @@ -177,7 +178,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.72.0
toolchain: 1.76.0
override: true
target: ${{ matrix.target.target }}
- uses: actions/setup-node@v2
Expand Down Expand Up @@ -209,7 +210,7 @@ jobs:
- name: Build project
working-directory: compiler
run: ${{ matrix.target.cross && 'cross' || 'cargo' }} build --release --target ${{ matrix.target.target }} ${{ matrix.target.features && '--features' }} ${{ matrix.target.features }}
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: ${{ matrix.target.artifact-name }}
path: compiler/target/${{ matrix.target.target }}/release/${{ matrix.target.build-name }}
Expand All @@ -229,27 +230,27 @@ jobs:
- name: Install dependencies
run: yarn install --frozen-lockfile --ignore-scripts
- name: Download artifact relay-bin-linux-x64
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: relay-bin-linux-x64
path: artifacts/linux-x64
- name: Download artifact relay-bin-linux-arm64
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: relay-bin-linux-arm64
path: artifacts/linux-arm64
- name: Download artifact relay-bin-macos-x64
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: relay-bin-macos-x64
path: artifacts/macos-x64
- name: Download artifact relay-bin-macos-arm64
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: relay-bin-macos-arm64
path: artifacts/macos-arm64
- name: Download artifact relay-bin-win-x64
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: relay-bin-win-x64
path: artifacts/win-x64
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docusaurus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.73.0 # We hit an LLVM error building Wasm on 1.72
toolchain: 1.76.0
override: true
- name: Install wasm-pack
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-cargo-lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.72.0
toolchain: 1.76.0
override: true
- name: cargo check
run: cargo check --features vendored --manifest-path=compiler/Cargo.toml
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ Relay is [MIT licensed](./LICENSE).

We'd like to thank [the contributors](https://github.com/facebook/relay/graphs/contributors) that helped make Relay in open source possible.

The open source project [`relay-hooks`](https://github.com/relay-tools/relay-hooks) allowed the community to experiment with Relay and React Hooks, and was a source of valuable feedback for us. The idea for the `useSubscription` hook originated in [an issue](https://github.com/relay-tools/relay-hooks/issues/5#issuecomment-603930570) on that repo. Thank you @morrys for driving this project and for playing such an important role in our open source community.
The open source project [`relay-hooks`](https://github.com/relay-tools/relay-hooks) allowed the community to experiment with Relay and React Hooks, and was a source of valuable feedback for us. The idea for the `useSubscription` hook originated in [an issue](https://github.com/relay-tools/relay-hooks/issues/5#issuecomment-603930570) on that repo. Thank you [@morrys](https://github.com/morrys) for driving this project and for playing such an important role in our open source community.

Thank you for helping make this possible!
152 changes: 32 additions & 120 deletions compiler/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 4 additions & 6 deletions compiler/README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
# Rust Compiler Rewrite
# Rust Compiler

This directory contains an experimental rewrite of the Relay compiler in Rust.
The code is still extremely new and incomplete. The components may work
individually, but are not yet fully integrated and may have bugs.

Goals of this project include:
This directory contains the implementation of the Relay compiler in Rust.
The Relay compiler was previously written in JavaScript and was re-written
in Rust for several benefits including:

- Fast compilation that scales to massive projects like
[the new facebook.com](https://developers.facebook.com/videos/2019/building-the-new-facebookcom-with-react-graphql-and-relay/).
Expand Down
2 changes: 1 addition & 1 deletion compiler/crates/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ license = "MIT"
colored = "2.1.0"
indexmap = { version = "2.2.6", features = ["arbitrary", "rayon", "serde"] }
intern = { path = "../intern" }
log = { version = "0.4.22", features = ["kv_unstable", "kv_unstable_std"] }
log = { version = "0.4.22", features = ["kv_unstable"] }
lsp-types = "0.94.1"
md-5 = "0.10"
rayon = "1.9.0"
Expand Down
Loading

0 comments on commit c22f597

Please sign in to comment.