diff --git a/.github/workflows/docusaurus.yml b/.github/workflows/docusaurus.yml index 531bea396806a..d72c7b8c941ca 100644 --- a/.github/workflows/docusaurus.yml +++ b/.github/workflows/docusaurus.yml @@ -11,48 +11,17 @@ on: - main jobs: - build-compiler-explorer: - name: Build Compiler Explorer - runs-on: macos-latest # wasm-pack not working on Ubuntu https://github.com/rustwasm/wasm-pack/issues/781 - steps: - - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1 - with: - toolchain: 1.58.0 - override: true - - name: Install wasm-pack - run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh - - name: "Build Compiler Playground Wasm NPM package" - run: wasm-pack build --target web - working-directory: ./compiler/crates/relay-compiler-playground - - uses: actions/upload-artifact@v3 - with: - name: compiler-playground-package - path: compiler/crates/relay-compiler-playground/pkg/ - build-and-deploy: runs-on: ubuntu-latest - needs: [build-compiler-explorer] steps: - name: Checkout uses: actions/checkout@v2.3.1 with: persist-credentials: false - - name: Download Compiler Explorer - uses: actions/download-artifact@v2 - with: - name: compiler-playground-package - path: tmp/compiler-playground-package - - - name: Link Compiler Explorer - run: yarn link - working-directory: tmp/compiler-playground-package - - name: Install and Build run: | yarn - yarn link relay-compiler-playground yarn build working-directory: website/ diff --git a/compiler/Cargo.lock b/compiler/Cargo.lock index 536cef743ad08..ff3a73f2f4f98 100644 --- a/compiler/Cargo.lock +++ b/compiler/Cargo.lock @@ -428,6 +428,7 @@ dependencies = [ "relay-transforms", "rustc-hash", "schema", + "serde", "tokio", ] @@ -552,7 +553,6 @@ dependencies = [ "colored", "diff", "lazy_static", - "parking_lot", "signedsource", "tokio", ] diff --git a/compiler/crates/fixture-tests/src/lib.rs b/compiler/crates/fixture-tests/src/lib.rs index f42b167377e8d..7562e8c5daf57 100644 --- a/compiler/crates/fixture-tests/src/lib.rs +++ b/compiler/crates/fixture-tests/src/lib.rs @@ -108,9 +108,8 @@ pub async fn test_fixture( let actual_result: Result; { let _guard = LOCK.lock(); - colored::control::set_override(false); + env::set_var("NO_COLOR", "1"); actual_result = transform(&fixture).await; - colored::control::unset_override(); } let actual = match &actual_result { diff --git a/packages/react-relay/relay-hooks/__tests__/loadQuery-store-behavior-test.js b/packages/react-relay/relay-hooks/__tests__/loadQuery-store-behavior-test.js index c8e23c05074f1..060a19b4632aa 100644 --- a/packages/react-relay/relay-hooks/__tests__/loadQuery-store-behavior-test.js +++ b/packages/react-relay/relay-hooks/__tests__/loadQuery-store-behavior-test.js @@ -27,7 +27,7 @@ import type { } from './__generated__/loadQueryStoreBehaviorTestQuery.graphql'; import type {GraphQLSingularResponse} from 'relay-runtime/network/RelayNetworkTypes'; import type {Sink} from 'relay-runtime/network/RelayObservable'; -import type {OperationType, Query} from 'relay-runtime/util/RelayRuntimeTypes'; +import type {Query} from 'relay-runtime/util/RelayRuntimeTypes'; const {loadQuery} = require('../loadQuery'); const { diff --git a/scripts/jest/preprocessor.js b/scripts/jest/preprocessor.js index b1b39851eee81..6ed92ff13a3e9 100644 --- a/scripts/jest/preprocessor.js +++ b/scripts/jest/preprocessor.js @@ -18,7 +18,7 @@ const path = require('path'); const babelOptions = getBabelOptions({ env: 'test', - // Tests use a Promise polfill so they can use jest.runAllTimers(). + // Tests use a Promise polyfill so they can use jest.runAllTimers(). autoImport: true, plugins: [ './dist/babel-plugin-relay', @@ -28,6 +28,7 @@ const babelOptions = getBabelOptions({ '@babel/plugin-proposal-optional-catch-binding', '@babel/plugin-proposal-optional-chaining', '@babel/plugin-transform-async-to-generator', + 'babel-plugin-syntax-hermes-parser', ], });